diff options
| author | teor <teor@torproject.org> | 2019-04-06 09:33:11 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-06 09:33:11 +1000 |
| commit | 48e990359b05661f2dd0ae503143ee9b18442475 (patch) | |
| tree | 1f024787cacc543a7f94397c8971954d1bf6bd19 | |
| parent | 102178e6d43ed990e972b2fbc4f611997c8943f0 (diff) | |
| parent | a0db5ade3e1e2b81ed1196eb98aeca53583fba64 (diff) | |
| download | tor-48e990359b05661f2dd0ae503143ee9b18442475.tar.gz tor-48e990359b05661f2dd0ae503143ee9b18442475.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.4
| -rw-r--r-- | changes/bug30021 | 8 | ||||
| -rw-r--r-- | src/common/tortls.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug30021 b/changes/bug30021 new file mode 100644 index 0000000000..2a887f3cf2 --- /dev/null +++ b/changes/bug30021 @@ -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. diff --git a/src/common/tortls.c b/src/common/tortls.c index b55511569b..6ff513b14f 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1570,7 +1570,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; |