diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-04 11:24:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-04 11:24:55 -0400 |
| commit | 1710f4bbd6bb100901e7f601a1c0f96b51845f86 (patch) | |
| tree | a78f91603343f77e6f07b8ebfe9bcfdf5b5419a6 | |
| parent | 54e249e269c63fd5f003dd8c15faa6a13902f8e4 (diff) | |
| download | tor-1710f4bbd6bb100901e7f601a1c0f96b51845f86.tar.gz tor-1710f4bbd6bb100901e7f601a1c0f96b51845f86.zip | |
Do not cache bogus results from classifying client ciphers
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.
| -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 1fbe3c663e..f79969d0da 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -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; |