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_nss.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_nss.c')
-rw-r--r-- | src/lib/tls/tortls_nss.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index c873367f6f..25446a81af 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -646,13 +646,6 @@ tor_tls_block_renegotiation(tor_tls_t *tls) /* We don't support renegotiation with NSS. */ } -void -tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls) -{ - tor_assert(tls); - /* We don't support renegotiation with NSS. */ -} - int tor_tls_get_pending_bytes(tor_tls_t *tls) { |