diff options
| author | beck <> | 2017-01-24 10:54:48 +0000 |
|---|---|---|
| committer | beck <> | 2017-01-24 10:54:48 +0000 |
| commit | 38ca4324c98f90377fdbe9cba67f752d84ab84d9 (patch) | |
| tree | 544ff014b073863ed6899fb751c48ba619125ebf /src/usr.sbin/ocspcheck | |
| parent | c2788a84ceb906a3081df72c9a41e036f14cd263 (diff) | |
| download | openbsd-38ca4324c98f90377fdbe9cba67f752d84ab84d9.tar.gz openbsd-38ca4324c98f90377fdbe9cba67f752d84ab84d9.tar.bz2 openbsd-38ca4324c98f90377fdbe9cba67f752d84ab84d9.zip | |
Actually load the cafile when providede, and error message cleanup
Diffstat (limited to 'src/usr.sbin/ocspcheck')
| -rw-r--r-- | src/usr.sbin/ocspcheck/ocspcheck.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.sbin/ocspcheck/ocspcheck.c b/src/usr.sbin/ocspcheck/ocspcheck.c index 0d6ebee028..847477c2d1 100644 --- a/src/usr.sbin/ocspcheck/ocspcheck.c +++ b/src/usr.sbin/ocspcheck/ocspcheck.c | |||
| @@ -190,12 +190,12 @@ read_cacerts(char *file) | |||
| 190 | } | 190 | } |
| 191 | if ((lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file())) == | 191 | if ((lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file())) == |
| 192 | NULL) { | 192 | NULL) { |
| 193 | warnx("Unable to load CA certs from file %s\n", file); | 193 | warnx("Unable to load CA certs from file %s", file); |
| 194 | goto end; | 194 | goto end; |
| 195 | } | 195 | } |
| 196 | if (file) { | 196 | if (file) { |
| 197 | if (!X509_LOOKUP_load_file(lookup, file, X509_FILETYPE_PEM)) { | 197 | if (!X509_LOOKUP_load_file(lookup, file, X509_FILETYPE_PEM)) { |
| 198 | warnx("Unable to load CA certs from file %s\n", file); | 198 | warnx("Unable to load CA certs from file %s", file); |
| 199 | goto end; | 199 | goto end; |
| 200 | } | 200 | } |
| 201 | } else | 201 | } else |
| @@ -203,7 +203,7 @@ read_cacerts(char *file) | |||
| 203 | 203 | ||
| 204 | if ((lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir())) == | 204 | if ((lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir())) == |
| 205 | NULL) { | 205 | NULL) { |
| 206 | warnx("Unable to load CA certs from file %s\n", file); | 206 | warnx("Unable to load CA certs from file %s", file); |
| 207 | goto end; | 207 | goto end; |
| 208 | } | 208 | } |
| 209 | X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT); | 209 | X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT); |
| @@ -556,7 +556,7 @@ main (int argc, char **argv) | |||
| 556 | * OSCP request based on the full certificate chain | 556 | * OSCP request based on the full certificate chain |
| 557 | * we have been given to check. | 557 | * we have been given to check. |
| 558 | */ | 558 | */ |
| 559 | if ((castore = read_cacerts(NULL)) == NULL) | 559 | if ((castore = read_cacerts(cafile)) == NULL) |
| 560 | errx(EXIT_FAILURE, "Unable to load %s", cafile); | 560 | errx(EXIT_FAILURE, "Unable to load %s", cafile); |
| 561 | 561 | ||
| 562 | if ((request = ocsp_request_new_from_cert(certfile, nonce)) == NULL) | 562 | if ((request = ocsp_request_new_from_cert(certfile, nonce)) == NULL) |