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

Update Wifi to use new keystore function

Browse Source 
The old wpa_supplicant.conf format used a special URI prefix
"keystore://" for the private_key value to indicate when to load things
from keystore.

The new format uses an OpenSSL ENGINE to perform operations with the
private key, so we don't need the special URI prefix.

Change-Id: I04751846f72b22eb5fc947bd7a32f47713e9fc82
This commit is contained in:
Kenny Root
2012-03-21 09:09:23 -07:00
parent eff40f4daf
commit 4786b261d3
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -62,7 +62,7 @@ import java.util.Iterator;
*/
public class WifiConfigController implements TextWatcher,
View.OnClickListener, AdapterView.OnItemSelectedListener {
private static final String KEYSTORE_SPACE = "keystore://";
private static final String KEYSTORE_SPACE = WifiConfiguration.KEYSTORE_URI;
private final WifiConfigUiBase mConfigUi;
private final View mView;
@@ -123,8 +123,10 @@ public class WifiConfigController implements TextWatcher,
if (config == null) {
return false;
}
String values[] = {config.ca_cert.value(), config.client_cert.value(),
config.private_key.value()};
if (config.key_id.value() != null) {
return true;
}
String values[] = { config.ca_cert.value(), config.client_cert.value() };
for (String value : values) {
if (value != null && value.startsWith(KEYSTORE_SPACE)) {
return true;
@@ -359,8 +361,10 @@ public class WifiConfigController implements TextWatcher,
config.client_cert.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
"" : KEYSTORE_SPACE + Credentials.USER_CERTIFICATE +
(String) mEapUserCertSpinner.getSelectedItem());
config.private_key.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
"" : KEYSTORE_SPACE + Credentials.USER_PRIVATE_KEY +
config.engine.setValue(WifiConfiguration.ENGINE_ENABLE);
config.engine_id.setValue(WifiConfiguration.KEYSTORE_ENGINE_ID);
config.key_id.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
"" : Credentials.USER_PRIVATE_KEY +
(String) mEapUserCertSpinner.getSelectedItem());
config.identity.setValue((mEapIdentityView.length() == 0) ? "" :
mEapIdentityView.getText().toString());
@@ -536,10 +540,10 @@ public class WifiConfigController implements TextWatcher,
WifiConfiguration config = mAccessPoint.getConfig();
setSelection(mEapMethodSpinner, config.eap.value());
setSelection(mPhase2Spinner, config.phase2.value());
setCertificate(mEapCaCertSpinner, Credentials.CA_CERTIFICATE,
setCertificate(mEapCaCertSpinner, KEYSTORE_SPACE + Credentials.CA_CERTIFICATE,
config.ca_cert.value());
setCertificate(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY,
config.private_key.value());
config.key_id.value());
mEapIdentityView.setText(config.identity.value());
mEapAnonymousView.setText(config.anonymous_identity.value());
}
@@ -672,7 +676,6 @@ public class WifiConfigController implements TextWatcher,
}
private void setCertificate(Spinner spinner, String prefix, String cert) {
prefix = KEYSTORE_SPACE + prefix;
if (cert != null && cert.startsWith(prefix)) {
setSelection(spinner, cert.substring(prefix.length()));
}