diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2011-04-29 16:41:35 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-04-29 16:41:35 +0000 |
commit | ae33c64a37c8a8d6dc1e38678e967f2e457bc33a (patch) | |
tree | 2423f4a1006fb83c06960f2170d2679ea0c608fb /contrib/package/iwinfo/src/iwinfo_lualib.c | |
parent | 8879c55bb39b31a03de5d798a436d73b30a011d6 (diff) |
libiwinfo:
- don't assume madwifi and nl80211 backends if no backend given
- only print intersection of group and unicast ciphers in crypto description
- fix crypto detection on madwifi in client mode
- bump pkg revision
Diffstat (limited to 'contrib/package/iwinfo/src/iwinfo_lualib.c')
-rw-r--r-- | contrib/package/iwinfo/src/iwinfo_lualib.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/package/iwinfo/src/iwinfo_lualib.c b/contrib/package/iwinfo/src/iwinfo_lualib.c index b327d08d80..516b11fffc 100644 --- a/contrib/package/iwinfo/src/iwinfo_lualib.c +++ b/contrib/package/iwinfo/src/iwinfo_lualib.c @@ -417,19 +417,22 @@ static char * iwinfo_crypto_desc(struct iwinfo_crypto_entry *c) case 3: sprintf(desc, "mixed WPA/WPA2 %s (%s)", iwinfo_crypto_print_suites(c->auth_suites), - iwinfo_crypto_print_ciphers(c->pair_ciphers)); + iwinfo_crypto_print_ciphers( + c->pair_ciphers & c->group_ciphers)); break; case 2: sprintf(desc, "WPA2 %s (%s)", iwinfo_crypto_print_suites(c->auth_suites), - iwinfo_crypto_print_ciphers(c->pair_ciphers)); + iwinfo_crypto_print_ciphers( + c->pair_ciphers & c->group_ciphers)); break; case 1: sprintf(desc, "WPA %s (%s)", iwinfo_crypto_print_suites(c->auth_suites), - iwinfo_crypto_print_ciphers(c->pair_ciphers)); + iwinfo_crypto_print_ciphers( + c->pair_ciphers & c->group_ciphers)); break; } } |