diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-12-17 17:58:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-17 17:58:10 +0000 |
| commit | 3610890fc90b4d6e8910d96ff92fb95e92e561f8 (patch) | |
| tree | 6ed5dc22adc156af2fcad085080f9594271acb1c | |
| parent | eae1cb934f0b9e778e91caf201aeb972d8aa10c1 (diff) | |
| parent | 53360555a747056b8e599c3e3fb06532e7e30f61 (diff) | |
| download | libcore-3610890fc90b4d6e8910d96ff92fb95e92e561f8.zip libcore-3610890fc90b4d6e8910d96ff92fb95e92e561f8.tar.gz libcore-3610890fc90b4d6e8910d96ff92fb95e92e561f8.tar.bz2 | |
Merge "Enable TLSv1.1 and TLSv1.2 by default for SSLSocket."
| -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, 5 insertions, 3 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java index 7f41836..0ae4abc 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocket.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java @@ -55,12 +55,12 @@ import java.net.UnknownHostException; * <tr> * <td>TLSv1.1</td> * <td>16+</td> - * <td></td> + * <td>20+</td> * </tr> * <tr> * <td>TLSv1.2</td> * <td>16+</td> - * <td></td> + * <td>20+</td> * </tr> * </tbody> * </table> diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index de0d7c2..fecb5c1 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -541,7 +541,9 @@ public final class StandardNames extends Assert { public static final Set<String> SSL_SOCKET_PROTOCOLS_CLIENT_DEFAULT = new HashSet<String>(Arrays.asList( "SSLv3", - "TLSv1")); + "TLSv1", + "TLSv1.1", + "TLSv1.2")); public static final Set<String> SSL_SOCKET_PROTOCOLS_SERVER_DEFAULT = new HashSet<String>(Arrays.asList( "SSLv3", |