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

Remove old KeyStore API call sites

Browse Source 
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.

Bug: 8122243
Change-Id: I59e38efbab6ad60a905ce8678a340da2088b19c9
This commit is contained in:
Kenny Root
2013-04-12 17:34:13 -07:00
parent 8054254a8a
commit 14415168b1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/CredentialStorage.java
View File

@@ -196,7 +196,7 @@ public final class CredentialStorage extends Activity {
String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME); String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA); byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
if (!mKeyStore.importKey(key, value, uid)) { if (!mKeyStore.importKey(key, value, uid, KeyStore.FLAG_ENCRYPTED)) {
Log.e(TAG, "Failed to install " + key + " as user " + uid); Log.e(TAG, "Failed to install " + key + " as user " + uid);
return; return;
} }
@@ -206,7 +206,7 @@ public final class CredentialStorage extends Activity {
String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME); String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA); byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
if (!mKeyStore.put(certName, certData, uid)) { if (!mKeyStore.put(certName, certData, uid, KeyStore.FLAG_ENCRYPTED)) {
Log.e(TAG, "Failed to install " + certName + " as user " + uid); Log.e(TAG, "Failed to install " + certName + " as user " + uid);
return; return;
} }
@@ -216,7 +216,7 @@ public final class CredentialStorage extends Activity {
String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME); String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA); byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
if (!mKeyStore.put(caListName, caListData, uid)) { if (!mKeyStore.put(caListName, caListData, uid, KeyStore.FLAG_ENCRYPTED)) {
Log.e(TAG, "Failed to install " + caListName + " as user " + uid); Log.e(TAG, "Failed to install " + caListName + " as user " + uid);
return; return;
} }

6
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -237,7 +237,8 @@ public class VpnSettings extends SettingsPreferenceFragment implements
if (button == DialogInterface.BUTTON_POSITIVE) { if (button == DialogInterface.BUTTON_POSITIVE) {
// Always save the profile. // Always save the profile.
VpnProfile profile = mDialog.getProfile(); VpnProfile profile = mDialog.getProfile();
mKeyStore.put(Credentials.VPN + profile.key, profile.encode()); mKeyStore.put(Credentials.VPN + profile.key, profile.encode(), KeyStore.UID_SELF,
KeyStore.FLAG_ENCRYPTED);
// Update the preference. // Update the preference.
VpnPreference preference = mPreferences.get(profile.key); VpnPreference preference = mPreferences.get(profile.key);
@@ -530,7 +531,8 @@ public class VpnSettings extends SettingsPreferenceFragment implements
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
return; return;
} }
keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes()); keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes(),
KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
} }
// kick profiles since we changed them // kick profiles since we changed them