Date: Wed, 27 Aug 2008 15:21:47 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 148619 for review Message-ID: <200808271521.m7RFLleI099625@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=148619 Change 148619 by sam@sam_ebb on 2008/08/27 15:20:49 don't display key indices as +1, show the actual value Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#21 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#21 (text+ko) ==== @@ -691,30 +691,30 @@ switch (cip->ic_cipher) { case IEEE80211_CIPHER_WEP: /* compatibility */ - db_printf(" wepkey %u:%s", wk->wk_keyix+1, + db_printf(" wepkey %u:%s", wk->wk_keyix, keylen <= 5 ? "40-bit" : keylen <= 13 ? "104-bit" : "128-bit"); break; case IEEE80211_CIPHER_TKIP: if (keylen > 128/8) keylen -= 128/8; /* ignore MIC for now */ - db_printf(" TKIP %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" TKIP %u:%u-bit", wk->wk_keyix, 8*keylen); break; case IEEE80211_CIPHER_AES_OCB: - db_printf(" AES-OCB %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" AES-OCB %u:%u-bit", wk->wk_keyix, 8*keylen); break; case IEEE80211_CIPHER_AES_CCM: - db_printf(" AES-CCM %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" AES-CCM %u:%u-bit", wk->wk_keyix, 8*keylen); break; case IEEE80211_CIPHER_CKIP: - db_printf(" CKIP %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" CKIP %u:%u-bit", wk->wk_keyix, 8*keylen); break; case IEEE80211_CIPHER_NONE: - db_printf(" NULL %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" NULL %u:%u-bit", wk->wk_keyix, 8*keylen); break; default: db_printf(" UNKNOWN (0x%x) %u:%u-bit", - cip->ic_cipher, wk->wk_keyix+1, 8*keylen); + cip->ic_cipher, wk->wk_keyix, 8*keylen); break; } if (memcmp(wk->wk_key, zerodata, keylen) != 0) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808271521.m7RFLleI099625>