[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d36a5dd05ec58dec8a6175a25958f008166c421b (commit)
      from  d7d8e2c894e242f7e4d25f986c5ff15758853b67 (commit)


- Log -----------------------------------------------------------------
commit d36a5dd05ec58dec8a6175a25958f008166c421b
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 1 10:48:59 2021 +0000

    Fix a copy&paste error in evp_extra_test
    
    test_EC_priv_pub fails to test the case where both a private and public
    key have been supplied.
    
    Fixes #14349
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14351)

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

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

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 2195f21a9d..33a8af717b 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -700,9 +700,8 @@ static int test_EC_priv_pub(void)
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
                                                        OSSL_PKEY_PARAM_PUB_KEY,
                                                        ec_pub, sizeof(ec_pub)))
-        || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                       OSSL_PKEY_PARAM_PUB_KEY,
-                                                       ec_pub, sizeof(ec_pub))))
+        || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
+                                             priv)))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld)))
         goto err;