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

Don't store deprecated trustedHardwarePublicKey field.

Browse Source 
Bug:77873515
Test: apct
Change-Id: I990203781587f1747af514725014bc6b5bf1e517
This commit is contained in:
Dmitry Dementyev
2018-04-10 16:03:52 -07:00
parent be72f3d5b8
commit ebdd19c773
5 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncTask.java
View File

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

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

@@ -132,8 +132,7 @@ public class KeyChainSnapshotDeserializer {
break;
case TAG_BACKEND_PUBLIC_KEY:
builder.setTrustedHardwarePublicKey(
readBlobTag(parser, TAG_BACKEND_PUBLIC_KEY));
// Unused
break;
case TAG_KEY_CHAIN_PROTECTION_PARAMS_LIST:

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

@@ -35,7 +35,7 @@ class KeyChainSnapshotSchema {
static final String TAG_RECOVERY_KEY_MATERIAL = "recoveryKeyMaterial";
static final String TAG_SERVER_PARAMS = "serverParams";
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 =
"keyChainProtectionParamsList";

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

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

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

@@ -45,7 +45,6 @@ public class KeyChainSnapshotSerializerTest {
private static final int MAX_ATTEMPTS = 21;
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[] 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 int SECRET_TYPE = KeyChainProtectionParams.TYPE_LOCKSCREEN;
private static final int LOCK_SCREEN_UI = KeyChainProtectionParams.UI_FORMAT_PASSWORD;
@@ -93,11 +92,6 @@ public class KeyChainSnapshotSerializerTest {
assertThat(roundTrip().getTrustedHardwareCertPath()).isEqualTo(CERT_PATH);
}
@Test
public void roundTrip_persistsBackendPublicKey() throws Exception {
assertThat(roundTrip().getTrustedHardwarePublicKey()).isEqualTo(PUBLIC_KEY_BLOB);
}
@Test
public void roundTrip_persistsParamsList() throws Exception {
assertThat(roundTrip().getKeyChainProtectionParams()).hasSize(1);
@@ -201,7 +195,6 @@ public class KeyChainSnapshotSerializerTest {
.setKeyChainProtectionParams(createKeyChainProtectionParamsList())
.setWrappedApplicationKeys(createKeys())
.setTrustedHardwareCertPath(CERT_PATH)
.setTrustedHardwarePublicKey(PUBLIC_KEY_BLOB)
.build();
}