diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-02 13:27:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-02 13:38:27 -0400 |
| commit | ff835e23280c0f29ca9ab25bfc3069276c0b8ab6 (patch) | |
| tree | 929fce1226ba10bde5499d8f030f9b61c12c3e73 | |
| parent | f90a704f12587ba7585a8a4d31cb6de756bb3868 (diff) | |
| download | tor-ff835e23280c0f29ca9ab25bfc3069276c0b8ab6.tar.gz tor-ff835e23280c0f29ca9ab25bfc3069276c0b8ab6.zip | |
Use autoconf, not OPENSSL_VERSION_NUMBER, to detect SSL_CIPHER_find
Repairs build with libressl
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/common/tortls.c | 2 |
2 files changed, 2 insertions, 1 deletions
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); |