diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-12-05 02:05:20 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-12-05 02:05:20 +0000 |
| commit | f87ab7a42da5299ce10cb3f933e5a561cdda5524 (patch) | |
| tree | 1c18646c56ef580f9486cd95e89dd7f2e66138e6 | |
| parent | 696335ab46d63c85387edd50aa742fc9dd7f491b (diff) | |
| download | openssl-f87ab7a42da5299ce10cb3f933e5a561cdda5524.tar.gz | |
Recent changes from 0.9.6-stable
| -rw-r--r-- | crypto/x509/by_file.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c index 78e9240a8d..05a3a0293b 100644 --- a/crypto/x509/by_file.c +++ b/crypto/x509/by_file.c @@ -100,18 +100,19 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, case X509_L_FILE_LOAD: if (argl == X509_FILETYPE_DEFAULT) { - ok = (X509_load_cert_crl_file(ctx,X509_get_default_cert_file(), - X509_FILETYPE_PEM) != 0); + file = (char *)Getenv(X509_get_default_cert_file_env()); + if (file) + ok = (X509_load_cert_crl_file(ctx,file, + X509_FILETYPE_PEM) != 0); + + if (!ok) + ok = (X509_load_cert_crl_file(ctx,X509_get_default_cert_file(), + X509_FILETYPE_PEM) != 0); + if (!ok) { X509err(X509_F_BY_FILE_CTRL,X509_R_LOADING_DEFAULTS); } - else - { - file=(char *)Getenv(X509_get_default_cert_file_env()); - ok = (X509_load_cert_crl_file(ctx,file, - X509_FILETYPE_PEM) != 0); - } } else { |