Changeset a931b7b in mainline for uspace/drv/nic/ar9271/ar9271.c

Timestamp:

2015-04-13T20:48:33Z (9 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cc575ef9

Parents:

053fc2b

Message:

Added TKIP support, handling old WPA in 4way handshake, some fixes in wifi_supplicant app

File:

• uspace/drv/nic/ar9271/ar9271.c (modified) (3 diffs)

uspace/drv/nic/ar9271/ar9271.c

@@ -440 +440 @@
                 uint32_t key[5];
                 uint32_t key_type;
-                uint32_t reg_ptr;
+                uint32_t reg_ptr, mic_reg_ptr;
                 void *data_start;
                 
@@ -465 +465 @@
                 if(key_conf->flags & IEEE80211_KEY_FLAG_TYPE_PAIRWISE) {
                         reg_ptr = AR9271_KEY_TABLE_STA;
+                        mic_reg_ptr = AR9271_KEY_TABLE_MIC_STA;
                 } else {
                         reg_ptr = AR9271_KEY_TABLE_GRP;
+                        mic_reg_ptr = AR9271_KEY_TABLE_MIC_GRP;
                 }
                 
-                if(key_conf->suite == IEEE80211_SECURITY_SUITE_TKIP) {
-                        // TODO
-                } else {
-                        data_start = (void *) key_conf->data;
-                        
-                        key[0] = uint32_t_le2host(
-                                *((uint32_t *) data_start));
-                        key[1] = uint16_t_le2host(
-                                *((uint16_t *) (data_start + 4)));
-                        key[2] = uint32_t_le2host(
-                                *((uint32_t *) (data_start + 6)));
-                        key[3] = uint16_t_le2host(
-                                *((uint16_t *) (data_start + 10)));
-                        key[4] = uint32_t_le2host(
-                                *((uint32_t *) (data_start + 12)));
-                        
-                        if(key_conf->suite == IEEE80211_SECURITY_SUITE_WEP40 ||
-                           key_conf->suite == IEEE80211_SECURITY_SUITE_WEP104) {
-                                key[4] &= 0xFF;
-                        }
-                        
-                        wmi_reg_write(ar9271->htc_device, reg_ptr + 0, key[0]);
-                        wmi_reg_write(ar9271->htc_device, reg_ptr + 4, key[1]);
-                        wmi_reg_write(ar9271->htc_device, reg_ptr + 8, key[2]);
-                        wmi_reg_write(ar9271->htc_device, reg_ptr + 12, key[3]);
-                        wmi_reg_write(ar9271->htc_device, reg_ptr + 16, key[4]);
-                        wmi_reg_write(ar9271->htc_device, reg_ptr + 20, 
-                                key_type);
+                data_start = (void *) key_conf->data;
+                
+                key[0] = uint32_t_le2host(
+                        *((uint32_t *) data_start));
+                key[1] = uint16_t_le2host(
+                        *((uint16_t *) (data_start + 4)));
+                key[2] = uint32_t_le2host(
+                        *((uint32_t *) (data_start + 6)));
+                key[3] = uint16_t_le2host(
+                        *((uint16_t *) (data_start + 10)));
+                key[4] = uint32_t_le2host(
+                        *((uint32_t *) (data_start + 12)));
+
+                if(key_conf->suite == IEEE80211_SECURITY_SUITE_WEP40 ||
+                   key_conf->suite == IEEE80211_SECURITY_SUITE_WEP104) {
+                        key[4] &= 0xFF;
                 }
+                
+                wmi_reg_write(ar9271->htc_device, reg_ptr + 0, key[0]);
+                wmi_reg_write(ar9271->htc_device, reg_ptr + 4, key[1]);
+                wmi_reg_write(ar9271->htc_device, reg_ptr + 8, key[2]);
+                wmi_reg_write(ar9271->htc_device, reg_ptr + 12, key[3]);
+                wmi_reg_write(ar9271->htc_device, reg_ptr + 16, key[4]);
+                wmi_reg_write(ar9271->htc_device, reg_ptr + 20, key_type);
                 
                 uint32_t macL, macH;
@@ -516 +513 @@
                 wmi_reg_write(ar9271->htc_device, reg_ptr + 24, macL);
                 wmi_reg_write(ar9271->htc_device, reg_ptr + 28, macH);
+                
+                /* Setup MIC keys for TKIP. */
+                if(key_conf->suite == IEEE80211_SECURITY_SUITE_TKIP) {
+                        uint32_t mic[5];
+                        uint8_t *gen_mic = 
+                                data_start + IEEE80211_TKIP_RX_MIC_OFFSET;
+                        uint8_t *tx_mic;
+                        if(key_conf->flags & IEEE80211_KEY_FLAG_TYPE_GROUP) {
+                                tx_mic = gen_mic;
+                        } else {
+                                tx_mic = data_start + 
+                                        IEEE80211_TKIP_TX_MIC_OFFSET;
+                        }
+                        
+                        mic[0] = uint32_t_le2host(
+                                *((uint32_t *) gen_mic));
+                        mic[1] = uint16_t_le2host(
+                                *((uint16_t *) (tx_mic + 2))) & 0xFFFF;
+                        mic[2] = uint32_t_le2host(
+                                *((uint32_t *) (gen_mic + 4)));
+                        mic[3] = uint16_t_le2host(
+                                *((uint16_t *) tx_mic)) & 0xFFFF;
+                        mic[4] = uint32_t_le2host(
+                                *((uint32_t *) (tx_mic + 4)));
+                        
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 0, 
+                                mic[0]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 4, 
+                                mic[1]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 8, 
+                                mic[2]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 12, 
+                                mic[3]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 16, 
+                                mic[4]);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 20, 
+                                AR9271_KEY_TABLE_TYPE_CLR);
+                        
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 24, 0);
+                        wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 28, 0);
+                }
                 
                 if(key_conf->flags & IEEE80211_KEY_FLAG_TYPE_GROUP)