diff options
| author | 2025-03-20 22:26:44 -0700 | |
|---|---|---|
| committer | 2025-03-20 22:26:44 -0700 | |
| commit | f0dba4d92dce95c5db6a8d03890da3c1237d4734 (patch) | |
| tree | 6c00f80e1d7d424939bd66363d20e1921793d993 /framework/java | |
| parent | d9155dc8da4c4d57c6f6050ab6bf528a402529a4 (diff) | |
Fix parsing of CIPHER and AKM for secure ranging
The capability string, found in scan results, includes encodings
for supported AKMs and CIPHERs by the AP. Building secure
ranging responder configuration process requires parsing these
encodings to populate the PASN configuration with the available
AKMs and CIPHERs. Later the best AKM and CIPHER is selected
based on the device capability.
Also make the CIPHER string for CCMP and GCMP explicitly as
CCMP-128 and GCMP-128.
Bug: 356734952
Test: atest FrameworksWifiTests
Flag: EXEMPT bug fix
Change-Id: I47329fe3b81535ac2a8cf4b70f9d4c89cf6aae75
Diffstat (limited to 'framework/java')
| -rw-r--r-- | framework/java/android/net/wifi/rtt/PasnConfig.java | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/framework/java/android/net/wifi/rtt/PasnConfig.java b/framework/java/android/net/wifi/rtt/PasnConfig.java index 547d94bb67..291a963f5b 100644 --- a/framework/java/android/net/wifi/rtt/PasnConfig.java +++ b/framework/java/android/net/wifi/rtt/PasnConfig.java @@ -120,17 +120,14 @@ public final class PasnConfig implements Parcelable { static { sStringToAkm.put("None", AKM_NONE); - sStringToAkm.put("PASN-", AKM_PASN); - // Transition mode. e.g. "[RSN-SAE+SAE_EXT_KEY-CCMP]" - sStringToAkm.put("SAE+", AKM_SAE); - // SAE mode only. e.g. "[RSN-PSK+SAE-CCMP]" - sStringToAkm.put("SAE-", AKM_SAE); - sStringToAkm.put("EAP-FILS-SHA256-", AKM_FILS_EAP_SHA256); - sStringToAkm.put("EAP-FILS-SHA384-", AKM_FILS_EAP_SHA384); - sStringToAkm.put("FT/EAP-", AKM_FT_EAP_SHA256); - sStringToAkm.put("FT/PSK-", AKM_FT_PSK_SHA256); - sStringToAkm.put("EAP-FT-SHA384-", AKM_FT_EAP_SHA384); - sStringToAkm.put("FT/PSK-SHA384-", AKM_FT_PSK_SHA384); + sStringToAkm.put("PASN", AKM_PASN); + sStringToAkm.put("SAE", AKM_SAE); + sStringToAkm.put("EAP-FILS-SHA256", AKM_FILS_EAP_SHA256); + sStringToAkm.put("EAP-FILS-SHA384", AKM_FILS_EAP_SHA384); + sStringToAkm.put("FT/EAP", AKM_FT_EAP_SHA256); + sStringToAkm.put("FT/PSK", AKM_FT_PSK_SHA256); + sStringToAkm.put("EAP-FT-SHA384", AKM_FT_EAP_SHA384); + sStringToAkm.put("FT/PSK-SHA384", AKM_FT_PSK_SHA384); } /** @@ -174,10 +171,10 @@ public final class PasnConfig implements Parcelable { static { sStringToCipher.put("None", CIPHER_NONE); - sStringToCipher.put("-CCMP]", CIPHER_CCMP_128); - sStringToCipher.put("-CCMP-256]", CIPHER_CCMP_256); - sStringToCipher.put("-GCMP]", CIPHER_GCMP_128); - sStringToCipher.put("-GCMP-256]", CIPHER_GCMP_256); + sStringToCipher.put("CCMP-128", CIPHER_CCMP_128); + sStringToCipher.put("CCMP-256", CIPHER_CCMP_256); + sStringToCipher.put("GCMP-128", CIPHER_GCMP_128); + sStringToCipher.put("GCMP-256", CIPHER_GCMP_256); } @AkmType |