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/lib/tls/tortls_openssl.c | |
| 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/lib/tls/tortls_openssl.c')
| -rw-r--r-- | src/lib/tls/tortls_openssl.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 7db27bba63..d59d65d995 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -1190,19 +1190,6 @@ tor_tls_block_renegotiation(tor_tls_t *tls) #endif } -/** Assert that the flags that allow legacy renegotiation are still set */ -void -tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls) -{ -#if defined(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) && \ - SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION != 0 - long options = SSL_get_options(tls->ssl); - tor_assert(0 != (options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)); -#else - (void) tls; -#endif /* defined(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) && ... */ -} - /** * Tell the TLS library that the underlying socket for <b>tls</b> has been * closed, and the library should not attempt to free that socket itself. |