| commit | 8088b64ab930206287847722d4a919339828249b | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <[email protected]> | Thu Nov 02 15:36:10 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu Nov 02 15:36:10 2023 +0000 |
| tree | f8c4a1d06e526810acb07d5e80f96745e9d7dea7 | |
| parent | 8f752e79094d9a5bb819e0824630b73ebc3eae4a [diff] | |
| parent | 543898a92b8ab332d302d5eb5e3a5fc5a1f4320f [diff] |
Merge "Clarifying the KM challenge size" into main am: b8fe0e98bd am: 61a89387d7 am: 543898a92b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2812463 Change-Id: I647e23d2cd1b4252211b49488c7bde189a3c195f Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/keystore/java/android/security/keystore/KeyGenParameterSpec.java b/keystore/java/android/security/keystore/KeyGenParameterSpec.java index 1ba41b1..b714035 100644 --- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java +++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java
@@ -1596,6 +1596,8 @@ * {@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) {