alg2 can be NULL

diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index dcf4a12585259067afbdd958e800c6a36792c9b9..4daeca18a99df60524ed46e4d5a2a89c05720645 100644 (file)
--- 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;
                /* 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(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:
                os1 = os2 = NULL;
                rv = 3;
                err: