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

Merge "Minor correction to the javadoc to match implementation" into pi-dev

Browse Source
This commit is contained in:
Bo Zhu
2018-03-30 00:04:46 +00:00
committed by Android (Google) Code Review
parent dab50eecfd ba94b9ab00
commit 3cda0f2989
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/security/keystore/recovery/KeyDerivationParams.java
View File

@@ -75,7 +75,7 @@ public final class KeyDerivationParams implements Parcelable {
* Creates instance of the class to to derive keys using salted SHA256 hash.
*
* <p>The salted SHA256 hash is computed over the concatenation of four byte strings, salt_len +
* salt + key_material_len + key_material, where salt_len and key_material_len are one-byte, and
* salt + key_material_len + key_material, where salt_len and key_material_len are 4-byte, and
* denote the number of bytes for salt and key_material, respectively.
*/
public static @NonNull KeyDerivationParams createSha256Params(@NonNull byte[] salt) {