From a17d5ecbf4280326cd22a16bd6e3682b094a4930 Mon Sep 17 00:00:00 2001 From: Mukul Sharma Date: Tue, 4 Jul 2017 12:39:17 +0530 Subject: [PATCH] qcacmn: Add support of GCMP (128/256) support Add support of GCMP (128/256) security ciper support. Change-Id: I3c9cb3dc72cce0a2cae3e468d3c1f3c004e11adf CRs-fixed: 2071087 --- umac/cmn_services/inc/wlan_cmn.h | 2 ++ umac/scan/core/src/wlan_scan_cache_db_ops.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h index 50e54c210782..0ad8f07ac62a 100644 --- a/umac/cmn_services/inc/wlan_cmn.h +++ b/umac/cmn_services/inc/wlan_cmn.h @@ -332,6 +332,8 @@ enum wlan_enc_type { WLAN_ENCRYPT_TYPE_KRK, WLAN_ENCRYPT_TYPE_BTK, WLAN_ENCRYPT_TYPE_AES_CMAC, + WLAN_ENCRYPT_TYPE_AES_GCMP, + WLAN_ENCRYPT_TYPE_AES_GCMP_256, WLAN_ENCRYPT_TYPE_ANY, WLAN_NUM_OF_ENCRYPT_TYPE = WLAN_ENCRYPT_TYPE_ANY, }; diff --git a/umac/scan/core/src/wlan_scan_cache_db_ops.c b/umac/scan/core/src/wlan_scan_cache_db_ops.c index 034bb3090f30..c08ea0e19eeb 100644 --- a/umac/scan/core/src/wlan_scan_cache_db_ops.c +++ b/umac/scan/core/src/wlan_scan_cache_db_ops.c @@ -386,6 +386,12 @@ static uint8_t scm_get_cipher_suite_type(enum wlan_enc_type enc) case WLAN_ENCRYPT_TYPE_AES: cipher_type = WLAN_CSE_CCMP; break; + case WLAN_ENCRYPT_TYPE_AES_GCMP: + cipher_type = WLAN_CSE_GCMP_128; + break; + case WLAN_ENCRYPT_TYPE_AES_GCMP_256: + cipher_type = WLAN_CSE_GCMP_256; + break; case WLAN_ENCRYPT_TYPE_NONE: cipher_type = WLAN_CSE_NONE; break; @@ -952,6 +958,8 @@ static bool scm_is_security_match(struct scan_filter *filter, break; case WLAN_ENCRYPT_TYPE_TKIP: case WLAN_ENCRYPT_TYPE_AES: + case WLAN_ENCRYPT_TYPE_AES_GCMP: + case WLAN_ENCRYPT_TYPE_AES_GCMP_256: /* First check if there is a RSN match */ match = scm_is_rsn_security(filter, db_entry, &local_security);