提交 109080ae 编写于 作者: A Andy Polyakov

Fix bugs in bug-fix to x509/by_dir.c.

PR: 1131
上级 31efffbd
...@@ -122,19 +122,18 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, ...@@ -122,19 +122,18 @@ 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()); dir=(char *)Getenv(X509_get_default_cert_dir_env());
if (dir) if (dir)
ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM); ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
else 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 else
ret=add_cert_dir(ld,argp,(int)argl); ret=add_cert_dir(ld,argp,(int)argl);
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册