[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  0a281eefb6355d62b2e2a66e425c6966d7f29486 (commit)
       via  8a709c5e4b5a6b91ebf5001a94ed80ab20f05472 (commit)
      from  2ed0a45a65b0df10648a4c11d365e2e1ebb1e697 (commit)


- Log -----------------------------------------------------------------
commit 0a281eefb6355d62b2e2a66e425c6966d7f29486
Author: Tomas Mraz <tomas at openssl.org>
Date:   Wed May 19 18:21:44 2021 +0200

    Exchange no-siv and no-ec2m between daily and ci workflows
    
    The no-ec2m with ec enabled is much more likely to show
    regressions such as #15170 than the no-siv build.
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15355)

commit 8a709c5e4b5a6b91ebf5001a94ed80ab20f05472
Author: Tomas Mraz <tomas at openssl.org>
Date:   Wed May 19 18:16:21 2021 +0200

    pem_read_bio_key_legacy: Do not obscure real error if there is one
    
    Fixes #15170
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15355)

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

Summary of changes:
 .github/workflows/run-checker-ci.yml    | 2 +-
 .github/workflows/run-checker-daily.yml | 2 +-
 crypto/pem/pem_pkey.c                   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 48ff9c9765..9a34e5d42e 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -13,8 +13,8 @@ jobs:
           no-ct,
           no-dtls,
           no-ec,
+          no-ec2m,
           no-legacy,
-          no-siv,
           no-sock,
           no-srp,
           no-srtp,
diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml
index efe350c254..a85ad2cb71 100644
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -44,7 +44,6 @@ jobs:
           no-dtls1_2,
           no-dtls1_2-method,
           no-dtls1-method,
-          no-ec2m,
           no-ecdh,
           no-ecdsa,
           enable-ec_nistp_64_gcc_128,
@@ -96,6 +95,7 @@ jobs:
           no-seed,
           no-shared,
           no-siphash,
+          no-siv,
           no-sm2,
           no-sm3,
           no-sm4,
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index 3f0a9e4fef..adbf8bcfe7 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -171,7 +171,8 @@ static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
     }
 
  p8err:
-    if (ret == NULL)
+    if (ret == NULL && ERR_peek_last_error() == 0)
+        /* ensure some error is reported but do not hide the real one */
         ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);
  err:
     OPENSSL_secure_free(nm);