www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.

Browse Source 
SSL_CTX_set_tmp_ecdh increases reference count, so we have to call EC_KEY_free,
otherwise eckey will not be freed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666363 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jan Kaluža
2015-03-13 07:32:46 +00:00
parent 71e93ff17b
commit 2c379ac463
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ssl/ssl_engine_init.c
View File

@@ -982,7 +982,7 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
#ifdef HAVE_ECC #ifdef HAVE_ECC
EC_GROUP *ecparams; EC_GROUP *ecparams;
int nid; int nid;
EC_KEY *eckey; EC_KEY *eckey = NULL;
#endif #endif
#ifndef HAVE_SSL_CONF_CMD #ifndef HAVE_SSL_CONF_CMD
SSL *ssl; SSL *ssl;
@@ -1151,10 +1151,11 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
#if defined(SSL_CTX_set_ecdh_auto) #if defined(SSL_CTX_set_ecdh_auto)
SSL_CTX_set_ecdh_auto(mctx->ssl_ctx, 1); SSL_CTX_set_ecdh_auto(mctx->ssl_ctx, 1);
#else #else
SSL_CTX_set_tmp_ecdh(mctx->ssl_ctx, eckey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
EC_KEY_new_by_curve_name(NID_X9_62_prime256v1)); SSL_CTX_set_tmp_ecdh(mctx->ssl_ctx, eckey);
#endif #endif
} }
EC_KEY_free(eckey);
#endif #endif
return APR_SUCCESS; return APR_SUCCESS;