summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorAdam Vartanian <flooey@google.com>2018-08-10 15:31:37 +0100
committerAdam Vartanian <flooey@google.com>2018-08-10 15:31:37 +0100
commit403a87e207460f25bc023609603fe15eb302a043 (patch)
tree93798fc4fd66270ab99e4d979e796d0b2173db4a /support
parente17f083623f0814b0f5c6689c7023a5e7d50612d (diff)
Update StandardNames for BoringSSL update
BoringSSL has removed support for some old cipher suites, remove them from the expected set. Test: cts -m CtsLibcoreTestCases Change-Id: Ia1680f357775dc2ea2f5b04974c11b4e991fbdfa
Diffstat (limited to 'support')
-rw-r--r--support/src/test/java/libcore/java/security/StandardNames.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java
index a9d60da88d..336929309c 100644
--- a/support/src/test/java/libcore/java/security/StandardNames.java
+++ b/support/src/test/java/libcore/java/security/StandardNames.java
@@ -796,16 +796,16 @@ public final class StandardNames {
addBoth( "SSL_RSA_WITH_3DES_EDE_CBC_SHA");
// TLSv1.2 cipher suites
- addBoth( "TLS_RSA_WITH_AES_128_CBC_SHA256");
- addBoth( "TLS_RSA_WITH_AES_256_CBC_SHA256");
+ addRi( "TLS_RSA_WITH_AES_128_CBC_SHA256");
+ addRi( "TLS_RSA_WITH_AES_256_CBC_SHA256");
addOpenSsl("TLS_RSA_WITH_AES_128_GCM_SHA256");
addOpenSsl("TLS_RSA_WITH_AES_256_GCM_SHA384");
- addBoth( "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256");
- addBoth( "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384");
+ addRi( "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256");
+ addRi( "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384");
addOpenSsl("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256");
addOpenSsl("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384");
- addBoth( "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256");
- addBoth( "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384");
+ addRi( "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256");
+ addRi( "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384");
addOpenSsl("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256");
addOpenSsl("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384");
addOpenSsl("TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256");