Fix key leak in S/Mime.

security/nss/lib/smime/cmsdigdata.c

@@ -34,7 +34,7 @@
 /*
  * CMS digestedData methods.
  *
- * $Id: cmsdigdata.c,v 1.2 2000-06-13 21:56:28 chrisk%netscape.com Exp $
+ * $Id: cmsdigdata.c,v 1.3 2002-01-25 19:08:17 relyea%netscape.com Exp $
  */
 
 #include "cmslocal.h"
@@ -87,6 +87,7 @@ void
 NSS_CMSDigestedData_Destroy(NSSCMSDigestedData *digd)
 {
     /* everything's in a pool, so don't worry about the storage */
+    NSS_CMSContentInfo_Destroy(&(digd->contentInfo));
     return;
 }
 

security/nss/lib/smime/cmsencdata.c

@@ -34,7 +34,7 @@
 /*
  * CMS encryptedData methods.
  *
- * $Id: cmsencdata.c,v 1.3 2001-12-07 01:36:12 relyea%netscape.com Exp $
+ * $Id: cmsencdata.c,v 1.4 2002-01-25 19:08:17 relyea%netscape.com Exp $
  */
 
 #include "cmslocal.h"
@@ -114,6 +114,7 @@ void
 NSS_CMSEncryptedData_Destroy(NSSCMSEncryptedData *encd)
 {
     /* everything's in a pool, so don't worry about the storage */
+    NSS_CMSContentInfo_Destroy(&(encd->contentInfo));
     return;
 }
 

security/nss/lib/smime/cmsenvdata.c

@@ -34,7 +34,7 @@
 /*
  * CMS envelopedData methods.
  *
- * $Id: cmsenvdata.c,v 1.6 2001-12-07 01:36:12 relyea%netscape.com Exp $
+ * $Id: cmsenvdata.c,v 1.7 2002-01-25 19:08:18 relyea%netscape.com Exp $
  */
 
 #include "cmslocal.h"
@@ -102,7 +102,8 @@ NSS_CMSEnvelopedData_Destroy(NSSCMSEnvelopedData *edp)
     while ((ri = *recipientinfos++) != NULL)
 	NSS_CMSRecipientInfo_Destroy(ri);
 
-    /* XXX storage ??? */
+   NSS_CMSContentInfo_Destroy(&(edp->contentInfo));
+
 }
 
 /*

security/nss/lib/smime/cmssigdata.c

@@ -34,7 +34,7 @@
 /*
  * CMS signedData methods.
  *
- * $Id: cmssigdata.c,v 1.13 2001-11-08 00:15:27 relyea%netscape.com Exp $
+ * $Id: cmssigdata.c,v 1.14 2002-01-25 19:08:19 relyea%netscape.com Exp $
  */
 
 #include "cmslocal.h"
@@ -105,6 +105,8 @@ NSS_CMSSignedData_Destroy(NSSCMSSignedData *sigd)
     }
 
     /* everything's in a pool, so don't worry about the storage */
+   NSS_CMSContentInfo_Destroy(&(sigd->contentInfo));
+
 }
 
 /*