diff options
author | Ben Laurie <ben@links.org> | 2015-08-02 02:45:44 +0100 |
---|---|---|
committer | Ben Laurie <ben@links.org> | 2015-08-02 02:45:44 +0100 |
commit | 480405e4a9a8f791324850c4f6b3d36d4e4de4f9 (patch) | |
tree | 6282a32001ddeba2d4410bb9171e5f11dbacf828 /apps/verify.c | |
parent | d237a2739c91eb97a7be57989de0a18051f98963 (diff) |
Add -Wconditional-uninitialized to clang strict warnings.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/verify.c')
-rw-r--r-- | apps/verify.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/apps/verify.c b/apps/verify.c index 7fcd32a404..8abc70859a 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -272,37 +272,35 @@ static int check(X509_STORE *ctx, char *file, if (crls) X509_STORE_CTX_set0_crls(csc, crls); i = X509_verify_cert(csc); - if (i > 0 && show_chain) { - chain = X509_STORE_CTX_get1_chain(csc); - num_untrusted = X509_STORE_CTX_get_num_untrusted(csc); + if (i > 0) { + printf("OK\n"); + ret = 1; + if (show_chain) { + chain = X509_STORE_CTX_get1_chain(csc); + num_untrusted = X509_STORE_CTX_get_num_untrusted(csc); + printf("Chain:\n"); + for (i = 0; i < sk_X509_num(chain); i++) { + X509 *cert = sk_X509_value(chain, i); + printf("depth=%d: ", i); + X509_NAME_print_ex_fp(stdout, + X509_get_subject_name(cert), + 0, XN_FLAG_ONELINE); + if (i < num_untrusted) + printf(" (untrusted)"); + printf("\n"); + } + sk_X509_pop_free(chain, X509_free); + } } X509_STORE_CTX_free(csc); ret = 0; end: - if (i > 0) { - printf("OK\n"); - ret = 1; - } else - ERR_print_errors(bio_err); - if (chain) { - printf("Chain:\n"); - for (i = 0; i < sk_X509_num(chain); i++) { - X509 *cert = sk_X509_value(chain, i); - printf("depth=%d: ", i); - X509_NAME_print_ex_fp(stdout, - X509_get_subject_name(cert), - 0, XN_FLAG_ONELINE); - if (i < num_untrusted) { - printf(" (untrusted)"); - } - printf("\n"); - } - sk_X509_pop_free(chain, X509_free); - } + if (i <= 0) + ERR_print_errors(bio_err); X509_free(x); - return (ret); + return ret; } static int cb(int ok, X509_STORE_CTX *ctx) |