From 5868b8e09089ac036ee7048a162e73616c0ca637 Mon Sep 17 00:00:00 2001
From: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Date: Wed, 12 Sep 2012 13:26:55 +0300
Subject: [PATCH] --- yaml --- r: 322639 b: refs/heads/master c:
 bc01637a80f5b670bd70a0279d3f93fa8de1c96d h: refs/heads/master i:   322637:
 2cbc460079ce312e86a9633e20a08a2dd67227d0   322635:
 fa71ceeae4ff97a68fcabfec079872b7a17aba3f   322631:
 f7d9355108d3492d8a7eb72689c9df66e915de97   322623:
 8b6359d9a96e5769dd0e9bd377be4b04d9ac2b86 v: v3

---
 [refs]             | 2 +-
 trunk/lib/digsig.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4851311e1e18..07f655a9aa1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8507876aaada8a2cf68ebccdf1d056465dd1fc11
+refs/heads/master: bc01637a80f5b670bd70a0279d3f93fa8de1c96d
diff --git a/trunk/lib/digsig.c b/trunk/lib/digsig.c
index 286d558033e2..8c0e62975c88 100644
--- a/trunk/lib/digsig.c
+++ b/trunk/lib/digsig.c
@@ -163,9 +163,11 @@ static int digsig_verify_rsa(struct key *key,
 	memcpy(out1 + head, p, l);
 
 	err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len);
+	if (err)
+		goto err;
 
-	if (!err && len == hlen)
-		err = memcmp(out2, h, hlen);
+	if (len != hlen || memcmp(out2, h, hlen))
+		err = -EINVAL;
 
 err:
 	mpi_free(in);