File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change 1
1
DD MMM YYYY - 2.9.3 - To be released
2
2
------------------------------------
3
3
4
+ * Only generate SecHashKey when SecHashEngine is On
5
+ [Issue #1671 - @dmuey, @monkburger]
4
6
* Fix arabic charset in unicode_mapping file
5
7
[Issue #1619 - @alaa-ahmed-a]
6
8
* Optionally preallocates memory when SecStreamInBodyInspection is on
Original file line number Diff line number Diff line change @@ -732,8 +732,13 @@ void init_directory_config(directory_config *dcfg)
732
732
if (dcfg -> col_timeout == NOT_SET ) dcfg -> col_timeout = 3600 ;
733
733
734
734
/* 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
+ }
737
742
if (dcfg -> crypto_key_add == NOT_SET ) dcfg -> crypto_key_add = HASH_KEYONLY ;
738
743
if (dcfg -> crypto_param_name == NOT_SET_P ) dcfg -> crypto_param_name = "crypt" ;
739
744
if (dcfg -> hash_is_enabled == NOT_SET ) dcfg -> hash_is_enabled = HASH_DISABLED ;
You can’t perform that action at this time.
0 commit comments