summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-02-03 11:31:57 -0500
committerNick Mathewson <nickm@torproject.org>2016-02-03 11:31:57 -0500
commitfa52b6f075a8bb90a3f3a014ef7423940f8a20b7 (patch)
treef95d744e4ee2b233ecaf8e49564a69c8373e80a6 /src/common
parentc1c3e45eab08b3ce31254c749fe10d93c6b65cb9 (diff)
downloadtor-fa52b6f075a8bb90a3f3a014ef7423940f8a20b7.tar.gz
tor-fa52b6f075a8bb90a3f3a014ef7423940f8a20b7.zip
Make tortls unit tests pass with LibreSSL.
Part of the fix for 17921.
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 5f84e5cf4d..827abc428d 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1338,7 +1338,7 @@ find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher)
return c != NULL;
}
# endif
-# if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0)
+# ifndef OPENSSL_1_1_API
if (m && m->get_cipher && m->num_ciphers) {
/* It would seem that some of the "let's-clean-up-openssl" forks have
* removed the get_cipher_by_char function. Okay, so now you get a