summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bo Zhu <bozhu@google.com> 2018-03-30 00:04:46 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-03-30 00:04:46 +0000
commit3cda0f298934526d95e8ed1f2d10610febdf5015 (patch)
tree7e04b5b7d04332d46df0e0dcc2a30f2da202927d
parentdab50eecfd1ba6ecf954d379acaaaaaf1d726fc2 (diff)
parentba94b9ab002758a19e016f7c06f003def5b61ad4 (diff)
Merge "Minor correction to the javadoc to match implementation" into pi-dev
-rw-r--r--core/java/android/security/keystore/recovery/KeyDerivationParams.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/security/keystore/recovery/KeyDerivationParams.java b/core/java/android/security/keystore/recovery/KeyDerivationParams.java
index d16f3ea317cf..fd80bb0bbe57 100644
--- a/core/java/android/security/keystore/recovery/KeyDerivationParams.java
+++ b/core/java/android/security/keystore/recovery/KeyDerivationParams.java
@@ -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) {