From 0b3b8c83c047137ed83f5697ed44c04dbed5bbeb Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 1 Dec 2016 16:32:39 +0100 Subject: [PATCH] tools: cmake: fix compatibility with LibreSSL as well 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 --- .../150-libarchive-fix-libressl-compat.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tools/cmake/patches/150-libarchive-fix-libressl-compat.patch diff --git a/tools/cmake/patches/150-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/150-libarchive-fix-libressl-compat.patch new file mode 100644 index 00000000000..a56ac2ed0c9 --- /dev/null +++ b/tools/cmake/patches/150-libarchive-fix-libressl-compat.patch @@ -0,0 +1,22 @@ +--- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h ++++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h +@@ -28,7 +28,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include /* malloc, free */ + #include /* 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 + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include /* malloc, free */ + #include /* memset */ + static inline HMAC_CTX *HMAC_CTX_new(void) -- 2.30.2