projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove redundant ERR_load_... declarations
[openssl.git]
/
crypto
/
x509
/
by_file.c
diff --git
a/crypto/x509/by_file.c
b/crypto/x509/by_file.c
index 78b4c47751b12ed2918b440614a77cf225e8213c..92e00d2d7335ab711defac1294634ef94a45fe2c 100644
(file)
--- a/
crypto/x509/by_file.c
+++ b/
crypto/x509/by_file.c
@@
-66,7
+66,7
@@
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
-#ifndef NO_STDIO
+#ifndef
OPENSSL_
NO_STDIO
static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
long argl, char **ret);
static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
long argl, char **ret);
@@
-100,8
+100,8
@@
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)
{
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);
+ 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);
if (!ok)
{
X509err(X509_F_BY_FILE_CTRL,X509_R_LOADING_DEFAULTS);
@@
-109,16
+109,17
@@
static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
else
{
file=(char *)Getenv(X509_get_default_cert_file_env());
else
{
file=(char *)Getenv(X509_get_default_cert_file_env());
- ok
=
X509_load_cert_crl_file(ctx,file,
- X509_FILETYPE_PEM);
+ ok
= (
X509_load_cert_crl_file(ctx,file,
+ X509_FILETYPE_PEM)
!= 0)
;
}
}
else
{
if(argl == X509_FILETYPE_PEM)
}
}
else
{
if(argl == X509_FILETYPE_PEM)
- ok=X509_load_cert_crl_file(ctx,argp,
- X509_FILETYPE_PEM);
- else ok=X509_load_cert_file(ctx,argp,(int)argl);
+ ok = (X509_load_cert_crl_file(ctx,argp,
+ X509_FILETYPE_PEM) != 0);
+ else
+ ok = (X509_load_cert_file(ctx,argp,(int)argl) != 0);
}
break;
}
}
break;
}
@@
-293,5
+294,5
@@
int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
}
}
-#endif /* NO_STDIO */
+#endif /*
OPENSSL_
NO_STDIO */