]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
kmac: make parameters conditional on FIPS
authorPauli <ppzgs1@gmail.com>
Wed, 13 Aug 2025 02:56:44 +0000 (12:56 +1000)
committerPauli <ppzgs1@gmail.com>
Fri, 15 Aug 2025 01:03:12 +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/macs/kmac_prov.c.in

index 78332fd5e48ab823a2d9a2cc085b2359d5b3d39a..1944be266fe133570962b7c57d575900b1e41e48 100644 (file)
@@ -395,7 +395,7 @@ static int kmac_final(void *vmacctx, unsigned char *out, size_t *outl,
 {- produce_param_decoder('kmac_get_ctx_params',
                          (['MAC_PARAM_SIZE',                    'size',   'size_t'],
                           ['MAC_PARAM_BLOCK_SIZE',              'bsize',  'size_t'],
-                          ['ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind',    'int'],
+                          ['ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind',    'int', 'fips'],
                          )); -}
 
 static const OSSL_PARAM *kmac_gettable_ctx_params(ossl_unused void *ctx,
@@ -433,8 +433,8 @@ static int kmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[])
                           ['MAC_PARAM_SIZE',              'size',    'size_t'],
                           ['MAC_PARAM_KEY',               'key',     'octet_string'],
                           ['MAC_PARAM_CUSTOM',            'custom',  'octet_string'],
-                          ['MAC_PARAM_FIPS_KEY_CHECK',    'ind_k',   'int'],
-                          ['MAC_PARAM_FIPS_NO_SHORT_MAC', 'ind_sht', 'int'],
+                          ['MAC_PARAM_FIPS_KEY_CHECK',    'ind_k',   'int', 'fips'],
+                          ['MAC_PARAM_FIPS_NO_SHORT_MAC', 'ind_sht', 'int', 'fips'],
                          )); -}
 
 static const OSSL_PARAM *kmac_settable_ctx_params(ossl_unused void *ctx,