diff options
| author | Kenny Root <kroot@google.com> | 2015-06-04 16:41:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 16:41:22 +0000 |
| commit | 9970b63a991cbfbe1f6deb10ad1336029cbbdea0 (patch) | |
| tree | 0ed43bde3fd3228adc7a63bea9f5b37c0697f09b | |
| parent | f080d44093ebb6baa594bc95755440b57206f846 (diff) | |
| parent | 90b217a3543f119bb7aa20d7a0e55fd5343e9ce7 (diff) | |
| download | libcore-9970b63a991cbfbe1f6deb10ad1336029cbbdea0.zip libcore-9970b63a991cbfbe1f6deb10ad1336029cbbdea0.tar.gz libcore-9970b63a991cbfbe1f6deb10ad1336029cbbdea0.tar.bz2 | |
Merge "Update offered ciphers" into mnc-dev
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLEngine.java | 96 | ||||
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLSocket.java | 108 | ||||
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 96 |
3 files changed, 150 insertions, 150 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java index 1d3d73a..0f94f41 100644 --- a/luni/src/main/java/javax/net/ssl/SSLEngine.java +++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java @@ -88,52 +88,52 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_DHE_RSA_WITH_DES_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_DH_anon_WITH_DES_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_DH_anon_WITH_RC4_128_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_RSA_EXPORT_WITH_RC4_40_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> @@ -143,17 +143,17 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>SSL_RSA_WITH_DES_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_RSA_WITH_NULL_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_RSA_WITH_NULL_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> @@ -298,32 +298,32 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_256_GCM_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -333,7 +333,7 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -368,7 +368,7 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_ECDHE_ECDSA_WITH_NULL_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -378,7 +378,7 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -413,7 +413,7 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_ECDHE_RSA_WITH_NULL_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -423,117 +423,117 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_NULL_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_NULL_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_RC4_128_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_NULL_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_RC4_128_SHA</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> @@ -563,7 +563,7 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_PSK_WITH_3DES_EDE_CBC_SHA</td> - * <td>21+</td> + * <td>21–22</td> * <td></td> * </tr> * <tr> @@ -638,7 +638,7 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_RSA_WITH_NULL_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * </tbody> diff --git a/luni/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java index e60bad1..50db129 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocket.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java @@ -132,52 +132,52 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_DHE_RSA_WITH_DES_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_DH_anon_WITH_DES_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_DH_anon_WITH_RC4_128_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_RSA_EXPORT_WITH_RC4_40_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> @@ -187,17 +187,17 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>SSL_RSA_WITH_DES_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td>9–19</td> * </tr> * <tr> * <td>SSL_RSA_WITH_NULL_MD5</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>SSL_RSA_WITH_NULL_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> @@ -272,37 +272,37 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA</td> - * <td>9+</td> + * <td>9–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_256_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_DH_anon_WITH_AES_256_GCM_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> @@ -337,7 +337,7 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>TLS_ECDHE_ECDSA_WITH_NULL_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> @@ -357,7 +357,7 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> @@ -392,7 +392,7 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>TLS_ECDHE_RSA_WITH_NULL_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> @@ -402,117 +402,117 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_NULL_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_NULL_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_RSA_WITH_RC4_128_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td>11–19</td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_NULL_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> * <td>TLS_ECDH_anon_WITH_RC4_128_SHA</td> - * <td>11+</td> + * <td>11–22</td> * <td></td> * </tr> * <tr> @@ -527,7 +527,7 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>TLS_PSK_WITH_3DES_EDE_CBC_SHA</td> - * <td>21+</td> + * <td>21–22</td> * <td></td> * </tr> * <tr> @@ -577,7 +577,7 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>TLS_RSA_WITH_NULL_SHA256</td> - * <td>20+</td> + * <td>20–22</td> * <td></td> * </tr> * </tbody> @@ -621,7 +621,7 @@ import java.net.UnknownHostException; * <tr> * <td>DES-CBC-SHA</td> * <td>SSL_RSA_WITH_DES_CBC_SHA</td> - * <td>1+</td> + * <td>1–22</td> * <td>1–19</td> * </tr> * <tr> @@ -675,19 +675,19 @@ import java.net.UnknownHostException; * <tr> * <td>EDH-RSA-DES-CBC-SHA</td> * <td>SSL_DHE_RSA_WITH_DES_CBC_SHA</td> - * <td>1+</td> + * <td>1–22</td> * <td>1–19</td> * </tr> * <tr> * <td>EDH-RSA-DES-CBC3-SHA</td> * <td>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</td> - * <td>1+</td> + * <td>1–22</td> * <td>1–19</td> * </tr> * <tr> * <td>EXP-DES-CBC-SHA</td> * <td>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>1+</td> + * <td>1–22</td> * <td>1–19</td> * </tr> * <tr> @@ -699,7 +699,7 @@ import java.net.UnknownHostException; * <tr> * <td>EXP-EDH-RSA-DES-CBC-SHA</td> * <td>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</td> - * <td>1+</td> + * <td>1–22</td> * <td>1–19</td> * </tr> * <tr> @@ -711,7 +711,7 @@ import java.net.UnknownHostException; * <tr> * <td>EXP-RC4-MD5</td> * <td>SSL_RSA_EXPORT_WITH_RC4_40_MD5</td> - * <td>1+</td> + * <td>1–22</td> * <td>1–19</td> * </tr> * <tr> diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index 414da7c..017c466 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -714,30 +714,18 @@ public final class StandardNames extends Assert { addBoth( "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"); addBoth( "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"); addBoth( "TLS_RSA_WITH_AES_256_CBC_SHA"); - addBoth( "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"); - addBoth( "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"); addBoth( "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"); addBoth( "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"); addBoth( "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"); addBoth( "TLS_RSA_WITH_AES_128_CBC_SHA"); - addBoth( "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"); - addBoth( "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"); addBoth( "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"); addBoth( "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"); addBoth( "TLS_ECDHE_RSA_WITH_RC4_128_SHA"); addBoth( "SSL_RSA_WITH_RC4_128_SHA"); - addBoth( "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"); - addBoth( "TLS_ECDH_RSA_WITH_RC4_128_SHA"); - addBoth( "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"); - addBoth( "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"); addBoth( "SSL_RSA_WITH_3DES_EDE_CBC_SHA"); - addBoth( "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"); - addBoth( "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"); - addBoth( "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA"); addBoth( "SSL_RSA_WITH_RC4_128_MD5"); // TLSv1.2 cipher suites - addBoth( "TLS_RSA_WITH_NULL_SHA256"); addBoth( "TLS_RSA_WITH_AES_128_CBC_SHA256"); addBoth( "TLS_RSA_WITH_AES_256_CBC_SHA256"); addOpenSsl("TLS_RSA_WITH_AES_128_GCM_SHA256"); @@ -746,14 +734,6 @@ public final class StandardNames extends Assert { addBoth( "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"); addOpenSsl("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"); addOpenSsl("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"); - addBoth( "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"); - addBoth( "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"); - addOpenSsl("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"); - addOpenSsl("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"); - addBoth( "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"); - addBoth( "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"); - addOpenSsl("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"); - addOpenSsl("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"); addBoth( "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"); addBoth( "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"); addOpenSsl("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"); @@ -762,14 +742,9 @@ public final class StandardNames extends Assert { addBoth( "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"); addOpenSsl("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"); addOpenSsl("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"); - addBoth( "TLS_DH_anon_WITH_AES_128_CBC_SHA256"); - addBoth( "TLS_DH_anon_WITH_AES_256_CBC_SHA256"); - addOpenSsl("TLS_DH_anon_WITH_AES_128_GCM_SHA256"); - addOpenSsl("TLS_DH_anon_WITH_AES_256_GCM_SHA384"); // Pre-Shared Key (PSK) cipher suites addOpenSsl("TLS_PSK_WITH_RC4_128_SHA"); - addOpenSsl("TLS_PSK_WITH_3DES_EDE_CBC_SHA"); addOpenSsl("TLS_PSK_WITH_AES_128_CBC_SHA"); addOpenSsl("TLS_PSK_WITH_AES_256_CBC_SHA"); addOpenSsl("TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"); @@ -783,29 +758,6 @@ public final class StandardNames extends Assert { addOpenSsl(CIPHER_SUITE_FALLBACK); // non-defaultCipherSuites - addBoth( "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"); - addBoth( "TLS_DH_anon_WITH_AES_256_CBC_SHA"); - addBoth( "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"); - addBoth( "TLS_DH_anon_WITH_AES_128_CBC_SHA"); - addBoth( "TLS_ECDH_anon_WITH_RC4_128_SHA"); - addBoth( "SSL_DH_anon_WITH_RC4_128_MD5"); - addBoth( "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"); - addBoth( "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"); - addBoth( "TLS_ECDHE_ECDSA_WITH_NULL_SHA"); - addBoth( "TLS_ECDHE_RSA_WITH_NULL_SHA"); - addBoth( "SSL_RSA_WITH_NULL_SHA"); - addBoth( "TLS_ECDH_ECDSA_WITH_NULL_SHA"); - addBoth( "TLS_ECDH_RSA_WITH_NULL_SHA"); - addBoth( "TLS_ECDH_anon_WITH_NULL_SHA"); - addBoth( "SSL_RSA_WITH_NULL_MD5"); - addBoth( "SSL_RSA_WITH_DES_CBC_SHA"); - addBoth( "SSL_DHE_RSA_WITH_DES_CBC_SHA"); - addBoth( "SSL_DH_anon_WITH_DES_CBC_SHA"); - addBoth( "SSL_RSA_EXPORT_WITH_RC4_40_MD5"); - addBoth( "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"); - addBoth( "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA"); - addBoth( "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"); - addBoth( "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"); // Android does not have Kerberos support addRi( "TLS_KRB5_WITH_RC4_128_SHA"); @@ -833,6 +785,54 @@ public final class StandardNames extends Assert { // Dropped addNeither("SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA"); addNeither("SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA"); + addRi( "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"); + addRi( "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA"); + addRi( "SSL_DHE_RSA_WITH_DES_CBC_SHA"); + addRi( "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"); + addRi( "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"); + addRi( "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"); + addRi( "SSL_DH_anon_WITH_DES_CBC_SHA"); + addRi( "SSL_DH_anon_WITH_RC4_128_MD5"); + addRi( "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA"); + addRi( "SSL_RSA_EXPORT_WITH_RC4_40_MD5"); + addRi( "SSL_RSA_WITH_DES_CBC_SHA"); + addRi( "SSL_RSA_WITH_NULL_MD5"); + addRi( "SSL_RSA_WITH_NULL_SHA"); + addRi( "TLS_DH_anon_WITH_AES_128_CBC_SHA"); + addRi( "TLS_DH_anon_WITH_AES_128_CBC_SHA256"); + addNeither("TLS_DH_anon_WITH_AES_128_GCM_SHA256"); + addRi( "TLS_DH_anon_WITH_AES_256_CBC_SHA"); + addRi( "TLS_DH_anon_WITH_AES_256_CBC_SHA256"); + addNeither("TLS_DH_anon_WITH_AES_256_GCM_SHA384"); + addRi( "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"); + addRi( "TLS_ECDHE_ECDSA_WITH_NULL_SHA"); + addRi( "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"); + addRi( "TLS_ECDHE_RSA_WITH_NULL_SHA"); + addRi( "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"); + addRi( "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"); + addRi( "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"); + addNeither("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"); + addRi( "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"); + addRi( "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"); + addNeither("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"); + addRi( "TLS_ECDH_ECDSA_WITH_NULL_SHA"); + addRi( "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"); + addRi( "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"); + addRi( "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"); + addRi( "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"); + addNeither("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"); + addRi( "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"); + addRi( "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"); + addNeither("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"); + addRi( "TLS_ECDH_RSA_WITH_NULL_SHA"); + addRi( "TLS_ECDH_RSA_WITH_RC4_128_SHA"); + addRi( "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"); + addRi( "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"); + addRi( "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"); + addRi( "TLS_ECDH_anon_WITH_NULL_SHA"); + addRi( "TLS_ECDH_anon_WITH_RC4_128_SHA"); + addNeither("TLS_PSK_WITH_3DES_EDE_CBC_SHA"); + addRi( "TLS_RSA_WITH_NULL_SHA256"); // Old non standard exportable encryption addNeither("SSL_RSA_EXPORT1024_WITH_DES_CBC_SHA"); |