From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 21 Aug 2018 23:20:31 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.7-rc~13^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f68aab83ba6ab61b010d4445b6c68a6cf780471a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4
---

f68aab83ba6ab61b010d4445b6c68a6cf780471a
diff --cc src/test/test_tortls.c
index 388f6df325,bb899a9577..5b5e69b002
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@@ -553,22 -547,6 +553,15 @@@ test_tortls_x509_cert_get_id_digests(vo
  }
  
  #ifndef OPENSSL_OPAQUE
- static int
- fixed_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
- {
-   (void) a; (void) b;
-   return 1;
- }
- 
 +/*
 + * Use only for the matching fake_x509_free() call
 + */
 +static X509 *
 +fake_x509_malloc(void)
 +{
 +  return tor_malloc_zero(sizeof(X509));
 +}
 +
  static void
  fake_x509_free(X509 *cert)
  {
@@@ -2795,7 -2784,7 +2796,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),
@@@ -2839,4 -2828,4 +2840,3 @@@
    LOCAL_TEST_CASE(context_init_one, 0),
    END_OF_TESTCASES
  };
--