[source] mkimage: fix openssl 1.1.x compat fix with libressl

LEDE Commits lede-commits at lists.infradead.org
Wed Nov 30 11:26:30 PST 2016


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/e678c9f764c37f963e6667777b6a05bddcf05ea5

commit e678c9f764c37f963e6667777b6a05bddcf05ea5
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Wed Nov 30 20:24:31 2016 +0100

    mkimage: fix openssl 1.1.x compat fix with libressl
    
    libressl sets OPENSSL_VERSION_NUMBER to 0x20000000L, which breaks API
    checks based on it.
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 tools/mkimage/patches/210-openssl-1.1.x-compat.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mkimage/patches/210-openssl-1.1.x-compat.patch b/tools/mkimage/patches/210-openssl-1.1.x-compat.patch
index fa7c99f..b1bc088 100644
--- a/tools/mkimage/patches/210-openssl-1.1.x-compat.patch
+++ b/tools/mkimage/patches/210-openssl-1.1.x-compat.patch
@@ -11,7 +11,7 @@
  #define HAVE_ERR_REMOVE_THREAD_STATE
  #endif
  
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
++#if (OPENSSL_VERSION_NUMBER < 0x10100005L) || defined(LIBRESSL_VERSION_NUMBER)
 +static void RSA_get0_key(const RSA *r,
 +                         const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
 +{



More information about the lede-commits mailing list