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

Change dir_ctrl to check for the environment variable before using the default

Browse Source 
directory instead of the other way around.

PR: 1131
This commit is contained in:
Richard Levitte 2005-06-23 21:14:15 +00:00
parent d996a9af2b
commit 0e441bc2be
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/x509/by_dir.c
View File

@ -122,19 +122,19 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
{ {
case X509_L_ADD_DIR: case X509_L_ADD_DIR:
if (argl == X509_FILETYPE_DEFAULT) if (argl == X509_FILETYPE_DEFAULT)
dir=(char *)Getenv(X509_get_default_cert_dir_env());
if (dir)
ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
else
{ {
ret=add_cert_dir(ld,X509_get_default_cert_dir(), ret=add_cert_dir(ld,X509_get_default_cert_dir(),
X509_FILETYPE_PEM); X509_FILETYPE_PEM);
}
if (!ret) if (!ret)
{ {
X509err(X509_F_DIR_CTRL,X509_R_LOADING_CERT_DIR); X509err(X509_F_DIR_CTRL,X509_R_LOADING_CERT_DIR);
} }
else
{
dir=(char *)Getenv(X509_get_default_cert_dir_env());
ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
}
}
else else
ret=add_cert_dir(ld,argp,(int)argl); ret=add_cert_dir(ld,argp,(int)argl);
break; break;