mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

mac: add some consistency to setting the XXX_final output length.

Browse Source 
The various MACs were all over the place with respects to what they did with
the output length in the final call.  Now they all unconditionally set the
output length and the EVP layer handles the possibility of a NULL pointer.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12582)
This commit is contained in:
Pauli 2020-08-05 15:26:48 +10:00
parent 992492f5e8
commit 5f6a0b2ff0
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/evp/mac_lib.c
View File

@ -120,11 +120,13 @@ int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen)
int EVP_MAC_final(EVP_MAC_CTX *ctx,
unsigned char *out, size_t *outl, size_t outsize)
{
size_t l = EVP_MAC_size(ctx);
size_t l;
int res = 1;
if (out != NULL)
res = ctx->meth->final(ctx->data, out, &l, outsize);
else
l = EVP_MAC_size(ctx);
if (outl != NULL)
*outl = l;
return res;

1
providers/implementations/macs/blake2_mac_impl.c
View File

@ -101,6 +101,7 @@ static int blake2_mac_final(void *vmacctx,
{
struct blake2_mac_data_st *macctx = vmacctx;
*outl = blake2_mac_size(macctx);
return BLAKE2_FINAL(out, &macctx->ctx);
}

3
providers/implementations/macs/hmac_prov.c
View File

@ -130,8 +130,7 @@ static int hmac_final(void *vmacctx, unsigned char *out, size_t *outl,
if (!HMAC_Final(macctx->ctx, out, &hlen))
return 0;
if (outl != NULL)
*outl = hlen;
*outl = hlen;
return 1;
}

3
providers/implementations/macs/kmac_prov.c
View File

@ -298,8 +298,7 @@ static int kmac_final(void *vmacctx, unsigned char *out, size_t *outl,
ok = right_encode(encoded_outlen, &len, lbits)
&& EVP_DigestUpdate(ctx, encoded_outlen, len)
&& EVP_DigestFinalXOF(ctx, out, kctx->out_len);
if (ok && outl != NULL)
*outl = kctx->out_len;
*outl = kctx->out_len;
return ok;
}

1
providers/implementations/macs/poly1305_prov.c
View File

@ -94,6 +94,7 @@ static int poly1305_final(void *vmacctx, unsigned char *out, size_t *outl,
struct poly1305_data_st *ctx = vmacctx;
Poly1305_Final(&ctx->poly1305, out);
*outl = poly1305_size();
return 1;
}