diff options
| author | teor <teor@torproject.org> | 2019-04-06 09:31:52 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-06 09:31:52 +1000 |
| commit | ea5e371822d58eb25eda912ba8afb8c0951b424c (patch) | |
| tree | 7a03eea79108b0cac94b1fdb0e5672157ae5a248 | |
| parent | 44ea341117ef9f439d7ba9eae74a7a225646bfa3 (diff) | |
| parent | db1c1dba34545c9b96f9ec4c01338caeaeeb0433 (diff) | |
| download | tor-ea5e371822d58eb25eda912ba8afb8c0951b424c.tar.gz tor-ea5e371822d58eb25eda912ba8afb8c0951b424c.zip | |
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
| -rw-r--r-- | changes/bug30021 | 8 | ||||
| -rw-r--r-- | src/lib/tls/tortls_openssl.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/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index e702cb9dfa..80b0df301f 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -905,7 +905,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; |