lua: fix WPA cipher reporting

Use the same logic as the command line interface for reporting the used WPA
ciphers. Instead of printing the intersection of pairwise and group ciphers,
report both group and pairwise ciphers.

This fixes a case where a connection which uses CCMP for pairwise and TKIP
as groupwise cipher is getting reported as using the NONE cipher.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-09-21 21:02:10 +02:00
parent 717ff71750
commit fd9e17be0c

View file

@ -134,21 +134,21 @@ static char * iwinfo_crypto_desc(struct iwinfo_crypto_entry *c)
sprintf(desc, "mixed WPA/WPA2 %s (%s)", sprintf(desc, "mixed WPA/WPA2 %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites), iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers( iwinfo_crypto_print_ciphers(
c->pair_ciphers & c->group_ciphers)); c->pair_ciphers | c->group_ciphers));
break; break;
case 2: case 2:
sprintf(desc, "WPA2 %s (%s)", sprintf(desc, "WPA2 %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites), iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers( iwinfo_crypto_print_ciphers(
c->pair_ciphers & c->group_ciphers)); c->pair_ciphers | c->group_ciphers));
break; break;
case 1: case 1:
sprintf(desc, "WPA %s (%s)", sprintf(desc, "WPA %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites), iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers( iwinfo_crypto_print_ciphers(
c->pair_ciphers & c->group_ciphers)); c->pair_ciphers | c->group_ciphers));
break; break;
} }
} }