June 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit ac1ddd5e5bf86b85553b685d6ffa256ef555d94a Merge: 91f49bc d561da1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 16:35:40 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --cc src/test/test_link_handshake.c index 66eeb72,ddf66f4..d81f9e8 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@@ -145,19 -103,10 +145,19 @@@ test_link_handshake_certs_ok(void *arg tt_int_op(tor_tls_context_init(TOR_TLS_CTX_IS_PUBLIC_SERVER, key1, key2, 86400), ==, 0); + if (with_ed) { + /* If we're making a CERTS cell for an ed handshake, let's make sure we + * have some Ed25519 certificates and keys. */ + init_mock_ed_keys(key2); + } else { + certs_cell_ed25519_disabled_for_testing = 1; + } + + /* c1 has started_here == 1 */ { - const tor_x509_cert_t *link = NULL; - tt_assert(!tor_tls_get_my_certs(1, &link, NULL)); - mock_own_cert = tor_x509_cert_dup(link); + const tor_x509_cert_t *link_cert = NULL; + tt_assert(!tor_tls_get_my_certs(1, &link_cert, NULL)); + mock_own_cert = tor_x509_cert_dup(link_cert); } c1->base_.state = OR_CONN_STATE_OR_HANDSHAKING_V3;

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 624bccc35e524807349086cbf95616d52c3475c7 Merge: fae8bcb ac1ddd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 16:35:40 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.9] Rename "link" variable to avoid shadowing warning.
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit d561da10ddb429e1d3f4f74723e94e39f7257a9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 16:35:37 2017 -0400 Rename "link" variable to avoid shadowing warning. --- src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index b979485..ddf66f4 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -104,9 +104,9 @@ test_link_handshake_certs_ok(void *arg) key1, key2, 86400), ==, 0); { - const tor_x509_cert_t *link = NULL; - tt_assert(!tor_tls_get_my_certs(1, &link, NULL)); - mock_own_cert = tor_x509_cert_dup(link); + const tor_x509_cert_t *link_cert = NULL; + tt_assert(!tor_tls_get_my_certs(1, &link_cert, NULL)); + mock_own_cert = tor_x509_cert_dup(link_cert); } c1->base_.state = OR_CONN_STATE_OR_HANDSHAKING_V3;

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 5343d2b03c8158fcd9c8811e367e26ac6bfa9827 Merge: e3b1573 ac1ddd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 16:35:40 2017 -0400 Merge branch 'maint-0.3.0' src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit ac1ddd5e5bf86b85553b685d6ffa256ef555d94a Merge: 91f49bc d561da1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 16:35:40 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --cc src/test/test_link_handshake.c index 66eeb72,ddf66f4..d81f9e8 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@@ -145,19 -103,10 +145,19 @@@ test_link_handshake_certs_ok(void *arg tt_int_op(tor_tls_context_init(TOR_TLS_CTX_IS_PUBLIC_SERVER, key1, key2, 86400), ==, 0); + if (with_ed) { + /* If we're making a CERTS cell for an ed handshake, let's make sure we + * have some Ed25519 certificates and keys. */ + init_mock_ed_keys(key2); + } else { + certs_cell_ed25519_disabled_for_testing = 1; + } + + /* c1 has started_here == 1 */ { - const tor_x509_cert_t *link = NULL; - tt_assert(!tor_tls_get_my_certs(1, &link, NULL)); - mock_own_cert = tor_x509_cert_dup(link); + const tor_x509_cert_t *link_cert = NULL; + tt_assert(!tor_tls_get_my_certs(1, &link_cert, NULL)); + mock_own_cert = tor_x509_cert_dup(link_cert); } c1->base_.state = OR_CONN_STATE_OR_HANDSHAKING_V3;

1 0

[tor/release-0.3.0] Rename "link" variable to avoid shadowing warning.
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit d561da10ddb429e1d3f4f74723e94e39f7257a9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 16:35:37 2017 -0400 Rename "link" variable to avoid shadowing warning. --- src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index b979485..ddf66f4 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -104,9 +104,9 @@ test_link_handshake_certs_ok(void *arg) key1, key2, 86400), ==, 0); { - const tor_x509_cert_t *link = NULL; - tt_assert(!tor_tls_get_my_certs(1, &link, NULL)); - mock_own_cert = tor_x509_cert_dup(link); + const tor_x509_cert_t *link_cert = NULL; + tt_assert(!tor_tls_get_my_certs(1, &link_cert, NULL)); + mock_own_cert = tor_x509_cert_dup(link_cert); } c1->base_.state = OR_CONN_STATE_OR_HANDSHAKING_V3;

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit ac1ddd5e5bf86b85553b685d6ffa256ef555d94a Merge: 91f49bc d561da1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 16:35:40 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --cc src/test/test_link_handshake.c index 66eeb72,ddf66f4..d81f9e8 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@@ -145,19 -103,10 +145,19 @@@ test_link_handshake_certs_ok(void *arg tt_int_op(tor_tls_context_init(TOR_TLS_CTX_IS_PUBLIC_SERVER, key1, key2, 86400), ==, 0); + if (with_ed) { + /* If we're making a CERTS cell for an ed handshake, let's make sure we + * have some Ed25519 certificates and keys. */ + init_mock_ed_keys(key2); + } else { + certs_cell_ed25519_disabled_for_testing = 1; + } + + /* c1 has started_here == 1 */ { - const tor_x509_cert_t *link = NULL; - tt_assert(!tor_tls_get_my_certs(1, &link, NULL)); - mock_own_cert = tor_x509_cert_dup(link); + const tor_x509_cert_t *link_cert = NULL; + tt_assert(!tor_tls_get_my_certs(1, &link_cert, NULL)); + mock_own_cert = tor_x509_cert_dup(link_cert); } c1->base_.state = OR_CONN_STATE_OR_HANDSHAKING_V3;

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 8dd9d631c924a9d5de6b9f4f33c862f8482522bb Merge: 9f642b5 d561da1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 16:35:40 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.0] Make code more clear about own_link_cert safety
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit e5bdfd66cf03e8410c511f6dcf309142c64c85f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 5 09:35:55 2017 -0400 Make code more clear about own_link_cert safety It's okay to call add_ed25519_cert with a NULL argument: so, document that. Also, add a tor_assert_nonfatal() to catch any case where we have failed to set own_link_cert when conn_in_server_mode. --- src/or/connection_or.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 0966ec8..9c806d1 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -2238,7 +2238,8 @@ add_certs_cell_cert_helper(certs_cell_t *certs_cell, /** Add an encoded X509 cert (stored as cert_len bytes at * cert_encoded) to the trunnel certs_cell_t object that we are - * building in certs_cell. Set its type field to cert_type. */ + * building in certs_cell. Set its type field to cert_type. + * (If cert is NULL, take no action.) */ static void add_x509_cert(certs_cell_t *certs_cell, uint8_t cert_type, @@ -2256,7 +2257,7 @@ add_x509_cert(certs_cell_t *certs_cell, /** Add an Ed25519 cert from cert to the trunnel certs_cell_t object * that we are building in certs_cell. Set its type field to - * cert_type. */ + * cert_type. (If cert is NULL, take no action.) */ static void add_ed25519_cert(certs_cell_t *certs_cell, uint8_t cert_type, @@ -2313,6 +2314,7 @@ connection_or_send_certs_cell(or_connection_t *conn) CERTTYPE_ED_ID_SIGN, get_master_signing_key_cert()); if (conn_in_server_mode) { + tor_assert_nonfatal(conn->handshake_state->own_link_cert); add_ed25519_cert(certs_cell, CERTTYPE_ED_SIGN_LINK, conn->handshake_state->own_link_cert);

