140 lines
5.1 KiB
Diff
140 lines
5.1 KiB
Diff
diff -ur nginx-1.12.0/auto/lib/openssl/conf nginx-1.12.0-wolfssl/auto/lib/openssl/conf
|
|
--- nginx-1.12.0/auto/lib/openssl/conf 2017-04-13 00:46:01.000000000 +1000
|
|
+++ nginx-1.12.0-wolfssl/auto/lib/openssl/conf 2017-04-13 09:53:49.670278950 +1000
|
|
@@ -61,8 +61,33 @@
|
|
ngx_feature_path=
|
|
ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
|
|
ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
|
|
+
|
|
+ if [ $WOLFSSL != NONE ]; then
|
|
+ ngx_feature="wolfSSL library in $WOLFSSL"
|
|
+ ngx_feature_path="$WOLFSSL/include/wolfssl"
|
|
+
|
|
+ if [ $NGX_RPATH = YES ]; then
|
|
+ ngx_feature_libs="-R$WOLFSSL/lib -L$WOLFSSL/lib -lwolfssl $NGX_LIBDL"
|
|
+ else
|
|
+ ngx_feature_libs="-L$WOLFSSL/lib -lwolfssl $NGX_LIBDL"
|
|
+ fi
|
|
+
|
|
+ CORE_INCS="$CORE_INCS $WOLFSSL/include/wolfssl"
|
|
+ CFLAGS="$CFLAGS -DWOLFSSL_NGINX"
|
|
+ fi
|
|
+
|
|
. auto/feature
|
|
|
|
+ if [ $WOLFSSL != NONE -a $ngx_found = no ]; then
|
|
+cat << END
|
|
+
|
|
+$0: error: Could not find wolfSSL at $WOLFSSL/include/wolfssl.
|
|
+SSL modules require the wolfSSL library.
|
|
+
|
|
+END
|
|
+ exit 1
|
|
+ fi
|
|
+
|
|
if [ $ngx_found = no ]; then
|
|
|
|
# FreeBSD port
|
|
diff -ur nginx-1.12.0/auto/options nginx-1.12.0-wolfssl/auto/options
|
|
--- nginx-1.12.0/auto/options 2017-04-13 00:46:01.000000000 +1000
|
|
+++ nginx-1.12.0-wolfssl/auto/options 2017-04-13 09:52:52.646047189 +1000
|
|
@@ -143,6 +143,7 @@
|
|
|
|
USE_OPENSSL=NO
|
|
OPENSSL=NONE
|
|
+WOLFSSL=NONE
|
|
|
|
USE_ZLIB=NO
|
|
ZLIB=NONE
|
|
@@ -345,6 +346,7 @@
|
|
--with-pcre-opt=*) PCRE_OPT="$value" ;;
|
|
--with-pcre-jit) PCRE_JIT=YES ;;
|
|
|
|
+ --with-wolfssl=*) WOLFSSL="$value" ;;
|
|
--with-openssl=*) OPENSSL="$value" ;;
|
|
--with-openssl-opt=*) OPENSSL_OPT="$value" ;;
|
|
|
|
@@ -563,6 +565,7 @@
|
|
--with-libatomic force libatomic_ops library usage
|
|
--with-libatomic=DIR set path to libatomic_ops library sources
|
|
|
|
+ --with-wolfssl=DIR set path to wolfSSL headers and library
|
|
--with-openssl=DIR set path to OpenSSL library sources
|
|
--with-openssl-opt=OPTIONS set additional build options for OpenSSL
|
|
|
|
Only in nginx-1.12.0-wolfssl: Makefile
|
|
Only in nginx-1.12.0-wolfssl: objs
|
|
diff -ur nginx-1.12.0/src/event/ngx_event_openssl.c nginx-1.12.0-wolfssl/src/event/ngx_event_openssl.c
|
|
--- nginx-1.12.0/src/event/ngx_event_openssl.c 2017-04-13 00:46:01.000000000 +1000
|
|
+++ nginx-1.12.0-wolfssl/src/event/ngx_event_openssl.c 2017-04-13 09:54:22.594624149 +1000
|
|
@@ -340,6 +340,10 @@
|
|
|
|
SSL_CTX_set_info_callback(ssl->ctx, ngx_ssl_info_callback);
|
|
|
|
+#ifdef WOLFSSL_NGINX
|
|
+ SSL_CTX_set_verify(ssl->ctx, SSL_VERIFY_NONE, NULL);
|
|
+#endif
|
|
+
|
|
return NGX_OK;
|
|
}
|
|
|
|
diff -ur nginx-1.12.0/src/event/ngx_event_openssl_stapling.c nginx-1.12.0-wolfssl/src/event/ngx_event_openssl_stapling.c
|
|
--- nginx-1.12.0/src/event/ngx_event_openssl_stapling.c 2017-04-13 00:46:01.000000000 +1000
|
|
+++ nginx-1.12.0-wolfssl/src/event/ngx_event_openssl_stapling.c 2017-04-13 09:54:56.830970748 +1000
|
|
@@ -313,7 +313,9 @@
|
|
for (i = 0; i < n; i++) {
|
|
issuer = sk_X509_value(chain, i);
|
|
if (X509_check_issued(issuer, cert) == X509_V_OK) {
|
|
-#if OPENSSL_VERSION_NUMBER >= 0x10100001L
|
|
+#ifdef WOLFSSL_NGINX
|
|
+ issuer = X509_dup(issuer);
|
|
+#elif OPENSSL_VERSION_NUMBER >= 0x10100001L
|
|
X509_up_ref(issuer);
|
|
#else
|
|
CRYPTO_add(&issuer->references, 1, CRYPTO_LOCK_X509);
|
|
diff -ur nginx-1.12.0/src/http/modules/ngx_http_ssl_module.c nginx-1.12.0-wolfssl/src/http/modules/ngx_http_ssl_module.c
|
|
--- nginx-1.12.0/src/http/modules/ngx_http_ssl_module.c 2017-04-13 00:46:02.000000000 +1000
|
|
+++ nginx-1.12.0-wolfssl/src/http/modules/ngx_http_ssl_module.c 2017-04-13 09:56:08.267656857 +1000
|
|
@@ -14,7 +14,11 @@
|
|
ngx_pool_t *pool, ngx_str_t *s);
|
|
|
|
|
|
+#ifndef WOLFSSL_NGINX
|
|
#define NGX_DEFAULT_CIPHERS "HIGH:!aNULL:!MD5"
|
|
+#else
|
|
+#define NGX_DEFAULT_CIPHERS "ALL"
|
|
+#endif
|
|
#define NGX_DEFAULT_ECDH_CURVE "auto"
|
|
|
|
#define NGX_HTTP_NPN_ADVERTISE "\x08http/1.1"
|
|
diff -ur nginx-1.12.0/src/mail/ngx_mail_ssl_module.c nginx-1.12.0-wolfssl/src/mail/ngx_mail_ssl_module.c
|
|
--- nginx-1.12.0/src/mail/ngx_mail_ssl_module.c 2017-04-13 00:46:02.000000000 +1000
|
|
+++ nginx-1.12.0-wolfssl/src/mail/ngx_mail_ssl_module.c 2017-04-13 09:56:36.643916645 +1000
|
|
@@ -10,7 +10,11 @@
|
|
#include <ngx_mail.h>
|
|
|
|
|
|
+#ifndef WOLFSSL_NGINX
|
|
#define NGX_DEFAULT_CIPHERS "HIGH:!aNULL:!MD5"
|
|
+#else
|
|
+#define NGX_DEFAULT_CIPHERS "ALL"
|
|
+#endif
|
|
#define NGX_DEFAULT_ECDH_CURVE "auto"
|
|
|
|
|
|
diff -ur nginx-1.12.0/src/stream/ngx_stream_ssl_module.c nginx-1.12.0-wolfssl/src/stream/ngx_stream_ssl_module.c
|
|
--- nginx-1.12.0/src/stream/ngx_stream_ssl_module.c 2017-04-13 00:46:02.000000000 +1000
|
|
+++ nginx-1.12.0-wolfssl/src/stream/ngx_stream_ssl_module.c 2017-04-13 09:57:09.364207951 +1000
|
|
@@ -14,7 +14,11 @@
|
|
ngx_pool_t *pool, ngx_str_t *s);
|
|
|
|
|
|
+#ifndef WOLFSSL_NGINX
|
|
#define NGX_DEFAULT_CIPHERS "HIGH:!aNULL:!MD5"
|
|
+#else
|
|
+#define NGX_DEFAULT_CIPHERS "ALL"
|
|
+#endif
|
|
#define NGX_DEFAULT_ECDH_CURVE "auto"
|
|
|
|
|