mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Use SSL_get_client_ciphers() on openssl 1.1+, not SSL_get_ciphers...

Browse source 
(which isn't correct.)

Fixes bug 17047; bugfix on 0.2.7.2-alpha, introduced by the merge in
0030765e04, apparently.
This commit is contained in:
Nick Mathewson 2015-09-13 11:51:51 -04:00
parent 8b98172579
commit 902517a7c0
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; STACK_OF(SSL_CIPHER) *ciphers;
#ifdef HAVE_SSL_GET_CLIENT_CIPHERS #ifdef HAVE_SSL_GET_CLIENT_CIPHERS
ciphers = SSL_get_ciphers(ssl); ciphers = SSL_get_client_ciphers(ssl);
#else #else
SSL_SESSION *session; SSL_SESSION *session;
if (!(session = SSL_get_session((SSL *)ssl))) { if (!(session = SSL_get_session((SSL *)ssl))) {