From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 17 Feb 2017 17:39:59 +0000 (+0000)
Subject: Thanks to Rüdiger, Yann and Jacob for catches and verification
X-Git-Tag: 2.5.0-alpha~649
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84d078e64cf7dd357ef3ceebcd3d252eefe7cf21;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index d6248c5b060..1cdc8981b18 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -1322,7 +1322,7 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
     /*
      * ...otherwise, enable auto curve selection (OpenSSL 1.0.2)
      * 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)
     else {
@@ -1334,6 +1334,7 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
 #endif
     }
 #endif
+    /* OpenSSL assures us that _free() is NULL-safe */
     EC_KEY_free(eckey);
     EC_GROUP_free(ecparams);
 #endif