Skip to content

Commit bd42c94

Browse files
committed
Fix version bug with ecdh
1 parent 7e89983 commit bd42c94

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/source/Crypto/Dtls_openssl.c

+6-7
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,15 @@ STATUS createSslCtx(PDtlsSessionCertificateInfo pCertificates, UINT32 certCount,
245245

246246
CHK(pSslCtx != NULL, STATUS_SSL_CTX_CREATION_FAILED);
247247

248-
// Version less than 1.1.0
249-
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
248+
// https://www.openssl.org/docs/man1.0.2/man3/SSL_CTX_set_ecdh_auto.html
249+
// Version >= 1.0.2 and < 1.1.0 [1.0.2, 1.1.0)
250+
#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && OPENSSL_VERSION_NUMBER < 0x10100000L)
250251
SSL_CTX_set_ecdh_auto(pSslCtx, TRUE);
251-
252-
// Version less than 3.0.0 and greater than 1.1.0
253-
#elif (OPENSSL_VERSION_NUMBER < 0x30000000L)
252+
#else
253+
// https://www.openssl.org/docs/man1.1.1/man3/
254+
// Version < 1.0.2 and >= 1.1.0 (1.0.2, 1.1.0]
254255
CHK((ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1)) != NULL, STATUS_SSL_CTX_CREATION_FAILED);
255256
CHK(SSL_CTX_set_tmp_ecdh(pSslCtx, ecdh) == 1, STATUS_SSL_CTX_CREATION_FAILED);
256-
#else
257-
DLOGI("ECDH enabled by default in 3.0.0. Nothing to do");
258257
#endif
259258

260259
SSL_CTX_set_verify(pSslCtx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, dtlsCertificateVerifyCallback);

0 commit comments

Comments
 (0)