Changeset 5306

Timestamp:

08/24/09 14:51:49 (4 years ago)

Author:

jow

Message:

libs/iwinfo: ignore proprietary ciphers or auth suites - we can't handle them anyway

Files:

• luci/trunk/libs/iwinfo/src/iwinfo_lualib.c (modified) (3 diffs)

luci/trunk/libs/iwinfo/src/iwinfo_lualib.c

@@ -159 +159 @@
 
             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++);
                 }
@@ -172 +170 @@
 
             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++);
                 }
@@ -185 +181 @@
 
             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++);
                 }