From 0b0f370384c49a6b029e93801307b59d3f8fe62d Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Mon, 15 Feb 2021 22:09:44 +0700 Subject: [PATCH 1/2] fix for haproxy and nginx build --- src/internal.c | 6 ++++-- wolfssl/internal.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/internal.c b/src/internal.c index aacdbfb11..e48085de1 100644 --- a/src/internal.c +++ b/src/internal.c @@ -18954,7 +18954,8 @@ void SetErrorString(int error, char* str) */ #ifndef NO_ERROR_STRINGS - #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) + #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) || \ + defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_NGINX) #define SUITE_INFO(x,y,z,w,v,u) {(x),(y),(z),(w),(v),(u),WOLFSSL_CIPHER_SUITE_FLAG_NONE} #define SUITE_ALIAS(x,z,w,v,u) {(x),"",(z),(w),(v),(u),WOLFSSL_CIPHER_SUITE_FLAG_NAMEALIAS}, #else @@ -18962,7 +18963,8 @@ void SetErrorString(int error, char* str) #define SUITE_ALIAS(x,z,w,v,u) {(x),"",(z),(w),WOLFSSL_CIPHER_SUITE_FLAG_NAMEALIAS}, #endif #else - #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) + #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) || \ + defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_NGINX) #define SUITE_INFO(x,y,z,w,v,u) {(x),(z),(w),(v),(u),WOLFSSL_CIPHER_SUITE_FLAG_NONE} #define SUITE_ALIAS(x,z,w,v,u) {(x),(z),(w),(v),(u),WOLFSSL_CIPHER_SUITE_FLAG_NAMEALIAS}, #else diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 48da5cf2b..d4f68a815 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -4720,7 +4720,8 @@ typedef struct CipherSuiteInfo { #endif byte cipherSuite0; byte cipherSuite; -#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) +#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) || \ + defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_NGINX) byte minor; byte major; #endif From f4519018eb7d7b0ba7a74581cd0dc17f287cab5f Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Mon, 15 Feb 2021 23:33:31 +0700 Subject: [PATCH 2/2] remove execute bit on smime bundles --- certs/test/smime-test-multipart-badsig.p7s | 0 certs/test/smime-test-multipart.p7s | 0 certs/test/smime-test.p7s | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 certs/test/smime-test-multipart-badsig.p7s mode change 100755 => 100644 certs/test/smime-test-multipart.p7s mode change 100755 => 100644 certs/test/smime-test.p7s diff --git a/certs/test/smime-test-multipart-badsig.p7s b/certs/test/smime-test-multipart-badsig.p7s old mode 100755 new mode 100644 diff --git a/certs/test/smime-test-multipart.p7s b/certs/test/smime-test-multipart.p7s old mode 100755 new mode 100644 diff --git a/certs/test/smime-test.p7s b/certs/test/smime-test.p7s old mode 100755 new mode 100644