diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-10-11 15:31:26 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-10-11 15:31:26 +0000 |
| commit | 12dadca75e4f5dae17bc0b1dac4f21a75e0886c5 (patch) | |
| tree | 0b022bf767dafb578bd7a396737f863406727fba /sys/dev | |
| parent | 13c797c70316f2622c06d3af0a23f696210a3734 (diff) | |
pad keys of size != RC4KEYLEN or RC4KEYLEN/2 with zero; noticed and tested by millert@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/if_wi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index dcc910d6c22..6568a3cd34e 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.83 2002/10/11 15:04:44 millert Exp $ */ +/* $OpenBSD: if_wi.c,v 1.84 2002/10/11 15:31:25 markus Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -124,7 +124,7 @@ u_int32_t widebug = WIDEBUG; #if !defined(lint) && !defined(__OpenBSD__) static const char rcsid[] = - "$OpenBSD: if_wi.c,v 1.83 2002/10/11 15:04:44 millert Exp $"; + "$OpenBSD: if_wi.c,v 1.84 2002/10/11 15:31:25 markus Exp $"; #endif /* lint */ #ifdef foo @@ -1926,15 +1926,15 @@ wi_do_hostencrypt(struct wi_softc *sc, caddr_t buf, int len) sc->wi_icv += 0x000100; /* prepend 24bit IV to tx key, byte order does not matter */ + bzero(key, sizeof(key)); key[0] = sc->wi_icv >> 16; key[1] = sc->wi_icv >> 8; key[2] = sc->wi_icv; - klen = sc->wi_keys.wi_keys[sc->wi_tx_key].wi_keylen + - IEEE80211_WEP_IVLEN; - klen = (klen >= RC4KEYLEN) ? RC4KEYLEN : RC4KEYLEN/2; + klen = sc->wi_keys.wi_keys[sc->wi_tx_key].wi_keylen; bcopy((char *)&sc->wi_keys.wi_keys[sc->wi_tx_key].wi_keydat, - (char *)key + IEEE80211_WEP_IVLEN, klen - IEEE80211_WEP_IVLEN); + (char *)key + IEEE80211_WEP_IVLEN, klen); + klen = (klen > IEEE80211_WEP_KEYLEN) ? RC4KEYLEN : RC4KEYLEN / 2; /* rc4 keysetup */ x = y = 0; |