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

SyntheticPasswordManager: rename derivePassword() to deriveSubkey()

Browse Source 
The output of derivePassword() is a key (byte array, not hex encoded),
not a password.  Therefore, rename it to deriveSubkey().

No change in behavior; this is just a cleanup.

Test: atest SyntheticPasswordTests
Change-Id: Ie3d74a579963bcbe63fc93c1b4c436c2aba8c342
This commit is contained in:
Eric Biggers
2022-06-24 19:19:54 +00:00
parent 50ce6b32e3
commit 7d9e115186
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
View File

@@ -186,7 +186,11 @@ public class SyntheticPasswordManager {
mVersion = version;
}
private byte[] derivePassword(byte[] personalization) {
/**
* Derives a subkey from the synthetic password. For v3 and later synthetic passwords the
* subkeys are 256-bit; for v1 and v2 they are 512-bit.
*/
private byte[] deriveSubkey(byte[] personalization) {
if (mVersion == SYNTHETIC_PASSWORD_VERSION_V3) {
return (new SP800Derive(mSyntheticPassword))
.withContext(personalization, PERSONALISATION_CONTEXT);
@@ -197,28 +201,28 @@ public class SyntheticPasswordManager {
}
public byte[] deriveKeyStorePassword() {
return bytesToHex(derivePassword(PERSONALIZATION_KEY_STORE_PASSWORD));
return bytesToHex(deriveSubkey(PERSONALIZATION_KEY_STORE_PASSWORD));
}
public byte[] deriveGkPassword() {
return derivePassword(PERSONALIZATION_SP_GK_AUTH);
return deriveSubkey(PERSONALIZATION_SP_GK_AUTH);
}
public byte[] deriveDiskEncryptionKey() {
return derivePassword(PERSONALIZATION_FBE_KEY);
return deriveSubkey(PERSONALIZATION_FBE_KEY);
}
public byte[] deriveVendorAuthSecret() {
return derivePassword(PERSONALIZATION_AUTHSECRET_KEY);
return deriveSubkey(PERSONALIZATION_AUTHSECRET_KEY);
}
public byte[] derivePasswordHashFactor() {
return derivePassword(PERSONALIZATION_PASSWORD_HASH);
return deriveSubkey(PERSONALIZATION_PASSWORD_HASH);
}
/** Derives key used to encrypt password metrics */
public byte[] deriveMetricsKey() {
return derivePassword(PERSONALIZATION_PASSWORD_METRICS);
return deriveSubkey(PERSONALIZATION_PASSWORD_METRICS);
}
/**