From e108eb3cc306a27453e06f0bd8c54966c152bab8 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 4 Jun 2015 10:23:38 -0700 Subject: Mark deprecated ciphers visually To make it easier to spot non-deprecated ciphers in the sea of deprecated ciphers, try to visually distinguish it with CSS styling. Bug: 21522548 Change-Id: I802024a3c33f0da394163c393ebd45a3d0bf75d0 --- luni/src/main/java/javax/net/ssl/SSLEngine.java | 164 +++++++++++++----------- luni/src/main/java/javax/net/ssl/SSLSocket.java | 144 +++++++++++---------- 2 files changed, 162 insertions(+), 146 deletions(-) (limited to 'luni/src') diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java index 0f94f41..e8d1a51 100644 --- a/luni/src/main/java/javax/net/ssl/SSLEngine.java +++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java @@ -28,6 +28,14 @@ import java.nio.ByteBuffer; *

{@code SSLEngine} instances obtained from default {@link SSLContext} are configured as * follows: * + * + * *

Protocols

* * @@ -71,67 +79,67 @@ import java.nio.ByteBuffer; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -141,17 +149,17 @@ import java.nio.ByteBuffer; * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -166,57 +174,57 @@ import java.nio.ByteBuffer; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -251,87 +259,87 @@ import java.nio.ByteBuffer; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -366,7 +374,7 @@ import java.nio.ByteBuffer; * * * - * + * * * * @@ -376,7 +384,7 @@ import java.nio.ByteBuffer; * * * - * + * * * * @@ -411,7 +419,7 @@ import java.nio.ByteBuffer; * * * - * + * * * * @@ -421,117 +429,117 @@ import java.nio.ByteBuffer; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -556,12 +564,12 @@ import java.nio.ByteBuffer; * * * - * + * * * * * - * + * * * * @@ -581,12 +589,12 @@ import java.nio.ByteBuffer; * * * - * + * * * * * - * + * * * * @@ -621,22 +629,22 @@ import java.nio.ByteBuffer; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * diff --git a/luni/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java index 50db129..f48870e 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocket.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java @@ -30,6 +30,14 @@ import java.net.UnknownHostException; *

{@code SSLSocket} instances obtained from default {@link SSLSocketFactory}, * {@link SSLServerSocketFactory}, and {@link SSLContext} are configured as follows: * + * + * *

Protocols

* *

Client socket: @@ -115,67 +123,67 @@ import java.net.UnknownHostException; *

* * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -185,17 +193,17 @@ import java.net.UnknownHostException; * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -210,32 +218,32 @@ import java.net.UnknownHostException; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -270,37 +278,37 @@ import java.net.UnknownHostException; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -335,7 +343,7 @@ import java.net.UnknownHostException; * * * - * + * * * * @@ -355,7 +363,7 @@ import java.net.UnknownHostException; * * * - * + * * * * @@ -390,7 +398,7 @@ import java.net.UnknownHostException; * * * - * + * * * * @@ -400,117 +408,117 @@ import java.net.UnknownHostException; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * @@ -525,7 +533,7 @@ import java.net.UnknownHostException; * * * - * + * * * * @@ -575,7 +583,7 @@ import java.net.UnknownHostException; * * * - * + * * * * @@ -618,7 +626,7 @@ import java.net.UnknownHostException; * * * - * + * * * * @@ -636,13 +644,13 @@ import java.net.UnknownHostException; * * * - * + * * * * * * - * + * * * * @@ -660,43 +668,43 @@ import java.net.UnknownHostException; * * * - * + * * * * * * - * + * * * * * * - * + * * * * * * - * + * * * * * * - * + * * * * * * - * + * * * * * * - * + * * * * @@ -708,7 +716,7 @@ import java.net.UnknownHostException; * * * - * + * * * * -- cgit v1.1
SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA9–229–19
SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA9–229–19
SSL_DHE_DSS_WITH_DES_CBC_SHA9–229–19
SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA9–229–19
SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA9–229–19
SSL_DHE_RSA_WITH_DES_CBC_SHA9–229–19
SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA9–22
SSL_DH_anon_EXPORT_WITH_RC4_40_MD59–22
SSL_DH_anon_WITH_3DES_EDE_CBC_SHA9–22
SSL_DH_anon_WITH_DES_CBC_SHA9–22
SSL_DH_anon_WITH_RC4_128_MD59–22
SSL_RSA_EXPORT_WITH_DES40_CBC_SHA9–229–19
SSL_RSA_EXPORT_WITH_RC4_40_MD59–229–199+9–19
SSL_RSA_WITH_DES_CBC_SHA9–229–19
SSL_RSA_WITH_NULL_MD59–22
SSL_RSA_WITH_NULL_SHA9–229+9+
TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA1–81–8
TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA1–81–8
TLS_DHE_DSS_WITH_AES_128_CBC_SHA9–229–22
TLS_DHE_DSS_WITH_AES_128_CBC_SHA25620–22
TLS_DHE_DSS_WITH_AES_128_GCM_SHA25620–22
TLS_DHE_DSS_WITH_AES_256_CBC_SHA9–2220–22
TLS_DHE_DSS_WITH_AES_256_CBC_SHA25620–22
TLS_DHE_DSS_WITH_AES_256_GCM_SHA38420–22
TLS_DHE_DSS_WITH_DES_CBC_SHA1–81–8
TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA1–81–8
TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA1–81–820+20+
TLS_DHE_RSA_WITH_DES_CBC_SHA1–81–8
TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA1–8
TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA1–8
TLS_DH_DSS_WITH_DES_CBC_SHA1–8
TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA1–8
TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA1–8
TLS_DH_RSA_WITH_DES_CBC_SHA1–8
TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA1–8
TLS_DH_anon_WITH_3DES_EDE_CBC_SHA1–8
TLS_DH_anon_WITH_AES_128_CBC_SHA9–22
TLS_DH_anon_WITH_AES_128_CBC_SHA25620–22
TLS_DH_anon_WITH_AES_128_GCM_SHA25620–22
TLS_DH_anon_WITH_AES_256_CBC_SHA9–22
TLS_DH_anon_WITH_AES_256_CBC_SHA25620–22
TLS_DH_anon_WITH_AES_256_GCM_SHA38420–22
TLS_DH_anon_WITH_DES_CBC_SHA1–8
TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA20–2220+20+
TLS_ECDHE_ECDSA_WITH_NULL_SHA20–2220+20+
TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA20–2220+20+
TLS_ECDHE_RSA_WITH_NULL_SHA20–2220+20+
TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA20–22
TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA20–22
TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA25620–22
TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA25620–22
TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA20–22
TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA38420–22
TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA38420–22
TLS_ECDH_ECDSA_WITH_NULL_SHA20–22
TLS_ECDH_ECDSA_WITH_RC4_128_SHA20–22
TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA20–22
TLS_ECDH_RSA_WITH_AES_128_CBC_SHA20–22
TLS_ECDH_RSA_WITH_AES_128_CBC_SHA25620–22
TLS_ECDH_RSA_WITH_AES_128_GCM_SHA25620–22
TLS_ECDH_RSA_WITH_AES_256_CBC_SHA20–22
TLS_ECDH_RSA_WITH_AES_256_CBC_SHA38420–22
TLS_ECDH_RSA_WITH_AES_256_GCM_SHA38420–22
TLS_ECDH_RSA_WITH_NULL_SHA20–22
TLS_ECDH_RSA_WITH_RC4_128_SHA20–22
TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA20–22
TLS_ECDH_anon_WITH_AES_128_CBC_SHA20–22
TLS_ECDH_anon_WITH_AES_256_CBC_SHA20–22
TLS_ECDH_anon_WITH_NULL_SHA20–22
TLS_ECDH_anon_WITH_RC4_128_SHA20–2221+21+
TLS_NULL_WITH_NULL_NULL1–8
TLS_PSK_WITH_3DES_EDE_CBC_SHA21–2221+
TLS_RSA_EXPORT_WITH_DES40_CBC_SHA1–81–8
TLS_RSA_WITH_3DES_EDE_CBC_SHA1–81–820+20+
TLS_RSA_WITH_DES_CBC_SHA1–81–8
TLS_RSA_WITH_NULL_MD51–8
TLS_RSA_WITH_NULL_SHA1–8
TLS_RSA_WITH_NULL_SHA25620–22
SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA9–229–19
SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA9–229–19
SSL_DHE_DSS_WITH_DES_CBC_SHA9–229–19
SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA9–229–19
SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA9–229–19
SSL_DHE_RSA_WITH_DES_CBC_SHA9–229–19
SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA9–22
SSL_DH_anon_EXPORT_WITH_RC4_40_MD59–22
SSL_DH_anon_WITH_3DES_EDE_CBC_SHA9–22
SSL_DH_anon_WITH_DES_CBC_SHA9–22
SSL_DH_anon_WITH_RC4_128_MD59–22
SSL_RSA_EXPORT_WITH_DES40_CBC_SHA9–229–19
SSL_RSA_EXPORT_WITH_RC4_40_MD59–229–199+9–19
SSL_RSA_WITH_DES_CBC_SHA9–229–19
SSL_RSA_WITH_NULL_MD59–22
SSL_RSA_WITH_NULL_SHA9–229+9+
TLS_DHE_DSS_WITH_AES_128_CBC_SHA9–229–22
TLS_DHE_DSS_WITH_AES_128_CBC_SHA25620–22
TLS_DHE_DSS_WITH_AES_128_GCM_SHA25620–22
TLS_DHE_DSS_WITH_AES_256_CBC_SHA9–2211–22
TLS_DHE_DSS_WITH_AES_256_CBC_SHA25620–22
TLS_DHE_DSS_WITH_AES_256_GCM_SHA38420–2220+20+
TLS_DH_anon_WITH_AES_128_CBC_SHA9–22
TLS_DH_anon_WITH_AES_128_CBC_SHA25620–22
TLS_DH_anon_WITH_AES_128_GCM_SHA25620–22
TLS_DH_anon_WITH_AES_256_CBC_SHA9–22
TLS_DH_anon_WITH_AES_256_CBC_SHA25620–22
TLS_DH_anon_WITH_AES_256_GCM_SHA38420–22
TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA11–2211–1920+20+
TLS_ECDHE_ECDSA_WITH_NULL_SHA11–2221+21+
TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA11–2211–1920+20+
TLS_ECDHE_RSA_WITH_NULL_SHA11–2211+11+
TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA11–2211–19
TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA11–2211–19
TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA25620–22
TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA25620–22
TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA11–2211–19
TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA38420–22
TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA38420–22
TLS_ECDH_ECDSA_WITH_NULL_SHA11–22
TLS_ECDH_ECDSA_WITH_RC4_128_SHA11–2211–19
TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA11–2211–19
TLS_ECDH_RSA_WITH_AES_128_CBC_SHA11–2211–19
TLS_ECDH_RSA_WITH_AES_128_CBC_SHA25620–22
TLS_ECDH_RSA_WITH_AES_128_GCM_SHA25620–22
TLS_ECDH_RSA_WITH_AES_256_CBC_SHA11–2211–19
TLS_ECDH_RSA_WITH_AES_256_CBC_SHA38420–22
TLS_ECDH_RSA_WITH_AES_256_GCM_SHA38420–22
TLS_ECDH_RSA_WITH_NULL_SHA11–22
TLS_ECDH_RSA_WITH_RC4_128_SHA11–2211–19
TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA11–22
TLS_ECDH_anon_WITH_AES_128_CBC_SHA11–22
TLS_ECDH_anon_WITH_AES_256_CBC_SHA11–22
TLS_ECDH_anon_WITH_NULL_SHA11–22
TLS_ECDH_anon_WITH_RC4_128_SHA11–2221+
TLS_PSK_WITH_3DES_EDE_CBC_SHA21–2220+20+
TLS_RSA_WITH_NULL_SHA25620–221–81–8
DES-CBC-SHASSL_RSA_WITH_DES_CBC_SHA1–221+1–19
DHE-DSS-AES128-SHATLS_DHE_DSS_WITH_AES_128_CBC_SHA1–221–22
DHE-DSS-AES256-SHATLS_DHE_DSS_WITH_AES_256_CBC_SHA1–221+1–8, 11+
EDH-DSS-DES-CBC-SHASSL_DHE_DSS_WITH_DES_CBC_SHA1–221–19
EDH-DSS-DES-CBC3-SHASSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA1–221–19
EDH-RSA-DES-CBC-SHASSL_DHE_RSA_WITH_DES_CBC_SHA1–221–19
EDH-RSA-DES-CBC3-SHASSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA1–221–19
EXP-DES-CBC-SHASSL_RSA_EXPORT_WITH_DES40_CBC_SHA1–221–19
EXP-EDH-DSS-DES-CBC-SHASSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA1–221–19
EXP-EDH-RSA-DES-CBC-SHASSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA1–221–81–8
EXP-RC4-MD5SSL_RSA_EXPORT_WITH_RC4_40_MD51–22