Commit 188abf7e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Submitted by: Ivan Nestlerode <inestlerode@us.ibm.com> 

Approved by: steve@openssl.org

Check return code properly in CMS_SignerInfo_verify_content().
parent f021b7cc

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.8j and 0.9.8k  [xx XXX xxxx]



  *) Fix bug where return value of CMS_SignerInfo_verify_content() was not

     checked correctly. This would allow some invalid signed attributes to

     appear to verify correctly. (CVE-2009-0591)

     [Ivan Nestlerode <inestlerode@us.ibm.com>]



  *) Reject UniversalString and BMPString types with invalid lengths. This

     prevents a crash in ASN1_STRING_print_ex() which assumes the strings have

     a legal length. (CVE-2009-0590)

crypto/cms/cms_smime.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs, 
		for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++)

			{

			si = sk_CMS_SignerInfo_value(sinfos, i);

			if (!CMS_SignerInfo_verify_content(si, cmsbio))

			if (CMS_SignerInfo_verify_content(si, cmsbio) <= 0)

				{

				CMSerr(CMS_F_CMS_VERIFY,

					CMS_R_CONTENT_VERIFY_ERROR);