aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-12-01 16:32:39 +0100
committerJo-Philipp Wich <jo@mein.io>2016-12-01 16:49:24 +0100
commit0b3b8c83c047137ed83f5697ed44c04dbed5bbeb (patch)
treef8c64e22e9b319916417e39a7a77eaffb4c4f9de /tools
parent07b571a4355a27502fcadf8f81144cab8e00a42a (diff)
downloadupstream-0b3b8c83c047137ed83f5697ed44c04dbed5bbeb.tar.gz
upstream-0b3b8c83c047137ed83f5697ed44c04dbed5bbeb.tar.bz2
upstream-0b3b8c83c047137ed83f5697ed44c04dbed5bbeb.zip
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 <jo@mein.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/cmake/patches/150-libarchive-fix-libressl-compat.patch22
1 files changed, 22 insertions, 0 deletions
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 0000000000..a56ac2ed0c
--- /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 <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)