Skip to content

Commit 43b8490

Browse files
author
Daniel Muey
committed
Issue #1671: Only generate SecHashKey when SecHashEngine is On
1 parent 203e85e commit 43b8490

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
DD MMM YYYY - 2.9.3 - To be released
22
------------------------------------
33

4+
* Only generate SecHashKey when SecHashEngine is On
5+
[Issue #1671 - @dmuey, @monkburger]
46
* Fix arabic charset in unicode_mapping file
57
[Issue #1619 - @alaa-ahmed-a]
68
* Optionally preallocates memory when SecStreamInBodyInspection is on

apache2/apache2_config.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,13 @@ void init_directory_config(directory_config *dcfg)
732732
if (dcfg->col_timeout == NOT_SET) dcfg->col_timeout = 3600;
733733

734734
/* Hash */
735-
if (dcfg->crypto_key == NOT_SET_P) dcfg->crypto_key = getkey(dcfg->mp);
736-
if (dcfg->crypto_key_len == NOT_SET) dcfg->crypto_key_len = strlen(dcfg->crypto_key);
735+
if (dcfg->hash_is_enabled == HASH_ENABLED) {
736+
if (dcfg->crypto_key == NOT_SET_P) dcfg->crypto_key = getkey(dcfg->mp);
737+
if (dcfg->crypto_key_len == NOT_SET) dcfg->crypto_key_len = strlen(dcfg->crypto_key);
738+
} else {
739+
if (dcfg->crypto_key == NOT_SET_P) dcfg->crypto_key = "";
740+
if (dcfg->crypto_key_len == NOT_SET) dcfg->crypto_key_len = 0;
741+
}
737742
if (dcfg->crypto_key_add == NOT_SET) dcfg->crypto_key_add = HASH_KEYONLY;
738743
if (dcfg->crypto_param_name == NOT_SET_P) dcfg->crypto_param_name = "crypt";
739744
if (dcfg->hash_is_enabled == NOT_SET) dcfg->hash_is_enabled = HASH_DISABLED;

0 commit comments

Comments
 (0)