diff options
author | Robin Lee <rgl@google.com> | 2016-02-22 13:52:17 +0000 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-02-26 15:08:34 -0800 |
commit | a47158ee848f4d77e241a8ef621443d4aad5e41c (patch) | |
tree | 7aa6517dda34dce9ff8fefeac743938156db4e06 /src/com/android/certinstaller/CredentialHelper.java | |
parent | 0a66a571a80538bc765a7bea799cd16f55c513d5 (diff) | |
download | android_packages_apps_CertInstaller-a47158ee848f4d77e241a8ef621443d4aad5e41c.tar.gz android_packages_apps_CertInstaller-a47158ee848f4d77e241a8ef621443d4aad5e41c.tar.bz2 android_packages_apps_CertInstaller-a47158ee848f4d77e241a8ef621443d4aad5e41c.zip |
Trust CA certificates added for the whole OS only
Excludes any CA certificates installed for wifi-only from being used for
anything else. Does not take effect retroactively against certs which
were already installed.
The CAs will continue to be saved to a part of the keystore accessible
by services running under WIFI_UID.
Bug: 26324357
Bug: 25780055
Change-Id: Ifeb9daf24c9f9a22b2b2daf247d5622c707c9885
Diffstat (limited to 'src/com/android/certinstaller/CredentialHelper.java')
-rw-r--r-- | src/com/android/certinstaller/CredentialHelper.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/certinstaller/CredentialHelper.java b/src/com/android/certinstaller/CredentialHelper.java index c131268..b502a1d 100644 --- a/src/com/android/certinstaller/CredentialHelper.java +++ b/src/com/android/certinstaller/CredentialHelper.java @@ -100,6 +100,7 @@ class CredentialHelper { try { outStates.putSerializable(DATA_KEY, mBundle); outStates.putString(KeyChain.EXTRA_NAME, mName); + outStates.putInt(Credentials.EXTRA_INSTALL_AS_UID, mUid); if (mUserKey != null) { outStates.putByteArray(Credentials.USER_PRIVATE_KEY, mUserKey.getEncoded()); @@ -120,6 +121,7 @@ class CredentialHelper { void onRestoreStates(Bundle savedStates) { mBundle = (HashMap) savedStates.getSerializable(DATA_KEY); mName = savedStates.getString(KeyChain.EXTRA_NAME); + mUid = savedStates.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1); byte[] bytes = savedStates.getByteArray(Credentials.USER_PRIVATE_KEY); if (bytes != null) { setPrivateKey(bytes); @@ -256,6 +258,10 @@ class CredentialHelper { return mUid != -1; } + int getInstallAsUid() { + return mUid; + } + Intent createSystemInstallIntent() { Intent intent = new Intent("com.android.credentials.INSTALL"); // To prevent the private key from being sniffed, we explicitly spell |