Updated through tag hostap_2_5 from git://w1.fi/hostap.git
[mech_eap.git] / libeap / src / common / wpa_common.c
index b295f31..e9d4248 100644 (file)
@@ -1,15 +1,9 @@
 /*
  * WPA/RSN - Shared functions for supplicant and authenticator
- * Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2015, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
@@ -18,6 +12,7 @@
 #include "crypto/md5.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"
+#include "crypto/sha384.h"
 #include "crypto/aes_wrap.h"
 #include "crypto/crypto.h"
 #include "ieee802_11_defs.h"
 #include "wpa_common.h"
 
 
+static unsigned int wpa_kck_len(int akmp)
+{
+       if (akmp == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192)
+               return 24;
+       return 16;
+}
+
+
+static unsigned int wpa_kek_len(int akmp)
+{
+       if (akmp == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192)
+               return 32;
+       return 16;
+}
+
+
+unsigned int wpa_mic_len(int akmp)
+{
+       if (akmp == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192)
+               return 24;
+       return 16;
+}
+
+
 /**
  * wpa_eapol_key_mic - Calculate EAPOL-Key MIC
  * @key: EAPOL-Key Key Confirmation Key (KCK)
+ * @key_len: KCK length in octets
+ * @akmp: WPA_KEY_MGMT_* used in key derivation
  * @ver: Key descriptor version (WPA_KEY_INFO_TYPE_*)
  * @buf: Pointer to the beginning of the EAPOL header (version field)
  * @len: Length of the EAPOL frame (from EAPOL header to the end of the frame)
  * happened during final editing of the standard and the correct behavior is
  * defined in the last draft (IEEE 802.11i/D10).
  */
