projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b3012c6
)
X509_check_mumble() failure is <= 0, not just 0
author
Viktor Dukhovni
<openssl-users@dukhovni.org>
Mon, 23 Jun 2014 00:14:53 +0000
(20:14 -0400)
committer
Viktor Dukhovni
<openssl-users@dukhovni.org>
Mon, 23 Jun 2014 00:14:53 +0000
(20:14 -0400)
crypto/x509/x509_vfy.c
patch
|
blob
|
history
diff --git
a/crypto/x509/x509_vfy.c
b/crypto/x509/x509_vfy.c
index
b6d4989
..
b6f16bb
100644
(file)
--- a/
crypto/x509/x509_vfy.c
+++ b/
crypto/x509/x509_vfy.c
@@
-748,17
+748,17
@@
static int check_id(X509_STORE_CTX *ctx)
X509_VERIFY_PARAM *vpm = ctx->param;
X509_VERIFY_PARAM_ID *id = vpm->id;
X509 *x = ctx->cert;
X509_VERIFY_PARAM *vpm = ctx->param;
X509_VERIFY_PARAM_ID *id = vpm->id;
X509 *x = ctx->cert;
- if (id->host &&
!X509_check_host(x, id->host, 0, id->hostflags)
)
+ if (id->host &&
X509_check_host(x, id->host, 0, id->hostflags) <= 0
)
{
if (!check_id_error(ctx, X509_V_ERR_HOSTNAME_MISMATCH))
return 0;
}
{
if (!check_id_error(ctx, X509_V_ERR_HOSTNAME_MISMATCH))
return 0;
}
- if (id->email &&
!X509_check_email(x, id->email, id->emaillen, 0)
)
+ if (id->email &&
X509_check_email(x, id->email, id->emaillen, 0) <= 0
)
{
if (!check_id_error(ctx, X509_V_ERR_EMAIL_MISMATCH))
return 0;
}
{
if (!check_id_error(ctx, X509_V_ERR_EMAIL_MISMATCH))
return 0;
}
- if (id->ip &&
!X509_check_ip(x, id->ip, id->iplen, 0)
)
+ if (id->ip &&
X509_check_ip(x, id->ip, id->iplen, 0) <= 0
)
{
if (!check_id_error(ctx, X509_V_ERR_IP_ADDRESS_MISMATCH))
return 0;
{
if (!check_id_error(ctx, X509_V_ERR_IP_ADDRESS_MISMATCH))
return 0;