forked from rpms/nginx
158 lines
5.8 KiB
Diff
158 lines
5.8 KiB
Diff
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
|
|
index 345914f..d23967f 100644
|
|
--- a/src/event/ngx_event_openssl.c
|
|
+++ b/src/event/ngx_event_openssl.c
|
|
@@ -252,6 +252,8 @@ ngx_ssl_init(ngx_log_t *log)
|
|
ngx_int_t
|
|
ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
|
|
{
|
|
+ ngx_uint_t prot = NGX_SSL_NO_PROT;
|
|
+
|
|
ssl->ctx = SSL_CTX_new(SSLv23_method());
|
|
|
|
if (ssl->ctx == NULL) {
|
|
@@ -316,49 +318,54 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
|
|
|
|
SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_DH_USE);
|
|
|
|
-#if OPENSSL_VERSION_NUMBER >= 0x009080dfL
|
|
- /* only in 0.9.8m+ */
|
|
- SSL_CTX_clear_options(ssl->ctx,
|
|
- SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
|
|
-#endif
|
|
-
|
|
- if (!(protocols & NGX_SSL_SSLv2)) {
|
|
- SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_SSLv2);
|
|
- }
|
|
- if (!(protocols & NGX_SSL_SSLv3)) {
|
|
- SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_SSLv3);
|
|
- }
|
|
- if (!(protocols & NGX_SSL_TLSv1)) {
|
|
- SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_TLSv1);
|
|
- }
|
|
-#ifdef SSL_OP_NO_TLSv1_1
|
|
- SSL_CTX_clear_options(ssl->ctx, SSL_OP_NO_TLSv1_1);
|
|
- if (!(protocols & NGX_SSL_TLSv1_1)) {
|
|
- SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_TLSv1_1);
|
|
- }
|
|
+ if (protocols){
|
|
+#ifdef SSL_OP_NO_TLSv1_3
|
|
+ if (protocols & NGX_SSL_TLSv1_3) {
|
|
+ prot = TLS1_3_VERSION;
|
|
+ } else
|
|
#endif
|
|
#ifdef SSL_OP_NO_TLSv1_2
|
|
- SSL_CTX_clear_options(ssl->ctx, SSL_OP_NO_TLSv1_2);
|
|
- if (!(protocols & NGX_SSL_TLSv1_2)) {
|
|
- SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_TLSv1_2);
|
|
- }
|
|
+ if (protocols & NGX_SSL_TLSv1_2) {
|
|
+ prot = TLS1_2_VERSION;
|
|
+ } else
|
|
#endif
|
|
-#ifdef SSL_OP_NO_TLSv1_3
|
|
- SSL_CTX_clear_options(ssl->ctx, SSL_OP_NO_TLSv1_3);
|
|
- if (!(protocols & NGX_SSL_TLSv1_3)) {
|
|
- SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_TLSv1_3);
|
|
- }
|
|
+#ifdef SSL_OP_NO_TLSv1_1
|
|
+ if (protocols & NGX_SSL_TLSv1_1) {
|
|
+ prot = TLS1_1_VERSION;
|
|
+ } else
|
|
#endif
|
|
+ if (protocols & NGX_SSL_TLSv1) {
|
|
+ prot = TLS1_VERSION;
|
|
+ }
|
|
+
|
|
+ if (prot == NGX_SSL_NO_PROT) {
|
|
+ ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
|
|
+ "No SSL protocols available [hint: ssl_protocols]");
|
|
+ return NGX_ERROR;
|
|
+ }
|
|
|
|
-#ifdef SSL_CTX_set_min_proto_version
|
|
- SSL_CTX_set_min_proto_version(ssl->ctx, 0);
|
|
- SSL_CTX_set_max_proto_version(ssl->ctx, TLS1_2_VERSION);
|
|
+ SSL_CTX_set_max_proto_version(ssl->ctx, prot);
|
|
+
|
|
+ /* Now, we have to scan for minimal protocol version,
|
|
+ *without allowing holes between min and max*/
|
|
+#if SSL_OP_NO_TLSv1_3
|
|
+ if ((prot == TLS1_3_VERSION) && (protocols & NGX_SSL_TLSv1_2)) {
|
|
+ prot = TLS1_2_VERSION;
|
|
+ }
|
|
#endif
|
|
|
|
-#ifdef TLS1_3_VERSION
|
|
- SSL_CTX_set_min_proto_version(ssl->ctx, 0);
|
|
- SSL_CTX_set_max_proto_version(ssl->ctx, TLS1_3_VERSION);
|
|
+#ifdef SSL_OP_NO_TLSv1_1
|
|
+ if ((prot == TLS1_2_VERSION) && (protocols & NGX_SSL_TLSv1_1)) {
|
|
+ prot = TLS1_1_VERSION;
|
|
+ }
|
|
+#endif
|
|
+#ifdef SSL_OP_NO_TLSv1_2
|
|
+ if ((prot == TLS1_1_VERSION) && (protocols & NGX_SSL_TLSv1)) {
|
|
+ prot = TLS1_VERSION;
|
|
+ }
|
|
#endif
|
|
+ SSL_CTX_set_min_proto_version(ssl->ctx, prot);
|
|
+ }
|
|
|
|
#ifdef SSL_OP_NO_COMPRESSION
|
|
SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_COMPRESSION);
|
|
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
|
|
index 61da0c5..fa7ac41 100644
|
|
--- a/src/event/ngx_event_openssl.h
|
|
+++ b/src/event/ngx_event_openssl.h
|
|
@@ -145,6 +145,7 @@ typedef struct {
|
|
#endif
|
|
|
|
|
|
+#define NGX_SSL_NO_PROT 0x0000
|
|
#define NGX_SSL_SSLv2 0x0002
|
|
#define NGX_SSL_SSLv3 0x0004
|
|
#define NGX_SSL_TLSv1 0x0008
|
|
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
|
|
index b3f8f47..8340a12 100644
|
|
--- a/src/http/modules/ngx_http_ssl_module.c
|
|
+++ b/src/http/modules/ngx_http_ssl_module.c
|
|
@@ -613,8 +613,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
|
|
ngx_conf_merge_value(conf->early_data, prev->early_data, 0);
|
|
|
|
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
|
|
- (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
|
|
- |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
|
|
+ 0)
|
|
|
|
ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size,
|
|
NGX_SSL_BUFSIZE);
|
|
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
|
|
index 5544f75..3316a4b 100644
|
|
--- a/src/mail/ngx_mail_ssl_module.c
|
|
+++ b/src/mail/ngx_mail_ssl_module.c
|
|
@@ -291,8 +291,7 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
|
|
prev->prefer_server_ciphers, 0);
|
|
|
|
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
|
|
- (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
|
|
- |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
|
|
+ 0);
|
|
|
|
ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
|
|
ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
|
|
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
|
|
index ec9524e..37af046 100644
|
|
--- a/src/stream/ngx_stream_ssl_module.c
|
|
+++ b/src/stream/ngx_stream_ssl_module.c
|
|
@@ -625,8 +625,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
|
|
prev->prefer_server_ciphers, 0);
|
|
|
|
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
|
|
- (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
|
|
- |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
|
|
+ 0);
|
|
|
|
ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
|
|
ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
|