forked from pool/openssl
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
|
Index: openssl-1.0.0/crypto/cms/cms_asn1.c
|
||
|
|
===================================================================
|
||
|
|
--- openssl-1.0.0.orig/crypto/cms/cms_asn1.c
|
||
|
|
+++ openssl-1.0.0/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) = {
|
||
|
|
Index: openssl-1.0.0/crypto/rsa/rsa_pmeth.c
|
||
|
|
===================================================================
|
||
|
|
--- openssl-1.0.0.orig/crypto/rsa/rsa_pmeth.c
|
||
|
|
+++ openssl-1.0.0/crypto/rsa/rsa_pmeth.c
|
||
|
|
@@ -246,6 +246,8 @@ static int pkey_rsa_verifyrecover(EVP_PK
|
||
|
|
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
|