generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure using SSL_CERT_FILE actually works, and has priority over system defaults.

Browse Source 
PR: 376
This commit is contained in:
Richard Levitte 2002-12-05 01:20:59 +00:00
parent d9090acdfb
commit 2589b74fd8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crypto/x509/by_file.c
View File

@ -100,18 +100,19 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
case X509_L_FILE_LOAD: case X509_L_FILE_LOAD:
if (argl == X509_FILETYPE_DEFAULT) if (argl == X509_FILETYPE_DEFAULT)
{ {
ok = (X509_load_cert_crl_file(ctx,X509_get_default_cert_file(), file = (char *)Getenv(X509_get_default_cert_file_env());
X509_FILETYPE_PEM) != 0); 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) if (!ok)
{ {
X509err(X509_F_BY_FILE_CTRL,X509_R_LOADING_DEFAULTS); 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 else
{ {