mesh: Rename MPM FSM states to match the standard

[mech_eap.git] / src / common / defs.h

diff --git a/src/common/defs.h b/src/common/defs.h
index 0c90c24..4f56794 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -1,6 +1,6 @@
 /*
  * WPA Supplicant - Common definitions
- * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2015, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -23,11 +23,15 @@ typedef enum { FALSE = 0, TRUE = 1 } Boolean;
 #define WPA_CIPHER_WEP104 BIT(2)
 #define WPA_CIPHER_TKIP BIT(3)
 #define WPA_CIPHER_CCMP BIT(4)
-#ifdef CONFIG_IEEE80211W
 #define WPA_CIPHER_AES_128_CMAC BIT(5)
-#endif /* CONFIG_IEEE80211W */
 #define WPA_CIPHER_GCMP BIT(6)
 #define WPA_CIPHER_SMS4 BIT(7)
+#define WPA_CIPHER_GCMP_256 BIT(8)
+#define WPA_CIPHER_CCMP_256 BIT(9)
+#define WPA_CIPHER_BIP_GMAC_128 BIT(11)
+#define WPA_CIPHER_BIP_GMAC_256 BIT(12)
+#define WPA_CIPHER_BIP_CMAC_256 BIT(13)
+#define WPA_CIPHER_GTK_NOT_USED BIT(14)
 
 #define WPA_KEY_MGMT_IEEE8021X BIT(0)
 #define WPA_KEY_MGMT_PSK BIT(1)
@@ -44,13 +48,19 @@ typedef enum { FALSE = 0, TRUE = 1 } Boolean;
 #define WPA_KEY_MGMT_WAPI_PSK BIT(12)
 #define WPA_KEY_MGMT_WAPI_CERT BIT(13)
 #define WPA_KEY_MGMT_CCKM BIT(14)
+#define WPA_KEY_MGMT_OSEN BIT(15)
+#define WPA_KEY_MGMT_IEEE8021X_SUITE_B BIT(16)
+#define WPA_KEY_MGMT_IEEE8021X_SUITE_B_192 BIT(17)
 
 static inline int wpa_key_mgmt_wpa_ieee8021x(int akm)
 {
        return !!(akm & (WPA_KEY_MGMT_IEEE8021X |
                         WPA_KEY_MGMT_FT_IEEE8021X |
                         WPA_KEY_MGMT_CCKM |
-                        WPA_KEY_MGMT_IEEE8021X_SHA256));
+                        WPA_KEY_MGMT_OSEN |
+                        WPA_KEY_MGMT_IEEE8021X_SHA256 |
+                        WPA_KEY_MGMT_IEEE8021X_SUITE_B |
+                        WPA_KEY_MGMT_IEEE8021X_SUITE_B_192));
 }
 
 static inline int wpa_key_mgmt_wpa_psk(int akm)
@@ -58,7 +68,8 @@ static inline int wpa_key_mgmt_wpa_psk(int akm)
        return !!(akm & (WPA_KEY_MGMT_PSK |
                         WPA_KEY_MGMT_FT_PSK |
                         WPA_KEY_MGMT_PSK_SHA256 |
-                        WPA_KEY_MGMT_SAE));
+                        WPA_KEY_MGMT_SAE |
+                        WPA_KEY_MGMT_FT_SAE));
 }
 
 static inline int wpa_key_mgmt_ft(int akm)
@@ -77,13 +88,27 @@ static inline int wpa_key_mgmt_sae(int akm)
 static inline int wpa_key_mgmt_sha256(int akm)
 {
        return !!(akm & (WPA_KEY_MGMT_PSK_SHA256 |
-                        WPA_KEY_MGMT_IEEE8021X_SHA256));
+                        WPA_KEY_MGMT_IEEE8021X_SHA256 |
+                        WPA_KEY_MGMT_OSEN |
+                        WPA_KEY_MGMT_IEEE8021X_SUITE_B));
+}
+
+static inline int wpa_key_mgmt_sha384(int akm)
+{
+       return !!(akm & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192);
+}
+
+static inline int wpa_key_mgmt_suite_b(int akm)
+{
+       return !!(akm & (WPA_KEY_MGMT_IEEE8021X_SUITE_B |
+                        WPA_KEY_MGMT_IEEE8021X_SUITE_B_192));
 }
 
 static inline int wpa_key_mgmt_wpa(int akm)
 {
        return wpa_key_mgmt_wpa_ieee8021x(akm) ||
-               wpa_key_mgmt_wpa_psk(akm);
+               wpa_key_mgmt_wpa_psk(akm) ||
+               wpa_key_mgmt_sae(akm);
 }
 
 static inline int wpa_key_mgmt_wpa_any(int akm)
