1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-23 07:31:31 +00:00

Check key size for rijndael, as invalid key size can lead to kernel panic.

It checked other algorithms against this bug and it seems they aren't
affected.

Reported by:	Mike Tancsa <mike@sentex.net>
PR:		i386/84860
Reviewed by:	phk, cperciva(x2)
This commit is contained in:
Pawel Jakub Dawidek 2005-08-16 18:59:00 +00:00
parent 207377b25e
commit 36c51ae068
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=149143
2 changed files with 4 additions and 0 deletions

View File

@ -734,6 +734,8 @@ int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBit
int i = 0;
u32 temp;
KASSERT(keyBits == 128 || keyBits == 192 || keyBits == 256,
("Invalid key size (%d).", keyBits));
rk[0] = GETU32(cipherKey );
rk[1] = GETU32(cipherKey + 4);
rk[2] = GETU32(cipherKey + 8);

View File

@ -512,6 +512,8 @@ rijndael128_setkey(u_int8_t **sched, u_int8_t *key, int len)
{
int err;
if (len != 16 && len != 24 && len != 32)
return (EINVAL);
MALLOC(*sched, u_int8_t *, sizeof(rijndael_ctx), M_CRYPTO_DATA,
M_NOWAIT|M_ZERO);
if (*sched != NULL) {