commit ac1ddd5e5bf86b85553b685d6ffa256ef555d94a Merge: 91f49bc d561da1 Author: Nick Mathewson nickm@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;