]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Use autoconf, not OPENSSL_VERSION_NUMBER, to detect SSL_CIPHER_find
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jun 2015 17:27:55 +0000 (13:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jun 2015 17:38:27 +0000 (13:38 -0400)
Repairs build with libressl

configure.ac
src/common/tortls.c

index ede8f8438c7d55e3de9879e362649f862db18b6c..ab96c20f3f1d1efd11fb9e9860a87ea8ee8784fe 100644 (file)
@@ -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"
index d80cf426063c7d9148c87b8aa716b749c26f035b..deeee5f0521673b8584b8ebeb53ec69473ba576d 100644 (file)
@@ -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);