mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 22:35:10 +00:00
Code Issues Releases Wiki Activity

Check for tls_config->dhparams_path being non-NULL before using it.

Browse Source
This commit is contained in:
Todd C. Miller
2020-04-28 10:52:08 -06:00
parent 79b064139f
commit 2ab8f2a732
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logsrvd/logsrvd.c
View File

@@ -1091,6 +1091,7 @@ static bool
init_tls_server_context(void) init_tls_server_context(void)
{ {
const SSL_METHOD *method; const SSL_METHOD *method;
FILE *dhparam_file = NULL;
SSL_CTX *ctx = NULL; SSL_CTX *ctx = NULL;
struct logsrvd_tls_runtime *tls_runtime = logsrvd_get_tls_runtime(); struct logsrvd_tls_runtime *tls_runtime = logsrvd_get_tls_runtime();
const struct logsrvd_tls_config *tls_config = logsrvd_get_tls_config(); const struct logsrvd_tls_config *tls_config = logsrvd_get_tls_config();
@@ -1186,7 +1187,8 @@ init_tls_server_context(void)
} }
/* try to load and set diffie-hellman parameters */ /* try to load and set diffie-hellman parameters */
FILE *dhparam_file = fopen(tls_config->dhparams_path, "r"); if (tls_config->dhparams_path != NULL)
dhparam_file = fopen(tls_config->dhparams_path, "r");
if (dhparam_file != NULL) { if (dhparam_file != NULL) {
DH* dhparams; DH* dhparams;
if ((dhparams = PEM_read_DHparams(dhparam_file, NULL, NULL, NULL)) != NULL) { if ((dhparams = PEM_read_DHparams(dhparam_file, NULL, NULL, NULL)) != NULL) {