}
/* Rt3xxx SoC */
- else if ((bc[off] == 0x3352) || (bc[off] == 0x5233) ||
+ else if ((bc[off] == 0x3050) || (bc[off] == 0x5030) ||
+ (bc[off] == 0x3051) || (bc[off] == 0x5130) ||
+ (bc[off] == 0x3052) || (bc[off] == 0x5230) ||
(bc[off] == 0x3350) || (bc[off] == 0x5033) ||
- (bc[off] == 0x3050) || (bc[off] == 0x5030) ||
- (bc[off] == 0x3052) || (bc[off] == 0x5230))
+ (bc[off] == 0x3352) || (bc[off] == 0x5233) ||
+ (bc[off] == 0x3662) || (bc[off] == 0x6236) ||
+ (bc[off] == 0x3883) || (bc[off] == 0x8338) ||
+ (bc[off] == 0x5350) || (bc[off] == 0x5053))
{
/* vendor: RaLink */
id->vendor_id = 0x1814;
id->subsystem_vendor_id = 0x1814;
/* device */
- if ((bc[off] & 0xf0) == 0x30)
+ if (((bc[off] & 0xf0) == 0x30) ||
+ ((bc[off] & 0xff) == 0x53))
+ id->device_id = (bc[off] >> 8) | (bc[off] & 0x00ff) << 8;
+ else
+ id->device_id = bc[off];
+
+ /* subsystem from EEPROM_NIC_CONF0_RF_TYPE */
+ id->subsystem_device_id = (bc[off + 0x1a] & 0x0f00) >> 8;
+ } else if ((bc[off] == 0x7620) || (bc[off] == 0x2076) ||
+ (bc[off] == 0x7628) || (bc[off] == 0x2876) ||
+ (bc[off] == 0x7688) || (bc[off] == 0x8876)) {
+ /* vendor: MediaTek */
+ id->vendor_id = 0x14c3;
+ id->subsystem_vendor_id = 0x14c3;
+
+ /* device */
+ if ((bc[off] & 0xff) == 0x76)
id->device_id = (bc[off] >> 8) | (bc[off] & 0x00ff) << 8;
else
id->device_id = bc[off];
return (id->vendor_id && id->device_id) ? 0 : -1;
}
+static void iwinfo_parse_rsn_cipher(uint8_t idx, uint16_t *ciphers)
+{
+ switch (idx)
+ {
+ case 0:
+ *ciphers |= IWINFO_CIPHER_NONE;
+ break;
+
+ case 1:
+ *ciphers |= IWINFO_CIPHER_WEP40;
+ break;
+
+ case 2:
+ *ciphers |= IWINFO_CIPHER_TKIP;
+ break;
+
+ case 3: /* WRAP */
+ break;
+
+ case 4:
+ *ciphers |= IWINFO_CIPHER_CCMP;
+ break;
+
+ case 5:
+ *ciphers |= IWINFO_CIPHER_WEP104;
+ break;
+
+ case 8:
+ *ciphers |= IWINFO_CIPHER_GCMP;
+ break;
+
+ case 9:
+ *ciphers |= IWINFO_CIPHER_GCMP256;
+ break;
+
+ case 10:
+ *ciphers |= IWINFO_CIPHER_CCMP256;
+ break;
+
+ case 6: /* AES-128-CMAC */
+ case 7: /* No group addressed */
+ case 11: /* BIP-GMAC-128 */
+ case 12: /* BIP-GMAC-256 */
+ case 13: /* BIP-CMAC-256 */
+ break;
+ }
+}
+
void iwinfo_parse_rsn(struct iwinfo_crypto_entry *c, uint8_t *data, uint8_t len,
- uint8_t defcipher, uint8_t defauth)
+ uint16_t defcipher, uint8_t defauth)
{
uint16_t i, count;
+ uint8_t wpa_version = 0;
static unsigned char ms_oui[3] = { 0x00, 0x50, 0xf2 };
static unsigned char ieee80211_oui[3] = { 0x00, 0x0f, 0xac };
len -= 2;
if (!memcmp(data, ms_oui, 3))
- c->wpa_version += 1;
+ wpa_version |= 1;
else if (!memcmp(data, ieee80211_oui, 3))
- c->wpa_version += 2;
+ wpa_version |= 2;
if (len < 4)
{
}
if (!memcmp(data, ms_oui, 3) || !memcmp(data, ieee80211_oui, 3))
- {
- switch (data[3])
- {
- case 1: c->group_ciphers |= IWINFO_CIPHER_WEP40; break;
- case 2: c->group_ciphers |= IWINFO_CIPHER_TKIP; break;
- case 4: c->group_ciphers |= IWINFO_CIPHER_CCMP; break;
- case 5: c->group_ciphers |= IWINFO_CIPHER_WEP104; break;
- case 6: /* AES-128-CMAC */ break;
- default: /* proprietary */ break;
- }
- }
+ iwinfo_parse_rsn_cipher(data[3], &c->group_ciphers);
data += 4;
len -= 4;
return;
for (i = 0; i < count; i++)
- {
if (!memcmp(data + 2 + (i * 4), ms_oui, 3) ||
- !memcmp(data + 2 + (i * 4), ieee80211_oui, 3))
- {
- switch (data[2 + (i * 4) + 3])
- {
- case 1: c->pair_ciphers |= IWINFO_CIPHER_WEP40; break;
- case 2: c->pair_ciphers |= IWINFO_CIPHER_TKIP; break;
- case 4: c->pair_ciphers |= IWINFO_CIPHER_CCMP; break;
- case 5: c->pair_ciphers |= IWINFO_CIPHER_WEP104; break;
- case 6: /* AES-128-CMAC */ break;
- default: /* proprietary */ break;
- }
- }
- }
+ !memcmp(data + 2 + (i * 4), ieee80211_oui, 3))
+ iwinfo_parse_rsn_cipher(data[2 + (i * 4) + 3], &c->pair_ciphers);
data += 2 + (count * 4);
len -= 2 + (count * 4);
{
switch (data[2 + (i * 4) + 3])
{
- case 1: c->auth_suites |= IWINFO_KMGMT_8021x; break;
- case 2: c->auth_suites |= IWINFO_KMGMT_PSK; break;
- case 3: /* FT/IEEE 802.1X */ break;
- case 4: /* FT/PSK */ break;
- case 5: /* IEEE 802.1X/SHA-256 */ break;
- case 6: /* PSK/SHA-256 */ break;
- default: /* proprietary */ break;
+ case 1: /* IEEE 802.1x */
+ c->wpa_version |= wpa_version;
+ c->auth_suites |= IWINFO_KMGMT_8021x;
+ break;
+
+ case 2: /* PSK */
+ c->wpa_version |= wpa_version;
+ c->auth_suites |= IWINFO_KMGMT_PSK;
+ break;
+
+ case 3: /* FT/IEEE 802.1X */
+ case 4: /* FT/PSK */
+ case 5: /* IEEE 802.1X/SHA-256 */
+ case 6: /* PSK/SHA-256 */
+ case 7: /* TPK Handshake */
+ break;
+
+ case 8: /* SAE */
+ c->wpa_version |= 4;
+ c->auth_suites |= IWINFO_KMGMT_SAE;
+ break;
+
+ case 9: /* FT/SAE */
+ case 10: /* undefined */
+ break;
+
+ case 11: /* 802.1x Suite-B */
+ case 12: /* 802.1x Suite-B-192 */
+ case 13: /* FT/802.1x SHA-384 */
+ c->wpa_version |= 4;
+ c->auth_suites |= IWINFO_KMGMT_8021x;
+ break;
+
+ case 14: /* FILS SHA-256 */
+ case 15: /* FILS SHA-384 */
+ case 16: /* FT/FILS SHA-256 */
+ case 17: /* FT/FILS SHA-384 */
+ break;
+
+ case 18: /* OWE */
+ c->wpa_version |= 4;
+ c->auth_suites |= IWINFO_KMGMT_OWE;
+ break;
}
}
}