Bug 559243: Can't decrypt a mail which is sent by Outlook 2010
authornelson%bolyard.com
Sun, 06 Jun 2010 22:36:35 +0000
changeset 9666 07c1a7916b3b610f815664432f7d75b193be7683
parent 9665 74aeb3ce8e27abf3a223bfe75b39cbda2db91ac3
child 9667 1cb080b104acf9163758331550d1801d5af5777e
push idunknown
push userunknown
push dateunknown
bugs559243
Bug 559243: Can't decrypt a mail which is sent by Outlook 2010 Patch contributed by Kaspar Brand <mozbugzilla@velox.ch>, r=nelson
security/nss/lib/smime/cmsasn1.c
--- a/security/nss/lib/smime/cmsasn1.c
+++ b/security/nss/lib/smime/cmsasn1.c
@@ -252,20 +252,19 @@ const SEC_ASN1Template NSS_PointerToCMSE
 /* -----------------------------------------------------------------------------
  * key transport recipient info
  */
 
 static const SEC_ASN1Template NSSCMSRecipientIdentifierTemplate[] = {
     { SEC_ASN1_CHOICE,
 	  offsetof(NSSCMSRecipientIdentifier,identifierType), NULL,
 	  sizeof(NSSCMSRecipientIdentifier) },
-    { SEC_ASN1_EXPLICIT | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC |
-      SEC_ASN1_XTRN | 0,
+    { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 0,
 	  offsetof(NSSCMSRecipientIdentifier,id.subjectKeyID),
-	  SEC_ASN1_SUB(SEC_PointerToOctetStringTemplate) ,
+	  SEC_ASN1_SUB(SEC_OctetStringTemplate) ,
 	  NSSCMSRecipientID_SubjectKeyID },
     { SEC_ASN1_POINTER | SEC_ASN1_XTRN,
 	  offsetof(NSSCMSRecipientIdentifier,id.issuerAndSN),
 	  SEC_ASN1_SUB(CERT_IssuerAndSNTemplate),
 	  NSSCMSRecipientID_IssuerSN },
     { 0 }
 };