diff options
| author | Benedict Wong <benedictwong@google.com> | 2017-11-08 18:27:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-08 18:27:06 +0000 |
| commit | cdd1d0ae7fb4e49a8a043bc4a2a3e098ef998fa4 (patch) | |
| tree | 943a260cc8ea630fc2ea91777c95fc0b2ee7bb3d /core/java | |
| parent | eac26194e8890e5e2b0f47ca3c0dee40e0882f92 (diff) | |
| parent | d840f4d66737071379aa7c83b64c4ee7533dabc5 (diff) | |
Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5 am: 6491b03410
am: d840f4d667
Change-Id: Ia0e1538feea2ddb0982875c925705c3648e50c8a
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/IpSecAlgorithm.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/net/IpSecAlgorithm.java b/core/java/android/net/IpSecAlgorithm.java index 16b1452311a6..64f8f39e2bca 100644 --- a/core/java/android/net/IpSecAlgorithm.java +++ b/core/java/android/net/IpSecAlgorithm.java @@ -78,7 +78,11 @@ public final class IpSecAlgorithm implements Parcelable { /** * AES-GCM Authentication/Integrity + Encryption/Ciphering Algorithm. * - * <p>Valid lengths for this key are {128, 192, 256}. + * <p>Valid lengths for keying material are {160, 224, 288}. + * + * <p>As per RFC4106 (Section 8.1), keying material consists of a 128, 192, or 256 bit AES key + * followed by a 32-bit salt. RFC compliance requires that the salt must be unique per + * invocation with the same key. * * <p>Valid ICV (truncation) lengths are {64, 96, 128}. */ |