PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Checks WEP password lengths of Wi-Fi network" into main

Browse Source
This commit is contained in:
Weng Su
2024-04-11 10:07:11 +00:00
committed by Android (Google) Code Review
parent d1b3691f6a 1cd3b6f21f
commit a66a4a0d41
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -514,6 +514,12 @@ public class WifiConfigController2 implements TextWatcher,
submit.setEnabled(isSubmittable());
}
boolean isValidWepPassword(String password) {
// Checks for WEP40 and WEP104 password lengths (5 and 13 bytes)
int passwordLen = (password != null) ? password.length() : -1;
return passwordLen == 5 || passwordLen == 13;
}
boolean isValidPsk(String password) {
if (password.length() == 64 && password.matches("[0-9A-Fa-f]{64}")) {
return true;
@@ -535,7 +541,7 @@ public class WifiConfigController2 implements TextWatcher,
boolean passwordInvalid = false;
if (mPasswordView != null
&& ((mWifiEntrySecurity == WifiEntry.SECURITY_WEP
&& mPasswordView.length() == 0)
&& !isValidWepPassword(mPasswordView.getText().toString()))
|| (mWifiEntrySecurity == WifiEntry.SECURITY_PSK
&& !isValidPsk(mPasswordView.getText().toString()))
|| (mWifiEntrySecurity == WifiEntry.SECURITY_SAE