From 0e88acfd4ef3abd5af048fda14810a207681c913 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 24 Aug 2009 13:51:49 +0000
Subject: libs/iwinfo: ignore proprietary ciphers or auth suites - we can't
 handle them anyway

---
 libs/iwinfo/src/iwinfo_lualib.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/libs/iwinfo/src/iwinfo_lualib.c b/libs/iwinfo/src/iwinfo_lualib.c
index d9c82b1ec..0bd2fa59a 100644
--- a/libs/iwinfo/src/iwinfo_lualib.c
+++ b/libs/iwinfo/src/iwinfo_lualib.c
@@ -158,39 +158,33 @@ static int iwinfo_L_scanlist(lua_State *L, int (*func)(const char *, char *, int
 			lua_setfield(L, -2, "wep");
 
 			lua_newtable(L);
-			for( j = 0, y = 1; j < 8; j++ )
+			for( j = 0, y = 1; j < IW_IE_CYPHER_NUM; j++ )
 			{
 				if( e->crypto.group_ciphers & (1<<j) )
 				{
-					lua_pushstring(L, (j < IW_IE_CYPHER_NUM)
-						? iw_ie_cypher_name[j] : "Proprietary");
-
+					lua_pushstring(L, iw_ie_cypher_name[j]);
 					lua_rawseti(L, -2, y++);
 				}
 			}
 			lua_setfield(L, -2, "group_ciphers");
 
 			lua_newtable(L);
-			for( j = 0, y = 1; j < 8; j++ )
+			for( j = 0, y = 1; j < IW_IE_CYPHER_NUM; j++ )
 			{
 				if( e->crypto.pair_ciphers & (1<<j) )
 				{
-					lua_pushstring(L, (j < IW_IE_CYPHER_NUM)
-						? iw_ie_cypher_name[j] : "Proprietary");
-
+					lua_pushstring(L, iw_ie_cypher_name[j]);
 					lua_rawseti(L, -2, y++);
 				}
 			}
 			lua_setfield(L, -2, "pair_ciphers");
 
 			lua_newtable(L);
-			for( j = 0, y = 1; j < 8; j++ )
+			for( j = 0, y = 1; j < IW_IE_KEY_MGMT_NUM; j++ )
 			{
 				if( e->crypto.auth_suites & (1<<j) )
 				{
-					lua_pushstring(L, (j < IW_IE_KEY_MGMT_NUM)
-						? iw_ie_key_mgmt_name[j] : "Proprietary");
-
+					lua_pushstring(L, iw_ie_key_mgmt_name[j]);
 					lua_rawseti(L, -2, y++);
 				}
 			}
-- 
cgit v1.2.3