aboutsummaryrefslogtreecommitdiff
path: root/src/lib/tls
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-04-05 14:53:33 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2019-04-05 14:53:33 +0300
commit217db9efe13bb4dee5f29684314a67375bb24315 (patch)
tree3a3908ac1d2ab84831bd1e5ed2a89cff8021fce5 /src/lib/tls
parent747b74c1825de055bd027c9c74088efdd61d7481 (diff)
parent1710f4bbd6bb100901e7f601a1c0f96b51845f86 (diff)
downloadtor-217db9efe13bb4dee5f29684314a67375bb24315.tar.gz
tor-217db9efe13bb4dee5f29684314a67375bb24315.zip
Merge branch 'tor-github/pr/902' into maint-0.4.0
Diffstat (limited to 'src/lib/tls')
-rw-r--r--src/lib/tls/tortls_openssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c
index f9f7a7a179..b40f948a3b 100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@ -905,7 +905,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl,
smartlist_free(elts);
}
done:
- if (tor_tls)
+ if (tor_tls && peer_ciphers)
return tor_tls->client_cipher_list_type = res;
return res;