From 1b742e514f267cbe16fef935d31aa7df837e2207 Mon Sep 17 00:00:00 2001
From: "dveditz%cruzio.com" <devnull@localhost>
Date: Mon, 16 Oct 2006 06:01:32 +0000
Subject: bug 356215, r=wtchang, a=dveditz

---
 security/nss/lib/softoken/rsawrapr.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/security/nss/lib/softoken/rsawrapr.c b/security/nss/lib/softoken/rsawrapr.c
index b40a30d80..2ae3039e7 100644
--- a/security/nss/lib/softoken/rsawrapr.c
+++ b/security/nss/lib/softoken/rsawrapr.c
@@ -489,7 +489,13 @@ RSA_CheckSign(NSSLOWKEYPublicKey *key,
     modulus_len = nsslowkey_PublicModulusLen(key);
     if (sign_len != modulus_len) 
     	goto failure;
-    if (hash_len > modulus_len - 8) 
+    /*
+     * 0x00 || BT || Pad || 0x00 || ActualData
+     *
+     * The "3" below is the first octet + the second octet + the 0x00
+     * octet that always comes just before the ActualData.
+     */
+    if (hash_len > modulus_len - (3 + RSA_BLOCK_MIN_PAD_LEN)) 
     	goto failure;
     PORT_Assert(key->keyType == NSSLOWKEYRSAKey);
     if (key->keyType != NSSLOWKEYRSAKey)
@@ -509,11 +515,11 @@ RSA_CheckSign(NSSLOWKEYPublicKey *key,
     if (buffer[0] != 0 || buffer[1] != 1) 
     	goto loser;
     for (i = 2; i < modulus_len - hash_len - 1; i++) {
-	if (buffer[i] == 0) 
-	    break;
 	if (buffer[i] != 0xff) 
 	    goto loser;
     }
+    if (buffer[i] != 0) 
+	goto loser;
 
     /*
      * make sure we get the same results
-- 
cgit v1.2.1