Changeset a931b7b in mainline for uspace/lib/ieee80211/include

Timestamp:

2015-04-13T20:48:33Z (10 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

Location:

uspace/lib/ieee80211/include

Files:

• ieee80211.h (modified) (1 diff)
• ieee80211_impl.h (modified) (1 diff)
• ieee80211_private.h (modified) (4 diffs)

uspace/lib/ieee80211/include/ieee80211.h

@@ -82 +82 @@
 } ieee80211_key_flags_t;
 
+typedef enum {
+        IEEE80211_TKIP_TX_MIC_OFFSET = 16,
+        IEEE80211_TKIP_RX_MIC_OFFSET = 24
+} ieee80211_tkip_mic_offset_t;
+
 /** Key config structure. */
 typedef struct {

uspace/lib/ieee80211/include/ieee80211_impl.h

@@ -53 +53 @@
 extern int ieee80211_scan_impl(ieee80211_dev_t *ieee80211_dev);
 extern int ieee80211_prf(uint8_t *key, uint8_t *data, uint8_t *hash, 
-        hash_func_t hash_sel);
+        size_t output_size);
+extern int ieee80211_rc4_key_unwrap(uint8_t *key, uint8_t *data, 
+        size_t data_size, uint8_t *output);
 extern int ieee80211_aes_key_unwrap(uint8_t *kek, uint8_t *data, 
         size_t data_size, uint8_t *output);

uspace/lib/ieee80211/include/ieee80211_private.h

@@ -52 +52 @@
 
 /* Timeout in us for waiting to finish 4-way handshake process. */
-#define HANDSHAKE_TIMEOUT 3000000
+#define HANDSHAKE_TIMEOUT 5000000
 
 /* Scanning period. */
@@ -86 +86 @@
 /* TK offset inside PTK. */
 #define TK_OFFSET 32
-
-/* Length of CCMP header we need to reserve. */
-#define IEEE80211_CCMP_HEADER_LENGTH 8
 
 /* 
@@ -95 +92 @@
  */
 #define PRF_CRYPT_DATA_LENGTH 2*32 + 2*ETH_ADDR
+
+/* Special room in header reserved for encryption. */
+typedef enum {
+        IEEE80211_TKIP_HEADER_LENGTH = 8,
+        IEEE80211_CCMP_HEADER_LENGTH = 8
+} ieee80211_encrypt_header_reserve_length_t;
+
+/* Special room in footer reserved for encryption. */
+typedef enum {
+        IEEE80211_TKIP_FOOTER_LENGTH = 4,
+        IEEE80211_CCMP_FOOTER_LENGTH = 8
+} ieee80211_encrypt_footer_reserve_length_t;
 
 /** IEEE 802.11 PTK key length. */
@@ -199 +208 @@
         time_t last_beacon;
         ieee80211_scan_result_t scan_result;
-        uint8_t rsn_copy[256];
-        size_t rsn_copy_len;
+        uint8_t auth_ie[256];
+        size_t auth_ie_len;
 } ieee80211_scan_result_link_t;