From 6fe3981e40ec5bd2c5e7980601e30cb9e8ebc3d5 Mon Sep 17 00:00:00 2001 From: Krupali Dhanvijay Date: Mon, 19 Aug 2024 16:43:46 +0530 Subject: [PATCH 1/2] qcacld-3.0: Update key management in original auth mode for WAPI Currently for WAPI connection auth mode is updated only in key management, but on connect request for validating auth mode, it compared with original key management and failing to connect because of mismatch in auth and cipher suits. To fix this, update auth mode in original key management as well in crypto for WAPI connection. CRs-Fixed: 3901275 Change-Id: I942fbbc68c18d7c8137053b5fc9cb0260109fdcd --- core/hdd/src/wlan_hdd_cfg80211.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 76831317f09b..9edadf77f669 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -21129,7 +21129,10 @@ static void hdd_set_wapi_crypto_key_mgmt_param(struct hdd_adapter *adapter) if (adapter->wapi_info.wapi_auth_mode == WAPI_AUTH_MODE_CERT) HDD_SET_BIT(set_val, WLAN_CRYPTO_KEY_MGMT_WAPI_CERT); + /* Set AKM and original AKM type */ wlan_crypto_set_vdev_param(vdev, WLAN_CRYPTO_PARAM_KEY_MGMT, set_val); + wlan_crypto_set_vdev_param(vdev, WLAN_CRYPTO_PARAM_ORIG_KEY_MGMT, + set_val); set_val = 0; HDD_SET_BIT(set_val, WLAN_CRYPTO_CIPHER_WAPI_SMS4); From 8cd10f873d824a3ac8e276ce2f1897815fb2e9d1 Mon Sep 17 00:00:00 2001 From: Ravindra Konda Date: Tue, 12 Nov 2024 01:10:17 -0800 Subject: [PATCH 2/2] Release 2.0.8.34Z Release 2.0.8.34Z Change-Id: I1699d8e33c61adc77a6fc10efdd00dc1dd38428b CRs-Fixed: 774533 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index a57de3022392..c8f76c9a8572 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 2 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 8 -#define QWLAN_VERSION_EXTRA "Y" +#define QWLAN_VERSION_EXTRA "Z" #define QWLAN_VERSION_BUILD 34 -#define QWLAN_VERSIONSTR "2.0.8.34Y" +#define QWLAN_VERSIONSTR "2.0.8.34Z" #endif /* QWLAN_VERSION_H */