September 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.4] Tell openssl to build its TLS contexts with security level 1
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 2ec88a2a6ddef1b916425438b9648879a977b120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:57:14 2018 -0400 Tell openssl to build its TLS contexts with security level 1 Fixes bug 27344, where we'd break compatibility with old tors by rejecting RSA1024 and DH1024. --- changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug27344 b/changes/bug27344 new file mode 100644 index 000000000..9f6685558 --- /dev/null +++ b/changes/bug27344 @@ -0,0 +1,4 @@ + o Minor features (compatibility): + - Tell OpenSSL to maintain backward compatibility with previous + RSA1024/DH1024 users in Tor. With OpenSSL 1.1.1-pre6, these ciphers + are disabled by default. Closes ticket 27344. diff --git a/configure.ac b/configure.ac index 76b3f423a..5ac3579d7 100644 --- a/configure.ac +++ b/configure.ac @@ -678,6 +678,7 @@ AC_CHECK_FUNCS([ \ SSL_get_client_ciphers \ SSL_get_client_random \ SSL_CIPHER_find \ + SSL_CTX_set_security_level \ TLS_method ]) diff --git a/src/common/tortls.c b/src/common/tortls.c index 4cbe8b10e..1f2fe1ce1 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1130,6 +1130,11 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; #endif +#ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL + /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */ + SSL_CTX_set_security_level(result->ctx, 1); +#endif + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); @@ -2555,4 +2560,3 @@ evaluate_ecgroup_for_tls(const char *ecgroup) return ret; } -

1 0

[tor/release-0.3.3] Merge branch 'ticket27344_029' into maint-0.2.9
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 1e46a391b3ef4dfc65044f900684368ea234c290 Merge: 9fcb3ef78 2ec88a2a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:15 2018 -0400 Merge branch 'ticket27344_029' into maint-0.2.9 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 0366ae224cb3b9cd55905201cd1b55a03f2736e9 Merge: 987e12a58 1e46a391b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --cc src/common/tortls.c index 03c0be1cd,1f2fe1ce1..6efc8c3e4 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@@ -1171,7 -1129,12 +1171,13 @@@ tor_tls_context_new(crypto_pk_t *identi #else if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; -#endif +#endif /* defined(HAVE_TLS_METHOD) */ ++ + #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL + /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */ + SSL_CTX_set_security_level(result->ctx, 1); + #endif + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3);

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 732ea9120c9db5d6368cba6f2b789aa4fca5db31 Merge: 056003d60 0366ae224 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 0330652346ed47863710454d3dccdc1b5109d53c Merge: 85cee6a74 8849b2ca3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:56 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 8849b2ca3c3943e7d2f109b8e56179be82092a6e Merge: 967cef2f8 732ea9120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:56 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Tell openssl to build its TLS contexts with security level 1
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 2ec88a2a6ddef1b916425438b9648879a977b120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:57:14 2018 -0400 Tell openssl to build its TLS contexts with security level 1 Fixes bug 27344, where we'd break compatibility with old tors by rejecting RSA1024 and DH1024. --- changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug27344 b/changes/bug27344 new file mode 100644 index 000000000..9f6685558 --- /dev/null +++ b/changes/bug27344 @@ -0,0 +1,4 @@ + o Minor features (compatibility): + - Tell OpenSSL to maintain backward compatibility with previous + RSA1024/DH1024 users in Tor. With OpenSSL 1.1.1-pre6, these ciphers + are disabled by default. Closes ticket 27344. diff --git a/configure.ac b/configure.ac index 76b3f423a..5ac3579d7 100644 --- a/configure.ac +++ b/configure.ac @@ -678,6 +678,7 @@ AC_CHECK_FUNCS([ \ SSL_get_client_ciphers \ SSL_get_client_random \ SSL_CIPHER_find \ + SSL_CTX_set_security_level \ TLS_method ]) diff --git a/src/common/tortls.c b/src/common/tortls.c index 4cbe8b10e..1f2fe1ce1 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1130,6 +1130,11 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; #endif +#ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL + /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */ + SSL_CTX_set_security_level(result->ctx, 1); +#endif + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); @@ -2555,4 +2560,3 @@ evaluate_ecgroup_for_tls(const char *ecgroup) return ret; } -

1 0

[tor/maint-0.3.2] Merge branch 'ticket27344_029' into maint-0.2.9
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 1e46a391b3ef4dfc65044f900684368ea234c290 Merge: 9fcb3ef78 2ec88a2a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:15 2018 -0400 Merge branch 'ticket27344_029' into maint-0.2.9 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 0366ae224cb3b9cd55905201cd1b55a03f2736e9 Merge: 987e12a58 1e46a391b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --cc src/common/tortls.c index 03c0be1cd,1f2fe1ce1..6efc8c3e4 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@@ -1171,7 -1129,12 +1171,13 @@@ tor_tls_context_new(crypto_pk_t *identi #else if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; -#endif +#endif /* defined(HAVE_TLS_METHOD) */ ++ + #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL + /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */ + SSL_CTX_set_security_level(result->ctx, 1); + #endif + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3);

1 0

[tor/maint-0.2.9] Merge branch 'ticket27344_029' into maint-0.2.9
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 1e46a391b3ef4dfc65044f900684368ea234c290 Merge: 9fcb3ef78 2ec88a2a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 09:15:15 2018 -0400 Merge branch 'ticket27344_029' into maint-0.2.9 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-)

1 0