]> granicus.if.org Git - transmission/commitdiff
Fix build with LibreSSL 2.7
authorBernard Spil <brnrd@FreeBSD.org>
Sun, 1 Apr 2018 20:39:09 +0000 (22:39 +0200)
committerBernard Spil <brnrd@FreeBSD.org>
Sun, 1 Apr 2018 20:39:09 +0000 (22:39 +0200)
LibreSSL 2.7 adds OpenSSL 1.1 API

See also: https://bugs.freebsd.org/226953
Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
libtransmission/crypto-utils-openssl.c

index 2c6147e24b1c510673febb63c9b10d8e901944fd..07f9d9fcfabd4ef0995abe13a117cde649afcd11 100644 (file)
@@ -48,7 +48,7 @@ static void log_openssl_error(char const* file, int line)
 
         if (!strings_loaded)
         {
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
             ERR_load_crypto_strings();
 #else
             OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
@@ -237,7 +237,7 @@ void tr_rc4_process(tr_rc4_ctx_t handle, void const* input, void* output, size_t
 ****
 ***/
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
 
 static inline int DH_set0_pqg(DH* dh, BIGNUM* p, BIGNUM* q, BIGNUM* g)
 {