diff options
| author | Adam Vartanian <flooey@google.com> | 2019-08-01 13:49:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-01 13:49:11 +0000 |
| commit | 6b2a19ef2a5e41455085079db483b4042193f890 (patch) | |
| tree | e801c076ecfd33d568defaecbd5cdd7091be158a /support | |
| parent | d5f94dfec8482453df15db2f63676d19bad01198 (diff) | |
| parent | d96d3054cc079bd34bae3259671b4fff7dabbe22 (diff) | |
Merge "Update to support Conscrypt sync"
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index eb9cf458fc..d53117b945 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -510,6 +510,7 @@ public final class StandardNames { provide("Cipher", "AES/ECB/PKCS5PADDING"); provide("Cipher", "AES/ECB/PKCS7PADDING"); provide("Cipher", "AES/GCM/NOPADDING"); + provide("Cipher", "AES/GCM-SIV/NOPADDING"); provide("Cipher", "AES/OFB/NOPADDING"); provide("Cipher", "AES/OFB/PKCS5PADDING"); provide("Cipher", "AES/OFB/PKCS7PADDING"); @@ -520,6 +521,7 @@ public final class StandardNames { provide("Cipher", "AES_128/ECB/PKCS5PADDING"); provide("Cipher", "AES_128/ECB/PKCS7PADDING"); provide("Cipher", "AES_128/GCM/NOPADDING"); + provide("Cipher", "AES_128/GCM-SIV/NOPADDING"); provide("Cipher", "AES_256/CBC/NOPADDING"); provide("Cipher", "AES_256/CBC/PKCS5PADDING"); provide("Cipher", "AES_256/CBC/PKCS7PADDING"); @@ -527,6 +529,7 @@ public final class StandardNames { provide("Cipher", "AES_256/ECB/PKCS5PADDING"); provide("Cipher", "AES_256/ECB/PKCS7PADDING"); provide("Cipher", "AES_256/GCM/NOPADDING"); + provide("Cipher", "AES_256/GCM-SIV/NOPADDING"); provide("Cipher", "DESEDE/CBC/NOPADDING"); provide("Cipher", "DESEDE/CBC/PKCS5PADDING"); provide("Cipher", "DESEDE/CBC/PKCS7PADDING"); |