[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  c1167f09d840b109ef1c1c1485e3de64be2fc625 (commit)
      from  14951ef01f9b54d804baf2fabdf0a715c630827b (commit)


- Log -----------------------------------------------------------------
commit c1167f09d840b109ef1c1c1485e3de64be2fc625
Author: Tomas Mraz <tomas at openssl.org>
Date:   Fri Jan 14 16:19:33 2022 +0100

    dh_exch.c: Correct gettable parameters for DH key exchange
    
    Fixes #17510
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17515)

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

Summary of changes:
 providers/implementations/exchange/dh_exch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/providers/implementations/exchange/dh_exch.c b/providers/implementations/exchange/dh_exch.c
index 4bea7af4ec..b0dd6b3591 100644
--- a/providers/implementations/exchange/dh_exch.c
+++ b/providers/implementations/exchange/dh_exch.c
@@ -415,12 +415,12 @@ static const OSSL_PARAM *dh_settable_ctx_params(ossl_unused void *vpdhctx,
 }
 
 static const OSSL_PARAM known_gettable_ctx_params[] = {
-    OSSL_PARAM_int(OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, NULL),
     OSSL_PARAM_utf8_string(OSSL_EXCHANGE_PARAM_KDF_TYPE, NULL, 0),
     OSSL_PARAM_utf8_string(OSSL_EXCHANGE_PARAM_KDF_DIGEST, NULL, 0),
     OSSL_PARAM_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN, NULL),
     OSSL_PARAM_DEFN(OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR,
                     NULL, 0),
+    OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_CEK_ALG, NULL, 0),
     OSSL_PARAM_END
 };