-int wpa_eapol_key_mic(const u8 *key, int ver, const u8 *buf, size_t len,
-                     u8 *mic)
+int wpa_eapol_key_mic(const u8 *key, size_t key_len, int akmp, int ver,
+                     const u8 *buf, size_t len, u8 *mic)
 {
-       u8 hash[SHA1_MAC_LEN];
+       u8 hash[SHA384_MAC_LEN];
 
        switch (ver) {
+#ifndef CONFIG_FIPS
        case WPA_KEY_INFO_TYPE_HMAC_MD5_RC4:
-               return hmac_md5(key, 16, buf, len, mic);
+               return hmac_md5(key, key_len, buf, len, mic);
+#endif /* CONFIG_FIPS */
        case WPA_KEY_INFO_TYPE_HMAC_SHA1_AES:
-               if (hmac_sha1(key, 16, buf, len, hash))
+               if (hmac_sha1(key, key_len, buf, len, hash))
                        return -1;
                os_memcpy(mic, hash, MD5_MAC_LEN);
                break;
@@ -60,6 +83,30 @@ int wpa_eapol_key_mic(const u8 *key, int ver, const u8 *buf, size_t len,
        case WPA_KEY_INFO_TYPE_AES_128_CMAC:
                return omac1_aes_128(key, buf, len, mic);
 #endif /* CONFIG_IEEE80211R || CONFIG_IEEE80211W */
+       case WPA_KEY_INFO_TYPE_AKM_DEFINED:
+               switch (akmp) {
+#ifdef CONFIG_HS20
+               case WPA_KEY_MGMT_OSEN:
+                       return omac1_aes_128(key, buf, len, mic);
+#endif /* CONFIG_HS20 */
+#ifdef CONFIG_SUITEB
+               case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
+                       if (hmac_sha256(key, key_len, buf, len, hash))
+                               return -1;
+                       os_memcpy(mic, hash, MD5_MAC_LEN);
+                       break;
+#endif /* CONFIG_SUITEB */
+#ifdef CONFIG_SUITEB192
+               case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
+                       if (hmac_sha384(key, key_len, buf, len, hash))
+                               return -1;
+                       os_memcpy(mic, hash, 24);
+                       break;
+#endif /* CONFIG_SUITEB192 */
+               default:
+                       return -1;
+               }
+               break;
        default:
                return -1;
        }
@@ -78,8 +125,9 @@ int wpa_eapol_key_mic(const u8 *key, int ver, const u8 *buf, size_t len,
  * @nonce1: ANonce or SNonce
  * @nonce2: SNonce or ANonce
  * @ptk: Buffer for pairwise transient key
- * @ptk_len: Length of PTK
- * @use_sha256: Whether to use SHA256-based KDF
+ * @akmp: Negotiated AKM
+ * @cipher: Negotiated pairwise cipher
+ * Returns: 0 on success, -1 on failure
  *
  * IEEE Std 802.11i-2004 - 8.5.1.2 Pairwise key hierarchy
  * PTK = PRF-X(PMK, "Pairwise key expansion",
@@ -90,12 +138,14 @@ int wpa_eapol_key_mic(const u8 *key, int ver, const u8 *buf, size_t len,
  *             Min(MAC_I, MAC_P) || Max(MAC_I, MAC_P) ||
  *             Min(INonce, PNonce) || Max(INonce, PNonce))
  */
-void wpa_pmk_to_ptk(const u8 *pmk, size_t pmk_len, const char *label,
-                   const u8 *addr1, const u8 *addr2,
-                   const u8 *nonce1, const u8 *nonce2,
-                   u8 *ptk, size_t ptk_len, int use_sha256)
+int wpa_pmk_to_ptk(const u8 *pmk, size_t pmk_len, const char *label,
+                  const u8 *addr1, const u8 *addr2,
+                  const u8 *nonce1, const u8 *nonce2,
+                  struct wpa_ptk *ptk, int akmp, int cipher)
 {
        u8 data[2 * ETH_ALEN + 2 * WPA_NONCE_LEN];
+       u8 tmp[WPA_KCK_MAX_LEN + WPA_KEK_MAX_LEN + WPA_TK_MAX_LEN];
+       size_t ptk_len;
 
        if (os_memcmp(addr1, addr2, ETH_ALEN) < 0) {
                os_memcpy(data, addr1, ETH_ALEN);
@@ -115,97 +165,301 @@ void wpa_pmk_to_ptk(const u8 *pmk, size_t pmk_len, const char *label,
                          WPA_NONCE_LEN);
        }
 
+       ptk->kck_len = wpa_kck_len(akmp);
+       ptk->kek_len = wpa_kek_len(akmp);
+       ptk->tk_len = wpa_cipher_key_len(cipher);
+       ptk_len = ptk->kck_len + ptk->kek_len + ptk->tk_len;
+
+#ifdef CONFIG_SUITEB192
+       if (wpa_key_mgmt_sha384(akmp))
+               sha384_prf(pmk, pmk_len, label, data, sizeof(data),
+                          tmp, ptk_len);
+       else
+#endif /* CONFIG_SUITEB192 */
 #ifdef CONFIG_IEEE80211W
-       if (use_sha256)
+       if (wpa_key_mgmt_sha256(akmp))
                sha256_prf(pmk, pmk_len, label, data, sizeof(data),
-                          ptk, ptk_len);
+                          tmp, ptk_len);
        else
 #endif /* CONFIG_IEEE80211W */
-               sha1_prf(pmk, pmk_len, label, data, sizeof(data), ptk,
-                        ptk_len);
+               sha1_prf(pmk, pmk_len, label, data, sizeof(data), tmp, ptk_len);
 
        wpa_printf(MSG_DEBUG, "WPA: PTK derivation - A1=" MACSTR " A2=" MACSTR,
                   MAC2STR(addr1), MAC2STR(addr2));
+       wpa_hexdump(MSG_DEBUG, "WPA: Nonce1", nonce1, WPA_NONCE_LEN);
+       wpa_hexdump(MSG_DEBUG, "WPA: Nonce2", nonce2, WPA_NONCE_LEN);
        wpa_hexdump_key(MSG_DEBUG, "WPA: PMK", pmk, pmk_len);
-       wpa_hexdump_key(MSG_DEBUG, "WPA: PTK", ptk, ptk_len);
+       wpa_hexdump_key(MSG_DEBUG, "WPA: PTK", tmp, ptk_len);
+
+       os_memcpy(ptk->kck, tmp, ptk->kck_len);
+       wpa_hexdump_key(MSG_DEBUG, "WPA: KCK", ptk->kck, ptk->kck_len);
+
+       os_memcpy(ptk->kek, tmp + ptk->kck_len, ptk->kek_len);
+       wpa_hexdump_key(MSG_DEBUG, "WPA: KEK", ptk->kek, ptk->kek_len);
+
+       os_memcpy(ptk->tk, tmp + ptk->kck_len + ptk->kek_len, ptk->tk_len);
+       wpa_hexdump_key(MSG_DEBUG, "WPA: TK", ptk->tk, ptk->tk_len);
+
+       os_memset(tmp, 0, sizeof(tmp));
+       return 0;
 }
 
 
 #ifdef CONFIG_IEEE80211R
-int wpa_ft_mic(const u8 *kck, const u8 *sta_addr, const u8 *ap_addr,
-              u8 transaction_seqnum, const u8 *mdie, size_t mdie_len,
+int wpa_ft_mic(const u8 *kck, size_t kck_len, const u8 *sta_addr,
+              const u8 *ap_addr, u8 transaction_seqnum,
+              const u8 *mdie, size_t mdie_len,
               const u8 *ftie, size_t ftie_len,
               const u8 *rsnie, size_t rsnie_len,
               const u8 *ric, size_t ric_len, u8 *mic)
 {
-       u8 *buf, *pos;
-       size_t buf_len;
-
-       buf_len = 2 * ETH_ALEN + 1 + mdie_len + ftie_len + rsnie_len + ric_len;
-       buf = os_malloc(buf_len);
-       if (buf == NULL)
+       const u8 *addr[9];
+       size_t len[9];
+       size_t i, num_elem = 0;
+       u8 zero_mic[16];
+
+       if (kck_len != 16) {
+               wpa_printf(MSG_WARNING, "FT: Unsupported KCK length %u",
+                          (unsigned int) kck_len);
                return -1;
+       }
+
+       addr[num_elem] = sta_addr;
+       len[num_elem] = ETH_ALEN;
+       num_elem++;
+
+       addr[num_elem] = ap_addr;
+       len[num_elem] = ETH_ALEN;
+       num_elem++;
+
+       addr[num_elem] = &transaction_seqnum;
+       len[num_elem] = 1;
+       num_elem++;
 
-       pos = buf;
-       os_memcpy(pos, sta_addr, ETH_ALEN);
-       pos += ETH_ALEN;
-       os_memcpy(pos, ap_addr, ETH_ALEN);
-       pos += ETH_ALEN;
-       *pos++ = transaction_seqnum;
        if (rsnie) {
-               os_memcpy(pos, rsnie, rsnie_len);
-               pos += rsnie_len;
+               addr[num_elem] = rsnie;
+               len[num_elem] = rsnie_len;
+               num_elem++;
        }
        if (mdie) {
-               os_memcpy(pos, mdie, mdie_len);
-               pos += mdie_len;
+               addr[num_elem] = mdie;
+               len[num_elem] = mdie_len;
+               num_elem++;
        }
        if (ftie) {
-               struct rsn_ftie *_ftie;
-               os_memcpy(pos, ftie, ftie_len);
-               if (ftie_len < 2 + sizeof(*_ftie)) {
-                       os_free(buf);
+               if (ftie_len < 2 + sizeof(struct rsn_ftie))
                        return -1;
-               }
-               _ftie = (struct rsn_ftie *) (pos + 2);
-               os_memset(_ftie->mic, 0, sizeof(_ftie->mic));
-               pos += ftie_len;
+
+               /* IE hdr and mic_control */
+               addr[num_elem] = ftie;
+               len[num_elem] = 2 + 2;
+               num_elem++;
+
+               /* MIC field with all zeros */
+               os_memset(zero_mic, 0, sizeof(zero_mic));
+               addr[num_elem] = zero_mic;
+               len[num_elem] = sizeof(zero_mic);
+               num_elem++;
+
+               /* Rest of FTIE */
+               addr[num_elem] = ftie + 2 + 2 + 16;
+               len[num_elem] = ftie_len - (2 + 2 + 16);
+               num_elem++;
        }
        if (ric) {
-               os_memcpy(pos, ric, ric_len);
-               pos += ric_len;
+               addr[num_elem] = ric;
+               len[num_elem] = ric_len;
+               num_elem++;
        }
 
-       wpa_hexdump(MSG_MSGDUMP, "FT: MIC data", buf, pos - buf);
-       if (omac1_aes_128(kck, buf, pos - buf, mic)) {
-               os_free(buf);
+       for (i = 0; i < num_elem; i++)
+               wpa_hexdump(MSG_MSGDUMP, "FT: MIC data", addr[i], len[i]);
+       if (omac1_aes_128_vector(kck, num_elem, addr, len, mic))
                return -1;
+
+       return 0;
+}
+
+
+static int wpa_ft_parse_ftie(const u8 *ie, size_t ie_len,
+                            struct wpa_ft_ies *parse)
+{
+       const u8 *end, *pos;
+
+       parse->ftie = ie;
+       parse->ftie_len = ie_len;
+
+       pos = ie + sizeof(struct rsn_ftie);
+       end = ie + ie_len;
+
+       while (pos + 2 <= end && pos + 2 + pos[1] <= end) {
+               switch (pos[0]) {
+               case FTIE_SUBELEM_R1KH_ID:
+                       if (pos[1] != FT_R1KH_ID_LEN) {
+                               wpa_printf(MSG_DEBUG, "FT: Invalid R1KH-ID "
+                                          "length in FTIE: %d", pos[1]);
+                               return -1;
+                       }
+                       parse->r1kh_id = pos + 2;
+                       break;
+               case FTIE_SUBELEM_GTK:
+                       parse->gtk = pos + 2;
+                       parse->gtk_len = pos[1];
+                       break;
+               case FTIE_SUBELEM_R0KH_ID:
+                       if (pos[1] < 1 || pos[1] > FT_R0KH_ID_MAX_LEN) {
+                               wpa_printf(MSG_DEBUG, "FT: Invalid R0KH-ID "
+                                          "length in FTIE: %d", pos[1]);
+                               return -1;
+                       }
+                       parse->r0kh_id = pos + 2;
+                       parse->r0kh_id_len = pos[1];
+                       break;
+#ifdef CONFIG_IEEE80211W
+               case FTIE_SUBELEM_IGTK:
+                       parse->igtk = pos + 2;
+                       parse->igtk_len = pos[1];
+                       break;
+#endif /* CONFIG_IEEE80211W */
+               }
+
+               pos += 2 + pos[1];
        }
 
-       os_free(buf);
+       return 0;
+}
+
+
+int wpa_ft_parse_ies(const u8 *ies, size_t ies_len,
+                    struct wpa_ft_ies *parse)
+{
+       const u8 *end, *pos;
+       struct wpa_ie_data data;
+       int ret;
+       const struct rsn_ftie *ftie;
+       int prot_ie_count = 0;
+
+       os_memset(parse, 0, sizeof(*parse));
+       if (ies == NULL)
+               return 0;
+
+       pos = ies;
+       end = ies + ies_len;
+       while (pos + 2 <= end && pos + 2 + pos[1] <= end) {
+               switch (pos[0]) {
+               case WLAN_EID_RSN:
+                       parse->rsn = pos + 2;
+                       parse->rsn_len = pos[1];
+                       ret = wpa_parse_wpa_ie_rsn(parse->rsn - 2,
+                                                  parse->rsn_len + 2,
+                                                  &data);
+                       if (ret < 0) {
+                               wpa_printf(MSG_DEBUG, "FT: Failed to parse "
+                                          "RSN IE: %d", ret);
+                               return -1;
+                       }
+                       if (data.num_pmkid == 1 && data.pmkid)
+                               parse->rsn_pmkid = data.pmkid;
+                       break;
+               case WLAN_EID_MOBILITY_DOMAIN:
+                       if (pos[1] < sizeof(struct rsn_mdie))
+                               return -1;
+                       parse->mdie = pos + 2;
+                       parse->mdie_len = pos[1];
+                       break;
+               case WLAN_EID_FAST_BSS_TRANSITION:
+                       if (pos[1] < sizeof(*ftie))
+                               return -1;
+                       ftie = (const struct rsn_ftie *) (pos + 2);
+                       prot_ie_count = ftie->mic_control[1];
+                       if (wpa_ft_parse_ftie(pos + 2, pos[1], parse) < 0)
+                               return -1;
+                       break;
+               case WLAN_EID_TIMEOUT_INTERVAL:
+                       if (pos[1] != 5)
+                               break;
+                       parse->tie = pos + 2;
+                       parse->tie_len = pos[1];
+                       break;
+               case WLAN_EID_RIC_DATA:
+                       if (parse->ric == NULL)
+                               parse->ric = pos;
+                       break;
+               }
+
+               pos += 2 + pos[1];
+       }
+
+       if (prot_ie_count == 0)
+               return 0; /* no MIC */
+
+       /*
+        * Check that the protected IE count matches with IEs included in the
+        * frame.
+        */
+       if (parse->rsn)
+               prot_ie_count--;
+       if (parse->mdie)
+               prot_ie_count--;
+       if (parse->ftie)
+               prot_ie_count--;
+       if (prot_ie_count < 0) {
+               wpa_printf(MSG_DEBUG, "FT: Some required IEs not included in "
+                          "the protected IE count");
+               return -1;
+       }
+
+       if (prot_ie_count == 0 && parse->ric) {
+               wpa_printf(MSG_DEBUG, "FT: RIC IE(s) in the frame, but not "
+                          "included in protected IE count");
+               return -1;
+       }
+
+       /* Determine the end of the RIC IE(s) */
+       pos = parse->ric;
+       while (pos && pos + 2 <= end && pos + 2 + pos[1] <= end &&
+              prot_ie_count) {
+               prot_ie_count--;
+               pos += 2 + pos[1];
+       }
+       parse->ric_len = pos - parse->ric;
+       if (prot_ie_count) {
+               wpa_printf(MSG_DEBUG, "FT: %d protected IEs missing from "
+                          "frame", (int) prot_ie_count);
+               return -1;
+       }
 
        return 0;
 }
 #endif /* CONFIG_IEEE80211R */
 
 
-#ifndef CONFIG_NO_WPA2
 static int rsn_selector_to_bitfield(const u8 *s)
 {
        if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_NONE)
                return WPA_CIPHER_NONE;
-       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_WEP40)
-               return WPA_CIPHER_WEP40;
        if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_TKIP)
                return WPA_CIPHER_TKIP;
        if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_CCMP)
                return WPA_CIPHER_CCMP;
-       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_WEP104)
-               return WPA_CIPHER_WEP104;
 #ifdef CONFIG_IEEE80211W
        if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_AES_128_CMAC)
                return WPA_CIPHER_AES_128_CMAC;
 #endif /* CONFIG_IEEE80211W */
