May 2021 - tor-commits - lists.torproject.org

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 25 May '21

25 May '21

commit bab2b29f89f21781a87010cf7120615615b90599 Merge: debede5e50 4a7379b80a Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue May 25 13:25:23 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-)

1 0

[tor/maint-0.4.4] Remove the function `tor_tls_assert_renegotiation_unblocked`.
by ahf＠torproject.org 25 May '21

25 May '21

commit 42ba87d9648c5aa6c15d53175c477ce697932188 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 25 07:38:31 2021 -0400 Remove the function `tor_tls_assert_renegotiation_unblocked`. It was used nowhere outside its own unit tests, and it was causing compilation issues with recent OpenSSL 3.0.0 alphas. Closes ticket 40399. --- changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-) diff --git a/changes/bug40399 b/changes/bug40399 new file mode 100644 index 0000000000..7954b85eaf --- /dev/null +++ b/changes/bug40399 @@ -0,0 +1,5 @@ + o Minor features (compatibility): + - Remove an assertion function related to TLS renegotiation. + It was used nowhere outside the unit tests, and it was breaking + compilation with recent alpha releases of OpenSSL 3.0.0. + Closes ticket 40399. diff --git a/src/lib/tls/tortls.h b/src/lib/tls/tortls.h index 8efc7a1c98..9398318035 100644 --- a/src/lib/tls/tortls.h +++ b/src/lib/tls/tortls.h @@ -107,7 +107,6 @@ int tor_tls_handshake(tor_tls_t *tls); int tor_tls_finish_handshake(tor_tls_t *tls); void tor_tls_unblock_renegotiation(tor_tls_t *tls); void tor_tls_block_renegotiation(tor_tls_t *tls); -void tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls); int tor_tls_get_pending_bytes(tor_tls_t *tls); size_t tor_tls_get_forced_write_size(tor_tls_t *tls); diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 6f6c47674e..b7f3513150 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -633,13 +633,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) { diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 80b0df301f..c5031a00aa 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -1168,19 +1168,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 tls has been * closed, and the library should not attempt to free that socket itself. diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index f4e3430dac..81c65d7446 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -1147,25 +1147,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) { @@ -2228,7 +2209,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),

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4
by ahf＠torproject.org 25 May '21

25 May '21

commit 11c7e6573013f60d2897720ebbc8c4164e124574 Merge: 48dd87933d 42ba87d964 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue May 25 13:25:23 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.4
by ahf＠torproject.org 25 May '21

25 May '21

commit 11c7e6573013f60d2897720ebbc8c4164e124574 Merge: 48dd87933d 42ba87d964 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue May 25 13:25:23 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-)

1 0

[tor/maint-0.4.6] Remove the function `tor_tls_assert_renegotiation_unblocked`.
by ahf＠torproject.org 25 May '21

25 May '21

commit 42ba87d9648c5aa6c15d53175c477ce697932188 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 25 07:38:31 2021 -0400 Remove the function `tor_tls_assert_renegotiation_unblocked`. It was used nowhere outside its own unit tests, and it was causing compilation issues with recent OpenSSL 3.0.0 alphas. Closes ticket 40399. --- changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-) diff --git a/changes/bug40399 b/changes/bug40399 new file mode 100644 index 0000000000..7954b85eaf --- /dev/null +++ b/changes/bug40399 @@ -0,0 +1,5 @@ + o Minor features (compatibility): + - Remove an assertion function related to TLS renegotiation. + It was used nowhere outside the unit tests, and it was breaking + compilation with recent alpha releases of OpenSSL 3.0.0. + Closes ticket 40399. diff --git a/src/lib/tls/tortls.h b/src/lib/tls/tortls.h index 8efc7a1c98..9398318035 100644 --- a/src/lib/tls/tortls.h +++ b/src/lib/tls/tortls.h @@ -107,7 +107,6 @@ int tor_tls_handshake(tor_tls_t *tls); int tor_tls_finish_handshake(tor_tls_t *tls); void tor_tls_unblock_renegotiation(tor_tls_t *tls); void tor_tls_block_renegotiation(tor_tls_t *tls); -void tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls); int tor_tls_get_pending_bytes(tor_tls_t *tls); size_t tor_tls_get_forced_write_size(tor_tls_t *tls); diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 6f6c47674e..b7f3513150 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -633,13 +633,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) { diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 80b0df301f..c5031a00aa 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -1168,19 +1168,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 tls has been * closed, and the library should not attempt to free that socket itself. diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index f4e3430dac..81c65d7446 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -1147,25 +1147,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) { @@ -2228,7 +2209,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),

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.4
by ahf＠torproject.org 25 May '21

25 May '21

commit 11c7e6573013f60d2897720ebbc8c4164e124574 Merge: 48dd87933d 42ba87d964 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue May 25 13:25:23 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5
by ahf＠torproject.org 25 May '21

25 May '21

commit 4a7379b80a3d0f61d258b26f82d894da9b8cd0f5 Merge: 97b61e21a9 11c7e65730 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue May 25 13:25:23 2021 +0000 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-)

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by ahf＠torproject.org 25 May '21

25 May '21

commit 4a7379b80a3d0f61d258b26f82d894da9b8cd0f5 Merge: 97b61e21a9 11c7e65730 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue May 25 13:25:23 2021 +0000 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 25 May '21

25 May '21

commit bab2b29f89f21781a87010cf7120615615b90599 Merge: debede5e50 4a7379b80a Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue May 25 13:25:23 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-)

1 0

[tor/release-0.3.5] Remove the function `tor_tls_assert_renegotiation_unblocked`.
by ahf＠torproject.org 25 May '21

25 May '21

commit 42ba87d9648c5aa6c15d53175c477ce697932188 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 25 07:38:31 2021 -0400 Remove the function `tor_tls_assert_renegotiation_unblocked`. It was used nowhere outside its own unit tests, and it was causing compilation issues with recent OpenSSL 3.0.0 alphas. Closes ticket 40399. --- changes/bug40399 | 5 +++++ src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 ------- src/lib/tls/tortls_openssl.c | 13 ------------- src/test/test_tortls_openssl.c | 20 -------------------- 5 files changed, 5 insertions(+), 41 deletions(-) diff --git a/changes/bug40399 b/changes/bug40399 new file mode 100644 index 0000000000..7954b85eaf --- /dev/null +++ b/changes/bug40399 @@ -0,0 +1,5 @@ + o Minor features (compatibility): + - Remove an assertion function related to TLS renegotiation. + It was used nowhere outside the unit tests, and it was breaking + compilation with recent alpha releases of OpenSSL 3.0.0. + Closes ticket 40399. diff --git a/src/lib/tls/tortls.h b/src/lib/tls/tortls.h index 8efc7a1c98..9398318035 100644 --- a/src/lib/tls/tortls.h +++ b/src/lib/tls/tortls.h @@ -107,7 +107,6 @@ int tor_tls_handshake(tor_tls_t *tls); int tor_tls_finish_handshake(tor_tls_t *tls); void tor_tls_unblock_renegotiation(tor_tls_t *tls); void tor_tls_block_renegotiation(tor_tls_t *tls); -void tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls); int tor_tls_get_pending_bytes(tor_tls_t *tls); size_t tor_tls_get_forced_write_size(tor_tls_t *tls); diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 6f6c47674e..b7f3513150 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -633,13 +633,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) { diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 80b0df301f..c5031a00aa 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -1168,19 +1168,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 tls has been * closed, and the library should not attempt to free that socket itself. diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index f4e3430dac..81c65d7446 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -1147,25 +1147,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) { @@ -2228,7 +2209,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),

1 0