0b3b8c83c0
Sadly, LibreSSL claims to be OpenSSL v2.0.0 while not providing the new interfaces introduced with OpenSSL v1.1.x, so extend the pre-OpenSSL 1.1.x compat checks to consider LibreSSL as well. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
22 lines
917 B
Diff
22 lines
917 B
Diff
--- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
|
|
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
|
|
@@ -28,7 +28,7 @@
|
|
#include <openssl/evp.h>
|
|
#include <openssl/opensslv.h>
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
#include <stdlib.h> /* malloc, free */
|
|
#include <string.h> /* memset */
|
|
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
|
|
--- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
|
|
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
|
|
@@ -28,7 +28,7 @@
|
|
#include <openssl/hmac.h>
|
|
#include <openssl/opensslv.h>
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
#include <stdlib.h> /* malloc, free */
|
|
#include <string.h> /* memset */
|
|
static inline HMAC_CTX *HMAC_CTX_new(void)
|