diff options
| author | Benedict Wong <benedictwong@google.com> | 2017-11-08 18:12:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-08 18:12:25 +0000 |
| commit | d840f4d66737071379aa7c83b64c4ee7533dabc5 (patch) | |
| tree | 13190dd054251cade784f7e8cb8fee628a5af3bf /core/java/android | |
| parent | fcec01f0402c3eb9ef36bb0434317008b30d07ae (diff) | |
| parent | 6491b034105d57c379b52f23f76e575dbf9d30dd (diff) | |
Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5
am: 6491b03410
Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab
Diffstat (limited to 'core/java/android')
| -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}. */ |