diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-06-05 16:35:40 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-06-05 16:35:40 -0400 |
commit | ac1ddd5e5bf86b85553b685d6ffa256ef555d94a (patch) | |
tree | 93959dc228bf2f111bc0e571fa6940e340375193 /src/test/test_link_handshake.c | |
parent | 91f49bc0f0759d0e0a794fbfe8cce5a9bb07e607 (diff) | |
parent | d561da10ddb429e1d3f4f74723e94e39f7257a9e (diff) | |
download | tor-ac1ddd5e5bf86b85553b685d6ffa256ef555d94a.tar.gz tor-ac1ddd5e5bf86b85553b685d6ffa256ef555d94a.zip |
Merge branch 'maint-0.2.9' into maint-0.3.0
Diffstat (limited to 'src/test/test_link_handshake.c')
-rw-r--r-- | src/test/test_link_handshake.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 66eeb724a2..d81f9e8eb2 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -155,9 +155,9 @@ test_link_handshake_certs_ok(void *arg) /* 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; |