]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
ecdh: make parameters conditional on FIPS
authorPauli <ppzgs1@gmail.com>
Wed, 13 Aug 2025 02:55:26 +0000 (12:55 +1000)
committerPauli <ppzgs1@gmail.com>
Fri, 15 Aug 2025 01:03:11 +0000 (11:03 +1000)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28243)

providers/implementations/exchange/ecdh_exch.c.in

index 9f5b31eb901c37df54692be0f85eb22b7f480434..16295b4ad28e6b8c2a3886084b205556e8dc4836 100644 (file)
@@ -254,9 +254,9 @@ void *ecdh_dupctx(void *vpecdhctx)
                           ['EXCHANGE_PARAM_KDF_DIGEST_PROPS',         'propq',     'utf8_string'],
                           ['EXCHANGE_PARAM_KDF_OUTLEN',               'len',       'size_t'],
                           ['EXCHANGE_PARAM_KDF_UKM',                  'ukm',       'octet_string'],
-                          ['EXCHANGE_PARAM_FIPS_KEY_CHECK',           'ind_k',     'int'],
-                          ['EXCHANGE_PARAM_FIPS_DIGEST_CHECK',        'ind_d',     'int'],
-                          ['EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK', 'ind_cofac', 'int'],
+                          ['EXCHANGE_PARAM_FIPS_KEY_CHECK',           'ind_k',     'int', 'fips'],
+                          ['EXCHANGE_PARAM_FIPS_DIGEST_CHECK',        'ind_d',     'int', 'fips'],
+                          ['EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK', 'ind_cofac', 'int', 'fips'],
                          )); -}
 
 static
@@ -370,7 +370,7 @@ const OSSL_PARAM *ecdh_settable_ctx_params(ossl_unused void *vpecdhctx,
                           ['EXCHANGE_PARAM_KDF_DIGEST',            'digest', 'utf8_string'],
                           ['EXCHANGE_PARAM_KDF_OUTLEN',            'len',    'size_t'],
                           ['EXCHANGE_PARAM_KDF_UKM',               'ukm',    'octet_ptr'],
-                          ['ALG_PARAM_FIPS_APPROVED_INDICATOR',    'ind',    'int'],
+                          ['ALG_PARAM_FIPS_APPROVED_INDICATOR',    'ind',    'int', 'fips'],
                          )); -}
 
 static