[openssl] OpenSSL_1_1_1-stable update

[patrick.steuer at de.ibm.com]

The branch OpenSSL_1_1_1-stable has been updated
       via  3e0b1a603b4dfb0ab5981634419a8db70ffc48b0 (commit)
       via  bf3797fe3b71d58791b20cf6bc2304284e7aaa85 (commit)
      from  2341db5ca10fa3dc1f04d739bd4614e9b3e4e386 (commit)


- Log -----------------------------------------------------------------
commit 3e0b1a603b4dfb0ab5981634419a8db70ffc48b0
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Tue May 21 18:50:39 2019 +0200

    EVP_Digest*: enable SHA3 pre-hashing for DSA
    
    Fixes #7323
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8970)
    
    (cherry picked from commit 3f950d87650776d0e2874588081fecb7bdd4fbd0)

commit bf3797fe3b71d58791b20cf6bc2304284e7aaa85
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Tue May 21 17:43:54 2019 +0200

    EVP_Digest*: enable SHA3 pre-hashing for ECDSA
    
    Fixes #8957
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8970)
    
    (cherry picked from commit e8d0678da4942dd027981175b16b6b3162731205)

-----------------------------------------------------------------------

Summary of changes:
 crypto/dsa/dsa_pmeth.c | 6 +++++-
 crypto/ec/ec_pmeth.c   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index dedbe5e..bc10aa8 100644
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c
@@ -138,7 +138,11 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
             EVP_MD_type((const EVP_MD *)p2) != NID_sha224 &&
             EVP_MD_type((const EVP_MD *)p2) != NID_sha256 &&
             EVP_MD_type((const EVP_MD *)p2) != NID_sha384 &&
-            EVP_MD_type((const EVP_MD *)p2) != NID_sha512) {
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha512 &&
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha3_224 &&
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha3_256 &&
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha3_384 &&
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha3_512) {
             DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
             return 0;
         }
diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index f4ad074..ffaa2f8 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -323,7 +323,11 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
             EVP_MD_type((const EVP_MD *)p2) != NID_sha224 &&
             EVP_MD_type((const EVP_MD *)p2) != NID_sha256 &&
             EVP_MD_type((const EVP_MD *)p2) != NID_sha384 &&
-            EVP_MD_type((const EVP_MD *)p2) != NID_sha512) {
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha512 &&
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha3_224 &&
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha3_256 &&
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha3_384 &&
+            EVP_MD_type((const EVP_MD *)p2) != NID_sha3_512) {
             ECerr(EC_F_PKEY_EC_CTRL, EC_R_INVALID_DIGEST_TYPE);
             return 0;
         }