From e052c8832e2c6effae14fe32aec6e62f41788dd2 Mon Sep 17 00:00:00 2001 From: Joël Stemmer Date: Wed, 29 Jul 2020 12:07:00 +0100 Subject: Update language to comply with Android's inclusive language guidance 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 --- .../android/server/backup/encryption/chunking/cdc/Hkdf.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/BackupEncryption/src') diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/Hkdf.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/Hkdf.java index c7af8c8778ce..d0776aef78b6 100644 --- a/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/Hkdf.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/Hkdf.java @@ -40,18 +40,18 @@ public final class Hkdf { * *

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() {} -- cgit v1.2.3-59-g8ed1b