summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-05 16:35:40 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-05 16:35:40 -0400
commit8dd9d631c924a9d5de6b9f4f33c862f8482522bb (patch)
treed54f07b17cd90dfa4d396a248a7844a6bac7d131
parent9f642b5918b58be86a23b4a09f0a8f5c77c0d8f5 (diff)
parentd561da10ddb429e1d3f4f74723e94e39f7257a9e (diff)
downloadtor-8dd9d631c924a9d5de6b9f4f33c862f8482522bb.tar.gz
tor-8dd9d631c924a9d5de6b9f4f33c862f8482522bb.zip
Merge branch 'maint-0.2.9' into release-0.2.9
-rw-r--r--src/test/test_link_handshake.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index b979485967..ddf66f4d34 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;