summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorBenedict Wong <benedictwong@google.com>2018-03-15 19:41:41 -0700
committerBenedict Wong <benedictwong@google.com>2018-03-20 12:34:52 -0700
commit9be845c5cd73a975b19182e720e15cce55810103 (patch)
tree17ded92f0fb3464e8002a7e1b5a03cd48515c539 /core/java
parenteb37b9cbb0bad11557c850a2b2805929a666061c (diff)
Add support for auth-only transforms
Kernel limitations prevent auth-only SAs from being created. Explicitly request a null encryption algorithm instead of omitting the algorithm to comply with the kernel requirement for ESP. Bug: 75049573 Test: CTS tests for auth-only, crypt-only transforms added for all combinations of (UDP, TCP, IPv4, IPv6, UDP-encap) Also added unit tests to ensure correct triggering of NULL_CRYPT usage. Merged-In: Ia9a5cfee9c7786412846bc039f326420f6211c08 Change-Id: Ia9a5cfee9c7786412846bc039f326420f6211c08 (cherry picked from commit bf013a3820c69348e034c6340b28e95f3441ebe8)
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/IpSecAlgorithm.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/net/IpSecAlgorithm.java b/core/java/android/net/IpSecAlgorithm.java
index c69a4d4c0bee..f4b328e412e0 100644
--- a/core/java/android/net/IpSecAlgorithm.java
+++ b/core/java/android/net/IpSecAlgorithm.java
@@ -38,6 +38,13 @@ public final class IpSecAlgorithm implements Parcelable {
private static final String TAG = "IpSecAlgorithm";
/**
+ * Null cipher.
+ *
+ * @hide
+ */
+ public static final String CRYPT_NULL = "ecb(cipher_null)";
+
+ /**
* AES-CBC Encryption/Ciphering Algorithm.
*
* <p>Valid lengths for this key are {128, 192, 256}.