+       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_GCMP)
+               return WPA_CIPHER_GCMP;
+       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_CCMP_256)
+               return WPA_CIPHER_CCMP_256;
+       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_GCMP_256)
+               return WPA_CIPHER_GCMP_256;
+       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_BIP_GMAC_128)
+               return WPA_CIPHER_BIP_GMAC_128;
+       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_BIP_GMAC_256)
+               return WPA_CIPHER_BIP_GMAC_256;
+       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_BIP_CMAC_256)
+               return WPA_CIPHER_BIP_CMAC_256;
+       if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_NO_GROUP_ADDRESSED)
+               return WPA_CIPHER_GTK_NOT_USED;
        return 0;
 }
 
@@ -228,9 +482,38 @@ static int rsn_key_mgmt_to_bitfield(const u8 *s)
        if (RSN_SELECTOR_GET(s) == RSN_AUTH_KEY_MGMT_PSK_SHA256)
                return WPA_KEY_MGMT_PSK_SHA256;
 #endif /* CONFIG_IEEE80211W */
+#ifdef CONFIG_SAE
+       if (RSN_SELECTOR_GET(s) == RSN_AUTH_KEY_MGMT_SAE)
+               return WPA_KEY_MGMT_SAE;
+       if (RSN_SELECTOR_GET(s) == RSN_AUTH_KEY_MGMT_FT_SAE)
+               return WPA_KEY_MGMT_FT_SAE;
+#endif /* CONFIG_SAE */
+       if (RSN_SELECTOR_GET(s) == RSN_AUTH_KEY_MGMT_802_1X_SUITE_B)
+               return WPA_KEY_MGMT_IEEE8021X_SUITE_B;
+       if (RSN_SELECTOR_GET(s) == RSN_AUTH_KEY_MGMT_802_1X_SUITE_B_192)
+               return WPA_KEY_MGMT_IEEE8021X_SUITE_B_192;
+       if (RSN_SELECTOR_GET(s) == RSN_AUTH_KEY_MGMT_OSEN)
+               return WPA_KEY_MGMT_OSEN;
        return 0;
 }
