diff options
| author | Kenny Root <kroot@google.com> | 2014-10-06 22:34:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 22:34:49 +0000 |
| commit | 141111edf51ab918a1c12312fcbabdd22525fa3c (patch) | |
| tree | d78582ee7c7de72444f8d2a0f269a6ae14d72da6 /luni/src/main/java/javax | |
| parent | 08e093e6aecfff0605b34d7138560998d0334ccd (diff) | |
| parent | e6a6e935e98f426c7000b2bf4086f87101f4441c (diff) | |
| download | libcore-141111edf51ab918a1c12312fcbabdd22525fa3c.zip libcore-141111edf51ab918a1c12312fcbabdd22525fa3c.tar.gz libcore-141111edf51ab918a1c12312fcbabdd22525fa3c.tar.bz2 | |
am e6a6e935: Add support for TLS_FALLBACK_SCSV
* commit 'e6a6e935e98f426c7000b2bf4086f87101f4441c':
Add support for TLS_FALLBACK_SCSV
Diffstat (limited to 'luni/src/main/java/javax')
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLEngine.java | 5 | ||||
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLSocket.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java index 3ba3450..cbf02ac 100644 --- a/luni/src/main/java/javax/net/ssl/SSLEngine.java +++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java @@ -542,6 +542,11 @@ import java.nio.ByteBuffer; * <td>20+</td> * </tr> * <tr> + * <td>TLS_FALLBACK_SCSV</td> + * <td>21+</td> + * <td></td> + * </tr> + * <tr> * <td>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA</td> * <td>21+</td> * <td>21+</td> diff --git a/luni/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java index 33a88b6..dc406e1 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocket.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java @@ -521,6 +521,11 @@ import java.net.UnknownHostException; * <td>11+</td> * </tr> * <tr> + * <td>TLS_FALLBACK_SCSV</td> + * <td>21+</td> + * <td></td> + * </tr> + * <tr> * <td>TLS_PSK_WITH_3DES_EDE_CBC_SHA</td> * <td>21+</td> * <td></td> |