]> 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)
committerMike Gelfand <mikedld@mikedld.com>
Fri, 6 Apr 2018 19:17:41 +0000 (22:17 +0300)
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 f5933a4c0aafcab9e399306c83f5f67d8f5ac4f9..b34af117c38fbeea9b6a3e80a7eb09145e1a9896 100644 (file)
@@ -50,7 +50,7 @@ log_openssl_error (const char * file,
       static bool strings_loaded = false;
       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);
@@ -236,7 +236,7 @@ tr_rc4_process (tr_rc4_ctx_t   handle,
 ****
 ***/
 
-#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,