From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 21 Sep 2016 19:02:10 +0000 (+0200)
Subject: lua: fix WPA cipher reporting
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fiwinfo.git;a=commitdiff_plain;h=fd9e17be0c43bd6b8df5371f0b353747bc563874

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>
---

diff --git a/iwinfo_lua.c b/iwinfo_lua.c
index 94913ac..1421111 100644
--- a/iwinfo_lua.c
+++ b/iwinfo_lua.c
@@ -134,21 +134,21 @@ static char * iwinfo_crypto_desc(struct iwinfo_crypto_entry *c)
 						sprintf(desc, "mixed WPA/WPA2 %s (%s)",
 							iwinfo_crypto_print_suites(c->auth_suites),
 							iwinfo_crypto_print_ciphers(
-								c->pair_ciphers & c->group_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 & c->group_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 & c->group_ciphers));
+								c->pair_ciphers | c->group_ciphers));
 						break;
 				}
 			}