diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-05-28 15:34:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-28 15:34:53 +0000 |
| commit | b106b5f3d44f7cd94ecc1b45a0e4b079c6aa5276 (patch) | |
| tree | 47cfea8e6085c29204b825c5c9d5574c02d6dbf7 | |
| parent | ddfd859719048c50cf247125af436391a4fff742 (diff) | |
| parent | 024b80ccf9d9f2dc3b1527cfc46d28bfb2ba0d6d (diff) | |
| download | libcore-b106b5f3d44f7cd94ecc1b45a0e4b079c6aa5276.zip libcore-b106b5f3d44f7cd94ecc1b45a0e4b079c6aa5276.tar.gz libcore-b106b5f3d44f7cd94ecc1b45a0e4b079c6aa5276.tar.bz2 | |
Merge "Update SSLEngine Javadoc to reflect recent changes."
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLEngine.java | 411 |
1 files changed, 358 insertions, 53 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java index 418dfa7..86266ab 100644 --- a/luni/src/main/java/javax/net/ssl/SSLEngine.java +++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java @@ -48,6 +48,16 @@ import java.nio.ByteBuffer; * <td>1+</td> * <td>1+</td> * </tr> + * <tr> + * <td>TLSv1.1</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLSv1.2</td> + * <td>20+</td> + * <td>20+</td> + * </tr> * </tbody> * </table> * @@ -62,59 +72,59 @@ import java.nio.ByteBuffer; * </thead> * <tbody> * <tr> - * <td>SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> + * <td>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9+</td> - * <td></td> + * <td>9-19</td> * </tr> * <tr> - * <td>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</td> + * <td>SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA</td> * <td>9+</td> - * <td></td> + * <td>9-19</td> * </tr> * <tr> - * <td>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</td> + * <td>SSL_DHE_DSS_WITH_DES_CBC_SHA</td> * <td>9+</td> - * <td></td> + * <td>9-19</td> * </tr> * <tr> - * <td>SSL_DH_anon_WITH_DES_CBC_SHA</td> + * <td>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9+</td> - * <td></td> + * <td>9-19</td> * </tr> * <tr> - * <td>SSL_DH_anon_WITH_RC4_128_MD5</td> + * <td>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>9+</td> - * <td></td> + * <td>9-19</td> * </tr> * <tr> - * <td>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> + * <td>SSL_DHE_RSA_WITH_DES_CBC_SHA</td> * <td>9+</td> * <td>9-19</td> * </tr> * <tr> - * <td>SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA</td> - * <td>9+</td> + * <td>SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> * <td>9+</td> + * <td></td> * </tr> * <tr> - * <td>SSL_DHE_DSS_WITH_DES_CBC_SHA</td> + * <td>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</td> * <td>9+</td> - * <td>9-19</td> + * <td></td> * </tr> * <tr> - * <td>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> + * <td>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</td> * <td>9+</td> - * <td>9-19</td> + * <td></td> * </tr> * <tr> - * <td>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>9+</td> + * <td>SSL_DH_anon_WITH_DES_CBC_SHA</td> * <td>9+</td> + * <td></td> * </tr> * <tr> - * <td>SSL_DHE_RSA_WITH_DES_CBC_SHA</td> + * <td>SSL_DH_anon_WITH_RC4_128_MD5</td> * <td>9+</td> - * <td>9-19</td> + * <td></td> * </tr> * <tr> * <td>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</td> @@ -129,7 +139,7 @@ import java.nio.ByteBuffer; * <tr> * <td>SSL_RSA_WITH_3DES_EDE_CBC_SHA</td> * <td>9+</td> - * <td>9+</td> + * <td>9-19</td> * </tr> * <tr> * <td>SSL_RSA_WITH_DES_CBC_SHA</td> @@ -149,7 +159,7 @@ import java.nio.ByteBuffer; * <tr> * <td>SSL_RSA_WITH_RC4_128_MD5</td> * <td>9+</td> - * <td>9+</td> + * <td>9-19</td> * </tr> * <tr> * <td>SSL_RSA_WITH_RC4_128_SHA</td> @@ -157,31 +167,96 @@ import java.nio.ByteBuffer; * <td>9+</td> * </tr> * <tr> - * <td>TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> + * <td>TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> + * <td>1-8</td> * <td>1-8</td> - * <td></td> * </tr> * <tr> - * <td>TLS_DH_anon_WITH_3DES_EDE_CBC_SHA</td> + * <td>TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA</td> + * <td>1-8</td> * <td>1-8</td> - * <td></td> * </tr> * <tr> - * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA</td> + * <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</td> * <td>9+</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA256</td> + * <td>20+</td> * <td></td> * </tr> * <tr> - * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA</td> + * <td>TLS_DHE_DSS_WITH_AES_128_GCM_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA</td> * <td>9+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA256</td> + * <td>20+</td> * <td></td> * </tr> * <tr> - * <td>TLS_DH_anon_WITH_DES_CBC_SHA</td> + * <td>TLS_DHE_DSS_WITH_AES_256_GCM_SHA384</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_DHE_DSS_WITH_DES_CBC_SHA</td> + * <td>1-8</td> * <td>1-8</td> + * </tr> + * <tr> + * <td>TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> + * <td>1-8</td> + * <td>1-8</td> + * </tr> + * <tr> + * <td>TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> + * <td>1-8</td> + * <td>1-8</td> + * </tr> + * <tr> + * <td>TLS_DHE_RSA_WITH_AES_128_CBC_SHA</td> + * <td>9+</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>TLS_DHE_RSA_WITH_AES_128_CBC_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_DHE_RSA_WITH_AES_128_GCM_SHA256</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_DHE_RSA_WITH_AES_256_CBC_SHA</td> + * <td>9+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_DHE_RSA_WITH_AES_256_CBC_SHA256</td> + * <td>20+</td> * <td></td> * </tr> * <tr> + * <td>TLS_DHE_RSA_WITH_AES_256_GCM_SHA384</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_DHE_RSA_WITH_DES_CBC_SHA</td> + * <td>1-8</td> + * <td>1-8</td> + * </tr> + * <tr> * <td>TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1-8</td> * <td></td> @@ -212,54 +287,259 @@ import java.nio.ByteBuffer; * <td></td> * </tr> * <tr> - * <td>TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>1-8</td> + * <td>TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> * <td>1-8</td> + * <td></td> * </tr> * <tr> - * <td>TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA</td> - * <td>1-8</td> + * <td>TLS_DH_anon_WITH_3DES_EDE_CBC_SHA</td> * <td>1-8</td> + * <td></td> * </tr> * <tr> - * <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</td> - * <td>9+</td> + * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA</td> * <td>9+</td> + * <td></td> * </tr> * <tr> - * <td>TLS_DHE_DSS_WITH_AES_256_CBC_SHA</td> + * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_DH_anon_WITH_AES_128_GCM_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA</td> * <td>9+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA256</td> * <td>20+</td> + * <td></td> * </tr> * <tr> - * <td>TLS_DHE_DSS_WITH_DES_CBC_SHA</td> - * <td>1-8</td> - * <td>1-8</td> + * <td>TLS_DH_anon_WITH_AES_256_GCM_SHA384</td> + * <td>20+</td> + * <td></td> * </tr> * <tr> - * <td>TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>1-8</td> + * <td>TLS_DH_anon_WITH_DES_CBC_SHA</td> * <td>1-8</td> + * <td></td> * </tr> * <tr> - * <td>TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>1-8</td> - * <td>1-8</td> + * <td>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</td> + * <td>20+</td> + * <td></td> * </tr> * <tr> - * <td>TLS_DHE_RSA_WITH_AES_128_CBC_SHA</td> - * <td>9+</td> - * <td>9+</td> + * <td>TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA</td> + * <td>20+</td> + * <td>20+</td> * </tr> * <tr> - * <td>TLS_DHE_RSA_WITH_AES_256_CBC_SHA</td> - * <td>9+</td> + * <td>TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256</td> * <td>20+</td> + * <td></td> * </tr> * <tr> - * <td>TLS_DHE_RSA_WITH_DES_CBC_SHA</td> - * <td>1-8</td> - * <td>1-8</td> + * <td>TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDHE_ECDSA_WITH_NULL_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDHE_ECDSA_WITH_RC4_128_SHA</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_NULL_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDHE_RSA_WITH_RC4_128_SHA</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_NULL_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_NULL_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_RSA_WITH_RC4_128_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_anon_WITH_NULL_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_ECDH_anon_WITH_RC4_128_SHA</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_EMPTY_RENEGOTIATION_INFO_SCSV</td> + * <td>20+</td> + * <td>20+</td> * </tr> * <tr> * <td>TLS_NULL_WITH_NULL_NULL</td> @@ -282,11 +562,31 @@ import java.nio.ByteBuffer; * <td>9+</td> * </tr> * <tr> + * <td>TLS_RSA_WITH_AES_128_CBC_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_RSA_WITH_AES_128_GCM_SHA256</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> * <td>TLS_RSA_WITH_AES_256_CBC_SHA</td> * <td>9+</td> * <td>20+</td> * </tr> * <tr> + * <td>TLS_RSA_WITH_AES_256_CBC_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> + * <tr> + * <td>TLS_RSA_WITH_AES_256_GCM_SHA384</td> + * <td>20+</td> + * <td>20+</td> + * </tr> + * <tr> * <td>TLS_RSA_WITH_DES_CBC_SHA</td> * <td>1-8</td> * <td>1-8</td> @@ -301,6 +601,11 @@ import java.nio.ByteBuffer; * <td>1-8</td> * <td></td> * </tr> + * <tr> + * <td>TLS_RSA_WITH_NULL_SHA256</td> + * <td>20+</td> + * <td></td> + * </tr> * </tbody> * </table> * |