Changeset 6006

Timestamp:

May 27, 2019 3:54:27 AM (5 years ago)

Author:

ming

Message:

Fixed #2203: Failure to set minimum SSL version when OpenSSL 1.1 is used

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -725 +725 @@
 
     /* Determine SSL method to use */
+    /* Specific version methods are deprecated since 1.1.0 */
 #if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
     || OPENSSL_VERSION_NUMBER < 0x10100000L
@@ -742 +743 @@
         break;
     }
+#endif
+
+    if (!ssl_method) {
+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
+    || OPENSSL_VERSION_NUMBER < 0x10100000L
+        ssl_method = (SSL_METHOD*)SSLv23_method();
 #else
-    /* Specific version methods are deprecated in 1.1.0 */
-    ssl_method = (SSL_METHOD*)TLS_method();
-#endif
-
-    if (!ssl_method) {
-        ssl_method = (SSL_METHOD*)SSLv23_method();
+        ssl_method = (SSL_METHOD*)TLS_method();
+#endif
 
 #ifdef SSL_OP_NO_SSLv2