summaryrefslogtreecommitdiffstats
path: root/sys/crypto
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2005-08-16 18:59:00 +0000
committerpjd <pjd@FreeBSD.org>2005-08-16 18:59:00 +0000
commit372c5a7d070d26ae5777e72e5403b62d9f0da99e (patch)
tree667a1055e89ba718cbf020e12793de0cd3a16ca7 /sys/crypto
parent1d6676e5bc30f3c6a759289b8e17002de8f5a721 (diff)
downloadFreeBSD-src-372c5a7d070d26ae5777e72e5403b62d9f0da99e.zip
FreeBSD-src-372c5a7d070d26ae5777e72e5403b62d9f0da99e.tar.gz
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)
Diffstat (limited to 'sys/crypto')
-rw-r--r--sys/crypto/rijndael/rijndael-alg-fst.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c
index 4f2164f..a0eb4fd 100644
--- a/sys/crypto/rijndael/rijndael-alg-fst.c
+++ b/sys/crypto/rijndael/rijndael-alg-fst.c
@@ -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);
OpenPOWER on IntegriCloud