Merge "Don't store deprecated trustedHardwarePublicKey field." into pi-dev (e6f3ab1b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncTask.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -349,7 +349,6 @@ public class KeySyncTask implements Runnable {
	.setSnapshotVersion(getSnapshotVersion(recoveryAgentUid, recreateCurrentVersion))		.setSnapshotVersion(getSnapshotVersion(recoveryAgentUid, recreateCurrentVersion))
	.setMaxAttempts(TRUSTED_HARDWARE_MAX_ATTEMPTS)		.setMaxAttempts(TRUSTED_HARDWARE_MAX_ATTEMPTS)
	.setCounterId(counterId)		.setCounterId(counterId)
	.setTrustedHardwarePublicKey(SecureBox.encodePublicKey(publicKey))
	.setServerParams(vaultHandle)		.setServerParams(vaultHandle)
	.setKeyChainProtectionParams(metadataList)		.setKeyChainProtectionParams(metadataList)
	.setWrappedApplicationKeys(createApplicationKeyEntries(encryptedApplicationKeys))		.setWrappedApplicationKeys(createApplicationKeyEntries(encryptedApplicationKeys))

services/core/java/com/android/server/locksettings/recoverablekeystore/serialization/KeyChainSnapshotDeserializer.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -132,8 +132,7 @@ public class KeyChainSnapshotDeserializer {
	break;		break;

	case TAG_BACKEND_PUBLIC_KEY:		case TAG_BACKEND_PUBLIC_KEY:
	builder.setTrustedHardwarePublicKey(		// Unused
	readBlobTag(parser, TAG_BACKEND_PUBLIC_KEY));
	break;		break;

	case TAG_KEY_CHAIN_PROTECTION_PARAMS_LIST:		case TAG_KEY_CHAIN_PROTECTION_PARAMS_LIST:

services/core/java/com/android/server/locksettings/recoverablekeystore/serialization/KeyChainSnapshotSchema.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ class KeyChainSnapshotSchema {
	static final String TAG_RECOVERY_KEY_MATERIAL = "recoveryKeyMaterial";		static final String TAG_RECOVERY_KEY_MATERIAL = "recoveryKeyMaterial";
	static final String TAG_SERVER_PARAMS = "serverParams";		static final String TAG_SERVER_PARAMS = "serverParams";
	static final String TAG_TRUSTED_HARDWARE_CERT_PATH = "thmCertPath";		static final String TAG_TRUSTED_HARDWARE_CERT_PATH = "thmCertPath";
	static final String TAG_BACKEND_PUBLIC_KEY = "backendPublicKey";		static final String TAG_BACKEND_PUBLIC_KEY = "backendPublicKey"; // Deprecated.

	static final String TAG_KEY_CHAIN_PROTECTION_PARAMS_LIST =		static final String TAG_KEY_CHAIN_PROTECTION_PARAMS_LIST =
	"keyChainProtectionParamsList";		"keyChainProtectionParamsList";

services/core/java/com/android/server/locksettings/recoverablekeystore/serialization/KeyChainSnapshotSerializer.java

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -162,10 +162,6 @@ public class KeyChainSnapshotSerializer {
	writePropertyTag(xmlSerializer, TAG_SERVER_PARAMS, keyChainSnapshot.getServerParams());		writePropertyTag(xmlSerializer, TAG_SERVER_PARAMS, keyChainSnapshot.getServerParams());
	writePropertyTag(xmlSerializer, TAG_TRUSTED_HARDWARE_CERT_PATH,		writePropertyTag(xmlSerializer, TAG_TRUSTED_HARDWARE_CERT_PATH,
	keyChainSnapshot.getTrustedHardwareCertPath());		keyChainSnapshot.getTrustedHardwareCertPath());
	if (keyChainSnapshot.getTrustedHardwarePublicKey() != null) {
	writePropertyTag(xmlSerializer, TAG_BACKEND_PUBLIC_KEY,
	keyChainSnapshot.getTrustedHardwarePublicKey());
	}
	}		}

	private static void writePropertyTag(		private static void writePropertyTag(

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,6 @@ public class KeyChainSnapshotSerializerTest {
	private static final int MAX_ATTEMPTS = 21;		private static final int MAX_ATTEMPTS = 21;
	private static final byte[] SERVER_PARAMS = new byte[] { 8, 2, 4 };		private static final byte[] SERVER_PARAMS = new byte[] { 8, 2, 4 };
	private static final byte[] KEY_BLOB = new byte[] { 124, 53, 53, 53 };		private static final byte[] KEY_BLOB = new byte[] { 124, 53, 53, 53 };
	private static final byte[] PUBLIC_KEY_BLOB = new byte[] { 6, 6, 6, 6, 6, 6, 7 };
	private static final CertPath CERT_PATH = TestData.CERT_PATH_1;		private static final CertPath CERT_PATH = TestData.CERT_PATH_1;
	private static final int SECRET_TYPE = KeyChainProtectionParams.TYPE_LOCKSCREEN;		private static final int SECRET_TYPE = KeyChainProtectionParams.TYPE_LOCKSCREEN;
	private static final int LOCK_SCREEN_UI = KeyChainProtectionParams.UI_FORMAT_PASSWORD;		private static final int LOCK_SCREEN_UI = KeyChainProtectionParams.UI_FORMAT_PASSWORD;
	@@ -93,11 +92,6 @@ public class KeyChainSnapshotSerializerTest {
	assertThat(roundTrip().getTrustedHardwareCertPath()).isEqualTo(CERT_PATH);		assertThat(roundTrip().getTrustedHardwareCertPath()).isEqualTo(CERT_PATH);
	}		}

	@Test
	public void roundTrip_persistsBackendPublicKey() throws Exception {
	assertThat(roundTrip().getTrustedHardwarePublicKey()).isEqualTo(PUBLIC_KEY_BLOB);
	}

	@Test		@Test
	public void roundTrip_persistsParamsList() throws Exception {		public void roundTrip_persistsParamsList() throws Exception {
	assertThat(roundTrip().getKeyChainProtectionParams()).hasSize(1);		assertThat(roundTrip().getKeyChainProtectionParams()).hasSize(1);
	@@ -201,7 +195,6 @@ public class KeyChainSnapshotSerializerTest {
	.setKeyChainProtectionParams(createKeyChainProtectionParamsList())		.setKeyChainProtectionParams(createKeyChainProtectionParamsList())
	.setWrappedApplicationKeys(createKeys())		.setWrappedApplicationKeys(createKeys())
	.setTrustedHardwareCertPath(CERT_PATH)		.setTrustedHardwareCertPath(CERT_PATH)
	.setTrustedHardwarePublicKey(PUBLIC_KEY_BLOB)
	.build();		.build();
	}		}