diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-12 05:43:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-12 05:43:32 +0000 |
| commit | fcafe95467db28e1fd687abe71b396e313ce14ce (patch) | |
| tree | be662e105ecb7066aa818290d199981fc99fb33f /service | |
| parent | 050acb5eec918f3f0a47f0955815398c15f10ca8 (diff) | |
| parent | 23c52a980ba8f7b31a1d140f58baee70dc0f2afd (diff) | |
Merge "[InformationElementUtil] Add FT/SAE AKM" into qt-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/util/InformationElementUtil.java | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/service/java/com/android/server/wifi/util/InformationElementUtil.java b/service/java/com/android/server/wifi/util/InformationElementUtil.java index 26ede7047..f75d57eff 100644 --- a/service/java/com/android/server/wifi/util/InformationElementUtil.java +++ b/service/java/com/android/server/wifi/util/InformationElementUtil.java @@ -406,15 +406,16 @@ public class InformationElementUtil { private static final int WPA_AKM_EAP = 0x01f25000; private static final int WPA_AKM_PSK = 0x02f25000; - private static final int WPA2_AKM_EAP = 0x01ac0f00; - private static final int WPA2_AKM_PSK = 0x02ac0f00; - private static final int WPA2_AKM_FT_EAP = 0x03ac0f00; - private static final int WPA2_AKM_FT_PSK = 0x04ac0f00; - private static final int WPA2_AKM_EAP_SHA256 = 0x05ac0f00; - private static final int WPA2_AKM_PSK_SHA256 = 0x06ac0f00; - private static final int WPA2_AKM_SAE = 0x08ac0f00; - private static final int WPA2_AKM_OWE = 0x12ac0f00; - private static final int WPA2_AKM_EAP_SUITE_B_192 = 0x0cac0f00; + private static final int RSN_AKM_EAP = 0x01ac0f00; + private static final int RSN_AKM_PSK = 0x02ac0f00; + private static final int RSN_AKM_FT_EAP = 0x03ac0f00; + private static final int RSN_AKM_FT_PSK = 0x04ac0f00; + private static final int RSN_AKM_EAP_SHA256 = 0x05ac0f00; + private static final int RSN_AKM_PSK_SHA256 = 0x06ac0f00; + private static final int RSN_AKM_SAE = 0x08ac0f00; + private static final int RSN_AKM_FT_SAE = 0x09ac0f00; + private static final int RSN_AKM_OWE = 0x12ac0f00; + private static final int RSN_AKM_EAP_SUITE_B_192 = 0x0cac0f00; private static final int WPA_CIPHER_NONE = 0x00f25000; private static final int WPA_CIPHER_TKIP = 0x02f25000; @@ -483,31 +484,34 @@ public class InformationElementUtil { for (int i = 0; i < akmCount; i++) { int akm = buf.getInt(); switch (akm) { - case WPA2_AKM_EAP: + case RSN_AKM_EAP: rsnKeyManagement.add(ScanResult.KEY_MGMT_EAP); break; - case WPA2_AKM_PSK: + case RSN_AKM_PSK: rsnKeyManagement.add(ScanResult.KEY_MGMT_PSK); break; - case WPA2_AKM_FT_EAP: + case RSN_AKM_FT_EAP: rsnKeyManagement.add(ScanResult.KEY_MGMT_FT_EAP); break; - case WPA2_AKM_FT_PSK: + case RSN_AKM_FT_PSK: rsnKeyManagement.add(ScanResult.KEY_MGMT_FT_PSK); break; - case WPA2_AKM_EAP_SHA256: + case RSN_AKM_EAP_SHA256: rsnKeyManagement.add(ScanResult.KEY_MGMT_EAP_SHA256); break; - case WPA2_AKM_PSK_SHA256: + case RSN_AKM_PSK_SHA256: rsnKeyManagement.add(ScanResult.KEY_MGMT_PSK_SHA256); break; - case WPA2_AKM_SAE: + case RSN_AKM_SAE: rsnKeyManagement.add(ScanResult.KEY_MGMT_SAE); break; - case WPA2_AKM_OWE: + case RSN_AKM_FT_SAE: + rsnKeyManagement.add(ScanResult.KEY_MGMT_FT_SAE); + break; + case RSN_AKM_OWE: rsnKeyManagement.add(ScanResult.KEY_MGMT_OWE); break; - case WPA2_AKM_EAP_SUITE_B_192: + case RSN_AKM_EAP_SUITE_B_192: rsnKeyManagement.add(ScanResult.KEY_MGMT_EAP_SUITE_B_192); break; default: @@ -756,6 +760,8 @@ public class InformationElementUtil { return "OWE"; case ScanResult.KEY_MGMT_SAE: return "SAE"; + case ScanResult.KEY_MGMT_FT_SAE: + return "FT/SAE"; case ScanResult.KEY_MGMT_EAP_SUITE_B_192: return "EAP_SUITE_B_192"; default: |