diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2017-01-17 10:48:30 -0800 |
|---|---|---|
| committer | Chad Brubaker <cbrubaker@google.com> | 2017-01-17 10:48:30 -0800 |
| commit | 3f3b9c8292773841760263f410b74ed0ab7aae6b (patch) | |
| tree | d6cf80fdc944825bef2d40a3111520ff79712925 /support | |
| parent | e1fd11be6bb6065383ddf98cadee6a00479fadf7 (diff) | |
Expose SSLContext.SSL as an alias for SSLContext.TLS
SSL was removed with SSLv3 however a lot of callers use
SSL instead of Default leading to breakage.
Test: libcore/run-libcore-tests
libcore/luni/src/test/java/libcore/javax/net/ssl/*
Bug:32584776
Bug:30977793
Change-Id: I7ce48488a28e2c62bb0c2a76261a11fbd5bb9da7
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 2 |
1 files changed, 2 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 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", |