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/lib/tls/tortls_openssl.c | |
| 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/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 2269714141..5c92df1259 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. |