diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-16 08:46:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-16 08:46:13 -0400 |
| commit | c84f3c917735caf073ee97935687c1ba8ee3639e (patch) | |
| tree | 27b538bcda057e96ec6d87925fd969b34cc82c91 | |
| parent | b257e34583d428dc0f9b6f06ca3f470e794ab513 (diff) | |
| parent | 902517a7c03ec5a879190903f65fafc62c0b1613 (diff) | |
| download | tor-c84f3c917735caf073ee97935687c1ba8ee3639e.tar.gz tor-c84f3c917735caf073ee97935687c1ba8ee3639e.zip | |
Merge remote-tracking branch 'public/bug17047'
| -rw-r--r-- | changes/bug17047 | 3 | ||||
| -rw-r--r-- | src/common/tortls.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug17047 b/changes/bug17047 new file mode 100644 index 0000000000..3ff40ad9b5 --- /dev/null +++ b/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. diff --git a/src/common/tortls.c b/src/common/tortls.c index 7447822d48..20c898456a 100644 --- a/src/common/tortls.c +++ b/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))) { |