Don't overwrite pointers to existing message digests if they've been

precomputed. Bugscape bug 54627. r=wtc, jpierre.
sailfishos-mirror · Dec 19, 2003 · 3d1bb8c · 3d1bb8c
1 parent 0d6152c
commit 3d1bb8c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/security/nss/lib/smime/cmsdigest.c b/security/nss/lib/smime/cmsdigest.c
@@ -252,7 +252,10 @@ NSS_CMSDigestContext_FinishMultiple(NSSCMSDigestContext *cmsdigcx,
 
 cleanup:
     NSS_CMSDigestContext_Cancel(cmsdigcx);
-    if (rv == SECSuccess && digestsp) {
+    /* Don't change the caller's digests pointer if we have no digests.
+    **  NSS_CMSSignedData_Encode_AfterData depends on this behavior.
+    */
+    if (rv == SECSuccess && digestsp && digests) {
 	*digestsp = digests;
     }
     return rv;

diff --git a/security/nss/lib/smime/cmssigdata.c b/security/nss/lib/smime/cmssigdata.c
@@ -213,8 +213,12 @@ NSS_CMSSignedData_Encode_BeforeData(NSSCMSSignedData *sigd)
         return SECFailure;
     }
     /* set up the digests */
+    if (sigd->digests && sigd->digests[0]) {
+	sigd->contentInfo.digcx = NULL; /* don't attempt to make new ones. */
+    } else 
     if (sigd->digestAlgorithms != NULL) {
-	sigd->contentInfo.digcx = NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
+	sigd->contentInfo.digcx = 
+	        NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
 	if (sigd->contentInfo.digcx == NULL)
 	    return SECFailure;
     }