summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eran Messeri <eranm@google.com> 2023-11-02 14:29:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-02 14:29:48 +0000
commitf18c3a5043252ef370809c8b036b5490d60e4a2c (patch)
tree2624790d136993aff19676d7565ec299ba3ef21a
parentee522c97e4ef19b93172137bdc58a607097f5aca (diff)
parentb8fe0e98bd5e4bea106ee4c9e35081dcef0af21d (diff)
Merge "Clarifying the KM challenge size" into main am: b8fe0e98bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2812463 Change-Id: I505412ef7945e3a7982ca1c9d0aefdfd64154b06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--keystore/java/android/security/keystore/KeyGenParameterSpec.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/keystore/java/android/security/keystore/KeyGenParameterSpec.java b/keystore/java/android/security/keystore/KeyGenParameterSpec.java
index 1ba41b106f56..b7140355e489 100644
--- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java
+++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java
@@ -1596,6 +1596,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu
* {@link #getAttestationChallenge()} returns non-null and the spec is used to generate a
* symmetric (AES or HMAC) key, {@link javax.crypto.KeyGenerator#generateKey()} will throw
* {@link java.security.InvalidAlgorithmParameterException}.
+ *
+ * <p>The challenge may be up to 128 bytes.
*/
@NonNull
public Builder setAttestationChallenge(byte[] attestationChallenge) {