diff options
| author | Kenny Root <kroot@google.com> | 2015-05-18 11:41:24 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-05-19 08:51:15 -0700 |
| commit | 75cad21abebdf292f7e8ca3ed8cc9f7929d5579b (patch) | |
| tree | 899ae4e297767afef196461d79092c5aee2a8df2 /support | |
| parent | 5b2c1c08fad0f48c5d3ec89164feb4b0ff8e1ffb (diff) | |
| download | libcore-75cad21abebdf292f7e8ca3ed8cc9f7929d5579b.zip libcore-75cad21abebdf292f7e8ca3ed8cc9f7929d5579b.tar.gz libcore-75cad21abebdf292f7e8ca3ed8cc9f7929d5579b.tar.bz2 | |
Track change from GCM -> AES/GCM/NoPadding
Update tests to track the change from GCM to AES/GCM/NoPadding
(cherry picked from commit 6e0cdd08e2a671393b8a410690d28140a80d9387)
Bug: 21209499
Change-Id: Ie8383cd2cd0bcb62a38c4c55cd86aa90ad834b2b
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index 9aab942..8434ef2 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -172,7 +172,7 @@ public final class StandardNames extends Assert { provide("CertificateFactory", "X.509"); // TODO: provideCipherModes and provideCipherPaddings for other Ciphers provide("Cipher", "AES"); - provideCipherModes("AES", new String[] { "CBC", "CFB", "CTR", "CTS", "ECB", "OFB" }); + provideCipherModes("AES", new String[] { "CBC", "CFB", "CTR", "CTS", "ECB", "GCM", "OFB" }); provideCipherPaddings("AES", new String[] { "NoPadding", "PKCS5Padding" }); provide("Cipher", "AESWrap"); provide("Cipher", "ARCFOUR"); @@ -180,7 +180,6 @@ public final class StandardNames extends Assert { provide("Cipher", "DES"); provide("Cipher", "DESede"); provide("Cipher", "DESedeWrap"); - provide("Cipher", "GCM"); provide("Cipher", "PBEWithMD5AndDES"); provide("Cipher", "PBEWithMD5AndTripleDES"); provide("Cipher", "PBEWithSHA1AndDESede"); @@ -479,6 +478,7 @@ public final class StandardNames extends Assert { provide("Cipher", "AES/ECB/NOPADDING"); provide("Cipher", "AES/ECB/PKCS5PADDING"); provide("Cipher", "AES/ECB/PKCS7PADDING"); + provide("Cipher", "AES/GCM/NOPADDING"); provide("Cipher", "AES/OFB/NOPADDING"); provide("Cipher", "AES/OFB/PKCS5PADDING"); provide("Cipher", "AES/OFB/PKCS7PADDING"); |