diff options
Diffstat (limited to 'luni/src/main/java/javax/net/ssl/SSLEngine.java')
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLEngine.java | 364 |
1 files changed, 186 insertions, 178 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java index cbf02ac..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,155 +79,155 @@ import java.nio.ByteBuffer; * </tr> * </thead> * <tbody> - * <tr> + * <tr class="deprecated"> * <td>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>9+</td> - * <td>9-19</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+</td> - * <td>9-19</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+</td> - * <td>9-19</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+</td> - * <td>9-19</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+</td> - * <td>9-19</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+</td> - * <td>9-19</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+</td> + * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_DES_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_DH_anon_WITH_RC4_128_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>9+</td> - * <td>9-19</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+</td> - * <td>9-19</td> + * <td>9–22</td> + * <td>9–19</td> * </tr> * <tr> * <td>SSL_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>9+</td> - * <td>9-19</td> + * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_DES_CBC_SHA</td> - * <td>9+</td> - * <td>9-19</td> + * <td>9–22</td> + * <td>9–19</td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_NULL_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>SSL_RSA_WITH_NULL_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_RSA_WITH_RC4_128_MD5</td> * <td>9+</td> - * <td>9-19</td> + * <td>9–19</td> * </tr> * <tr> * <td>SSL_RSA_WITH_RC4_128_SHA</td> * <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> + * <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> + * <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+</td> - * <td>9+</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+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA</td> - * <td>9+</td> - * <td>20+</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+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DHE_DSS_WITH_AES_256_GCM_SHA384</td> - * <td>20+</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> + * <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> + * <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> + * <td>1–8</td> + * <td>1–8</td> * </tr> * <tr> * <td>TLS_DHE_RSA_WITH_AES_128_CBC_SHA</td> @@ -251,89 +259,89 @@ 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> + * <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>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>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_DSS_WITH_DES_CBC_SHA</td> - * <td>1-8</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>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>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_RSA_WITH_DES_CBC_SHA</td> - * <td>1-8</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>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>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_DH_anon_WITH_AES_256_GCM_SHA384</td> - * <td>20+</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>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -366,9 +374,9 @@ 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+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -376,9 +384,9 @@ 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+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -411,9 +419,9 @@ 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+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -421,119 +429,119 @@ 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+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_NULL_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_NULL_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_RSA_WITH_RC4_128_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_NULL_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_ECDH_anon_WITH_RC4_128_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -556,14 +564,14 @@ 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>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_PSK_WITH_3DES_EDE_CBC_SHA</td> - * <td>21+</td> + * <td>21–22</td> * <td></td> * </tr> * <tr> @@ -581,15 +589,15 @@ 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> + * <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> + * <td>1–8</td> + * <td>1–8</td> * </tr> * <tr> * <td>TLS_RSA_WITH_AES_128_CBC_SHA</td> @@ -621,24 +629,24 @@ 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> + * <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>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_WITH_NULL_SHA</td> - * <td>1-8</td> + * <td>1–8</td> * <td></td> * </tr> - * <tr> + * <tr class="deprecated"> * <td>TLS_RSA_WITH_NULL_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * </tbody> |