diff options
author | Matt Caswell <matt@openssl.org> | 2015-09-22 16:00:52 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-09-25 14:49:59 +0100 |
commit | 2b6bcb702d237171ec5217956a42c8dce031ea51 (patch) | |
tree | 28ae33107e186389f048d4e7f0aa9a9a12ed79a2 /apps/apps.h | |
parent | 631fb6af5f404e4f8b4ae33f3ffdcec81b9df19a (diff) | |
download | openssl-2b6bcb702d237171ec5217956a42c8dce031ea51.tar.gz |
Add support for -no-CApath and -no-CAfile options
For those command line options that take the verification options
-CApath and -CAfile, if those options are absent then the default path or
file is used instead. It is not currently possible to specify *no* path or
file at all. This change adds the options -no-CApath and -no-CAfile to
specify that the default locations should not be used to all relevant
applications.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'apps/apps.h')
-rw-r--r-- | apps/apps.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/apps.h b/apps/apps.h index 2d198a104f..185ac2422e 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -442,9 +442,10 @@ STACK_OF(X509) *load_certs(const char *file, int format, STACK_OF(X509_CRL) *load_crls(const char *file, int format, const char *pass, ENGINE *e, const char *cert_descrip); -X509_STORE *setup_verify(char *CAfile, char *CApath); -int ctx_set_verify_locations(SSL_CTX *ctx, - const char *CAfile, const char *CApath); +X509_STORE *setup_verify(char *CAfile, char *CApath, + int noCAfile, int noCApath); +int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile, + const char *CApath, int noCAfile, int noCApath); # ifdef OPENSSL_NO_ENGINE # define setup_engine(engine, debug) NULL # else |