-#endif /* CONFIG_NO_WPA2 */
+
+
+int wpa_cipher_valid_group(int cipher)
+{
+       return wpa_cipher_valid_pairwise(cipher) ||
+               cipher == WPA_CIPHER_GTK_NOT_USED;
+}
+
+
+#ifdef CONFIG_IEEE80211W
+int wpa_cipher_valid_mgmt_group(int cipher)
+{
+       return cipher == WPA_CIPHER_AES_128_CMAC ||
+               cipher == WPA_CIPHER_BIP_GMAC_128 ||
+               cipher == WPA_CIPHER_BIP_GMAC_256 ||
+               cipher == WPA_CIPHER_BIP_CMAC_256;
+}
+#endif /* CONFIG_IEEE80211W */
 
 
 /**
@@ -243,8 +526,6 @@ static int rsn_key_mgmt_to_bitfield(const u8 *s)
 int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
                         struct wpa_ie_data *data)
 {
-#ifndef CONFIG_NO_WPA2
-       const struct rsn_ie_hdr *hdr;
        const u8 *pos;
        int left;
        int i, count;
@@ -274,28 +555,37 @@ int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
                return -1;
        }
 
-       hdr = (const struct rsn_ie_hdr *) rsn_ie;
+       if (rsn_ie_len >= 6 && rsn_ie[1] >= 4 &&
+           rsn_ie[1] == rsn_ie_len - 2 &&
+           WPA_GET_BE32(&rsn_ie[2]) == OSEN_IE_VENDOR_TYPE) {
+               pos = rsn_ie + 6;
+               left = rsn_ie_len - 6;
 
-       if (hdr->elem_id != WLAN_EID_RSN ||
-           hdr->len != rsn_ie_len - 2 ||
-           WPA_GET_LE16(hdr->version) != RSN_VERSION) {
-               wpa_printf(MSG_DEBUG, "%s: malformed ie or unknown version",
-                          __func__);
-               return -2;
-       }
+               data->proto = WPA_PROTO_OSEN;
+       } else {
+               const struct rsn_ie_hdr *hdr;
 
-       pos = (const u8 *) (hdr + 1);
-       left = rsn_ie_len - sizeof(*hdr);
+               hdr = (const struct rsn_ie_hdr *) rsn_ie;
+
+               if (hdr->elem_id != WLAN_EID_RSN ||
+                   hdr->len != rsn_ie_len - 2 ||
+                   WPA_GET_LE16(hdr->version) != RSN_VERSION) {
+                       wpa_printf(MSG_DEBUG, "%s: malformed ie or unknown version",
+                                  __func__);
+                       return -2;
+               }
+
+               pos = (const u8 *) (hdr + 1);
+               left = rsn_ie_len - sizeof(*hdr);
+       }
 
        if (left >= RSN_SELECTOR_LEN) {
                data->group_cipher = rsn_selector_to_bitfield(pos);
-#ifdef CONFIG_IEEE80211W
-               if (data->group_cipher == WPA_CIPHER_AES_128_CMAC) {
-                       wpa_printf(MSG_DEBUG, "%s: AES-128-CMAC used as group "
-                                  "cipher", __func__);
+               if (!wpa_cipher_valid_group(data->group_cipher)) {
+                       wpa_printf(MSG_DEBUG, "%s: invalid group cipher 0x%x",
+                                  __func__, data->group_cipher);
                        return -1;
                }
-#endif /* CONFIG_IEEE80211W */
                pos += RSN_SELECTOR_LEN;
                left -= RSN_SELECTOR_LEN;
        } else if (left > 0) {
@@ -309,7 +599,7 @@ int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
                count = WPA_GET_LE16(pos);
                pos += 2;
                left -= 2;
-               if (count == 0 || left < count * RSN_SELECTOR_LEN) {
+               if (count == 0 || count > left / RSN_SELECTOR_LEN) {
                        wpa_printf(MSG_DEBUG, "%s: ie count botch (pairwise), "
                                   "count %u left %u", __func__, count, left);
                        return -4;
@@ -337,7 +627,7 @@ int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
                count = WPA_GET_LE16(pos);
                pos += 2;
                left -= 2;
-               if (count == 0 || left < count * RSN_SELECTOR_LEN) {
+               if (count == 0 || count > left / RSN_SELECTOR_LEN) {
                        wpa_printf(MSG_DEBUG, "%s: ie count botch (key mgmt), "
                                   "count %u left %u", __func__, count, left);
                        return -6;
@@ -360,17 +650,17 @@ int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
        }
 
        if (left >= 2) {
-               data->num_pmkid = WPA_GET_LE16(pos);
+               u16 num_pmkid = WPA_GET_LE16(pos);
                pos += 2;
                left -= 2;
-               if (left < (int) data->num_pmkid * PMKID_LEN) {
+               if (num_pmkid > (unsigned int) left / PMKID_LEN) {
                        wpa_printf(MSG_DEBUG, "%s: PMKID underflow "
-                                  "(num_pmkid=%lu left=%d)",
-                                  __func__, (unsigned long) data->num_pmkid,
-                                  left);
+                                  "(num_pmkid=%u left=%d)",
+                                  __func__, num_pmkid, left);
                        data->num_pmkid = 0;
                        return -9;
                } else {
+                       data->num_pmkid = num_pmkid;
                        data->pmkid = pos;
                        pos += data->num_pmkid * PMKID_LEN;
                        left -= data->num_pmkid * PMKID_LEN;
@@ -380,7 +670,7 @@ int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
 #ifdef CONFIG_IEEE80211W
        if (left >= 4) {
                data->mgmt_group_cipher = rsn_selector_to_bitfield(pos);
-               if (data->mgmt_group_cipher != WPA_CIPHER_AES_128_CMAC) {
+               if (!wpa_cipher_valid_mgmt_group(data->mgmt_group_cipher)) {
                        wpa_printf(MSG_DEBUG, "%s: Unsupported management "
                                   "group cipher 0x%x", __func__,
                                   data->mgmt_group_cipher);
@@ -392,14 +682,142 @@ int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
 #endif /* CONFIG_IEEE80211W */
 
        if (left > 0) {
-               wpa_printf(MSG_DEBUG, "%s: ie has %u trailing bytes - ignored",
+               wpa_hexdump(MSG_DEBUG,
+                           "wpa_parse_wpa_ie_rsn: ignore trailing bytes",
+                           pos, left);
+       }
+
+       return 0;
+}
+
+
+static int wpa_selector_to_bitfield(const u8 *s)
+{
+       if (RSN_SELECTOR_GET(s) == WPA_CIPHER_SUITE_NONE)
+               return WPA_CIPHER_NONE;
+       if (RSN_SELECTOR_GET(s) == WPA_CIPHER_SUITE_TKIP)
+               return WPA_CIPHER_TKIP;
+       if (RSN_SELECTOR_GET(s) == WPA_CIPHER_SUITE_CCMP)
+               return WPA_CIPHER_CCMP;
+       return 0;
+}
+
+
+static int wpa_key_mgmt_to_bitfield(const u8 *s)
+{
+       if (RSN_SELECTOR_GET(s) == WPA_AUTH_KEY_MGMT_UNSPEC_802_1X)
+               return WPA_KEY_MGMT_IEEE8021X;
+       if (RSN_SELECTOR_GET(s) == WPA_AUTH_KEY_MGMT_PSK_OVER_802_1X)
+               return WPA_KEY_MGMT_PSK;
+       if (RSN_SELECTOR_GET(s) == WPA_AUTH_KEY_MGMT_NONE)
+               return WPA_KEY_MGMT_WPA_NONE;
+       return 0;
+}
+
+
+int wpa_parse_wpa_ie_wpa(const u8 *wpa_ie, size_t wpa_ie_len,
+                        struct wpa_ie_data *data)
+{
+       const struct wpa_ie_hdr *hdr;
+       const u8 *pos;
+       int left;
+       int i, count;
+
+       os_memset(data, 0, sizeof(*data));
+       data->proto = WPA_PROTO_WPA;
+       data->pairwise_cipher = WPA_CIPHER_TKIP;
+       data->group_cipher = WPA_CIPHER_TKIP;
+       data->key_mgmt = WPA_KEY_MGMT_IEEE8021X;
+       data->capabilities = 0;
+       data->pmkid = NULL;
+       data->num_pmkid = 0;
+       data->mgmt_group_cipher = 0;
+
+       if (wpa_ie_len < sizeof(struct wpa_ie_hdr)) {
+               wpa_printf(MSG_DEBUG, "%s: ie len too short %lu",
+                          __func__, (unsigned long) wpa_ie_len);
+               return -1;
+       }
+
+       hdr = (const struct wpa_ie_hdr *) wpa_ie;
+
+       if (hdr->elem_id != WLAN_EID_VENDOR_SPECIFIC ||
+           hdr->len != wpa_ie_len - 2 ||
+           RSN_SELECTOR_GET(hdr->oui) != WPA_OUI_TYPE ||
+           WPA_GET_LE16(hdr->version) != WPA_VERSION) {
+               wpa_printf(MSG_DEBUG, "%s: malformed ie or unknown version",
+                          __func__);
+               return -2;
+       }
+
+       pos = (const u8 *) (hdr + 1);
+       left = wpa_ie_len - sizeof(*hdr);
+
+       if (left >= WPA_SELECTOR_LEN) {
+               data->group_cipher = wpa_selector_to_bitfield(pos);
+               pos += WPA_SELECTOR_LEN;
+               left -= WPA_SELECTOR_LEN;
+       } else if (left > 0) {
+               wpa_printf(MSG_DEBUG, "%s: ie length mismatch, %u too much",
                           __func__, left);
+               return -3;
+       }
+
+       if (left >= 2) {
+               data->pairwise_cipher = 0;
+               count = WPA_GET_LE16(pos);
+               pos += 2;
+               left -= 2;
+               if (count == 0 || count > left / WPA_SELECTOR_LEN) {
+                       wpa_printf(MSG_DEBUG, "%s: ie count botch (pairwise), "
+                                  "count %u left %u", __func__, count, left);
+                       return -4;
+               }
+               for (i = 0; i < count; i++) {
+                       data->pairwise_cipher |= wpa_selector_to_bitfield(pos);
+                       pos += WPA_SELECTOR_LEN;
+                       left -= WPA_SELECTOR_LEN;
+               }
+       } else if (left == 1) {
+               wpa_printf(MSG_DEBUG, "%s: ie too short (for key mgmt)",
+                          __func__);
+               return -5;
+       }
+
+       if (left >= 2) {
+               data->key_mgmt = 0;
+               count = WPA_GET_LE16(pos);
+               pos += 2;
+               left -= 2;
+               if (count == 0 || count > left / WPA_SELECTOR_LEN) {
+                       wpa_printf(MSG_DEBUG, "%s: ie count botch (key mgmt), "
+                                  "count %u left %u", __func__, count, left);
+                       return -6;
+               }
+               for (i = 0; i < count; i++) {
+                       data->key_mgmt |= wpa_key_mgmt_to_bitfield(pos);
+                       pos += WPA_SELECTOR_LEN;
+                       left -= WPA_SELECTOR_LEN;
+               }
+       } else if (left == 1) {
+               wpa_printf(MSG_DEBUG, "%s: ie too short (for capabilities)",
+                          __func__);
+               return -7;
+       }
+
+       if (left >= 2) {
+               data->capabilities = WPA_GET_LE16(pos);
+               pos += 2;
+               left -= 2;
+       }
+
+       if (left > 0) {
+               wpa_hexdump(MSG_DEBUG,
+                           "wpa_parse_wpa_ie_wpa: ignore trailing bytes",
+                           pos, left);
        }
 
        return 0;
-#else /* CONFIG_NO_WPA2 */
-       return -1;
-#endif /* CONFIG_NO_WPA2 */
 }
 
 
@@ -415,7 +833,7 @@ void wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len,
                       const u8 *mdid, const u8 *r0kh_id, size_t r0kh_id_len,
                       const u8 *s0kh_id, u8 *pmk_r0, u8 *pmk_r0_name)
 {
-       u8 buf[1 + WPA_MAX_SSID_LEN + MOBILITY_DOMAIN_ID_LEN + 1 +
+       u8 buf[1 + SSID_MAX_LEN + MOBILITY_DOMAIN_ID_LEN + 1 +
               FT_R0KH_ID_MAX_LEN + ETH_ALEN];
        u8 *pos, r0_key_data[48], hash[32];
        const u8 *addr[2];
@@ -429,7 +847,7 @@ void wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len,
         * PMK-R0 = L(R0-Key-Data, 0, 256)
         * PMK-R0Name-Salt = L(R0-Key-Data, 256, 128)
         */
-       if (ssid_len > WPA_MAX_SSID_LEN || r0kh_id_len > FT_R0KH_ID_MAX_LEN)
+       if (ssid_len > SSID_MAX_LEN || r0kh_id_len > FT_R0KH_ID_MAX_LEN)
                return;
        pos = buf;
        *pos++ = ssid_len;
@@ -520,15 +938,17 @@ void wpa_derive_pmk_r1(const u8 *pmk_r0, const u8 *pmk_r0_name,
  *
  * IEEE Std 802.11r-2008 - 8.5.1.5.5
  */
-void wpa_pmk_r1_to_ptk(const u8 *pmk_r1, const u8 *snonce, const u8 *anonce,
-                      const u8 *sta_addr, const u8 *bssid,
-                      const u8 *pmk_r1_name,
-                      u8 *ptk, size_t ptk_len, u8 *ptk_name)
+int wpa_pmk_r1_to_ptk(const u8 *pmk_r1, const u8 *snonce, const u8 *anonce,
+                     const u8 *sta_addr, const u8 *bssid,
+                     const u8 *pmk_r1_name,
+                     struct wpa_ptk *ptk, u8 *ptk_name, int akmp, int cipher)
 {
        u8 buf[2 * WPA_NONCE_LEN + 2 * ETH_ALEN];
        u8 *pos, hash[32];
        const u8 *addr[6];
        size_t len[6];
+       u8 tmp[WPA_KCK_MAX_LEN + WPA_KEK_MAX_LEN + WPA_TK_MAX_LEN];
+       size_t ptk_len;
 
        /*
         * PTK = KDF-PTKLen(PMK-R1, "FT-PTK", SNonce || ANonce ||
@@ -544,7 +964,12 @@ void wpa_pmk_r1_to_ptk(const u8 *pmk_r1, const u8 *snonce, const u8 *anonce,
        os_memcpy(pos, sta_addr, ETH_ALEN);
        pos += ETH_ALEN;
 
-       sha256_prf(pmk_r1, PMK_LEN, "FT-PTK", buf, pos - buf, ptk, ptk_len);
+       ptk->kck_len = wpa_kck_len(akmp);
+       ptk->kek_len = wpa_kek_len(akmp);
+       ptk->tk_len = wpa_cipher_key_len(cipher);
+       ptk_len = ptk->kck_len + ptk->kek_len + ptk->tk_len;
+
+       sha256_prf(pmk_r1, PMK_LEN, "FT-PTK", buf, pos - buf, tmp, ptk_len);
 
        /*
         * PTKName = Truncate-128(SHA-256(PMKR1Name || "FT-PTKN" || SNonce ||
@@ -565,6 +990,19 @@ void wpa_pmk_r1_to_ptk(const u8 *pmk_r1, const u8 *snonce, const u8 *anonce,
 
        sha256_vector(6, addr, len, hash);
        os_memcpy(ptk_name, hash, WPA_PMK_NAME_LEN);
+
+       os_memcpy(ptk->kck, tmp, ptk->kck_len);
+       os_memcpy(ptk->kek, tmp + ptk->kck_len, ptk->kek_len);
+       os_memcpy(ptk->tk, tmp + ptk->kck_len + ptk->kek_len, ptk->tk_len);
+
+       wpa_hexdump_key(MSG_DEBUG, "FT: KCK", ptk->kck, ptk->kck_len);
+       wpa_hexdump_key(MSG_DEBUG, "FT: KEK", ptk->kek, ptk->kek_len);
+       wpa_hexdump_key(MSG_DEBUG, "FT: TK", ptk->tk, ptk->tk_len);
+       wpa_hexdump(MSG_DEBUG, "FT: PTKName", ptk_name, WPA_PMK_NAME_LEN);
+
+       os_memset(tmp, 0, sizeof(tmp));
+
+       return 0;
 }
 
 #endif /* CONFIG_IEEE80211R */
@@ -604,6 +1042,72 @@ void rsn_pmkid(const u8 *pmk, size_t pmk_len, const u8 *aa, const u8 *spa,
 }
 
 
+#ifdef CONFIG_SUITEB
+/**
+ * rsn_pmkid_suite_b - Calculate PMK identifier for Suite B AKM
+ * @kck: Key confirmation key
+ * @kck_len: Length of kck in bytes
+ * @aa: Authenticator address
+ * @spa: Supplicant address
+ * @pmkid: Buffer for PMKID
+ * Returns: 0 on success, -1 on failure
+ *
+ * IEEE Std 802.11ac-2013 - 11.6.1.3 Pairwise key hierarchy
+ * PMKID = Truncate(HMAC-SHA-256(KCK, "PMK Name" || AA || SPA))
+ */
+int rsn_pmkid_suite_b(const u8 *kck, size_t kck_len, const u8 *aa,
+                     const u8 *spa, u8 *pmkid)
+{
+       char *title = "PMK Name";
+       const u8 *addr[3];
+       const size_t len[3] = { 8, ETH_ALEN, ETH_ALEN };
+       unsigned char hash[SHA256_MAC_LEN];
+
+       addr[0] = (u8 *) title;
+       addr[1] = aa;
+       addr[2] = spa;
+
+       if (hmac_sha256_vector(kck, kck_len, 3, addr, len, hash) < 0)
+               return -1;
+       os_memcpy(pmkid, hash, PMKID_LEN);
+       return 0;
+}
+#endif /* CONFIG_SUITEB */
+
+
+#ifdef CONFIG_SUITEB192
+/**
+ * rsn_pmkid_suite_b_192 - Calculate PMK identifier for Suite B AKM
+ * @kck: Key confirmation key
+ * @kck_len: Length of kck in bytes
+ * @aa: Authenticator address
+ * @spa: Supplicant address
+ * @pmkid: Buffer for PMKID
+ * Returns: 0 on success, -1 on failure
+ *
+ * IEEE Std 802.11ac-2013 - 11.6.1.3 Pairwise key hierarchy
+ * PMKID = Truncate(HMAC-SHA-384(KCK, "PMK Name" || AA || SPA))
+ */
+int rsn_pmkid_suite_b_192(const u8 *kck, size_t kck_len, const u8 *aa,
+                         const u8 *spa, u8 *pmkid)
+{
+       char *title = "PMK Name";
+       const u8 *addr[3];
+       const size_t len[3] = { 8, ETH_ALEN, ETH_ALEN };
+       unsigned char hash[SHA384_MAC_LEN];
+
+       addr[0] = (u8 *) title;
+       addr[1] = aa;
+       addr[2] = spa;
+
+       if (hmac_sha384_vector(kck, kck_len, 3, addr, len, hash) < 0)
+               return -1;
+       os_memcpy(pmkid, hash, PMKID_LEN);
+       return 0;
+}
+#endif /* CONFIG_SUITEB192 */
+
+
 /**
  * wpa_cipher_txt - Convert cipher suite to a text string
  * @cipher: Cipher suite (WPA_CIPHER_* enum)
@@ -624,6 +1128,14 @@ const char * wpa_cipher_txt(int cipher)
                return "CCMP";
        case WPA_CIPHER_CCMP | WPA_CIPHER_TKIP:
                return "CCMP+TKIP";
+       case WPA_CIPHER_GCMP:
+               return "GCMP";
+       case WPA_CIPHER_GCMP_256:
+               return "GCMP-256";
+       case WPA_CIPHER_CCMP_256:
+               return "CCMP-256";
+       case WPA_CIPHER_GTK_NOT_USED:
+               return "GTK_NOT_USED";
        default:
                return "UNKNOWN";
        }
@@ -665,12 +1177,52 @@ const char * wpa_key_mgmt_txt(int key_mgmt, int proto)
        case WPA_KEY_MGMT_PSK_SHA256:
                return "WPA2-PSK-SHA256";
 #endif /* CONFIG_IEEE80211W */
+       case WPA_KEY_MGMT_WPS:
+               return "WPS";
+       case WPA_KEY_MGMT_SAE:
+               return "SAE";
+       case WPA_KEY_MGMT_FT_SAE:
+               return "FT-SAE";
+       case WPA_KEY_MGMT_OSEN:
+               return "OSEN";
+       case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
+               return "WPA2-EAP-SUITE-B";
+       case WPA_KEY_MGMT_IEEE8021X_SUITE_B_192:
+               return "WPA2-EAP-SUITE-B-192";
        default:
                return "UNKNOWN";
        }
 }
 
 
+u32 wpa_akm_to_suite(int akm)
+{
+       if (akm & WPA_KEY_MGMT_FT_IEEE8021X)
+               return WLAN_AKM_SUITE_FT_8021X;
+       if (akm & WPA_KEY_MGMT_FT_PSK)
+               return WLAN_AKM_SUITE_FT_PSK;
+       if (akm & WPA_KEY_MGMT_IEEE8021X)
+               return WLAN_AKM_SUITE_8021X;
+       if (akm & WPA_KEY_MGMT_IEEE8021X_SHA256)
+               return WLAN_AKM_SUITE_8021X_SHA256;
+       if (akm & WPA_KEY_MGMT_IEEE8021X)
+               return WLAN_AKM_SUITE_8021X;
+       if (akm & WPA_KEY_MGMT_PSK_SHA256)
+               return WLAN_AKM_SUITE_PSK_SHA256;
+       if (akm & WPA_KEY_MGMT_PSK)
+               return WLAN_AKM_SUITE_PSK;
+       if (akm & WPA_KEY_MGMT_CCKM)
+               return WLAN_AKM_SUITE_CCKM;
+       if (akm & WPA_KEY_MGMT_OSEN)
+               return WLAN_AKM_SUITE_OSEN;
+       if (akm & WPA_KEY_MGMT_IEEE8021X_SUITE_B)
+               return WLAN_AKM_SUITE_8021X_SUITE_B;
+       if (akm & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192)
+               return WLAN_AKM_SUITE_8021X_SUITE_B_192;
+       return 0;
+}
+
+
 int wpa_compare_rsn_ie(int ft_initial_assoc,
                       const u8 *ie1, size_t ie1len,
                       const u8 *ie2, size_t ie2len)
@@ -746,6 +1298,9 @@ int wpa_insert_pmkid(u8 *ies, size_t ies_len, const u8 *pmkid)
                os_memmove(rpos + 2, rpos, end - rpos);
                *rpos++ = 0;
                *rpos++ = 0;
+               added += 2;
+               start[1] += 2;
+               rend = rpos;
        } else {
                /* Skip RSN Capabilities */
                rpos += 2;
@@ -758,7 +1313,7 @@ int wpa_insert_pmkid(u8 *ies, size_t ies_len, const u8 *pmkid)
 
        if (rpos == rend) {
                /* No PMKID-Count field included; add it */
-               os_memmove(rpos + 2 + PMKID_LEN, rpos, end - rpos);
+               os_memmove(rpos + 2 + PMKID_LEN, rpos, end + added - rpos);
                WPA_PUT_LE16(rpos, 1);
                rpos += 2;
                os_memcpy(rpos, pmkid, PMKID_LEN);
@@ -773,7 +1328,7 @@ int wpa_insert_pmkid(u8 *ies, size_t ies_len, const u8 *pmkid)
                }
                WPA_PUT_LE16(rpos, 1);
                rpos += 2;
-               os_memmove(rpos + PMKID_LEN, rpos, end - rpos);
+               os_memmove(rpos + PMKID_LEN, rpos, end + added - rpos);
                os_memcpy(rpos, pmkid, PMKID_LEN);
                added += PMKID_LEN;
                start[1] += PMKID_LEN;
@@ -785,3 +1340,325 @@ int wpa_insert_pmkid(u8 *ies, size_t ies_len, const u8 *pmkid)
        return added;
 }
 #endif /* CONFIG_IEEE80211R */
+
+
+int wpa_cipher_key_len(int cipher)
+{
+       switch (cipher) {
+       case WPA_CIPHER_CCMP_256:
+       case WPA_CIPHER_GCMP_256:
+       case WPA_CIPHER_BIP_GMAC_256:
+       case WPA_CIPHER_BIP_CMAC_256:
+               return 32;
+       case WPA_CIPHER_CCMP:
+       case WPA_CIPHER_GCMP:
+       case WPA_CIPHER_AES_128_CMAC:
+       case WPA_CIPHER_BIP_GMAC_128:
+               return 16;
+       case WPA_CIPHER_TKIP:
+               return 32;
+       }
+
+       return 0;
+}
+
+
+int wpa_cipher_rsc_len(int cipher)
+{
+       switch (cipher) {
+       case WPA_CIPHER_CCMP_256:
+       case WPA_CIPHER_GCMP_256:
+       case WPA_CIPHER_CCMP:
+       case WPA_CIPHER_GCMP:
+       case WPA_CIPHER_TKIP:
+               return 6;
+       }
+
+       return 0;
+}
+
+
+int wpa_cipher_to_alg(int cipher)
+{
+       switch (cipher) {
+       case WPA_CIPHER_CCMP_256:
+               return WPA_ALG_CCMP_256;
+       case WPA_CIPHER_GCMP_256:
+               return WPA_ALG_GCMP_256;
+       case WPA_CIPHER_CCMP:
+               return WPA_ALG_CCMP;
+       case WPA_CIPHER_GCMP:
+               return WPA_ALG_GCMP;
+       case WPA_CIPHER_TKIP:
+               return WPA_ALG_TKIP;
+       case WPA_CIPHER_AES_128_CMAC:
+               return WPA_ALG_IGTK;
+       case WPA_CIPHER_BIP_GMAC_128:
+               return WPA_ALG_BIP_GMAC_128;
+       case WPA_CIPHER_BIP_GMAC_256:
+               return WPA_ALG_BIP_GMAC_256;
+       case WPA_CIPHER_BIP_CMAC_256:
+               return WPA_ALG_BIP_CMAC_256;
+       }
+       return WPA_ALG_NONE;
+}
+
+
+int wpa_cipher_valid_pairwise(int cipher)
+{
+       return cipher == WPA_CIPHER_CCMP_256 ||
+               cipher == WPA_CIPHER_GCMP_256 ||
+               cipher == WPA_CIPHER_CCMP ||
+               cipher == WPA_CIPHER_GCMP ||
+               cipher == WPA_CIPHER_TKIP;
+}
+
+
+u32 wpa_cipher_to_suite(int proto, int cipher)
+{
+       if (cipher & WPA_CIPHER_CCMP_256)
+               return RSN_CIPHER_SUITE_CCMP_256;
+       if (cipher & WPA_CIPHER_GCMP_256)
+               return RSN_CIPHER_SUITE_GCMP_256;
+       if (cipher & WPA_CIPHER_CCMP)
+               return (proto == WPA_PROTO_RSN ?
+                       RSN_CIPHER_SUITE_CCMP : WPA_CIPHER_SUITE_CCMP);
+       if (cipher & WPA_CIPHER_GCMP)
+               return RSN_CIPHER_SUITE_GCMP;
+       if (cipher & WPA_CIPHER_TKIP)
+               return (proto == WPA_PROTO_RSN ?
+                       RSN_CIPHER_SUITE_TKIP : WPA_CIPHER_SUITE_TKIP);
+       if (cipher & WPA_CIPHER_NONE)
+               return (proto == WPA_PROTO_RSN ?
+                       RSN_CIPHER_SUITE_NONE : WPA_CIPHER_SUITE_NONE);
+       if (cipher & WPA_CIPHER_GTK_NOT_USED)
+               return RSN_CIPHER_SUITE_NO_GROUP_ADDRESSED;
+       if (cipher & WPA_CIPHER_AES_128_CMAC)
+               return RSN_CIPHER_SUITE_AES_128_CMAC;
+       if (cipher & WPA_CIPHER_BIP_GMAC_128)
+               return RSN_CIPHER_SUITE_BIP_GMAC_128;
+       if (cipher & WPA_CIPHER_BIP_GMAC_256)
+               return RSN_CIPHER_SUITE_BIP_GMAC_256;
+       if (cipher & WPA_CIPHER_BIP_CMAC_256)
+               return RSN_CIPHER_SUITE_BIP_CMAC_256;
+       return 0;
+}
+
+
+int rsn_cipher_put_suites(u8 *start, int ciphers)
+{
+       u8 *pos = start;
+
+       if (ciphers & WPA_CIPHER_CCMP_256) {
+               RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_CCMP_256);
+               pos += RSN_SELECTOR_LEN;
+       }
+       if (ciphers & WPA_CIPHER_GCMP_256) {
+               RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_GCMP_256);
+               pos += RSN_SELECTOR_LEN;
+       }
+       if (ciphers & WPA_CIPHER_CCMP) {
+               RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_CCMP);
+               pos += RSN_SELECTOR_LEN;
+       }
+       if (ciphers & WPA_CIPHER_GCMP) {
+               RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_GCMP);
+               pos += RSN_SELECTOR_LEN;
+       }
+       if (ciphers & WPA_CIPHER_TKIP) {
+               RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_TKIP);
+               pos += RSN_SELECTOR_LEN;
+       }
+       if (ciphers & WPA_CIPHER_NONE) {
+               RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_NONE);
+               pos += RSN_SELECTOR_LEN;
+       }
+
+       return (pos - start) / RSN_SELECTOR_LEN;
+}
+
+
+int wpa_cipher_put_suites(u8 *start, int ciphers)
+{
+       u8 *pos = start;
+
+       if (ciphers & WPA_CIPHER_CCMP) {
+               RSN_SELECTOR_PUT(pos, WPA_CIPHER_SUITE_CCMP);
+               pos += WPA_SELECTOR_LEN;
+       }
+       if (ciphers & WPA_CIPHER_TKIP) {
+               RSN_SELECTOR_PUT(pos, WPA_CIPHER_SUITE_TKIP);
+               pos += WPA_SELECTOR_LEN;
+       }
+       if (ciphers & WPA_CIPHER_NONE) {
+               RSN_SELECTOR_PUT(pos, WPA_CIPHER_SUITE_NONE);
+               pos += WPA_SELECTOR_LEN;
+       }
+
+       return (pos - start) / RSN_SELECTOR_LEN;
+}
+
+
+int wpa_pick_pairwise_cipher(int ciphers, int none_allowed)
+{
+       if (ciphers & WPA_CIPHER_CCMP_256)
+               return WPA_CIPHER_CCMP_256;
+       if (ciphers & WPA_CIPHER_GCMP_256)
+               return WPA_CIPHER_GCMP_256;
+       if (ciphers & WPA_CIPHER_CCMP)
+               return WPA_CIPHER_CCMP;
+       if (ciphers & WPA_CIPHER_GCMP)
+               return WPA_CIPHER_GCMP;
+       if (ciphers & WPA_CIPHER_TKIP)
+               return WPA_CIPHER_TKIP;
+       if (none_allowed && (ciphers & WPA_CIPHER_NONE))
+               return WPA_CIPHER_NONE;
+       return -1;
+}
+
+
+int wpa_pick_group_cipher(int ciphers)
+{
+       if (ciphers & WPA_CIPHER_CCMP_256)
+               return WPA_CIPHER_CCMP_256;
+       if (ciphers & WPA_CIPHER_GCMP_256)
+               return WPA_CIPHER_GCMP_256;
+       if (ciphers & WPA_CIPHER_CCMP)
+               return WPA_CIPHER_CCMP;
+       if (ciphers & WPA_CIPHER_GCMP)
+               return WPA_CIPHER_GCMP;
+       if (ciphers & WPA_CIPHER_GTK_NOT_USED)
+               return WPA_CIPHER_GTK_NOT_USED;
+       if (ciphers & WPA_CIPHER_TKIP)
+               return WPA_CIPHER_TKIP;
+       return -1;
+}
+
+
+int wpa_parse_cipher(const char *value)
+{
+       int val = 0, last;
+       char *start, *end, *buf;
+
+       buf = os_strdup(value);
+       if (buf == NULL)
+               return -1;
+       start = buf;
+
+       while (*start != '\0') {
+               while (*start == ' ' || *start == '\t')
+                       start++;
+               if (*start == '\0')
+                       break;
+               end = start;
+               while (*end != ' ' && *end != '\t' && *end != '\0')
+                       end++;
+               last = *end == '\0';
+               *end = '\0';
+               if (os_strcmp(start, "CCMP-256") == 0)
+                       val |= WPA_CIPHER_CCMP_256;
+               else if (os_strcmp(start, "GCMP-256") == 0)
+                       val |= WPA_CIPHER_GCMP_256;
+               else if (os_strcmp(start, "CCMP") == 0)
+                       val |= WPA_CIPHER_CCMP;
+               else if (os_strcmp(start, "GCMP") == 0)
+                       val |= WPA_CIPHER_GCMP;
+               else if (os_strcmp(start, "TKIP") == 0)
+                       val |= WPA_CIPHER_TKIP;
+               else if (os_strcmp(start, "WEP104") == 0)
+                       val |= WPA_CIPHER_WEP104;
+               else if (os_strcmp(start, "WEP40") == 0)
+                       val |= WPA_CIPHER_WEP40;
+               else if (os_strcmp(start, "NONE") == 0)
+                       val |= WPA_CIPHER_NONE;
+               else if (os_strcmp(start, "GTK_NOT_USED") == 0)
+                       val |= WPA_CIPHER_GTK_NOT_USED;
+               else {
+                       os_free(buf);
+                       return -1;
+               }
+
+               if (last)
+                       break;
+               start = end + 1;
+       }
+       os_free(buf);
+
+       return val;
+}
+
+
+int wpa_write_ciphers(char *start, char *end, int ciphers, const char *delim)
+{
+       char *pos = start;
+       int ret;
+
+       if (ciphers & WPA_CIPHER_CCMP_256) {
+               ret = os_snprintf(pos, end - pos, "%sCCMP-256",
+                                 pos == start ? "" : delim);
+               if (os_snprintf_error(end - pos, ret))
+                       return -1;
+               pos += ret;
+       }
+       if (ciphers & WPA_CIPHER_GCMP_256) {
+               ret = os_snprintf(pos, end - pos, "%sGCMP-256",
+                                 pos == start ? "" : delim);
+               if (os_snprintf_error(end - pos, ret))
+                       return -1;
+               pos += ret;
+       }
+       if (ciphers & WPA_CIPHER_CCMP) {
+               ret = os_snprintf(pos, end - pos, "%sCCMP",
+                                 pos == start ? "" : delim);
+               if (os_snprintf_error(end - pos, ret))
+                       return -1;
+               pos += ret;
+       }
+       if (ciphers & WPA_CIPHER_GCMP) {
+               ret = os_snprintf(pos, end - pos, "%sGCMP",
+                                 pos == start ? "" : delim);
+               if (os_snprintf_error(end - pos, ret))
+                       return -1;
+               pos += ret;
+       }
+       if (ciphers & WPA_CIPHER_TKIP) {
+               ret = os_snprintf(pos, end - pos, "%sTKIP",
+                                 pos == start ? "" : delim);
+               if (os_snprintf_error(end - pos, ret))
+                       return -1;
+               pos += ret;
+       }
+       if (ciphers & WPA_CIPHER_NONE) {
+               ret = os_snprintf(pos, end - pos, "%sNONE",
+                                 pos == start ? "" : delim);
+               if (os_snprintf_error(end - pos, ret))
+                       return -1;
+               pos += ret;
+       }
+
+       return pos - start;
+}
+
+
+int wpa_select_ap_group_cipher(int wpa, int wpa_pairwise, int rsn_pairwise)
+{
+       int pairwise = 0;
+
+       /* Select group cipher based on the enabled pairwise cipher suites */
+       if (wpa & 1)
+               pairwise |= wpa_pairwise;
+       if (wpa & 2)
+               pairwise |= rsn_pairwise;
+
+       if (pairwise & WPA_CIPHER_TKIP)
+               return WPA_CIPHER_TKIP;
+       if ((pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP)) == WPA_CIPHER_GCMP)
+               return WPA_CIPHER_GCMP;
+       if ((pairwise & (WPA_CIPHER_GCMP_256 | WPA_CIPHER_CCMP |
+                        WPA_CIPHER_GCMP)) == WPA_CIPHER_GCMP_256)
+               return WPA_CIPHER_GCMP_256;
+       if ((pairwise & (WPA_CIPHER_CCMP_256 | WPA_CIPHER_CCMP |
+                        WPA_CIPHER_GCMP)) == WPA_CIPHER_CCMP_256)
+               return WPA_CIPHER_CCMP_256;
+       return WPA_CIPHER_CCMP;
+}