lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Add changes to support OSEN AKM for HS-2.0

Browse Source 
OSEN is a new AKM to support HS-2.0. This change is to support
the same.

Change-Id: I6d6c3c2bca76a346d83c6f1303ae86177f2fde67
CRs-Fixed: 2361385
This commit is contained in:
Srinivas Dasari 2018-12-18 17:45:06 +05:30 committed by nshrivas
parent 71118e7ad7
commit b328f1a4f9
4 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/hdd/src/wlan_hdd_assoc.c
View File

@ -129,6 +129,8 @@ uint8_t ccp_rsn_oui_18[HDD_RSN_OUI_SIZE] = {0x00, 0x0F, 0xAC, 0x12};
uint8_t ccp_rsn_oui_80[HDD_RSN_OUI_SIZE] = {0x00, 0x0F, 0xAC, 0x08};
uint8_t ccp_rsn_oui_90[HDD_RSN_OUI_SIZE] = {0x00, 0x0F, 0xAC, 0x09};
#endif
static const
u8 ccp_rsn_oui_13[HDD_RSN_OUI_SIZE] = {0x50, 0x6F, 0x9A, 0x01};
/* Offset where the EID-Len-IE, start. */
#define FT_ASSOC_RSP_IES_OFFSET 6 /* Capability(2) + AID(2) + Status Code(2) */
@ -5008,6 +5010,8 @@ eCsrAuthType hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4])
} else if (memcmp(auth_suite, ccp_rsn_oui_0c, 4) == 0) {
/* Check for Suite B EAP 384 */
auth_type = eCSR_AUTH_TYPE_SUITEB_EAP_SHA384;
} else if (memcmp(auth_suite, ccp_rsn_oui_13, 4) == 0) {
auth_type = eCSR_AUTH_TYPE_OSEN;
} else {
hdd_translate_fils_rsn_to_csr_auth(auth_suite, &auth_type);
hdd_translate_sae_rsn_to_csr_auth(auth_suite, &auth_type);
@ -5507,6 +5511,9 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
if (RSNAuthType == eCSR_AUTH_TYPE_DPP_RSN) {
roam_profile->AuthType.authType[0] =
eCSR_AUTH_TYPE_DPP_RSN;
} else if (RSNAuthType == eCSR_AUTH_TYPE_OSEN) {
roam_profile->AuthType.authType[0] =
eCSR_AUTH_TYPE_OSEN;
} else if ((RSNAuthType == eCSR_AUTH_TYPE_FT_RSN) &&
((key_mgmt & HDD_AUTH_KEY_MGMT_802_1X)
== HDD_AUTH_KEY_MGMT_802_1X)) {

1
core/sme/inc/csr_api.h
View File

@ -66,6 +66,7 @@ typedef enum {
eCSR_AUTH_TYPE_OWE,
eCSR_AUTH_TYPE_SUITEB_EAP_SHA256,
eCSR_AUTH_TYPE_SUITEB_EAP_SHA384,
eCSR_AUTH_TYPE_OSEN,
eCSR_NUM_OF_SUPPORT_AUTH_TYPE,
eCSR_AUTH_TYPE_FAILED = 0xff,
eCSR_AUTH_TYPE_UNKNOWN = eCSR_AUTH_TYPE_FAILED,

4
core/sme/src/csr/csr_api_scan.c
View File

@ -2213,6 +2213,8 @@ static enum wlan_auth_type csr_covert_auth_type_new(eCsrAuthType auth)
return WLAN_AUTH_TYPE_SUITEB_EAP_SHA384;
case eCSR_AUTH_TYPE_SAE:
return WLAN_AUTH_TYPE_SAE;
case eCSR_AUTH_TYPE_OSEN:
return WLAN_AUTH_TYPE_OSEN;
case eCSR_NUM_OF_SUPPORT_AUTH_TYPE:
default:
return WLAN_AUTH_TYPE_OPEN_SYSTEM;
@ -2272,6 +2274,8 @@ static eCsrAuthType csr_covert_auth_type_old(enum wlan_auth_type auth)
return eCSR_AUTH_TYPE_SUITEB_EAP_SHA384;
case WLAN_AUTH_TYPE_SAE:
return eCSR_AUTH_TYPE_SAE;
case WLAN_AUTH_TYPE_OSEN:
return eCSR_AUTH_TYPE_OSEN;
case WLAN_NUM_OF_SUPPORT_AUTH_TYPE:
default:
return eCSR_AUTH_TYPE_OPEN_SYSTEM;

30
core/sme/src/csr/csr_util.c
View File

@ -127,6 +127,9 @@ uint8_t csr_rsn_oui[][CSR_RSN_OUI_SIZE] = {
{0x00, 0x00, 0x00, 0x00},
{0x00, 0x00, 0x00, 0x00},
#endif
#define ENUM_OSEN 21
/* OSEN RSN */
{0x50, 0x6F, 0x9A, 0x01},
/* define new oui here, update #define CSR_OUI_***_INDEX */
};
@ -2127,6 +2130,7 @@ bool csr_is_profile_rsn(struct csr_roam_profile *pProfile)
case eCSR_AUTH_TYPE_FT_FILS_SHA256:
case eCSR_AUTH_TYPE_FT_FILS_SHA384:
case eCSR_AUTH_TYPE_DPP_RSN:
case eCSR_AUTH_TYPE_OSEN:
fRSNProfile = true;
break;
@ -2994,6 +2998,23 @@ static bool csr_is_auth_wpa_sae(struct mac_context *mac,
}
#endif
/*
* csr_is_auth_osen() - check whether oui is osen rsn
* @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 OSEN, false otherwise
*/
static bool csr_is_auth_osen(tpAniSirGlobal mac,
u8 all_suites[][CSR_RSN_OUI_SIZE],
u8 suite_count, u8 oui[])
{
return csr_is_oui_match(mac, all_suites, suite_count,
csr_rsn_oui[ENUM_OSEN], oui);
}
#ifndef WLAN_CONV_CRYPTO_IE_SUPPORT
static bool csr_is_auth_wpa(struct mac_context *mac,
uint8_t AllSuites[][CSR_WPA_OUI_SIZE],
@ -3304,9 +3325,16 @@ static bool csr_get_rsn_information(struct mac_context *mac_ctx,
csr_check_sae_auth(mac_ctx, authsuites, c_auth_suites,
authentication, auth_type, i, &neg_authtype);
if (neg_authtype == eCSR_AUTH_TYPE_UNKNOWN &&
csr_is_auth_osen(mac_ctx, authsuites,
c_auth_suites, authentication)) {
if (eCSR_AUTH_TYPE_OSEN == auth_type->authType[i])
neg_authtype = eCSR_AUTH_TYPE_OSEN;
}
if ((neg_authtype == eCSR_AUTH_TYPE_UNKNOWN) &&
csr_is_auth_dpp_rsn(mac_ctx, authsuites,
c_auth_suites, authentication)) {
c_auth_suites,
authentication)) {
if (eCSR_AUTH_TYPE_DPP_RSN == auth_type->authType[i])
neg_authtype = eCSR_AUTH_TYPE_DPP_RSN;
}