Browse Source

libarchive: Backport fix for build with LibreSSL 2.7

Backport libarchive commit v3.3.3~16^2 (fix build with LibreSSL 2.7,
2018-04-01).  LibreSSL 2.7 adds OpenSSL 1.1 API leading to conflicts on
method names.

Fixes: #18404
Brad King 7 years ago
parent
commit
e7e88e955b
1 changed files with 2 additions and 1 deletions
  1. 2 1
      Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h

+ 2 - 1
Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h

@@ -28,7 +28,8 @@
 #include <openssl/hmac.h>
 #include <openssl/opensslv.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 #include <stdlib.h> /* malloc, free */
 #include <string.h> /* memset */
 static inline HMAC_CTX *HMAC_CTX_new(void)