Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide work profile key in user credentials screen

Browse Source 
Bug: 28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
This commit is contained in:
Ricky Wai
2016-05-24 19:27:08 +01:00
parent 977ade26dd
commit d398244513
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -141,6 +141,9 @@ public class LockPatternUtils {
// consider it a complex PIN/password. // consider it a complex PIN/password.
public static final int MAX_ALLOWED_SEQUENCE = 3; public static final int MAX_ALLOWED_SEQUENCE = 3;
public static final String PROFILE_KEY_NAME_ENCRYPT = "profile_key_name_encrypt_";
public static final String PROFILE_KEY_NAME_DECRYPT = "profile_key_name_decrypt_";
private final Context mContext; private final Context mContext;
private final ContentResolver mContentResolver; private final ContentResolver mContentResolver;
private DevicePolicyManager mDevicePolicyManager; private DevicePolicyManager mDevicePolicyManager;

14
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -112,8 +112,6 @@ public class LockSettingsService extends ILockSettings.Stub {
private static final int FBE_ENCRYPTED_NOTIFICATION = 0; private static final int FBE_ENCRYPTED_NOTIFICATION = 0;
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private static final String PROFILE_KEY_NAME_ENCRYPT = "profile_key_name_encrypt_";
private static final String PROFILE_KEY_NAME_DECRYPT = "profile_key_name_decrypt_";
private static final int PROFILE_KEY_IV_SIZE = 12; private static final int PROFILE_KEY_IV_SIZE = 12;
private static final String SEPARATE_PROFILE_CHALLENGE_KEY = "lockscreen.profilechallenge"; private static final String SEPARATE_PROFILE_CHALLENGE_KEY = "lockscreen.profilechallenge";
private final Object mSeparateChallengeLock = new Object(); private final Object mSeparateChallengeLock = new Object();
@@ -700,7 +698,7 @@ public class LockSettingsService extends ILockSettings.Stub {
java.security.KeyStore keyStore = java.security.KeyStore.getInstance("AndroidKeyStore"); java.security.KeyStore keyStore = java.security.KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null); keyStore.load(null);
SecretKey decryptionKey = (SecretKey) keyStore.getKey( SecretKey decryptionKey = (SecretKey) keyStore.getKey(
PROFILE_KEY_NAME_DECRYPT + userId, null); LockPatternUtils.PROFILE_KEY_NAME_DECRYPT + userId, null);
Cipher cipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/" Cipher cipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/"
+ KeyProperties.BLOCK_MODE_GCM + "/" + KeyProperties.ENCRYPTION_PADDING_NONE); + KeyProperties.BLOCK_MODE_GCM + "/" + KeyProperties.ENCRYPTION_PADDING_NONE);
@@ -982,14 +980,14 @@ public class LockSettingsService extends ILockSettings.Stub {
java.security.KeyStore keyStore = java.security.KeyStore.getInstance("AndroidKeyStore"); java.security.KeyStore keyStore = java.security.KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null); keyStore.load(null);
keyStore.setEntry( keyStore.setEntry(
PROFILE_KEY_NAME_ENCRYPT + userId, LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + userId,
new java.security.KeyStore.SecretKeyEntry(secretKey), new java.security.KeyStore.SecretKeyEntry(secretKey),
new KeyProtection.Builder(KeyProperties.PURPOSE_ENCRYPT) new KeyProtection.Builder(KeyProperties.PURPOSE_ENCRYPT)
.setBlockModes(KeyProperties.BLOCK_MODE_GCM) .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE) .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
.build()); .build());
keyStore.setEntry( keyStore.setEntry(
PROFILE_KEY_NAME_DECRYPT + userId, LockPatternUtils.PROFILE_KEY_NAME_DECRYPT + userId,
new java.security.KeyStore.SecretKeyEntry(secretKey), new java.security.KeyStore.SecretKeyEntry(secretKey),
new KeyProtection.Builder(KeyProperties.PURPOSE_DECRYPT) new KeyProtection.Builder(KeyProperties.PURPOSE_DECRYPT)
.setBlockModes(KeyProperties.BLOCK_MODE_GCM) .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
@@ -1000,7 +998,7 @@ public class LockSettingsService extends ILockSettings.Stub {
// Key imported, obtain a reference to it. // Key imported, obtain a reference to it.
SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey( SecretKey keyStoreEncryptionKey = (SecretKey) keyStore.getKey(
PROFILE_KEY_NAME_ENCRYPT + userId, null); LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + userId, null);
// The original key can now be discarded. // The original key can now be discarded.
Cipher cipher = Cipher.getInstance( Cipher cipher = Cipher.getInstance(
@@ -1399,8 +1397,8 @@ public class LockSettingsService extends ILockSettings.Stub {
try { try {
java.security.KeyStore keyStore = java.security.KeyStore.getInstance("AndroidKeyStore"); java.security.KeyStore keyStore = java.security.KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null); keyStore.load(null);
keyStore.deleteEntry(PROFILE_KEY_NAME_ENCRYPT + targetUserId); keyStore.deleteEntry(LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT + targetUserId);
keyStore.deleteEntry(PROFILE_KEY_NAME_DECRYPT + targetUserId); keyStore.deleteEntry(LockPatternUtils.PROFILE_KEY_NAME_DECRYPT + targetUserId);
} catch (KeyStoreException | NoSuchAlgorithmException | CertificateException } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException
| IOException e) { | IOException e) {
// We have tried our best to remove all keys // We have tried our best to remove all keys