aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/cms
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2010-11-22 18:23:44 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2010-11-22 18:23:44 +0000
commita3ddd25abaadeab1a1bdbac75385d53ba5beb7e1 (patch)
tree5691801dabb6a06320a55f5ce8ed927af41514f3 /crypto/openssl/crypto/cms
parentf7842e00f57fe6cfa3b337fbf078cad9fe291188 (diff)
parentf2c43d19b91f8847c1dfd87721254b44f963d9a2 (diff)
downloadsrc-a3ddd25abaadeab1a1bdbac75385d53ba5beb7e1.tar.gz
src-a3ddd25abaadeab1a1bdbac75385d53ba5beb7e1.zip
Merge OpenSSL 0.9.8p into head.
Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt
Notes
Notes: svn path=/head/; revision=215697
Diffstat (limited to 'crypto/openssl/crypto/cms')
-rw-r--r--crypto/openssl/crypto/cms/cms_asn1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssl/crypto/cms/cms_asn1.c b/crypto/openssl/crypto/cms/cms_asn1.c
index 766492186183..b253d54b5701 100644
--- a/crypto/openssl/crypto/cms/cms_asn1.c
+++ b/crypto/openssl/crypto/cms/cms_asn1.c
@@ -130,8 +130,8 @@ ASN1_NDEF_SEQUENCE(CMS_SignedData) = {
} ASN1_NDEF_SEQUENCE_END(CMS_SignedData)
ASN1_SEQUENCE(CMS_OriginatorInfo) = {
- ASN1_IMP_SET_OF_OPT(CMS_SignedData, certificates, CMS_CertificateChoices, 0),
- ASN1_IMP_SET_OF_OPT(CMS_SignedData, crls, CMS_RevocationInfoChoice, 1)
+ ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, certificates, CMS_CertificateChoices, 0),
+ ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1)
} ASN1_SEQUENCE_END(CMS_OriginatorInfo)
ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = {