summaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-05-18 13:08:18 -0700
committerKenny Root <kroot@google.com>2015-05-19 08:51:30 -0700
commite31bd0c48b5aed701ac43ae9d1e0ff44daf77a2c (patch)
treedc565fbd745cc6cd1fdbab46b2fb2b7c8599dce6 /support
parent75cad21abebdf292f7e8ca3ed8cc9f7929d5579b (diff)
downloadlibcore-e31bd0c48b5aed701ac43ae9d1e0ff44daf77a2c.zip
libcore-e31bd0c48b5aed701ac43ae9d1e0ff44daf77a2c.tar.gz
libcore-e31bd0c48b5aed701ac43ae9d1e0ff44daf77a2c.tar.bz2
No need to test "GCM" mode in regular Cipher test
Partially revert change from 6e0cdd08e2a671393b8a410690d28140a80d9387. Since the regular cipher test expects to be able to use all padding types with every mode, testing GCM is not appropriate here. It is still tested elsewhere in CipherTest. (cherry picked from commit a174063b24e6f792fc58373439808842e1c0d657) Bug: 21209499 Change-Id: Ie20ddab4112f350cce08114c913a89a659823823
Diffstat (limited to 'support')
-rw-r--r--support/src/test/java/libcore/java/security/StandardNames.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java
index 8434ef2..414da7c 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", "GCM", "OFB" });
+ provideCipherModes("AES", new String[] { "CBC", "CFB", "CTR", "CTS", "ECB", "OFB" });
provideCipherPaddings("AES", new String[] { "NoPadding", "PKCS5Padding" });
provide("Cipher", "AESWrap");
provide("Cipher", "ARCFOUR");