From 41a7999299a1c84652fbeddf98edb863e82aabf6 Mon Sep 17 00:00:00 2001 From: Hai Shalom Date: Wed, 22 Jul 2020 14:36:40 -0700 Subject: [WPA3-Enterprise] Fix connection issues to ECDSA networks Fix connection issues with ECDSA networks. The initialization of the Suite-B ciphers was not performed due to a bug in the logic that checked if KeyStore is required for the connection. Bug: 161570436 Test: atest WifiKeyStoreTest Test: Connect to WPA3-Enterprise 192-bit ECDSA and RSA networks Test: Connect to WPA2-Enterprise network Change-Id: I34489a69f91802cc9bf0c64ae3734ae237ead47b Merged-In: I34489a69f91802cc9bf0c64ae3734ae237ead47b (cherry picked from commit 27e757ab5d4c65462295b1a985eb823a8e1199d1) --- service/java/com/android/server/wifi/WifiKeyStore.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiKeyStore.java b/service/java/com/android/server/wifi/WifiKeyStore.java index d59dd1d47..70daa0d55 100644 --- a/service/java/com/android/server/wifi/WifiKeyStore.java +++ b/service/java/com/android/server/wifi/WifiKeyStore.java @@ -65,7 +65,9 @@ public class WifiKeyStore { // Certificate and private key management for EnterpriseConfig private static boolean needsKeyStore(WifiEnterpriseConfig config) { - return (config.getClientCertificate() != null || config.getCaCertificate() != null); + return (config.getClientCertificate() != null || config.getCaCertificate() != null + || config.getCaCertificateAlias() != null + || config.getClientCertificateAlias() != null); } private static boolean isHardwareBackedKey(Key key) { -- cgit v1.2.3