tor

commit 48e990359b05661f2dd0ae503143ee9b18442475
parent 102178e6d43ed990e972b2fbc4f611997c8943f0
Author: teor <teor@torproject.org>
Date:   Sat,  6 Apr 2019 09:33:11 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

Diffstat:
A
changes/bug30021
 | 
8
++++++++
M
src/common/tortls.c
 | 
2
+-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changes/bug30021 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
@@ -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;