]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: ssl: fix error messages for OCSP loading
authorWilliam Lallemand <wlallemand@haproxy.com>
Tue, 15 Oct 2019 08:05:37 +0000 (10:05 +0200)
committerWilliam Lallemand <wlallemand@haproxy.org>
Tue, 15 Oct 2019 11:50:20 +0000 (13:50 +0200)
The error messages for OCSP in ssl_sock_load_crt_file_into_ckch() add a
double extension to the filename, that can be confusing. The messages
reference a .issuer.issuer file.

src/ssl_sock.c

index ef91821543269691caa2bdd25b25a4de134d9656..1a48e2a392bc9b3b5ab4555e584b59ac283acdf3 100644 (file)
@@ -3007,7 +3007,7 @@ static int ssl_sock_load_crt_file_into_ckch(const char *path, BIO *buf, struct c
                        snprintf(fp, MAXPATHLEN+1, "%s.issuer", path);
                        if (stat(fp, &st) == 0) {
                                if (BIO_read_filename(in, fp) <= 0) {
-                                       memprintf(err, "%s '%s.issuer' is present but cannot be read or parsed'.\n",
+                                       memprintf(err, "%s '%s' is present but cannot be read or parsed'.\n",
                                                  *err ? *err : "", fp);
                                        ret = 1;
                                        goto end;
@@ -3015,14 +3015,14 @@ static int ssl_sock_load_crt_file_into_ckch(const char *path, BIO *buf, struct c
 
                                issuer = PEM_read_bio_X509_AUX(in, NULL, NULL, NULL);
                                if (!issuer) {
-                                       memprintf(err, "%s '%s.issuer' is present but cannot be read or parsed'.\n",
+                                       memprintf(err, "%s '%s' is present but cannot be read or parsed'.\n",
                                                  *err ? *err : "", fp);
                                        ret = 1;
                                        goto end;
                                }
 
                                if (X509_check_issued(ckch->ocsp_issuer, ckch->cert) != X509_V_OK) {
-                                       memprintf(err, "%s '%s.issuer' is not an issuer'.\n",
+                                       memprintf(err, "%s '%s' is not an issuer'.\n",
                                                  *err ? *err : "", fp);
                                        ret = 1;
                                        goto end;