summaryrefslogtreecommitdiff
path: root/lib/vtls/mesalink.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-08-18 00:22:34 +0200
committerDaniel Stenberg <daniel@haxx.se>2020-08-19 15:55:50 +0200
commit80d73bcca22f098812db06c08bbf2807f19782c0 (patch)
treeffe846c9a90c3087dcd8dcbbba5694b04b9e101e /lib/vtls/mesalink.c
parent9d954e49bce3706a9a2efb119ecd05767f0f2a9e (diff)
downloadcurl-80d73bcca22f098812db06c08bbf2807f19782c0.tar.gz
tls: provide the CApath verbose log on its own line
... not newline separated from the previous line. This makes it output asterisk prefixed properly like other verbose putput! Reported-by: jmdavitt on github Fixes #5826 Closes #5827
Diffstat (limited to 'lib/vtls/mesalink.c')
-rw-r--r--lib/vtls/mesalink.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c
index 7132bdfd2..17c64735e 100644
--- a/lib/vtls/mesalink.c
+++ b/lib/vtls/mesalink.c
@@ -158,8 +158,8 @@ mesalink_connect_step1(struct connectdata *conn, int sockindex)
SSL_CONN_CONFIG(CApath))) {
if(SSL_CONN_CONFIG(verifypeer)) {
failf(data,
- "error setting certificate verify locations:\n"
- " CAfile: %s\n CApath: %s",
+ "error setting certificate verify locations: "
+ " CAfile: %s CApath: %s",
SSL_CONN_CONFIG(CAfile) ?
SSL_CONN_CONFIG(CAfile) : "none",
SSL_CONN_CONFIG(CApath) ?
@@ -173,13 +173,10 @@ mesalink_connect_step1(struct connectdata *conn, int sockindex)
else {
infof(data, "successfully set certificate verify locations:\n");
}
- infof(data,
- " CAfile: %s\n"
- " CApath: %s\n",
- SSL_CONN_CONFIG(CAfile)?
- SSL_CONN_CONFIG(CAfile): "none",
- SSL_CONN_CONFIG(CApath)?
- SSL_CONN_CONFIG(CApath): "none");
+ infof(data, " CAfile: %s\n",
+ SSL_CONN_CONFIG(CAfile) ? SSL_CONN_CONFIG(CAfile): "none");
+ infof(data, " CApath: %s\n",
+ SSL_CONN_CONFIG(CApath) ? SSL_CONN_CONFIG(CApath): "none");
}
if(SSL_SET_OPTION(cert) && SSL_SET_OPTION(key)) {