diff options
author | beck <> | 2017-01-24 12:08:35 +0000 |
---|---|---|
committer | beck <> | 2017-01-24 12:08:35 +0000 |
commit | e432318586fcb3988146bb24e4e5b151339beed8 (patch) | |
tree | 793d1b75f8952143d3d601c3da75c57061887c43 | |
parent | fa8684bd364e9a9fb9e924416192e2f4843f8f87 (diff) | |
download | openbsd-e432318586fcb3988146bb24e4e5b151339beed8.tar.gz openbsd-e432318586fcb3988146bb24e4e5b151339beed8.tar.bz2 openbsd-e432318586fcb3988146bb24e4e5b151339beed8.zip |
Say no to two line error messages on failure
-rw-r--r-- | src/usr.sbin/ocspcheck/ocspcheck.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/usr.sbin/ocspcheck/ocspcheck.c b/src/usr.sbin/ocspcheck/ocspcheck.c index 847477c2d1..8ce1008dbe 100644 --- a/src/usr.sbin/ocspcheck/ocspcheck.c +++ b/src/usr.sbin/ocspcheck/ocspcheck.c | |||
@@ -557,10 +557,9 @@ main (int argc, char **argv) | |||
557 | * we have been given to check. | 557 | * we have been given to check. |
558 | */ | 558 | */ |
559 | if ((castore = read_cacerts(cafile)) == NULL) | 559 | if ((castore = read_cacerts(cafile)) == NULL) |
560 | errx(EXIT_FAILURE, "Unable to load %s", cafile); | 560 | exit(EXIT_FAILURE); |
561 | |||
562 | if ((request = ocsp_request_new_from_cert(certfile, nonce)) == NULL) | 561 | if ((request = ocsp_request_new_from_cert(certfile, nonce)) == NULL) |
563 | errx(EXIT_FAILURE, "Unable to build OCSP request"); | 562 | exit(EXIT_FAILURE); |
564 | 563 | ||
565 | if ((host = url2host(request->url, &port, &path)) == NULL) | 564 | if ((host = url2host(request->url, &port, &path)) == NULL) |
566 | errx(EXIT_FAILURE, "Invalid OCSP url %s from %s", request->url, | 565 | errx(EXIT_FAILURE, "Invalid OCSP url %s from %s", request->url, |
@@ -605,7 +604,7 @@ main (int argc, char **argv) | |||
605 | OPENSSL_add_all_algorithms_noconf(); | 604 | OPENSSL_add_all_algorithms_noconf(); |
606 | if (!validate_response(hget->bodypart, hget->bodypartsz, | 605 | if (!validate_response(hget->bodypart, hget->bodypartsz, |
607 | request, castore, host, certfile)) | 606 | request, castore, host, certfile)) |
608 | errx(EXIT_FAILURE, "Can not validate %s", certfile); | 607 | exit(EXIT_FAILURE); |
609 | 608 | ||
610 | /* | 609 | /* |
611 | * If we have been given a place to save a staple, | 610 | * If we have been given a place to save a staple, |