From: Viktor Dukhovni <openssl-users@dukhovni.org>
Date: Mon, 23 Jun 2014 00:14:53 +0000 (-0400)
Subject: X509_check_mumble() failure is <= 0, not just 0
X-Git-Tag: master-post-reformat~678
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=a48fb0400c9c45d56144966b774998ebe37804ef

X509_check_mumble() failure is <= 0, not just 0
---

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index b6d4989e4b..b6f16bb772 100644
--- 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;
-	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 (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 (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;