Unverified Commit a0db5ade authored by teor's avatar teor
Browse files

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

parents e1955a2c 1710f4bb
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.
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment