diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-05-25 13:25:23 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-05-25 13:25:23 +0000 |
| commit | de5f94000cd9dbb3ba503f66d95f2bba230dfb78 (patch) | |
| tree | bc0b92ac8b7e1c2a49d09e61e054667a23f51f18 /src/test | |
| parent | 22552ad88e1e95ef9d2c6655c7602b7b25836075 (diff) | |
| parent | bab2b29f89f21781a87010cf7120615615b90599 (diff) | |
| download | tor-de5f94000cd9dbb3ba503f66d95f2bba230dfb78.tar.gz tor-de5f94000cd9dbb3ba503f66d95f2bba230dfb78.zip | |
Merge branch 'maint-0.4.6' into main
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_tortls_openssl.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index ede5b31dd0..010e09c8eb 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -1143,25 +1143,6 @@ test_tortls_unblock_renegotiation(void *ignored) } #endif /* !defined(OPENSSL_OPAQUE) */ -#ifndef OPENSSL_OPAQUE -static void -test_tortls_assert_renegotiation_unblocked(void *ignored) -{ - (void)ignored; - tor_tls_t *tls; - - tls = tor_malloc_zero(sizeof(tor_tls_t)); - tls->ssl = tor_malloc_zero(sizeof(SSL)); - tor_tls_unblock_renegotiation(tls); - tor_tls_assert_renegotiation_unblocked(tls); - /* No assertion here - this test will fail if tor_assert is turned on - * and things are bad. */ - - tor_free(tls->ssl); - tor_free(tls); -} -#endif /* !defined(OPENSSL_OPAQUE) */ - static void test_tortls_set_logged_address(void *ignored) { @@ -2224,7 +2205,6 @@ struct testcase_t tortls_openssl_tests[] = { INTRUSIVE_TEST_CASE(server_info_callback, 0), LOCAL_TEST_CASE(get_write_overhead_ratio, TT_FORK), LOCAL_TEST_CASE(is_server, 0), - INTRUSIVE_TEST_CASE(assert_renegotiation_unblocked, 0), INTRUSIVE_TEST_CASE(block_renegotiation, 0), INTRUSIVE_TEST_CASE(unblock_renegotiation, 0), INTRUSIVE_TEST_CASE(set_renegotiate_callback, 0), |