diff options
| author | ume <ume@FreeBSD.org> | 2001-11-27 14:11:47 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2001-11-27 14:11:47 +0000 |
| commit | 8ee8d7c8d6970b575b23f82aaaf20971b506627a (patch) | |
| tree | ef38c076ab249d72ff27c36266b0e153e4326896 /sys/crypto | |
| parent | ab5488a6a1c405cf165b96e55b8beb755a913412 (diff) | |
| download | FreeBSD-src-8ee8d7c8d6970b575b23f82aaaf20971b506627a.zip FreeBSD-src-8ee8d7c8d6970b575b23f82aaaf20971b506627a.tar.gz | |
fixed the cast128 calculation with a short cipher key length.
the memory was overridden when the key length was less than 16 bytes.
Obtained from: KAME
MFC after: 1 week
Diffstat (limited to 'sys/crypto')
| -rw-r--r-- | sys/crypto/cast128/cast128.c | 17 | ||||
| -rw-r--r-- | sys/crypto/cast128/cast128.h | 4 |
2 files changed, 17 insertions, 4 deletions
diff --git a/sys/crypto/cast128/cast128.c b/sys/crypto/cast128/cast128.c index 88873f2..8c31d9d 100644 --- a/sys/crypto/cast128/cast128.c +++ b/sys/crypto/cast128/cast128.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: cast128.c,v 1.4 2000/11/06 13:58:08 itojun Exp $ */ +/* $KAME: cast128.c,v 1.5 2001/11/27 09:47:32 sakane Exp $ */ /* * heavily modified by Tomomi Suzuki <suzuki@grelot.elec.ryukoku.ac.jp> @@ -55,9 +55,22 @@ static u_int32_t S8[]; /* * Step 1 */ -void set_cast128_subkey(u_int32_t *subkey, u_int8_t *key) +void set_cast128_subkey(u_int32_t *subkey, u_int8_t *key0, int keylen) { u_int32_t buf[8]; /* for x0x1x2x3, x4x5x6x7 ..., z0z1z2z3, ... */ + u_int32_t key[16]; + int i; + + /* + * the key has to be initilized. should it be logged when the key + * length is more than 16 bytes ? anyway, ignore it at this moment. + */ + if (keylen > 16) + keylen = 16; + for (i = 0; i < keylen; i++) + key[i] = key0[i]; + while (i < 16) + key[i++] = 0; buf[0] = (key[ 0] << 24) | (key[ 1] << 16) | (key[ 2] << 8) | key[ 3]; diff --git a/sys/crypto/cast128/cast128.h b/sys/crypto/cast128/cast128.h index 4057a1f..fbfa590 100644 --- a/sys/crypto/cast128/cast128.h +++ b/sys/crypto/cast128/cast128.h @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: cast128.h,v 1.6 2000/09/18 20:59:20 itojun Exp $ */ +/* $KAME: cast128.h,v 1.7 2001/11/27 09:47:32 sakane Exp $ */ /* * heavily modified by Tomomi Suzuki <suzuki@grelot.elec.ryukoku.ac.jp> @@ -46,7 +46,7 @@ #define CAST128_DECRYPT 0 -extern void set_cast128_subkey __P((u_int32_t *, u_int8_t *)); +extern void set_cast128_subkey __P((u_int32_t *, u_int8_t *, int)); extern void cast128_encrypt_round16 __P((u_int8_t *, const u_int8_t *, u_int32_t *)); extern void cast128_decrypt_round16 __P((u_int8_t *, const u_int8_t *, |
