diff options
| -rw-r--r-- | luni/src/test/java/libcore/javax/net/ssl/SSLContextTest.java | 6 | ||||
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/luni/src/test/java/libcore/javax/net/ssl/SSLContextTest.java b/luni/src/test/java/libcore/javax/net/ssl/SSLContextTest.java index 1a2b4f5ddb..9c8fe9103c 100644 --- a/luni/src/test/java/libcore/javax/net/ssl/SSLContextTest.java +++ b/luni/src/test/java/libcore/javax/net/ssl/SSLContextTest.java @@ -588,12 +588,6 @@ public class SSLContextTest extends TestCase { fail("SSLv3 should not be supported"); } catch (NoSuchAlgorithmException expected) { } - - try { - SSLContext context = SSLContext.getInstance("SSL"); - fail("SSL should not be supported"); - } catch (NoSuchAlgorithmException expected) { - } } private static void assertContentsInOrder(List<String> expected, String... actual) { diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index b4bffc1410..c959b694a9 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -614,6 +614,7 @@ public final class StandardNames extends Assert { provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.SSLv3, TLSVersion.TLSv12); provideSslContextEnabledProtocols("Default", TLSVersion.SSLv3, TLSVersion.TLSv1); } else { + provideSslContextEnabledProtocols("SSL", TLSVersion.TLSv1, TLSVersion.TLSv12); provideSslContextEnabledProtocols("TLS", TLSVersion.TLSv1, TLSVersion.TLSv12); provideSslContextEnabledProtocols("TLSv1", TLSVersion.TLSv1, TLSVersion.TLSv12); provideSslContextEnabledProtocols("TLSv1.1", TLSVersion.TLSv1, TLSVersion.TLSv12); @@ -625,6 +626,7 @@ public final class StandardNames extends Assert { public static final String SSL_CONTEXT_PROTOCOLS_DEFAULT = "Default"; public static final Set<String> SSL_CONTEXT_PROTOCOLS = new HashSet<String>(Arrays.asList( SSL_CONTEXT_PROTOCOLS_DEFAULT, + "SSL", "TLS", "TLSv1", "TLSv1.1", |