From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 13 Jul 2017 12:37:57 +0000 (+0100)
Subject: Set maskHash when creating parameters.
X-Git-Tag: OpenSSL_1_1_1-pre1~1012
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=74753357463215485fb0fc3509d69c113e4432bc;p=oweals%2Fopenssl.git

Set maskHash when creating parameters.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3920)
---

diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 69b45fd509..0527d1a968 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -567,6 +567,8 @@ RSA_PSS_PARAMS *rsa_pss_params_create(const EVP_MD *sigmd,
         mgf1md = sigmd;
     if (!rsa_md_to_mgf1(&pss->maskGenAlgorithm, mgf1md))
         goto err;
+    if (!rsa_md_to_algor(&pss->maskHash, mgf1md))
+        goto err;
     return pss;
  err:
     RSA_PSS_PARAMS_free(pss);