Blob Blame History Raw
diff -up openssl-fips-0.9.8e/CHANGES.ocsp-dos openssl-fips-0.9.8e/CHANGES
diff -up openssl-fips-0.9.8e/crypto/asn1/a_verify.c.ocsp-dos openssl-fips-0.9.8e/crypto/asn1/a_verify.c
--- openssl-fips-0.9.8e/crypto/asn1/a_verify.c.ocsp-dos	2005-05-09 02:27:32.000000000 +0200
+++ openssl-fips-0.9.8e/crypto/asn1/a_verify.c	2013-02-25 11:34:37.011201995 +0100
@@ -133,6 +133,12 @@ int ASN1_item_verify(const ASN1_ITEM *it
 	unsigned char *buf_in=NULL;
 	int ret= -1,i,inl;
 
+	if (!pkey)
+		{
+		ASN1err(ASN1_F_ASN1_ITEM_VERIFY, ERR_R_PASSED_NULL_PARAMETER);
+		return -1;
+		}
+
 	EVP_MD_CTX_init(&ctx);
 	i=OBJ_obj2nid(a->algorithm);
 	type=EVP_get_digestbyname(OBJ_nid2sn(i));
diff -up openssl-fips-0.9.8e/crypto/ocsp/ocsp_vfy.c.ocsp-dos openssl-fips-0.9.8e/crypto/ocsp/ocsp_vfy.c
--- openssl-fips-0.9.8e/crypto/ocsp/ocsp_vfy.c.ocsp-dos	2006-11-13 14:23:05.000000000 +0100
+++ openssl-fips-0.9.8e/crypto/ocsp/ocsp_vfy.c	2013-02-25 11:34:38.363204929 +0100
@@ -91,9 +91,12 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs
 		{
 		EVP_PKEY *skey;
 		skey = X509_get_pubkey(signer);
-		ret = OCSP_BASICRESP_verify(bs, skey, 0);
-		EVP_PKEY_free(skey);
-		if(ret <= 0)
+		if (skey)
+			{
+			ret = OCSP_BASICRESP_verify(bs, skey, 0);
+			EVP_PKEY_free(skey);
+			}
+		if(!skey || ret <= 0)
 			{
 			OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, OCSP_R_SIGNATURE_FAILURE);
 			goto end;