nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

Browse Source
This commit is contained in:
teor 2019-04-06 09:28:58 +10:00
commit a0db5ade3e
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug30021 Normal file
View File

@ -0,0 +1,8 @@
o Minor bugfixes (TLS protocol, integration tests):
- When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol. This, in turn, was causing Stem
integration tests to stall in some cases.
Fixes bug 30021; bugfix on 0.2.4.8-alpha.

2
src/common/tortls.c
View File

@ -1500,7 +1500,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl,
smartlist_free(elts);
}
done:
if (tor_tls)
if (tor_tls && peer_ciphers)
return tor_tls->client_cipher_list_type = res;
return res;