Merge "Keystore 2.0: Remove hidden Keystore API from locksettings tests." (665844b1) · Commits · e / os / android_frameworks_base

keystore/java/android/security/KeyStore.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ public class KeyStore {
		case UserState.LSKF_LOCKED:
		return KeyStore.State.LOCKED;
		default:
		throw new AssertionError(KeyStore.VALUE_CORRUPTED);
		throw new AssertionError(userState);
		}
		}
		ret = mBinder.getState(userId);

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/KeySyncTaskTest.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.os.FileUtils;
		import android.security.keystore.AndroidKeyStoreSecretKey;
		import android.security.keystore.KeyGenParameterSpec;
		import android.security.keystore.KeyProperties;
		import android.security.keystore.recovery.KeyChainSnapshot;
		@@ -109,7 +108,7 @@ public class KeySyncTaskTest {
		private RecoverySnapshotStorage mRecoverySnapshotStorage;
		private RecoverableKeyStoreDb mRecoverableKeyStoreDb;
		private File mDatabaseFile;
		private AndroidKeyStoreSecretKey mWrappingKey;
		private SecretKey mWrappingKey;
		private PlatformEncryptionKey mEncryptKey;

		private KeySyncTask mKeySyncTask;
		@@ -848,7 +847,7 @@ public class KeySyncTaskTest {
		return keyGenerator.generateKey();
		}

		private AndroidKeyStoreSecretKey generateAndroidKeyStoreKey() throws Exception {
		private SecretKey generateAndroidKeyStoreKey() throws Exception {
		KeyGenerator keyGenerator = KeyGenerator.getInstance(
		KEY_ALGORITHM,
		ANDROID_KEY_STORE_PROVIDER);
		@@ -857,7 +856,7 @@ public class KeySyncTaskTest {
		.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
		.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
		.build());
		return (AndroidKeyStoreSecretKey) keyGenerator.generateKey();
		return keyGenerator.generateKey();
		}

		private static byte[] utf8Bytes(String s) {

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyGeneratorTest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertNull;

		import android.content.Context;
		import android.security.keystore.AndroidKeyStoreSecretKey;
		import android.security.keystore.KeyGenParameterSpec;
		import android.security.keystore.KeyProperties;

		@@ -45,6 +44,7 @@ import java.util.Random;

		import javax.crypto.Cipher;
		import javax.crypto.KeyGenerator;
		import javax.crypto.SecretKey;
		import javax.crypto.spec.GCMParameterSpec;

		@SmallTest
		@@ -77,7 +77,7 @@ public class RecoverableKeyGeneratorTest {
		mDatabaseFile = context.getDatabasePath(DATABASE_FILE_NAME);
		mRecoverableKeyStoreDb = RecoverableKeyStoreDb.newInstance(context);

		AndroidKeyStoreSecretKey platformKey = generatePlatformKey();
		SecretKey platformKey = generatePlatformKey();
		mPlatformKey = new PlatformEncryptionKey(TEST_GENERATION_ID, platformKey);
		mDecryptKey = new PlatformDecryptionKey(TEST_GENERATION_ID, platformKey);
		mRecoverableKeyGenerator = RecoverableKeyGenerator.newInstance(mRecoverableKeyStoreDb);
		@@ -168,7 +168,7 @@ public class RecoverableKeyGeneratorTest {
		assertArrayEquals(rawMaterial, unwrappedMaterial);
		}

		private AndroidKeyStoreSecretKey generatePlatformKey() throws Exception {
		private SecretKey generatePlatformKey() throws Exception {
		KeyGenerator keyGenerator = KeyGenerator.getInstance(
		KEY_ALGORITHM,
		ANDROID_KEY_STORE_PROVIDER);
		@@ -177,7 +177,7 @@ public class RecoverableKeyGeneratorTest {
		.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
		.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
		.build());
		return (AndroidKeyStoreSecretKey) keyGenerator.generateKey();
		return keyGenerator.generateKey();
		}

		private static byte[] randomBytes(int n) {

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.content.Intent;
		import android.os.Binder;
		import android.os.ServiceSpecificException;
		import android.os.UserHandle;
		import android.security.keystore.AndroidKeyStoreSecretKey;
		import android.security.keystore.KeyGenParameterSpec;
		import android.security.keystore.KeyProperties;
		import android.security.keystore.recovery.KeyChainProtectionParams;
		@@ -1311,7 +1310,7 @@ public class RecoverableKeyStoreManagerTest {
		mRecoverableKeyStoreDb.setShouldCreateSnapshot(userId, uid, false);
		}

		private AndroidKeyStoreSecretKey generateAndroidKeyStoreKey() throws Exception {
		private SecretKey generateAndroidKeyStoreKey() throws Exception {
		KeyGenerator keyGenerator = KeyGenerator.getInstance(
		KEY_ALGORITHM,
		ANDROID_KEY_STORE_PROVIDER);
		@@ -1320,6 +1319,6 @@ public class RecoverableKeyStoreManagerTest {
		.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
		.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
		.build());
		return (AndroidKeyStoreSecretKey) keyGenerator.generateKey();
		return keyGenerator.generateKey();
		}
		}

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/WrappedKeyTest.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertTrue;
		import static org.junit.Assert.fail;

		import android.security.keystore.AndroidKeyStoreSecretKey;
		import android.security.keystore.KeyGenParameterSpec;
		import android.security.keystore.KeyProperties;
		import android.util.Pair;
		@@ -117,7 +116,7 @@ public class WrappedKeyTest {
		@Test
		public void decryptWrappedKeys_decryptsWrappedKeys_nullMetadata() throws Exception {
		String alias = "karlin";
		AndroidKeyStoreSecretKey platformKey = generateAndroidKeyStoreKey();
		SecretKey platformKey = generateAndroidKeyStoreKey();
		SecretKey appKey = generateKey();
		WrappedKey wrappedKey = WrappedKey.fromSecretKey(
		new PlatformEncryptionKey(GENERATION_ID, platformKey), appKey, NULL_METADATA);
		@@ -136,7 +135,7 @@ public class WrappedKeyTest {
		@Test
		public void decryptWrappedKeys_decryptsWrappedKeys_nonNullMetadata() throws Exception {
		String alias = "karlin";
		AndroidKeyStoreSecretKey platformKey = generateAndroidKeyStoreKey();
		SecretKey platformKey = generateAndroidKeyStoreKey();
		SecretKey appKey = generateKey();
		WrappedKey wrappedKey = WrappedKey.fromSecretKey(
		new PlatformEncryptionKey(GENERATION_ID, platformKey), appKey, NON_NULL_METADATA);
		@@ -155,7 +154,7 @@ public class WrappedKeyTest {
		@Test
		public void decryptWrappedKeys_doesNotDieIfSomeKeysAreUnwrappable() throws Exception {
		String alias = "karlin";
		AndroidKeyStoreSecretKey platformKey = generateAndroidKeyStoreKey();
		SecretKey platformKey = generateAndroidKeyStoreKey();
		SecretKey appKey = generateKey();
		WrappedKey wrappedKey = WrappedKey.fromSecretKey(
		new PlatformEncryptionKey(GENERATION_ID, platformKey), appKey, NULL_METADATA);
		@@ -171,7 +170,7 @@ public class WrappedKeyTest {

		@Test
		public void decryptWrappedKeys_throwsIfPlatformKeyGenerationIdDoesNotMatch() throws Exception {
		AndroidKeyStoreSecretKey platformKey = generateAndroidKeyStoreKey();
		SecretKey platformKey = generateAndroidKeyStoreKey();
		WrappedKey wrappedKey = WrappedKey.fromSecretKey(
		new PlatformEncryptionKey(GENERATION_ID, platformKey), generateKey(),
		/metadata=/ null);
		@@ -197,7 +196,7 @@ public class WrappedKeyTest {
		return keyGenerator.generateKey();
		}

		private AndroidKeyStoreSecretKey generateAndroidKeyStoreKey() throws Exception {
		private SecretKey generateAndroidKeyStoreKey() throws Exception {
		KeyGenerator keyGenerator = KeyGenerator.getInstance(
		KEY_ALGORITHM,
		ANDROID_KEY_STORE_PROVIDER);
		@@ -207,6 +206,6 @@ public class WrappedKeyTest {
		.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
		.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
		.build());
		return (AndroidKeyStoreSecretKey) keyGenerator.generateKey();
		return keyGenerator.generateKey();
		}
		}