mirror of
https://github.com/apache/httpd.git
synced 2025-08-07 04:02:58 +03:00
Thanks to Rüdiger, Yann and Jacob for catches and verification
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783438 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -1322,7 +1322,7 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
|
|||||||
/*
|
/*
|
||||||
* ...otherwise, enable auto curve selection (OpenSSL 1.0.2)
|
* ...otherwise, enable auto curve selection (OpenSSL 1.0.2)
|
||||||
* or configure NIST P-256 (required to enable ECDHE for earlier versions)
|
* or configure NIST P-256 (required to enable ECDHE for earlier versions)
|
||||||
* ECDH is always enabled in 1.0.2 unless excluded from SSLCipherList
|
* ECDH is always enabled in 1.1.0 unless excluded from SSLCipherList
|
||||||
*/
|
*/
|
||||||
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
|
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
|
||||||
else {
|
else {
|
||||||
@@ -1334,6 +1334,7 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
/* OpenSSL assures us that _free() is NULL-safe */
|
||||||
EC_KEY_free(eckey);
|
EC_KEY_free(eckey);
|
||||||
EC_GROUP_free(ecparams);
|
EC_GROUP_free(ecparams);
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user