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 | 624bccc35e524807349086cbf95616d52c3475c7 (patch) | |
tree | d88272acd5f542ab881957d8d164105d2c99bcfb | |
parent | fae8bcba9e344dd6ab5419a9019afd4947e329f0 (diff) | |
parent | ac1ddd5e5bf86b85553b685d6ffa256ef555d94a (diff) | |
download | tor-624bccc35e524807349086cbf95616d52c3475c7.tar.gz tor-624bccc35e524807349086cbf95616d52c3475c7.zip |
Merge branch 'maint-0.3.0' into release-0.3.0
-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; |