diff options
author | teor <teor@torproject.org> | 2019-08-12 09:40:08 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-08-12 09:40:08 +1000 |
commit | 955cf9620c68c17f6531e80f9f4a7fa7d9f0f479 (patch) | |
tree | 805a4f191d9eb0450610441bfb91eba32c40e3aa /changes | |
parent | 3287cae68c8e6f2f72967bf6fb07e601792ecd2c (diff) | |
parent | 4dd96f74444b0eeb8b3b2c36f6f129edddd464d4 (diff) | |
download | tor-955cf9620c68c17f6531e80f9f4a7fa7d9f0f479.tar.gz tor-955cf9620c68c17f6531e80f9f4a7fa7d9f0f479.zip |
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5
Diffstat (limited to 'changes')
-rw-r--r-- | changes/29241_diagnostic | 4 | ||||
-rw-r--r-- | changes/bug29241 | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changes/29241_diagnostic b/changes/29241_diagnostic new file mode 100644 index 0000000000..1e38654957 --- /dev/null +++ b/changes/29241_diagnostic @@ -0,0 +1,4 @@ + o Minor features (NSS, diagnostic): + - Try to log an error from NSS (if there is any) and a more useful + description of our situation if we are using NSS and a call to + SSL_ExportKeyingMaterial() fails. Diagnostic for ticket 29241. diff --git a/changes/bug29241 b/changes/bug29241 new file mode 100644 index 0000000000..7f25e154d1 --- /dev/null +++ b/changes/bug29241 @@ -0,0 +1,6 @@ + o Major bugfixes (NSS, relay): + - When running with NSS, disable TLS 1.2 ciphersuites that use SHA384 + for their PRF. Due to an NSS bug, the TLS key exporters for these + ciphersuites don't work -- which caused relays to fail to handshake + with one another when these ciphersuites were enabled. + Fixes bug 29241; bugfix on 0.3.5.1-alpha. |