Changeset 5787 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

May 7, 2018 3:13:49 PM (7 years ago)

Author:

riza

Message:

Fixed #2112: pjsip initializes EECDH incorrectly when linked with OpenSSL
1.1.0x.

File:

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

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

@@ -1001 +1001 @@
         }
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     #ifndef SSL_CTRL_SET_ECDH_AUTO
         #define SSL_CTRL_SET_ECDH_AUTO 94
@@ -1022 +1023 @@
     #endif
         }
+#else // OPENSSL_VERSION_NUMBER < 0x10100000L
+    PJ_LOG(4,(ssock->pool->obj_name, "SSL ECDH already initialized "
+              "(OpenSSL 1.1.0+), faster PFS cipher-suites enabled"));
+#endif // OPENSSL_VERSION_NUMBER < 0x10100000L
     } else {
         X509_STORE *pkix_validation_store = SSL_CTX_get_cert_store(ctx);