fix swoole#3934 (swoole#3962)

matyhtf · web-flow · commit fa5e3714f5d3 · 2020-12-28T18:03:37.000+08:00
diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc
@@ -856,6 +856,9 @@ PHP_MINFO_FUNCTION(swoole) {
 #else
     php_info_print_table_row(2, "openssl", "enabled");
 #endif
+#ifdef SW_SUPPORT_DTLS
+    php_info_print_table_row(2, "dtls", "enabled");
+#endif
 #endif
 #ifdef SW_USE_HTTP2
     php_info_print_table_row(2, "http2", "enabled");
diff --git a/ext-src/swoole_runtime.cc b/ext-src/swoole_runtime.cc
@@ -24,18 +24,6 @@
 #include <initializer_list>
 
 /* openssl */
-#ifndef OPENSSL_NO_TLS1_METHOD
-#define HAVE_TLS1 1
-#endif
-#ifndef OPENSSL_NO_TLS1_1_METHOD
-#define HAVE_TLS11 1
-#endif
-#ifndef OPENSSL_NO_TLS1_2_METHOD
-#define HAVE_TLS12 1
-#endif
-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(OPENSSL_NO_TLS1_3)
-#define HAVE_TLS13 1
-#endif
 #ifndef OPENSSL_NO_ECDH
 #define HAVE_ECDH 1
 #endif
@@ -911,25 +899,25 @@ static int socket_set_option(php_stream *stream, int option, int value, void *pt
 
             array_init(&tmp);
             switch (SSL_version(ssl)) {
-#ifdef HAVE_TLS13
+#ifdef TLS1_3_VERSION
             case TLS1_3_VERSION:
                 proto_str = "TLSv1.3";
                 break;
 #endif
-#ifdef HAVE_TLS12
+#ifdef TLS1_2_VERSION
             case TLS1_2_VERSION:
                 proto_str = "TLSv1.2";
                 break;
 #endif
-#ifdef HAVE_TLS11
+#ifdef TLS1_1_VERSION
             case TLS1_1_VERSION:
                 proto_str = "TLSv1.1";
                 break;
 #endif
             case TLS1_VERSION:
                 proto_str = "TLSv1";
                 break;
-#ifdef HAVE_SSL3
+#ifdef SSL3_VERSION
             case SSL3_VERSION:
                 proto_str = "SSLv3";
                 break;
diff --git a/include/swoole_ssl.h b/include/swoole_ssl.h
@@ -38,6 +38,10 @@
 #define SW_SUPPORT_DTLS
 #endif
 
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000fL
+#undef SW_SUPPORT_DTLS
+#endif
+
 enum swSSL_create_flag {
     SW_SSL_SERVER = 1,
     SW_SSL_CLIENT = 2,
diff --git a/src/protocol/ssl.cc b/src/protocol/ssl.cc
@@ -528,7 +528,7 @@ bool SSLContext::set_ciphers() {
     }
 
 #ifndef OPENSSL_NO_RSA
-    SSL_CTX_set_tmp_rsa_callback(ssl_context, swSSL_rsa_key_callback);
+    SSL_CTX_set_tmp_rsa_callback(context, swSSL_rsa_key_callback);
 #endif
 
     if (!dhparam.empty() && !set_dhparam()) {
@@ -698,8 +698,6 @@ static int swSSL_verify_callback(int ok, X509_STORE_CTX *x509_store) {
     return 1;
 }
 
-
-
 #ifdef SW_SUPPORT_DTLS
 
 #define COOKIE_SECRET_LENGTH (32)

Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ bool SSLContext::set_ciphers() {`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`#ifndef OPENSSL_NO_RSA`
`531`		`- SSL_CTX_set_tmp_rsa_callback(ssl_context, swSSL_rsa_key_callback);`
	`531`	`+ SSL_CTX_set_tmp_rsa_callback(context, swSSL_rsa_key_callback);`
`532`	`532`	`#endif`
`533`	`533`
`534`	`534`	`if (!dhparam.empty() && !set_dhparam()) {`
`@@ -698,8 +698,6 @@ static int swSSL_verify_callback(int ok, X509_STORE_CTX *x509_store) {`
`698`	`698`	`return 1;`
`699`	`699`	`}`
`700`	`700`
`701`		`-`
`702`		`-`
`703`	`701`	`#ifdef SW_SUPPORT_DTLS`
`704`	`702`
`705`	`703`	`#define COOKIE_SECRET_LENGTH (32)`