diff options
| author | Hai Shalom <haishalom@google.com> | 2019-05-14 16:45:05 -0700 |
|---|---|---|
| committer | Hai Shalom <haishalom@google.com> | 2019-05-14 16:48:58 -0700 |
| commit | 9d8bc7f0dfb352e3369c26c1e6e5a697b75dfa31 (patch) | |
| tree | a70d5f00c7a717ce99f908f822d0c1cc8c37ddf0 /tests | |
| parent | b788af3376c4b676795f04c0092d139780c664a9 (diff) | |
[PSK/EAP] Do not add SHA256 Key mgmt for SupplicantHal < 1.2
Following on GSI Q on P failure:
Do not add SHA256 Key management where Supplicant HAL version
is lower than 1.2, where it is not supported.
Bug: 132656148
Test: atest SupplicantStaNetworkHalTest
Change-Id: Idf6f85fa409082b3b88dd36b624f8878be695709
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java index f8896f44c..796dce1df 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java @@ -842,6 +842,36 @@ public class SupplicantStaNetworkHalTest { } /** + * Tests the addition of SHA256 flags (WPA_PSK_SHA256) is ignored on HAL v1.1 or lower + */ + @Test + public void testAddPskSha256FlagsHal1_1OrLower() throws Exception { + WifiConfiguration config = WifiConfigurationTestUtil.createPskNetwork(); + assertTrue(mSupplicantNetwork.saveWifiConfiguration(config)); + + // Check the supplicant variables to ensure that we have NOT added the SHA256 flags. + assertFalse((mSupplicantVariables.keyMgmtMask + & android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork.KeyMgmtMask + .WPA_PSK_SHA256) == android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork + .KeyMgmtMask.WPA_PSK_SHA256); + } + + /** + * Tests the addition of SHA256 flags (WPA_EAP_SHA256) is ignored on HAL v1.1 or lower + */ + @Test + public void testAddEapSha256FlagsHal1_1OrLower() throws Exception { + WifiConfiguration config = WifiConfigurationTestUtil.createEapNetwork(); + assertTrue(mSupplicantNetwork.saveWifiConfiguration(config)); + + // Check the supplicant variables to ensure that we have NOT added the SHA256 flags. + assertFalse((mSupplicantVariables.keyMgmtMask + & android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork.KeyMgmtMask + .WPA_EAP_SHA256) == android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork + .KeyMgmtMask.WPA_EAP_SHA256); + } + + /** * Tests the retrieval of WPS NFC token. */ @Test |