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 | 11c7e6573013f60d2897720ebbc8c4164e124574 (patch) | |
| tree | dbac90689b873021094635bb28ba94bd11b8e452 /src/test | |
| parent | 48dd87933dd1c592937ef62d20aeac8998edc0fb (diff) | |
| parent | 42ba87d9648c5aa6c15d53175c477ce697932188 (diff) | |
| download | tor-11c7e6573013f60d2897720ebbc8c4164e124574.tar.gz tor-11c7e6573013f60d2897720ebbc8c4164e124574.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.4
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 42a901fe77..c1a87fbb4f 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), |