137 lines
4.3 KiB
Diff
137 lines
4.3 KiB
Diff
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
|
|
index 39d9602..28d3f84 100644
|
|
--- a/auto/lib/openssl/conf
|
|
+++ b/auto/lib/openssl/conf
|
|
@@ -53,8 +53,33 @@ else
|
|
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 --git a/auto/options b/auto/options
|
|
index 43724b1..b26fd9d 100644
|
|
--- a/auto/options
|
|
+++ b/auto/options
|
|
@@ -141,6 +141,7 @@ PCRE_OPT=
|
|
PCRE_CONF_OPT=
|
|
PCRE_JIT=NO
|
|
|
|
+WOLFSSL=NONE
|
|
USE_OPENSSL=NO
|
|
OPENSSL=NONE
|
|
|
|
@@ -345,6 +346,7 @@ use the \"--with-mail_ssl_module\" option instead"
|
|
--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" ;;
|
|
|
|
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
|
|
index c98e3c2..1b67cbc 100644
|
|
--- a/src/event/ngx_event_openssl.c
|
|
+++ b/src/event/ngx_event_openssl.c
|
|
@@ -330,6 +330,10 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
|
|
|
|
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 --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
|
|
index d332c11..bfea170 100644
|
|
--- a/src/event/ngx_event_openssl_stapling.c
|
|
+++ b/src/event/ngx_event_openssl_stapling.c
|
|
@@ -313,7 +313,9 @@ ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl,
|
|
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 --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
|
|
index 2771ac1..8197ad3 100644
|
|
--- a/src/http/modules/ngx_http_ssl_module.c
|
|
+++ b/src/http/modules/ngx_http_ssl_module.c
|
|
@@ -14,7 +14,11 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
|
|
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 --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
|
|
index fbc9bc7..1fc3504 100644
|
|
--- a/src/mail/ngx_mail_ssl_module.c
|
|
+++ b/src/mail/ngx_mail_ssl_module.c
|
|
@@ -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 --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
|
|
index 9191641..01c5a3a 100644
|
|
--- a/src/stream/ngx_stream_ssl_module.c
|
|
+++ b/src/stream/ngx_stream_ssl_module.c
|
|
@@ -14,7 +14,11 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
|
|
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"
|
|
|
|
|