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

* modules/ssl/ssl_engine_init.c (make_dh_params): Remove redundant

Browse Source 
temporary variable; no functional change.
  (free_dh_params): Add comment.

Submitted by: rpluem, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1603915 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2014-06-19 15:09:15 +00:00
parent ff4ff27e69
commit 33ef4d63bc
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/ssl/ssl_engine_init.c
View File

@@ -53,22 +53,17 @@ APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ssl, SSL, int, init_server,
*/ */
static DH *make_dh_params(BIGNUM *(*prime)(BIGNUM *), const char *gen) static DH *make_dh_params(BIGNUM *(*prime)(BIGNUM *), const char *gen)
{ {
DH *dh = NULL; DH *dh = DH_new();
DH *dh_tmp;
if (dh) { if (!dh) {
return dh;
}
if (!(dh_tmp = DH_new())) {
return NULL; return NULL;
} }
dh_tmp->p = prime(NULL); dh->p = prime(NULL);
BN_dec2bn(&dh_tmp->g, gen); BN_dec2bn(&dh->g, gen);
if (!dh_tmp->p || !dh_tmp->g) { if (!dh->p || !dh->g) {
DH_free(dh_tmp); DH_free(dh);
return NULL; return NULL;
} }
dh = dh_tmp;
return dh; return dh;
} }
@@ -87,6 +82,9 @@ static void init_dh_params(void)
static void free_dh_params(void) static void free_dh_params(void)
{ {
/* DH_free() is a noop for a NULL parameter, so these are harmless
* in the (unexpected) case where these variables are already
* NULL. */
DH_free(dhparam1024); DH_free(dhparam1024);
DH_free(dhparam2048); DH_free(dhparam2048);
DH_free(dhparam3072); DH_free(dhparam3072);