nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug17047'

Browse Source
This commit is contained in:
Nick Mathewson 2015-09-16 08:46:13 -04:00
commit c84f3c9177
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug17047 Normal file
View File

@ -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.

2
src/common/tortls.c
View File

@ -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))) {