diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2010-06-01 14:39:01 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2010-06-01 14:39:01 +0000 |
commit | 3cbb15ee813453c52694c1d6f9a89eb7ae757943 (patch) | |
tree | 781e78bb251c919b6bf0634f430a731b9c73d12d /crypto | |
parent | 2d060267b1d78c14c901d93032543105a6f15e08 (diff) | |
download | openssl-3cbb15ee813453c52694c1d6f9a89eb7ae757943.tar.gz |
add CVE-2010-0742 and CVS-2010-1633 fixes
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/cms/cms_asn1.c | 4 | ||||
-rw-r--r-- | crypto/rsa/rsa_pmeth.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c index 835cae4e0b..cfe67fb6c1 100644 --- a/crypto/cms/cms_asn1.c +++ b/crypto/cms/cms_asn1.c @@ -131,8 +131,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) = { diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index ff65c071f8..60bf6145ab 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -251,6 +251,8 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx, ret = int_rsa_verify(EVP_MD_type(rctx->md), NULL, 0, rout, &sltmp, sig, siglen, ctx->pkey->pkey.rsa); + if (ret <= 0) + return 0; ret = sltmp; } else |