[tor-commits] [tor/master] Use autoconf, not OPENSSL_VERSION_NUMBER, to detect SSL_CIPHER_find

[nickm@xxxxxxxxxxxxxx]

commit ff835e23280c0f29ca9ab25bfc3069276c0b8ab6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 2 13:27:55 2015 -0400

    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 ede8f84..ab96c20 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 d80cf42..deeee5f 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);



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits