From ff835e23280c0f29ca9ab25bfc3069276c0b8ab6 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 2 Jun 2015 13:27:55 -0400
Subject: [PATCH] Use autoconf, not OPENSSL_VERSION_NUMBER, to detect
SSL_CIPHER_find
Repairs build with libressl
---
configure.ac | 1 +
src/common/tortls.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index ede8f8438c..ab96c20f3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -639,6 +639,7 @@ AC_CHECK_FUNCS([ \
SSL_get_server_random \
SSL_get_client_ciphers \
SSL_get_client_random \
+ SSL_CIPHER_find \
])
LIBS="$save_LIBS"
LDFLAGS="$save_LDFLAGS"
diff --git a/src/common/tortls.c b/src/common/tortls.c
index d80cf42606..deeee5f052 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1487,7 +1487,7 @@ static int
find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher)
{
const SSL_CIPHER *c;
-#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,2)
+#ifdef HAVE_SSL_CIPHER_FIND
{
unsigned char cipherid[3];
tor_assert(ssl);
--
GitLab