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