faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

siv: add more assertions

Browse source 
Make sure the returned tag and key lengths are sane.
This commit is contained in:
Miroslav Lichvar 2020-07-14 17:04:30 +02:00
parent 66e097e3e6
commit 32a82a38fd
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
siv_gnutls.c
View file

@ -134,11 +134,17 @@ int
SIV_GetKeyLength(SIV_Algorithm algorithm) SIV_GetKeyLength(SIV_Algorithm algorithm)
{ {
gnutls_cipher_algorithm_t calgo = get_cipher_algorithm(algorithm); gnutls_cipher_algorithm_t calgo = get_cipher_algorithm(algorithm);
int len;
if (calgo == 0) if (calgo == 0)
return 0; return 0;
return gnutls_cipher_get_key_size(calgo); len = gnutls_cipher_get_key_size(calgo);
if (len < 1 || len > SIV_MAX_KEY_LENGTH)
LOG_FATAL("Invalid key length");
return len;
} }
/* ================================================== */ /* ================================================== */
@ -177,7 +183,14 @@ SIV_SetKey(SIV_Instance instance, const unsigned char *key, int length)
int int
SIV_GetTagLength(SIV_Instance instance) SIV_GetTagLength(SIV_Instance instance)
{ {
return gnutls_cipher_get_tag_size(instance->algorithm); int len;
len = gnutls_cipher_get_tag_size(instance->algorithm);
if (len < 1 || len > SIV_MAX_TAG_LENGTH)
LOG_FATAL("Invalid tag length");
return len;
} }
/* ================================================== */ /* ================================================== */

4
siv_nettle.c
View file

@ -69,6 +69,8 @@ SIV_DestroyInstance(SIV_Instance instance)
int int
SIV_GetKeyLength(SIV_Algorithm algorithm) SIV_GetKeyLength(SIV_Algorithm algorithm)
{ {
assert(32 <= SIV_MAX_KEY_LENGTH);
if (algorithm == AEAD_AES_SIV_CMAC_256) if (algorithm == AEAD_AES_SIV_CMAC_256)
return 32; return 32;
return 0; return 0;
@ -92,6 +94,8 @@ SIV_SetKey(SIV_Instance instance, const unsigned char *key, int length)
int int
SIV_GetTagLength(SIV_Instance instance) SIV_GetTagLength(SIV_Instance instance)
{ {
assert(SIV_DIGEST_SIZE <= SIV_MAX_TAG_LENGTH);
return SIV_DIGEST_SIZE; return SIV_DIGEST_SIZE;
} }