Merge pull request #10904 from aidangarske/fix/pkcs7-stream-signed-content

Frauschi · web-flow · commit c327ea36bfa7 · 2026-07-15T09:43:34.000+02:00
Fix PKCS7 streamed SignedData dropping content
diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
@@ -3192,6 +3192,9 @@ static int wc_PKCS7_EncodeContentStreamHelper(wc_PKCS7* pkcs7, int cipherType,
                 ret = wc_HashUpdate(&esd->hash, esd->hashType,
                     contentData, (word32)contentDataSz);
             }
+            else {
+                ret = 0;
+            }
             break;
 
     #ifndef NO_AES

Original file line number	Diff line number	Diff line change
`@@ -3192,6 +3192,9 @@ static int wc_PKCS7_EncodeContentStreamHelper(wc_PKCS7* pkcs7, int cipherType,`
`3192`	`3192`	`ret = wc_HashUpdate(&esd->hash, esd->hashType,`
`3193`	`3193`	`contentData, (word32)contentDataSz);`
`3194`	`3194`	`}`
	`3195`	`+ else {`
	`3196`	`+ ret = 0;`
	`3197`	`+ }`
`3195`	`3198`	`break;`
`3196`	`3199`
`3197`	`3200`	`#ifndef NO_AES`