Commit 567a894f authored by flypig's avatar flypig

Merge branch 'jb52403' into 'mer-5.6'

Don't set temp ECDH params for OpenSSL >= 1.1.0

See merge request !73
parents f6ea444e e15a6319
......@@ -324,11 +324,12 @@ init_context:
q_DH_free(dh);
#ifndef OPENSSL_NO_EC
#if OPENSSL_VERSION_NUMBER >= 0x10002000L && OPENSSL_VERSION_NUMBER < 0x10100000L
#if OPENSSL_VERSION_NUMBER < 0x10100000L // Auto is the default after 0x10100000L
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
if (q_SSLeay() >= 0x10002000L) {
q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL);
} else
#endif
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
{
// Set temp ECDH params
EC_KEY *ecdh = 0;
......@@ -336,6 +337,7 @@ init_context:
q_SSL_CTX_set_tmp_ecdh(sslContext->ctx, ecdh);
q_EC_KEY_free(ecdh);
}
#endif // OPENSSL_VERSION_NUMBER < 0x10100000L
#endif // OPENSSL_NO_EC
const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment