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

Update language to comply with Android's inclusive language guidance

Browse Source 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: refactoring CL, existing tests still pass. Verified by running
 `atest HkdfTest.java` in the corresponding test directory.
Change-Id: If6154e6d75eab4b2c97bdc08f5eebdba4cf45249
This commit is contained in:
Joël Stemmer
2020-07-29 12:07:00 +01:00
parent 84e70df9d4
commit e052c8832e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/Hkdf.java
View File

@@ -40,18 +40,18 @@ public final class Hkdf {
*
* <p>IMPORTANT: The use or edit of this method requires a security review.
*
* @param masterKey Master key from which to derive sub-keys.
* @param mainKey Main key from which to derive sub-keys.
* @param salt A randomly generated 256-bit byte string.
* @param data Arbitrary information that is bound to the derived key (i.e., used in its
* creation).
* @return Raw derived key bytes = HKDF-SHA256(masterKey, salt, data).
* @return Raw derived key bytes = HKDF-SHA256(mainKey, salt, data).
* @throws InvalidKeyException If the salt can not be used as a valid key.
*/
static byte[] hkdf(byte[] masterKey, byte[] salt, byte[] data) throws InvalidKeyException {
Objects.requireNonNull(masterKey, "HKDF requires master key to be set.");
static byte[] hkdf(byte[] mainKey, byte[] salt, byte[] data) throws InvalidKeyException {
Objects.requireNonNull(mainKey, "HKDF requires main key to be set.");
Objects.requireNonNull(salt, "HKDF requires a salt.");
Objects.requireNonNull(data, "No data provided to HKDF.");
return hkdfSha256Expand(hkdfSha256Extract(masterKey, salt), data);
return hkdfSha256Expand(hkdfSha256Extract(mainKey, salt), data);
}
private Hkdf() {}