Browse Source

Merge remote-tracking branch 'public/bug17047'

Nick Mathewson 8 years ago
parent
commit
c84f3c9177
2 changed files with 4 additions and 1 deletions
  1. 3 0
      changes/bug17047
  2. 1 1
      src/common/tortls.c

+ 3 - 0
changes/bug17047

@@ -0,0 +1,3 @@
+  o Minor bugfixes (portability):
+    - Restore correct operation of TLS client-cipher detection on
+      OpenSSL 1.1.  Fixes bug 14047; bugfix on 0.2.7.2-alpha.

+ 1 - 1
src/common/tortls.c

@@ -1563,7 +1563,7 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl)
 {
   STACK_OF(SSL_CIPHER) *ciphers;
 #ifdef HAVE_SSL_GET_CLIENT_CIPHERS
-  ciphers = SSL_get_ciphers(ssl);
+  ciphers = SSL_get_client_ciphers(ssl);
 #else
   SSL_SESSION *session;
   if (!(session = SSL_get_session((SSL *)ssl))) {