diff options
| author | Yan Yan <evitayan@google.com> | 2021-03-02 18:24:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-02 18:24:27 +0000 |
| commit | 8c7f74fa3546e1af940bfe17856e473fa538c28b (patch) | |
| tree | 07090929d6648f466ac99a94a6b7fa697e8104f1 /core/res | |
| parent | b0a8269167592806c10028edabc66e3a2b1e3531 (diff) | |
| parent | bd0b8751e68bb82a71821c72a8db6a2bb98625f9 (diff) | |
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC"
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 --> |