diff options
| author | kaie%kuix.de <devnull@localhost> | 2006-06-14 13:29:35 +0000 |
|---|---|---|
| committer | kaie%kuix.de <devnull@localhost> | 2006-06-14 13:29:35 +0000 |
| commit | c3ac661f2759cae919aa568bfd2ae5e0b4feda56 (patch) | |
| tree | 4db679a9a90835260b4a5cdf74c3f7ff4e3eb35b | |
| parent | 725d50e2f166b746c547992028a9452f3283ab57 (diff) | |
| download | nss-hg-c3ac661f2759cae919aa568bfd2ae5e0b4feda56.tar.gz | |
bug 335021, incorrect smime_encryptionkeypref_template leads to QuickDER decoding failureXULRUNNER_1_8_0_5_RELEASEXULRUNNER_1_8_0_5_RC5XULRUNNER_1_8_0_5_RC4XULRUNNER_1_8_0_5_RC2THUNDERBIRD_1_5_0_7_RC1THUNDERBIRD_1_5_0_5_RELEASETHUNDERBIRD_1_5_0_5_RC4THUNDERBIRD_1_5_0_5_RC3THUNDERBIRD_1_5_0_5_RC2THUNDERBIRD_1_5_0_5_RC1SEAMONKEY_1_0_4_RELEASESEAMONKEY_1_0_3_RELEASEMOZILLA_1_8_0_5_RELEASEMOZILLA_1_8_0_5_RC5MOZILLA_1_8_0_5_RC4MOZILLA_1_8_0_5_RC2FIREFOX_1_5_0_7_RC2FIREFOX_1_5_0_7_RC1FIREFOX_1_5_0_6_RELEASEFIREFOX_1_5_0_6_RC1FIREFOX_1_5_0_5_RELEASEFIREFOX_1_5_0_5_RC5FIREFOX_1_5_0_5_RC4FIREFOX_1_5_0_5_RC3FIREFOX_1_5_0_5_RC2FIREFOX_1_5_0_5_RC1
fixes bug 332571 can't encrypt e-mail message with valid certificate
r=nelson, r=rrelyea, a=dveditz
| -rw-r--r-- | security/nss/lib/smime/smimeutil.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/security/nss/lib/smime/smimeutil.c b/security/nss/lib/smime/smimeutil.c index 6fb10ec07..559d2fd37 100644 --- a/security/nss/lib/smime/smimeutil.c +++ b/security/nss/lib/smime/smimeutil.c @@ -116,15 +116,18 @@ static const SEC_ASN1Template smime_encryptionkeypref_template[] = { { SEC_ASN1_CHOICE, offsetof(NSSSMIMEEncryptionKeyPreference,selector), NULL, sizeof(NSSSMIMEEncryptionKeyPreference) }, - { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 0, + { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 0 + | SEC_ASN1_CONSTRUCTED, offsetof(NSSSMIMEEncryptionKeyPreference,id.issuerAndSN), SEC_ASN1_SUB(CERT_IssuerAndSNTemplate), NSSSMIMEEncryptionKeyPref_IssuerSN }, - { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | 1, + { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | 1 + | SEC_ASN1_CONSTRUCTED, offsetof(NSSSMIMEEncryptionKeyPreference,id.recipientKeyID), NSSCMSRecipientKeyIdentifierTemplate, NSSSMIMEEncryptionKeyPref_IssuerSN }, - { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 2, + { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 2 + | SEC_ASN1_CONSTRUCTED, offsetof(NSSSMIMEEncryptionKeyPreference,id.subjectKeyID), SEC_ASN1_SUB(SEC_OctetStringTemplate), NSSSMIMEEncryptionKeyPref_SubjectKeyID }, |