diff options
| author | Kenny Root <kroot@google.com> | 2014-11-04 23:09:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-04 23:09:20 +0000 |
| commit | d4d881ff8989346583de40c49519f83b4b51d160 (patch) | |
| tree | a673515922aa56b3c9c105bdf18844c9121b19b3 | |
| parent | ef4d1341e70d2683d5d9f2a8892535ae90eb184c (diff) | |
| parent | 8e810dd5a8e7f0ca6b293704b91911900df100a3 (diff) | |
| download | libcore-d4d881ff8989346583de40c49519f83b4b51d160.zip libcore-d4d881ff8989346583de40c49519f83b4b51d160.tar.gz libcore-d4d881ff8989346583de40c49519f83b4b51d160.tar.bz2 | |
Merge "SSLSocket: track update to TLS defaults"
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 14 |
1 files changed, 8 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 ff6128e..c28a841 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -559,10 +559,10 @@ public final class StandardNames extends Assert { } else { provideSslContextEnabledProtocols("SSL", TLSVersion.SSLv3, TLSVersion.TLSv12); provideSslContextEnabledProtocols("SSLv3", TLSVersion.SSLv3, TLSVersion.TLSv12); - provideSslContextEnabledProtocols("TLS", TLSVersion.SSLv3, TLSVersion.TLSv12); - provideSslContextEnabledProtocols("TLSv1", TLSVersion.SSLv3, TLSVersion.TLSv12); - provideSslContextEnabledProtocols("TLSv1.1", TLSVersion.SSLv3, TLSVersion.TLSv12); - provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.SSLv3, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLS", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.1", TLSVersion.TLSv1, TLSVersion.TLSv12); + provideSslContextEnabledProtocols("TLSv1.2", TLSVersion.TLSv1, TLSVersion.TLSv12); } } @@ -602,13 +602,11 @@ public final class StandardNames extends Assert { "TLSv1.2")); public static final Set<String> SSL_SOCKET_PROTOCOLS_CLIENT_DEFAULT = new HashSet<String>(Arrays.asList( - "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2")); public static final Set<String> SSL_SOCKET_PROTOCOLS_SERVER_DEFAULT = new HashSet<String>(Arrays.asList( - "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2")); @@ -621,6 +619,10 @@ public final class StandardNames extends Assert { * do to disable general use of SSLv2. */ SSL_SOCKET_PROTOCOLS.add("SSLv2Hello"); + + /* The RI still has SSLv3 as a default protocol. */ + SSL_SOCKET_PROTOCOLS_CLIENT_DEFAULT.add("SSLv3"); + SSL_SOCKET_PROTOCOLS_SERVER_DEFAULT.add("SSLv3"); } } |