diff options
author | Pauli <pauli@openssl.org> | 2021-05-24 14:22:17 +1000 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-05-25 17:23:50 +1000 |
commit | eb1b66f00ca4e1fb6f9e815e8686768b6d81722d (patch) | |
tree | abe98cebf08f1f7eaa4c63fe72b7f8fc8948171c /providers | |
parent | 36b6db08fe3dbb58ba2a45a6170f21b5149dfe26 (diff) |
mac: add a getter for the MAC block size.
Fixes #12342
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15427)
Diffstat (limited to 'providers')
-rw-r--r-- | providers/implementations/macs/blake2_mac_impl.c | 10 | ||||
-rw-r--r-- | providers/implementations/macs/blake2b_mac.c | 1 | ||||
-rw-r--r-- | providers/implementations/macs/blake2s_mac.c | 1 | ||||
-rw-r--r-- | providers/implementations/macs/cmac_prov.c | 10 | ||||
-rw-r--r-- | providers/implementations/macs/hmac_prov.c | 24 | ||||
-rw-r--r-- | providers/implementations/macs/kmac_prov.c | 21 |
6 files changed, 49 insertions, 18 deletions
diff --git a/providers/implementations/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c index e1ffa04bfd..3c6b0c2c0c 100644 --- a/providers/implementations/macs/blake2_mac_impl.c +++ b/providers/implementations/macs/blake2_mac_impl.c @@ -146,6 +146,7 @@ static int blake2_mac_final(void *vmacctx, static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), + OSSL_PARAM_size_t(OSSL_MAC_PARAM_BLOCK_SIZE, NULL), OSSL_PARAM_END }; static const OSSL_PARAM *blake2_gettable_ctx_params(ossl_unused void *ctx, @@ -158,8 +159,13 @@ static int blake2_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) { OSSL_PARAM *p; - if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL) - return OSSL_PARAM_set_size_t(p, blake2_mac_size(vmacctx)); + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL + && !OSSL_PARAM_set_size_t(p, blake2_mac_size(vmacctx))) + return 0; + + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_BLOCK_SIZE)) != NULL + && !OSSL_PARAM_set_size_t(p, BLAKE2_BLOCKBYTES)) + return 0; return 1; } diff --git a/providers/implementations/macs/blake2b_mac.c b/providers/implementations/macs/blake2b_mac.c index 0bc5b1c275..b445cbd578 100644 --- a/providers/implementations/macs/blake2b_mac.c +++ b/providers/implementations/macs/blake2b_mac.c @@ -14,6 +14,7 @@ #define BLAKE2_OUTBYTES BLAKE2B_OUTBYTES #define BLAKE2_PERSONALBYTES BLAKE2B_PERSONALBYTES #define BLAKE2_SALTBYTES BLAKE2B_SALTBYTES +#define BLAKE2_BLOCKBYTES BLAKE2B_BLOCKBYTES /* Function names */ #define BLAKE2_PARAM_INIT ossl_blake2b_param_init diff --git a/providers/implementations/macs/blake2s_mac.c b/providers/implementations/macs/blake2s_mac.c index cb500e29ab..6b3fa28bd3 100644 --- a/providers/implementations/macs/blake2s_mac.c +++ b/providers/implementations/macs/blake2s_mac.c @@ -14,6 +14,7 @@ #define BLAKE2_OUTBYTES BLAKE2S_OUTBYTES #define BLAKE2_PERSONALBYTES BLAKE2S_PERSONALBYTES #define BLAKE2_SALTBYTES BLAKE2S_SALTBYTES +#define BLAKE2_BLOCKBYTES BLAKE2S_BLOCKBYTES /* Function names */ #define BLAKE2_PARAM_INIT ossl_blake2s_param_init diff --git a/providers/implementations/macs/cmac_prov.c b/providers/implementations/macs/cmac_prov.c index 0795c245a7..85625c8681 100644 --- a/providers/implementations/macs/cmac_prov.c +++ b/providers/implementations/macs/cmac_prov.c @@ -145,6 +145,7 @@ static int cmac_final(void *vmacctx, unsigned char *out, size_t *outl, static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), + OSSL_PARAM_size_t(OSSL_MAC_PARAM_BLOCK_SIZE, NULL), OSSL_PARAM_END }; static const OSSL_PARAM *cmac_gettable_ctx_params(ossl_unused void *ctx, @@ -157,8 +158,13 @@ static int cmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) { OSSL_PARAM *p; - if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL) - return OSSL_PARAM_set_size_t(p, cmac_size(vmacctx)); + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL + && !OSSL_PARAM_set_size_t(p, cmac_size(vmacctx))) + return 0; + + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_BLOCK_SIZE)) != NULL + && !OSSL_PARAM_set_size_t(p, cmac_size(vmacctx))) + return 0; return 1; } diff --git a/providers/implementations/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c index f291e574ca..3a0679ce8f 100644 --- a/providers/implementations/macs/hmac_prov.c +++ b/providers/implementations/macs/hmac_prov.c @@ -134,13 +134,20 @@ static void *hmac_dup(void *vsrc) return dst; } -static size_t hmac_size(void *vmacctx) +static size_t hmac_size(struct hmac_data_st *macctx) { - struct hmac_data_st *macctx = vmacctx; - return HMAC_size(macctx->ctx); } +static int hmac_block_size(struct hmac_data_st *macctx) +{ + const EVP_MD *md = ossl_prov_digest_md(&macctx->digest); + + if (md == NULL) + return 0; + return EVP_MD_block_size(md); +} + static int hmac_setkey(struct hmac_data_st *macctx, const unsigned char *key, size_t keylen) { @@ -234,6 +241,7 @@ static int hmac_final(void *vmacctx, unsigned char *out, size_t *outl, static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), + OSSL_PARAM_size_t(OSSL_MAC_PARAM_BLOCK_SIZE, NULL), OSSL_PARAM_END }; static const OSSL_PARAM *hmac_gettable_ctx_params(ossl_unused void *ctx, @@ -244,10 +252,16 @@ static const OSSL_PARAM *hmac_gettable_ctx_params(ossl_unused void *ctx, static int hmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) { + struct hmac_data_st *macctx = vmacctx; OSSL_PARAM *p; - if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL) - return OSSL_PARAM_set_size_t(p, hmac_size(vmacctx)); + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL + && !OSSL_PARAM_set_size_t(p, hmac_size(macctx))) + return 0; + + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_BLOCK_SIZE)) != NULL + && !OSSL_PARAM_set_int(p, hmac_block_size(macctx))) + return 0; return 1; } diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c index c95cf57ffb..4ee57ca1c2 100644 --- a/providers/implementations/macs/kmac_prov.c +++ b/providers/implementations/macs/kmac_prov.c @@ -239,13 +239,6 @@ static void *kmac_dup(void *vsrc) return dst; } -static size_t kmac_size(void *vmacctx) -{ - struct kmac_data_st *kctx = vmacctx; - - return kctx->out_len; -} - static int kmac_setkey(struct kmac_data_st *kctx, const unsigned char *key, size_t keylen) { @@ -361,6 +354,7 @@ static int kmac_final(void *vmacctx, unsigned char *out, size_t *outl, static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), + OSSL_PARAM_size_t(OSSL_MAC_PARAM_BLOCK_SIZE, NULL), OSSL_PARAM_END }; static const OSSL_PARAM *kmac_gettable_ctx_params(ossl_unused void *ctx, @@ -371,10 +365,19 @@ static const OSSL_PARAM *kmac_gettable_ctx_params(ossl_unused void *ctx, static int kmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) { + struct kmac_data_st *kctx = vmacctx; OSSL_PARAM *p; + int sz; + + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL + && !OSSL_PARAM_set_size_t(p, kctx->out_len)) + return 0; - if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL) - return OSSL_PARAM_set_size_t(p, kmac_size(vmacctx)); + if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_BLOCK_SIZE)) != NULL) { + sz = EVP_MD_block_size(ossl_prov_digest_md(&kctx->digest)); + if (!OSSL_PARAM_set_int(p, sz)) + return 0; + } return 1; } |