From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 11 Mar 2010 19:27:03 +0000 (+0000)
Subject: alg2 can be NULL
X-Git-Tag: OpenSSL-fips-2_0-rc1~1192
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e62774c3b97b4bf837d0777d7851df67f776d775;p=oweals%2Fopenssl.git

alg2 can be NULL
---

diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index dcf4a12585..4daeca18a9 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -617,13 +617,16 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
 		/* Finally create string with pss parameter encoding. */
 		if (!ASN1_item_pack(pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), &os1))
 			goto err;
-		os2 = ASN1_STRING_dup(os1);
-		if (!os2)
-			goto err;
+		if (alg2)
+			{
+			os2 = ASN1_STRING_dup(os1);
+			if (!os2)
+				goto err;
+			X509_ALGOR_set0(alg2, OBJ_nid2obj(NID_rsassaPss),
+						V_ASN1_SEQUENCE, os2);
+			}
 		X509_ALGOR_set0(alg1, OBJ_nid2obj(NID_rsassaPss),
 					V_ASN1_SEQUENCE, os1);
-		X509_ALGOR_set0(alg2, OBJ_nid2obj(NID_rsassaPss),
-					V_ASN1_SEQUENCE, os2);
 		os1 = os2 = NULL;
 		rv = 3;
 		err: