diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-11-21 22:28:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-11-21 22:28:31 +0000 |
| commit | 52664f5081939c96c5867fd02278f7575f1cab2d (patch) | |
| tree | f2a5a01dcf50d2f54aa8114adf8ed59867754ed6 /apps/verify.c | |
| parent | a716d727347d6cd81534327901b509c6f5763f83 (diff) | |
Transparent support for PKCS#8 private keys in RSA/DSA.
New universal public key format.
Fix CRL+cert load problem in by_file.c
Make verify report errors when loading files or dirs
Diffstat (limited to 'apps/verify.c')
| -rw-r--r-- | apps/verify.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/apps/verify.c b/apps/verify.c index 840fda9561..4166b92fb4 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -124,13 +124,25 @@ int MAIN(int argc, char **argv) lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_file()); if (lookup == NULL) abort(); - if (!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM)) - X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT); + if (CAfile) { + i=X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM); + if(!i) { + BIO_printf(bio_err, "Error loading file %s\n", CAfile); + ERR_print_errors(bio_err); + goto end; + } + } else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT); lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_hash_dir()); if (lookup == NULL) abort(); - if (!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM)) - X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT); + if (CApath) { + i=X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM); + if(!i) { + BIO_printf(bio_err, "Error loading directory %s\n", CApath); + ERR_print_errors(bio_err); + goto end; + } + } else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT); ERR_clear_error(); |