diff options
| author | Ed Heyl <edheyl@google.com> | 2014-07-14 23:04:36 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2014-07-14 23:04:36 -0700 |
| commit | 1d64efb33b25007fa5a32892b1cfedd23a7973bb (patch) | |
| tree | 976e4cd05e30122f362bbe3e357dadd25f6b9c55 | |
| parent | 7fdd2c384f5b419e360017ffe640af1246123534 (diff) | |
| download | libcore-1d64efb33b25007fa5a32892b1cfedd23a7973bb.zip libcore-1d64efb33b25007fa5a32892b1cfedd23a7973bb.tar.gz libcore-1d64efb33b25007fa5a32892b1cfedd23a7973bb.tar.bz2 | |
reconcile aosp (510a147e8b463fc2678aed6ad4f8095cc891eea8) after branching. Please do not merge.
Change-Id: I11aabb0a603a77d86697b600fe4379817076af7f
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLEngine.java | 16 | ||||
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLSocket.java | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java index 59cdf62..f2b051c 100644 --- a/luni/src/main/java/javax/net/ssl/SSLEngine.java +++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java @@ -542,13 +542,13 @@ import java.nio.ByteBuffer; * <td>20+</td> * </tr> * <tr> - * <td>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA</td> + * <td>21+</td> * <td></td> * </tr> * <tr> - * <td>TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384</td> - * <td>20+</td> + * <td>TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA</td> + * <td>21+</td> * <td></td> * </tr> * <tr> @@ -558,22 +558,22 @@ import java.nio.ByteBuffer; * </tr> * <tr> * <td>TLS_PSK_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>21+</td> * <td></td> * </tr> * <tr> * <td>TLS_PSK_WITH_AES_128_CBC_SHA</td> - * <td>20+</td> + * <td>21+</td> * <td></td> * </tr> * <tr> * <td>TLS_PSK_WITH_AES_256_CBC_SHA</td> - * <td>20+</td> + * <td>21+</td> * <td></td> * </tr> * <tr> * <td>TLS_PSK_WITH_RC4_128_SHA</td> - * <td>20+</td> + * <td>21+</td> * <td></td> * </tr> * <tr> diff --git a/luni/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java index 72e1dbe..af97fa8 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocket.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java @@ -346,13 +346,13 @@ import java.net.UnknownHostException; * <td>11+</td> * </tr> * <tr> - * <td>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256</td> - * <td>20+</td> + * <td>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA</td> + * <td>21+</td> * <td></td> * </tr> * <tr> - * <td>TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384</td> - * <td>20+</td> + * <td>TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA</td> + * <td>21+</td> * <td></td> * </tr> * <tr> @@ -522,22 +522,22 @@ import java.net.UnknownHostException; * </tr> * <tr> * <td>TLS_PSK_WITH_3DES_EDE_CBC_SHA</td> - * <td>20+</td> + * <td>21+</td> * <td></td> * </tr> * <tr> * <td>TLS_PSK_WITH_AES_128_CBC_SHA</td> - * <td>20+</td> + * <td>21+</td> * <td></td> * </tr> * <tr> * <td>TLS_PSK_WITH_AES_256_CBC_SHA</td> - * <td>20+</td> + * <td>21+</td> * <td></td> * </tr> * <tr> * <td>TLS_PSK_WITH_RC4_128_SHA</td> - * <td>20+</td> + * <td>21+</td> * <td></td> * </tr> * <tr> |