[source] tools: cmake: fix compatibility with LibreSSL as well

LEDE Commits lede-commits at lists.infradead.org
Thu Dec 1 07:49:27 PST 2016


jow pushed a commit to source.git, branch master:
https://git.lede-project.org/0b3b8c83c047137ed83f5697ed44c04dbed5bbeb

commit 0b3b8c83c047137ed83f5697ed44c04dbed5bbeb
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Thu Dec 1 16:32:39 2016 +0100

    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 at mein.io>
---
 .../150-libarchive-fix-libressl-compat.patch       | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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 0000000..a56ac2e
--- /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)



More information about the lede-commits mailing list