1 0

[tor/maint-0.3.0] Test prerequisites: function to dup a cert, make get_own_cert mockable.
by nickm＠torproject.org 05 Jun '17

05 Jun '17

commit 39b7e89c28efda628d57640302276b7f04b2c0de Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 1 08:55:54 2017 -0400 Test prerequisites: function to dup a cert, make get_own_cert mockable. --- src/common/tortls.c | 13 +++++++++++-- src/common/tortls.h | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 055b468..1661b7e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -677,6 +677,15 @@ MOCK_IMPL(STATIC tor_x509_cert_t *, return cert; } +/** Return a new copy of cert. */ +tor_x509_cert_t * +tor_x509_cert_dup(const tor_x509_cert_t *cert) +{ + tor_assert(cert); + X509 *x509 = cert->cert; + return tor_x509_cert_new(X509_dup(x509)); +} + /** Read a DER-encoded X509 cert, of length exactly certificate_len, * from a certificate. Return a newly allocated tor_x509_cert_t on * success and NULL on failure. */ @@ -2023,8 +2032,8 @@ tor_tls_get_peer_cert,(tor_tls_t *tls)) /** Return the cerficate we used on the connection, or NULL if somehow * we didn't use one. */ -tor_x509_cert_t * -tor_tls_get_own_cert(tor_tls_t *tls) +MOCK_IMPL(tor_x509_cert_t *, +tor_tls_get_own_cert,(tor_tls_t *tls)) { X509 *cert = SSL_get_certificate(tls->ssl); tls_log_errors(tls, LOG_WARN, LD_HANDSHAKE, diff --git a/src/common/tortls.h b/src/common/tortls.h index ae11b7a..f018c45 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -197,8 +197,9 @@ void tor_tls_set_renegotiate_callback(tor_tls_t *tls, int tor_tls_is_server(tor_tls_t *tls); void tor_tls_free(tor_tls_t *tls); int tor_tls_peer_has_cert(tor_tls_t *tls); +tor_x509_cert_t *tor_x509_cert_dup(const tor_x509_cert_t *cert); MOCK_DECL(tor_x509_cert_t *,tor_tls_get_peer_cert,(tor_tls_t *tls)); -tor_x509_cert_t *tor_tls_get_own_cert(tor_tls_t *tls); +MOCK_DECL(tor_x509_cert_t *,tor_tls_get_own_cert,(tor_tls_t *tls)); int tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_t **identity); int tor_tls_check_lifetime(int severity, tor_tls_t *tls, int past_tolerance,

1 0