1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: ssl: forgotten newline in error messages on ca-file

Browse Source 
Add forgotten newlines in ssl_store_load_ca_from_buf() error messages.
This commit is contained in:
William Lallemand 2022-11-24 18:45:28 +01:00
parent 0279df9e82
commit 3992f55ff3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl_ckch.c
View File

@ -1268,21 +1268,21 @@ int ssl_store_load_locations_file(char *path, int create_if_none, enum cafile_ty
store = X509_STORE_new(); store = X509_STORE_new();
if (!store) { if (!store) {
ha_alert("Cannot allocate memory!"); ha_alert("Cannot allocate memory!\n");
goto err; goto err;
} }
if (strcmp(path, "@system-ca") == 0) { if (strcmp(path, "@system-ca") == 0) {
dir = X509_get_default_cert_dir(); dir = X509_get_default_cert_dir();
if (!dir) { if (!dir) {
ha_alert("Couldn't get the system CA directory from X509_get_default_cert_dir()."); ha_alert("Couldn't get the system CA directory from X509_get_default_cert_dir().\n");
goto err; goto err;
} }
} else { } else {
if (stat(path, &buf) == -1) { if (stat(path, &buf) == -1) {
ha_alert("Couldn't open the ca-file '%s' (%s).", path, strerror(errno)); ha_alert("Couldn't open the ca-file '%s' (%s).\n", path, strerror(errno));
goto err; goto err;
} }
@ -1295,7 +1295,7 @@ int ssl_store_load_locations_file(char *path, int create_if_none, enum cafile_ty
if (file) { if (file) {
if (!X509_STORE_load_locations(store, file, NULL)) { if (!X509_STORE_load_locations(store, file, NULL)) {
e = ERR_get_error(); e = ERR_get_error();
ha_alert("Couldn't open the ca-file '%s' (%s).", path, ERR_reason_error_string(e)); ha_alert("Couldn't open the ca-file '%s' (%s).\n", path, ERR_reason_error_string(e));
goto err; goto err;
} }
} else if (dir) { } else if (dir) {