diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-12-19 21:19:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-19 21:19:10 +0000 |
| commit | bde0fd713daaecb5028dad40136538b219c77145 (patch) | |
| tree | 1863addc3e808d7ff9c7fda2c5e59e707b7213ff | |
| parent | 79a0da5d3d4c6369cee33877a005f3c99f281c85 (diff) | |
| parent | 71fa3ffedf35aff964eb2545e9af5fecfb8fe8ce (diff) | |
| download | libcore-bde0fd713daaecb5028dad40136538b219c77145.zip libcore-bde0fd713daaecb5028dad40136538b219c77145.tar.gz libcore-bde0fd713daaecb5028dad40136538b219c77145.tar.bz2 | |
Merge "Disable MD5 cipher suites in SSLSocket and SSLEngine."
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLSocket.java | 4 | ||||
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java index e97b411..2eafbb5 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocket.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java @@ -203,7 +203,7 @@ import java.net.UnknownHostException; * <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> @@ -686,7 +686,7 @@ import java.net.UnknownHostException; * <td>RC4-MD5</td> * <td>SSL_RSA_WITH_RC4_128_MD5</td> * <td>1+</td> - * <td>1+</td> + * <td>1-19</td> * </tr> * <tr> * <td>RC4-SHA</td> diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index ee9f68a..b33aefe 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -805,7 +805,6 @@ public final class StandardNames extends Assert { "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA", "SSL_RSA_WITH_RC4_128_SHA", - "SSL_RSA_WITH_RC4_128_MD5", CIPHER_SUITE_SECURE_RENEGOTIATION); private static final Set<String> PERMITTED_DEFAULT_KEY_EXCHANGE_ALGS = @@ -823,8 +822,7 @@ public final class StandardNames extends Assert { "AES_256_GCM")); private static final Set<String> PERMITTED_DEFAULT_MACS = - new HashSet<String>(Arrays.asList("MD5", - "SHA", + new HashSet<String>(Arrays.asList("SHA", "SHA256", "SHA384")); |