]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
cmac: 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/cmac_prov.c.in

index e8198842b81d5a13bb99aa27818f737610a8ad5d..f25f7b3c7e29818a0e0c38606b30beb44ba160da 100644 (file)
@@ -206,7 +206,7 @@ static int cmac_final(void *vmacctx, unsigned char *out, size_t *outl,
 {- produce_param_decoder('cmac_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 *cmac_gettable_ctx_params(ossl_unused void *ctx,
@@ -240,7 +240,7 @@ static int cmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[])
                           ['ALG_PARAM_ENGINE',                'engine', 'utf8_string', 'hidden'],
                           ['MAC_PARAM_PROPERTIES',            'propq',  'utf8_string'],
                           ['MAC_PARAM_KEY',                   'key',    'octet_string'],
-                          ['CIPHER_PARAM_FIPS_ENCRYPT_CHECK', 'ind_ec', 'int'],
+                          ['CIPHER_PARAM_FIPS_ENCRYPT_CHECK', 'ind_ec', 'int', 'fips'],
                          )); -}
 
 static const OSSL_PARAM *cmac_settable_ctx_params(ossl_unused void *ctx,