diff options
| author | Yan Yan <evitayan@google.com> | 2021-03-02 21:08:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 21:08:15 +0000 |
| commit | d57ace3aa462f9422acd59ff40b8e92490e056bb (patch) | |
| tree | 4732fcbeebcc8ad7106caf4156d8c703f11eb327 /core/res | |
| parent | 11e82fe9a8f6534cd10adb2552cc674b02af5e6d (diff) | |
| parent | 8c7f74fa3546e1af940bfe17856e473fa538c28b (diff) | |
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9cc8508fb44e10371bc76bb31f20340f8663b18
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/config.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 93758b6d66d6..22a79ed12c24 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1691,7 +1691,7 @@ * SDK level 28 makes the following algorithms mandatory : "cbc(aes)", "hmac(md5)", "hmac(sha1)", "hmac(sha256)", "hmac(sha384)", "hmac(sha512)", "rfc4106(gcm(aes))" * SDK level 31 makes the following algorithms mandatory : "rfc3686(ctr(aes))", - "xcbc(aes)", "rfc7539esp(chacha20,poly1305)" + "xcbc(aes)", "cmac(aes)", "rfc7539esp(chacha20,poly1305)" --> <string-array name="config_optionalIpSecAlgorithms" translatable="false"> <!-- Add algorithm here --> |