diff options
| author | Kenny Root <kroot@google.com> | 2015-06-04 10:23:38 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-06-12 09:53:20 -0700 |
| commit | e108eb3cc306a27453e06f0bd8c54966c152bab8 (patch) | |
| tree | 883f80f7c2b3303984deb4dab8daec142b18c0cf /luni/src | |
| parent | 9970b63a991cbfbe1f6deb10ad1336029cbbdea0 (diff) | |
| download | libcore-e108eb3cc306a27453e06f0bd8c54966c152bab8.zip libcore-e108eb3cc306a27453e06f0bd8c54966c152bab8.tar.gz libcore-e108eb3cc306a27453e06f0bd8c54966c152bab8.tar.bz2 | |
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
Diffstat (limited to 'luni/src')
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLEngine.java | 164 | ||||
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLSocket.java | 144 |
2 files changed, 162 insertions, 146 deletions
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; * <p>{@code SSLEngine} instances obtained from default {@link SSLContext} are configured as * follows: * + * <style type="text/css"> + * tr.deprecated { + * background-color: #ccc; + * color: #999; + * font-style: italic; + * } + * </style> + * * <h4>Protocols</h4> * <table> * <thead> @@ -71,67 +79,67 @@ import java.nio.ByteBuffer; * </tr> * </thead> * <tbody> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_DSS_WITH_DES_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_RSA_WITH_DES_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_DES_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_RC4_128_MD5</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_EXPORT_WITH_RC4_40_MD5</td> * <td>9–22</td> * <td>9–19</td> @@ -141,17 +149,17 @@ import java.nio.ByteBuffer; * <td>9+</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_DES_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_NULL_MD5</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_NULL_SHA</td> * <td>9–22</td> * <td></td> @@ -166,57 +174,57 @@ import java.nio.ByteBuffer; * <td>9+</td> * <td>9+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</td> * <td>9–22</td> * <td>9–22</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_128_GCM_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA</td> * <td>9–22</td> * <td>20–22</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_256_GCM_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_DES_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> @@ -251,87 +259,87 @@ import java.nio.ByteBuffer; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_RSA_WITH_DES_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_DSS_WITH_DES_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_RSA_WITH_DES_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_3DES_EDE_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_GCM_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_GCM_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_DES_CBC_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</td> * <td>20–22</td> * <td></td> @@ -366,7 +374,7 @@ import java.nio.ByteBuffer; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_ECDSA_WITH_NULL_SHA</td> * <td>20–22</td> * <td></td> @@ -376,7 +384,7 @@ import java.nio.ByteBuffer; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>20–22</td> * <td></td> @@ -411,7 +419,7 @@ import java.nio.ByteBuffer; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_RSA_WITH_NULL_SHA</td> * <td>20–22</td> * <td></td> @@ -421,117 +429,117 @@ import java.nio.ByteBuffer; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_NULL_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_NULL_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_RC4_128_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_NULL_SHA</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_RC4_128_SHA</td> * <td>20–22</td> * <td></td> @@ -556,12 +564,12 @@ import java.nio.ByteBuffer; * <td>21+</td> * <td>21+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_NULL_WITH_NULL_NULL</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_PSK_WITH_3DES_EDE_CBC_SHA</td> * <td>21–22</td> * <td></td> @@ -581,12 +589,12 @@ import java.nio.ByteBuffer; * <td>21+</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> @@ -621,22 +629,22 @@ import java.nio.ByteBuffer; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_WITH_DES_CBC_SHA</td> * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_WITH_NULL_MD5</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_WITH_NULL_SHA</td> * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_WITH_NULL_SHA256</td> * <td>20–22</td> * <td></td> 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; * <p>{@code SSLSocket} instances obtained from default {@link SSLSocketFactory}, * {@link SSLServerSocketFactory}, and {@link SSLContext} are configured as follows: * + * <style type="text/css"> + * tr.deprecated { + * background-color: #ccc; + * color: #999; + * font-style: italic; + * } + * </style> + * * <h4>Protocols</h4> * * <p>Client socket: @@ -115,67 +123,67 @@ import java.net.UnknownHostException; * </tr> * </thead> * <tbody> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_DSS_WITH_DES_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_RSA_WITH_DES_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_DES_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_RC4_128_MD5</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_EXPORT_WITH_RC4_40_MD5</td> * <td>9–22</td> * <td>9–19</td> @@ -185,17 +193,17 @@ import java.net.UnknownHostException; * <td>9+</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_DES_CBC_SHA</td> * <td>9–22</td> * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_NULL_MD5</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_NULL_SHA</td> * <td>9–22</td> * <td></td> @@ -210,32 +218,32 @@ import java.net.UnknownHostException; * <td>9+</td> * <td>9+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</td> * <td>9–22</td> * <td>9–22</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_128_GCM_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA</td> * <td>9–22</td> * <td>11–22</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_256_GCM_SHA384</td> * <td>20–22</td> * <td></td> @@ -270,37 +278,37 @@ import java.net.UnknownHostException; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_GCM_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA</td> * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_GCM_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</td> * <td>11–22</td> * <td>11–19</td> @@ -335,7 +343,7 @@ import java.net.UnknownHostException; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_ECDSA_WITH_NULL_SHA</td> * <td>11–22</td> * <td></td> @@ -355,7 +363,7 @@ import java.net.UnknownHostException; * <td>21+</td> * <td>21+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>11–22</td> * <td>11–19</td> @@ -390,7 +398,7 @@ import java.net.UnknownHostException; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_RSA_WITH_NULL_SHA</td> * <td>11–22</td> * <td></td> @@ -400,117 +408,117 @@ import java.net.UnknownHostException; * <td>11+</td> * <td>11+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</td> * <td>11–22</td> * <td>11–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA</td> * <td>11–22</td> * <td>11–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA</td> * <td>11–22</td> * <td>11–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_NULL_SHA</td> * <td>11–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</td> * <td>11–22</td> * <td>11–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>11–22</td> * <td>11–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA</td> * <td>11–22</td> * <td>11–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA</td> * <td>11–22</td> * <td>11–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384</td> * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_NULL_SHA</td> * <td>11–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_RC4_128_SHA</td> * <td>11–22</td> * <td>11–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</td> * <td>11–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</td> * <td>11–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</td> * <td>11–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_NULL_SHA</td> * <td>11–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_RC4_128_SHA</td> * <td>11–22</td> * <td></td> @@ -525,7 +533,7 @@ import java.net.UnknownHostException; * <td>21+</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_PSK_WITH_3DES_EDE_CBC_SHA</td> * <td>21–22</td> * <td></td> @@ -575,7 +583,7 @@ import java.net.UnknownHostException; * <td>20+</td> * <td>20+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_WITH_NULL_SHA256</td> * <td>20–22</td> * <td></td> @@ -618,7 +626,7 @@ import java.net.UnknownHostException; * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>DES-CBC-SHA</td> * <td>SSL_RSA_WITH_DES_CBC_SHA</td> * <td>1–22</td> @@ -636,13 +644,13 @@ import java.net.UnknownHostException; * <td>1+</td> * <td>1–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>DHE-DSS-AES128-SHA</td> * <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</td> * <td>1–22</td> * <td>1–22</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>DHE-DSS-AES256-SHA</td> * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA</td> * <td>1–22</td> @@ -660,43 +668,43 @@ import java.net.UnknownHostException; * <td>1+</td> * <td>1–8, 11+</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>EDH-DSS-DES-CBC-SHA</td> * <td>SSL_DHE_DSS_WITH_DES_CBC_SHA</td> * <td>1–22</td> * <td>1–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>EDH-DSS-DES-CBC3-SHA</td> * <td>SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA</td> * <td>1–22</td> * <td>1–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>EDH-RSA-DES-CBC-SHA</td> * <td>SSL_DHE_RSA_WITH_DES_CBC_SHA</td> * <td>1–22</td> * <td>1–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>EDH-RSA-DES-CBC3-SHA</td> * <td>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>1–22</td> * <td>1–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>EXP-DES-CBC-SHA</td> * <td>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–22</td> * <td>1–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>EXP-EDH-DSS-DES-CBC-SHA</td> * <td>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–22</td> * <td>1–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>EXP-EDH-RSA-DES-CBC-SHA</td> * <td>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1–22</td> @@ -708,7 +716,7 @@ import java.net.UnknownHostException; * <td>1–8</td> * <td>1–8</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>EXP-RC4-MD5</td> * <td>SSL_RSA_EXPORT_WITH_RC4_40_MD5</td> * <td>1–22</td> |