summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-16 08:46:13 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-16 08:46:13 -0400
commitc84f3c917735caf073ee97935687c1ba8ee3639e (patch)
tree27b538bcda057e96ec6d87925fd969b34cc82c91 /src/common
parentb257e34583d428dc0f9b6f06ca3f470e794ab513 (diff)
parent902517a7c03ec5a879190903f65fafc62c0b1613 (diff)
downloadtor-c84f3c917735caf073ee97935687c1ba8ee3639e.tar.gz
tor-c84f3c917735caf073ee97935687c1ba8ee3639e.zip
Merge remote-tracking branch 'public/bug17047'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/tortls.c2
1 files changed, 1 insertions, 1 deletions
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))) {