check trailing 0's in signeeds check case

JacobBarthelmeh · JacobBarthelmeh · commit 05138154a9e4 · 2024-03-01T22:57:10.000+07:00
diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
@@ -6012,12 +6012,10 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
                 }
             }
 
-            if (ret < 0)
-                break;
-
         #ifndef NO_PKCS7_STREAM
             /* make sure that terminating zero's follow */
-            if (ret >= 0 && pkcs7->stream->indefLen == 1) {
+            if ((ret == PKCS7_SIGNEEDS_CHECK || ret >= 0) &&
+                    pkcs7->stream->indefLen == 1) {
                 int i;
                 for (i = 0; i < 3 * ASN_INDEF_END_SZ; i++) {
                     if (pkiMsg2[idx + i] != 0) {
@@ -6026,9 +6024,11 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
                     }
                 }
             }
+        #endif /* NO_PKCS7_STREAM */
+
             if (ret < 0)
                 break;
-        #endif /* NO_PKCS7_STREAM */
+
 
             ret = 0; /* success */
         #ifndef NO_PKCS7_STREAM

Original file line number	Diff line number	Diff line change
`@@ -6012,12 +6012,10 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,`
`6012`	`6012`	`}`
`6013`	`6013`	`}`
`6014`	`6014`
`6015`		`- if (ret < 0)`
`6016`		`- break;`
`6017`		`-`
`6018`	`6015`	`#ifndef NO_PKCS7_STREAM`
`6019`	`6016`	`/* make sure that terminating zero's follow */`
`6020`		`- if (ret >= 0 && pkcs7->stream->indefLen == 1) {`
	`6017`	`+ if ((ret == PKCS7_SIGNEEDS_CHECK \|\| ret >= 0) &&`
	`6018`	`+ pkcs7->stream->indefLen == 1) {`
`6021`	`6019`	`int i;`
`6022`	`6020`	`for (i = 0; i < 3 * ASN_INDEF_END_SZ; i++) {`
`6023`	`6021`	`if (pkiMsg2[idx + i] != 0) {`
`@@ -6026,9 +6024,11 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,`
`6026`	`6024`	`}`
`6027`	`6025`	`}`
`6028`	`6026`	`}`
	`6027`	`+ #endif /* NO_PKCS7_STREAM */`
	`6028`	`+`
`6029`	`6029`	`if (ret < 0)`
`6030`	`6030`	`break;`
`6031`		`- #endif /* NO_PKCS7_STREAM */`
	`6031`	`+`
`6032`	`6032`
`6033`	`6033`	`ret = 0; /* success */`
`6034`	`6034`	`#ifndef NO_PKCS7_STREAM`