[tor-commits] [tor/maint-0.3.4] Mark cert_matches_key as not-intrusive; fix stretch compilation.

[nickm@xxxxxxxxxxxxxx]

commit 9068e2fa280395ba15d30465ec25141cff876922
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 22 09:37:26 2018 -0400

    Mark cert_matches_key as not-intrusive; fix stretch compilation.
---
 src/or/connection_edge.c | 1 -
 src/test/test_tortls.c   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 12fe2f57c..7a97c632d 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -3823,4 +3823,3 @@ connection_edge_free_all(void)
   smartlist_free(pending_entry_connections);
   pending_entry_connections = NULL;
 }
-
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index b0aec88ec..4febd82dd 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -2779,7 +2779,7 @@ struct testcase_t tortls_tests[] = {
   LOCAL_TEST_CASE(always_accept_verify_cb, 0),
   INTRUSIVE_TEST_CASE(x509_cert_free, 0),
   LOCAL_TEST_CASE(x509_cert_get_id_digests, 0),
-  INTRUSIVE_TEST_CASE(cert_matches_key, 0),
+  LOCAL_TEST_CASE(cert_matches_key, 0),
   INTRUSIVE_TEST_CASE(cert_get_key, 0),
   LOCAL_TEST_CASE(get_my_client_auth_key, TT_FORK),
   LOCAL_TEST_CASE(get_my_certs, TT_FORK),
@@ -2823,4 +2823,3 @@ struct testcase_t tortls_tests[] = {
   LOCAL_TEST_CASE(context_init_one, 0),
   END_OF_TESTCASES
 };
-



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits