mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow 0 length plaintext and aad for aes-siv

Browse Source 
Test vectors taken from wycheproof:

https://github.com/C2SP/wycheproof/blob/master/testvectors/aes_siv_cmac_test.json

Fixes #26580

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26658)
This commit is contained in:
SaEvangelista 2025-02-03 21:19:28 -05:00 committed by Tomas Mraz
parent 20599e480f
commit f11c10d83e
3 changed files with 3620 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/modes/siv128.c
View File

@ -291,7 +291,7 @@ int ossl_siv128_encrypt(SIV128_CONTEXT *ctx,
if (!siv128_do_encrypt(ctx->cipher_ctx, out, in, len, &q))
return 0;
ctx->final_ret = 0;
return len;
return 1;
}
/*
@ -327,7 +327,7 @@ int ossl_siv128_decrypt(SIV128_CONTEXT *ctx,
return 0;
}
ctx->final_ret = 0;
return len;
return 1;
}
/*

15
providers/implementations/ciphers/cipher_aes_siv.c
View File

@ -118,18 +118,9 @@ static int siv_cipher(void *vctx, unsigned char *out, size_t *outl,
if (!ossl_prov_is_running())
return 0;
/* Ignore just empty encryption/decryption call and not AAD. */
if (out != NULL) {
if (inl == 0) {
if (outl != NULL)
*outl = 0;
return 1;
}
if (outsize < inl) {
ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
return 0;
}
if (out != NULL && outsize < inl) {
ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
return 0;
}
if (ctx->hw->cipher(ctx, out, in, inl) <= 0)

3615
test/recipes/30-test_evp_data/evpciph_aes_siv.txt
View File

File diff suppressed because it is too large Load Diff