summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorYan Yan <evitayan@google.com>2020-08-12 13:48:39 -0700
committerYan Yan <evitayan@google.com>2020-10-16 17:53:37 +0000
commitb766701fa4323e7c158547d205df78ce5396c02f (patch)
tree70b56d447b13f0adc4b06e2d5dc2a827b1ec2abd /api
parent27267b655c2881134e7704c7fde6eaed2118dd23 (diff)
Expose new algorithms as public API
Bug: 161716062 Test: FrameworksNetTests:IpSecAlgorithmTest Change-Id: I5041c61ad5a4aa58b259e24de80a2c63d6b19dae
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 68a22f2360cf..0937818c5cc1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30048,9 +30048,12 @@ package android.net {
method public int describeContents();
method @NonNull public byte[] getKey();
method @NonNull public String getName();
+ method @NonNull public static java.util.Set<java.lang.String> getSupportedAlgorithms();
method public int getTruncationLengthBits();
method public void writeToParcel(android.os.Parcel, int);
+ field public static final String AUTH_AES_XCBC = "xcbc(aes)";
field public static final String AUTH_CRYPT_AES_GCM = "rfc4106(gcm(aes))";
+ field public static final String AUTH_CRYPT_CHACHA20_POLY1305 = "rfc7539esp(chacha20,poly1305)";
field public static final String AUTH_HMAC_MD5 = "hmac(md5)";
field public static final String AUTH_HMAC_SHA1 = "hmac(sha1)";
field public static final String AUTH_HMAC_SHA256 = "hmac(sha256)";
@@ -30058,6 +30061,7 @@ package android.net {
field public static final String AUTH_HMAC_SHA512 = "hmac(sha512)";
field @NonNull public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR;
field public static final String CRYPT_AES_CBC = "cbc(aes)";
+ field public static final String CRYPT_AES_CTR = "rfc3686(ctr(aes))";
}
public final class IpSecManager {