[openssl] master update

[tomas]

The branch master has been updated
       via  1cba86234aba9925ac01982c7aa8f9bc42f11a23 (commit)
      from  8cdc3425aff7447af868de8590053191b32ad454 (commit)


- Log -----------------------------------------------------------------
commit 1cba86234aba9925ac01982c7aa8f9bc42f11a23
Author: Tomas Mraz <to...@openssl.org>
Date:   Wed Feb 24 17:45:55 2021 +0100

    evp_extra_test: Do not manipulate providers in default context
    
    Otherwise the with OPENSSL_TEST_RAND_ORDER following tests will
    be broken. There is also no real need to do that.
    
    Fixes #14070
    
    Reviewed-by: Paul Dale <pa...@openssl.org>
    Reviewed-by: Matt Caswell <m...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14305)

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

Summary of changes:
 test/evp_extra_test.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index a2490a9fe9..845752fae4 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -2418,15 +2418,13 @@ err:
 static int test_EVP_rsa_pss_with_keygen_bits(void)
 {
     int ret;
-    OSSL_PROVIDER *provider;
     EVP_PKEY_CTX *ctx;
     EVP_PKEY *pkey;
     const EVP_MD *md;
     pkey = NULL;
     ret = 0;
-    provider = OSSL_PROVIDER_load(NULL, "default");
-    md = EVP_get_digestbyname("sha256");
 
+    md = EVP_get_digestbyname("sha256");
     ret = TEST_ptr((ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA_PSS, NULL)))
         && TEST_true(EVP_PKEY_keygen_init(ctx))
         && TEST_int_gt(EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 512), 0)
@@ -2435,7 +2433,6 @@ static int test_EVP_rsa_pss_with_keygen_bits(void)
 
     EVP_PKEY_free(pkey);
     EVP_PKEY_CTX_free(ctx);
-    OSSL_PROVIDER_unload(provider);
     return ret;
 }