RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-11 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: ssl: crt-list do ckchn_lookup

Browse Source
This commit is contained in:
William Lallemand 2019-10-10 11:38:13 +02:00 committed by William Lallemand
parent 572d9f5847
commit eed4bf234e
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl_sock.c
View File

@ -3853,22 +3853,18 @@ int ssl_sock_load_cert_list_file(char *file, struct bind_conf *bind_conf, struct
break; break;
} }
if (stat(crt_path, &buf) == 0) { if ((ckchn = ckchn_lookup(crt_path)) == NULL) {
if (stat(crt_path, &buf) == 0)
ckchn = ckchn_load_cert_file(crt_path, 0, err); ckchn = ckchn_load_cert_file(crt_path, 0, err);
if (!ckchn)
cfgerr++;
else else
cfgerr = ssl_sock_load_ckchn(crt_path, ckchn, bind_conf, ssl_conf,
&args[cur_arg], arg - cur_arg - 1, err);
} else {
ckchn = ckchn_load_cert_file(crt_path, 1, err); ckchn = ckchn_load_cert_file(crt_path, 1, err);
}
if (!ckchn) if (!ckchn)
cfgerr++; cfgerr++;
else else
cfgerr = ssl_sock_load_multi_ckchn(crt_path, ckchn, bind_conf, ssl_conf, cfgerr += ssl_sock_load_ckchn(crt_path, ckchn, bind_conf, ssl_conf,
&args[cur_arg], arg - cur_arg - 1, err); &args[cur_arg], arg - cur_arg - 1, err);
}
if (cfgerr) { if (cfgerr) {
memprintf(err, "error processing line %d in file '%s' : %s", linenum, file, *err); memprintf(err, "error processing line %d in file '%s' : %s", linenum, file, *err);