@@ -100,6 +125,7 @@ static inline int wpa_key_mgmt_cckm(int akm)
 #define WPA_PROTO_WPA BIT(0)
 #define WPA_PROTO_RSN BIT(1)
 #define WPA_PROTO_WAPI BIT(2)
+#define WPA_PROTO_OSEN BIT(3)
 
 #define WPA_AUTH_ALG_OPEN BIT(0)
 #define WPA_AUTH_ALG_SHARED BIT(1)
@@ -117,41 +143,12 @@ enum wpa_alg {
        WPA_ALG_PMK,
        WPA_ALG_GCMP,
        WPA_ALG_SMS4,
-       WPA_ALG_KRK
-};
-
-/**
- * enum wpa_cipher - Cipher suites
- */
-enum wpa_cipher {
-       CIPHER_NONE,
-       CIPHER_WEP40,
-       CIPHER_TKIP,
-       CIPHER_CCMP,
-       CIPHER_WEP104,
-       CIPHER_GCMP,
-       CIPHER_SMS4
-};
-
-/**
- * enum wpa_key_mgmt - Key management suites
- */
-enum wpa_key_mgmt {
-       KEY_MGMT_802_1X,
-       KEY_MGMT_PSK,
-       KEY_MGMT_NONE,
-       KEY_MGMT_802_1X_NO_WPA,
-       KEY_MGMT_WPA_NONE,
-       KEY_MGMT_FT_802_1X,
-       KEY_MGMT_FT_PSK,
-       KEY_MGMT_802_1X_SHA256,
-       KEY_MGMT_PSK_SHA256,
-       KEY_MGMT_WPS,
-       KEY_MGMT_SAE,
-       KEY_MGMT_FT_SAE,
-       KEY_MGMT_WAPI_PSK,
-       KEY_MGMT_WAPI_CERT,
-       KEY_MGMT_CCKM
+       WPA_ALG_KRK,
+       WPA_ALG_GCMP_256,
+       WPA_ALG_CCMP_256,
+       WPA_ALG_BIP_GMAC_128,
+       WPA_ALG_BIP_GMAC_256,
+       WPA_ALG_BIP_CMAC_256
 };
 
 /**
@@ -177,7 +174,7 @@ enum wpa_states {
        /**
         * WPA_INTERFACE_DISABLED - Interface disabled
         *
-        * This stat eis entered if the network interface is disabled, e.g.,
+        * This state is entered if the network interface is disabled, e.g.,
         * due to rfkill. wpa_supplicant refuses any new operations that would
         * use the radio until the interface has been enabled.
         */
@@ -298,6 +295,7 @@ enum hostapd_hw_mode {
        HOSTAPD_MODE_IEEE80211G,
        HOSTAPD_MODE_IEEE80211A,
        HOSTAPD_MODE_IEEE80211AD,
+       HOSTAPD_MODE_IEEE80211ANY,
        NUM_HOSTAPD_MODES
 };
 
@@ -313,10 +311,34 @@ enum wpa_ctrl_req_type {
        WPA_CTRL_REQ_EAP_OTP,
        WPA_CTRL_REQ_EAP_PASSPHRASE,
        WPA_CTRL_REQ_SIM,
+       WPA_CTRL_REQ_PSK_PASSPHRASE,
+       WPA_CTRL_REQ_EXT_CERT_CHECK,
        NUM_WPA_CTRL_REQS
 };
 
 /* Maximum number of EAP methods to store for EAP server user information */
 #define EAP_MAX_METHODS 8
 
+enum mesh_plink_state {
+       PLINK_IDLE = 1,
+       PLINK_OPN_SNT,
+       PLINK_OPN_RCVD,
+       PLINK_CNF_RCVD,
+       PLINK_ESTAB,
+       PLINK_HOLDING,
+       PLINK_BLOCKED, /* not defined in the IEEE 802.11 standard */
+};
+
+enum set_band {
+       WPA_SETBAND_AUTO,
+       WPA_SETBAND_5G,
+       WPA_SETBAND_2G
+};
+
+enum wpa_radio_work_band {
+       BAND_2_4_GHZ = BIT(0),
+       BAND_5_GHZ = BIT(1),
+       BAND_60_GHZ = BIT(2),
+};
+
 #endif /* DEFS_H */