Browse Source

qcacmn: Add new wlan crypto params

Add new param types for wlan_crypto_auth_mode,
wlan_crypto_key_mgmt, wlan_crypto_cipher_type.
Need as part of convergence while converting
param type received from NL to crypto param type.

Change-Id: I0110990d9d2b4b24a87770ebce2b17312a2894fc
CRs-Fixed: 2258383
Harprit Chhabada 6 years ago
parent
commit
6e8c57303b
1 changed files with 25 additions and 17 deletions
  1. 25 17
      umac/cmn_services/crypto/inc/wlan_crypto_global_def.h

+ 25 - 17
umac/cmn_services/crypto/inc/wlan_crypto_global_def.h

@@ -87,23 +87,25 @@
  * Cipher types
  */
 typedef enum wlan_crypto_cipher_type {
-	WLAN_CRYPTO_CIPHER_WEP          = 0,
-	WLAN_CRYPTO_CIPHER_TKIP         = 1,
-	WLAN_CRYPTO_CIPHER_AES_OCB      = 2,
-	WLAN_CRYPTO_CIPHER_AES_CCM      = 3,
-	WLAN_CRYPTO_CIPHER_WAPI_SMS4    = 4,
-	WLAN_CRYPTO_CIPHER_CKIP         = 5,
-	WLAN_CRYPTO_CIPHER_AES_CMAC     = 6,
-	WLAN_CRYPTO_CIPHER_AES_CCM_256  = 7,
-	WLAN_CRYPTO_CIPHER_AES_CMAC_256 = 8,
-	WLAN_CRYPTO_CIPHER_AES_GCM      = 9,
-	WLAN_CRYPTO_CIPHER_AES_GCM_256  = 10,
-	WLAN_CRYPTO_CIPHER_AES_GMAC     = 11,
-	WLAN_CRYPTO_CIPHER_AES_GMAC_256 = 12,
-	WLAN_CRYPTO_CIPHER_WAPI_GCM4    = 13,
-	WLAN_CRYPTO_CIPHER_FILS_AEAD    = 14,
-	WLAN_CRYPTO_CIPHER_NONE         = 15,
-	WLAN_CRYPTO_CIPHER_MAX          = WLAN_CRYPTO_CIPHER_NONE,
+	WLAN_CRYPTO_CIPHER_WEP             = 0,
+	WLAN_CRYPTO_CIPHER_TKIP            = 1,
+	WLAN_CRYPTO_CIPHER_AES_OCB         = 2,
+	WLAN_CRYPTO_CIPHER_AES_CCM         = 3,
+	WLAN_CRYPTO_CIPHER_WAPI_SMS4       = 4,
+	WLAN_CRYPTO_CIPHER_CKIP            = 5,
+	WLAN_CRYPTO_CIPHER_AES_CMAC        = 6,
+	WLAN_CRYPTO_CIPHER_AES_CCM_256     = 7,
+	WLAN_CRYPTO_CIPHER_AES_CMAC_256    = 8,
+	WLAN_CRYPTO_CIPHER_AES_GCM         = 9,
+	WLAN_CRYPTO_CIPHER_AES_GCM_256     = 10,
+	WLAN_CRYPTO_CIPHER_AES_GMAC        = 11,
+	WLAN_CRYPTO_CIPHER_AES_GMAC_256    = 12,
+	WLAN_CRYPTO_CIPHER_WAPI_GCM4       = 13,
+	WLAN_CRYPTO_CIPHER_FILS_AEAD       = 14,
+	WLAN_CRYPTO_CIPHER_WEP_40          = 15,
+	WLAN_CRYPTO_CIPHER_WEP_104         = 16,
+	WLAN_CRYPTO_CIPHER_NONE            = 17,
+	WLAN_CRYPTO_CIPHER_MAX             = WLAN_CRYPTO_CIPHER_NONE,
 } wlan_crypto_cipher_type;
 
 /* Auth types */
@@ -117,6 +119,10 @@ typedef enum wlan_crypto_auth_mode {
 	WLAN_CRYPTO_AUTH_RSNA     = 6,
 	WLAN_CRYPTO_AUTH_CCKM     = 7,
 	WLAN_CRYPTO_AUTH_WAPI     = 8,
+	WLAN_CRYPTO_AUTH_SAE      = 9,
+	WLAN_CRYPTO_AUTH_FILS_SK  = 10,
+	/** Keep WLAN_CRYPTO_AUTH_MAX at the end. */
+	WLAN_CRYPTO_AUTH_MAX      = WLAN_CRYPTO_AUTH_FILS_SK,
 } wlan_crypto_auth_mode;
 
 /* crypto capabilities */
@@ -171,6 +177,8 @@ typedef enum wlan_crypto_key_mgmt {
 	WLAN_CRYPTO_KEY_MGMT_FT_FILS_SHA384        = 21,
 	WLAN_CRYPTO_KEY_MGMT_OWE                   = 22,
 	WLAN_CRYPTO_KEY_MGMT_DPP                   = 23,
+	/** Keep WLAN_CRYPTO_KEY_MGMT_MAX at the end. */
+	WLAN_CRYPTO_KEY_MGMT_MAX                   = WLAN_CRYPTO_KEY_MGMT_DPP,
 } wlan_crypto_key_mgmt;
 
 /**