Merge "wlan: Add support for OWE" into wlan-driver.lnx.1.0
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 92650f7..0eec5af 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -147,6 +147,11 @@
#define WLAN_AKM_SUITE_SAE 0x000FAC08
#endif
+#ifndef WLAN_AKM_SUITE_OWE_1
+#define WLAN_AKM_SUITE_OWE_1 0x000FAC12
+#endif
+
+
enum qca_nl80211_vendor_subcmds {
QCA_NL80211_VENDOR_SUBCMD_UNSPEC = 0,
QCA_NL80211_VENDOR_SUBCMD_TEST = 1,
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 4ddb100..d08e1b3 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -156,6 +156,8 @@
v_U8_t ccp_rsn_oui_80[HDD_RSN_OUI_SIZE] = {0x00, 0x0F, 0xAC, 0x08};
v_U8_t ccp_rsn_oui_90[HDD_RSN_OUI_SIZE] = {0x00, 0x0F, 0xAC, 0x09};
#endif
+/* OWE https://tools.ietf.org/html/rfc8110 */
+uint8_t ccp_rsn_oui_18[HDD_RSN_OUI_SIZE] = {0x00, 0x0F, 0xAC, 0x12};
#if defined(WLAN_FEATURE_VOWIFI_11R)
// Offset where the EID-Len-IE, start.
@@ -4499,6 +4501,11 @@
auth_type = eCSR_AUTH_TYPE_RSN_8021X_SHA256;
} else
#endif
+ if (!memcmp(auth_suite, ccp_rsn_oui_18, 4))
+ {
+ auth_type = eCSR_AUTH_TYPE_OWE;
+ } else
+
{
/* If auth suite is of SAE, auth_type will be
* overwritten in hdd_translate_sae_rsn_to_csr_auth
@@ -4506,6 +4513,8 @@
hdd_translate_sae_rsn_to_csr_auth(auth_suite, &auth_type);
}
+ hddLog(LOG1, FL("auth_type : %d"), auth_type);
+
return auth_type;
}
@@ -4909,7 +4918,10 @@
ENTER();
pRoamProfile->AuthType.numEntries = 1;
- hddLog( LOG1, "%s: pHddStaCtx->conn_info.authType = %d", __func__, pHddStaCtx->conn_info.authType);
+ hddLog( LOG1,
+ "%s: authType = %d RSNAuthType %d wpa_versions %d",
+ __func__, pHddStaCtx->conn_info.authType, RSNAuthType,
+ pWextState->wpaVersion);
switch( pHddStaCtx->conn_info.authType)
{
@@ -4984,7 +4996,12 @@
eCSR_AUTH_TYPE_RSN_8021X_SHA256;
} else
#endif
-
+ if ((RSNAuthType == eCSR_AUTH_TYPE_OWE) &&
+ ((pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X)
+ == IW_AUTH_KEY_MGMT_802_1X)) {
+ /* OWE case */
+ pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_OWE;
+ } else
if( (pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X)
== IW_AUTH_KEY_MGMT_802_1X) {
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_RSN;
@@ -4992,7 +5009,8 @@
if ( (pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_PSK)
== IW_AUTH_KEY_MGMT_PSK) {
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_RSN_PSK;
- } else {
+ } else
+ {
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_UNKNOWN;
}
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index a3ed21f..bf90fe1 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -16405,8 +16405,13 @@
pWextState->authKeyMgmt |= IW_AUTH_KEY_MGMT_802_1X;
break;
+ case WLAN_AKM_SUITE_OWE_1:
+ hddLog(LOG1, "setting key mgmt type to OWE");
+ pWextState->authKeyMgmt |= IW_AUTH_KEY_MGMT_802_1X;
+ break;
+
default:
- hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Unsupported key mgmt type %d",
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Unsupported key mgmt type %x",
__func__, key_mgmt);
return -EINVAL;
@@ -16880,6 +16885,32 @@
}
break;
#endif
+ case SIR_MAC_REQUEST_EID_MAX:
+ if (genie[0] == SIR_DH_PARAMETER_ELEMENT_EXT_EID)
+ {
+ v_U16_t curAddIELen = pWextState->assocAddIE.length;
+ if (SIR_MAC_MAX_ADD_IE_LENGTH <
+ (pWextState->assocAddIE.length + eLen))
+ {
+ hddLog(VOS_TRACE_LEVEL_FATAL, "Cannot accommodate assocAddIE "
+ "Need bigger buffer space");
+ VOS_ASSERT(0);
+ return -ENOMEM;
+ }
+ hddLog(VOS_TRACE_LEVEL_INFO, "Set DH EXT IE(len %d)",
+ eLen + 2);
+ memcpy( pWextState->assocAddIE.addIEdata + curAddIELen,
+ genie - 2, eLen + 2);
+ pWextState->assocAddIE.length += eLen + 2;
+ pWextState->roamProfile.pAddIEAssoc =
+ pWextState->assocAddIE.addIEdata;
+ pWextState->roamProfile.nAddIEAssocLength =
+ pWextState->assocAddIE.length;
+ }else {
+ hddLog(VOS_TRACE_LEVEL_FATAL, "UNKNOWN EID: %X", genie[0]);
+ }
+ break;
+
default:
hddLog (VOS_TRACE_LEVEL_ERROR,
"%s Set UNKNOWN IE %X", __func__, elementId);
diff --git a/CORE/MAC/inc/aniSystemDefs.h b/CORE/MAC/inc/aniSystemDefs.h
index 1a91aed..3594ef3 100644
--- a/CORE/MAC/inc/aniSystemDefs.h
+++ b/CORE/MAC/inc/aniSystemDefs.h
@@ -85,6 +85,7 @@
eSIR_FT_AUTH,
#endif
eSIR_AUTH_TYPE_SAE = 3,
+ eSIR_AUTH_TYPE_OWE = 4,
#if defined FEATURE_WLAN_ESE
eSIR_LEAP_AUTH = 0x80,
#endif
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index 930f29d..b7e4ce9 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2016, 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016, 2017, 2019 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -463,6 +463,9 @@
#define SIR_MAC_OUI_VERSION_1 1
+/* OWE DH Parameter element https://tools.ietf.org/html/rfc8110 */
+#define SIR_DH_PARAMETER_ELEMENT_EXT_EID 32
+
// OUI and type definition for WPA IE in network byte order
#define SIR_MAC_WPA_OUI 0x01F25000
#define SIR_MAC_WME_OUI 0x02F25000
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index dc4fe9d..0e6685e 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -72,6 +72,7 @@
eCSR_AUTH_TYPE_RSN_PSK_SHA256,
eCSR_AUTH_TYPE_RSN_8021X_SHA256,
#endif
+ eCSR_AUTH_TYPE_OWE,
eCSR_NUM_OF_SUPPORT_AUTH_TYPE,
eCSR_AUTH_TYPE_FAILED = 0xff,
eCSR_AUTH_TYPE_UNKNOWN = eCSR_AUTH_TYPE_FAILED,
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index cfa5b53..2cce017 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -3367,8 +3367,11 @@
pBssConfig->uCfgDot11Mode = eCSR_CFG_DOT11_MODE_11A;
}
}
- smsLog(pMac, LOG1, FL("phyMode %d uCfgDot11Mode %d"),
- pProfile->phyMode, pBssConfig->uCfgDot11Mode);
+ smsLog(pMac, LOG1,
+ FL("phyMode %d uCfgDot11Mode %d negotiatedAuthType %d"),
+ pProfile->phyMode, pBssConfig->uCfgDot11Mode,
+ pProfile->negotiatedAuthType);
+
//Qos
if ((pBssConfig->uCfgDot11Mode != eCSR_CFG_DOT11_MODE_11N) &&
(pMac->roam.configParam.WMMSupportMode == eCsrRoamWmmNoQos))
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 63b0119..dbcab60 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -83,6 +83,9 @@
{0x00, 0x00, 0x00, 0x00},
#endif
/* define new oui here */
+#define ENUM_OWE 11
+ /* OWE https://tools.ietf.org/html/rfc8110 */
+ {0x00, 0x0F, 0xAC, 0x12},
};
#ifdef FEATURE_WLAN_WAPI
@@ -2858,12 +2861,16 @@
case eCSR_AUTH_TYPE_RSN_PSK_SHA256:
case eCSR_AUTH_TYPE_RSN_8021X_SHA256:
#endif
- fRSNProfile = TRUE;
+ fRSNProfile = true;
break;
case eCSR_AUTH_TYPE_SAE:
fRSNProfile = true;
break;
+ case eCSR_AUTH_TYPE_OWE:
+ fRSNProfile = true;
+ break;
+
default:
fRSNProfile = FALSE;
break;
@@ -3625,6 +3632,24 @@
oui);
}
#endif
+
+/**
+ * csr_is_auth_wpa_sae() - check whether oui is OWE
+ * @mac: Global MAC context
+ * @all_suites: pointer to all supported akm suites
+ * @suite_count: all supported akm suites count
+ * @oui: Oui needs to be matched
+ *
+ * Return: True if OUI is SAE, false otherwise
+ */
+static bool csr_is_auth_wpa_owe(tpAniSirGlobal mac,
+ uint8_t all_suites[][CSR_RSN_OUI_SIZE],
+ uint8_t suite_count, uint8_t oui[])
+{
+ return csrIsOuiMatch
+ (mac, all_suites, suite_count, csrRSNOui[ENUM_OWE], oui);
+}
+
static tANI_BOOLEAN csrIsAuthWpa( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_WPA_OUI_SIZE],
tANI_U8 cAllSuites,
tANI_U8 Oui[] )
@@ -3894,6 +3919,12 @@
negAuthType = eCSR_AUTH_TYPE_RSN_8021X_SHA256;
}
#endif
+ if ((negAuthType == eCSR_AUTH_TYPE_UNKNOWN) &&
+ csr_is_auth_wpa_owe(pMac, AuthSuites,
+ cAuthSuites, Authentication)) {
+ if (eCSR_AUTH_TYPE_OWE == pAuthType->authType[i])
+ negAuthType = eCSR_AUTH_TYPE_OWE;
+ }
// The 1st auth type in the APs RSN IE, to match stations connecting
// profiles auth type will cause us to exit this loop
diff --git a/Kbuild b/Kbuild
index aed086a..c085b36 100644
--- a/Kbuild
+++ b/Kbuild
@@ -26,6 +26,9 @@
#Flag to enable SAE
CONFIG_WLAN_FEATURE_SAE := y
+#Flag to enable OWE
+ CONFIG_WLAN_AKM_SUITE_OWE := y
+
#Flag to enable Legacy Fast Roaming(LFR) Make Before Break
CONFIG_PRIMA_WLAN_LFR_MBB := y
@@ -684,6 +687,10 @@
CDEFINES += -DWLAN_FEATURE_SAE
endif
+ifeq ($(CONFIG_WLAN_AKM_SUITE_OWE),y)
+CDEFINES += -DWLAN_AKM_SUITE_OWE
+endif
+
ifeq ($(CONFIG_PRIMA_WLAN_LFR_MBB),y)
CDEFINES += -DWLAN_FEATURE_LFR_MBB
endif