Browse Source

update set_ctx_param MAC calls to return 1 for a NULL params

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14383)
master
Pauli 1 year ago
parent
commit
5a6b62bb42
5 changed files with 15 additions and 0 deletions
  1. +3
    -0
      providers/implementations/macs/blake2_mac_impl.c
  2. +3
    -0
      providers/implementations/macs/cmac_prov.c
  3. +3
    -0
      providers/implementations/macs/hmac_prov.c
  4. +3
    -0
      providers/implementations/macs/kmac_prov.c
  5. +3
    -0
      providers/implementations/macs/siphash_prov.c

+ 3
- 0
providers/implementations/macs/blake2_mac_impl.c View File

@ -185,6 +185,9 @@ static int blake2_mac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
struct blake2_mac_data_st *macctx = vmacctx;
const OSSL_PARAM *p;
if (params == NULL)
return 1;
if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_SIZE)) != NULL) {
size_t size;


+ 3
- 0
providers/implementations/macs/cmac_prov.c View File

@ -184,6 +184,9 @@ static int cmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
OSSL_LIB_CTX *ctx = PROV_LIBCTX_OF(macctx->provctx);
const OSSL_PARAM *p;
if (params == NULL)
return 1;
if (!ossl_prov_cipher_load_from_params(&macctx->cipher, params, ctx))
return 0;


+ 3
- 0
providers/implementations/macs/hmac_prov.c View File

@ -294,6 +294,9 @@ static int hmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
const OSSL_PARAM *p;
int flags = 0;
if (params == NULL)
return 1;
if (!ossl_prov_digest_load_from_params(&macctx->digest, params, ctx))
return 0;


+ 3
- 0
providers/implementations/macs/kmac_prov.c View File

@ -379,6 +379,9 @@ static int kmac_set_ctx_params(void *vmacctx, const OSSL_PARAM *params)
struct kmac_data_st *kctx = vmacctx;
const OSSL_PARAM *p;
if (params == NULL)
return 1;
if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_XOF)) != NULL
&& !OSSL_PARAM_get_int(p, &kctx->xof_mode))
return 0;


+ 3
- 0
providers/implementations/macs/siphash_prov.c View File

@ -195,6 +195,9 @@ static int siphash_set_params(void *vmacctx, const OSSL_PARAM *params)
const OSSL_PARAM *p = NULL;
size_t size;
if (params == NULL)
return 1;
if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_SIZE)) != NULL) {
if (!OSSL_PARAM_get_size_t(p, &size)
|| !SipHash_set_hash_size(&ctx->siphash, size))


Loading…
Cancel
Save