commit 51b46d8f2fb25e81012e4eef0a86867f75c1d03d
author Kenny Root <kroot@google.com> Tue Mar 22 13:29:14 2016 -0700
committer Kenny Root <kroot@google.com> Tue Mar 22 14:08:41 2016 -0700
tree 3b40304194d03e18e65f7ae293d5b44f7ae5d8e1
parent 7f1e8e236e57c219037eb32a502572770b314e82

Update cipher information for N changes

In N we've removed RC4 as a default cipher and added ChaCha20-Poly1305
as a default cipher.

Bug: 27041019
Change-Id: I6defe1311e56ee3859fc1052ccd1a07e7a71fb09

ojluni/src/main/java/javax/net/ssl/SSLEngine.java

diff --git a/ojluni/src/main/java/javax/net/ssl/SSLEngine.java b/ojluni/src/main/java/javax/net/ssl/SSLEngine.java
index 1550744..36b8bcc 100755
--- a/ojluni/src/main/java/javax/net/ssl/SSLEngine.java
+++ b/ojluni/src/main/java/javax/net/ssl/SSLEngine.java
@@ -506,7 +506,7 @@
  *         <tr>
  *             <td>SSL_RSA_WITH_RC4_128_SHA</td>
  *             <td>9+</td>
- *             <td>9+</td>
+ *             <td>9&ndash;23</td>
  *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</td>
@@ -708,6 +708,11 @@
  *             <td>20+</td>
  *             <td>20+</td>
  *         </tr>
+ *         <tr>
+ *             <td>TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</td>
+ *             <td>24+</td>
+ *             <td>24+</td>
+ *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_ECDHE_ECDSA_WITH_NULL_SHA</td>
  *             <td>20&ndash;22</td>
@@ -716,7 +721,7 @@
  *         <tr>
  *             <td>TLS_ECDHE_ECDSA_WITH_RC4_128_SHA</td>
  *             <td>20+</td>
- *             <td>20+</td>
+ *             <td>20&ndash;23</td>
  *         </tr>
  *         <tr>
  *             <td>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA</td>
@@ -728,6 +733,11 @@
  *             <td>21+</td>
  *             <td>21+</td>
  *         </tr>
+ *         <tr>
+ *             <td>TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256</td>
+ *             <td>24+</td>
+ *             <td>24+</td>
+ *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</td>
  *             <td>20&ndash;22</td>
@@ -763,6 +773,11 @@
  *             <td>20+</td>
  *             <td>20+</td>
  *         </tr>
+ *         <tr>
+ *             <td>TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</td>
+ *             <td>24+</td>
+ *             <td>24+</td>
+ *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_ECDHE_RSA_WITH_NULL_SHA</td>
  *             <td>20&ndash;22</td>
@@ -771,7 +786,7 @@
  *         <tr>
  *             <td>TLS_ECDHE_RSA_WITH_RC4_128_SHA</td>
  *             <td>20+</td>
- *             <td>20+</td>
+ *             <td>20&ndash;23</td>
  *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</td>

ojluni/src/main/java/javax/net/ssl/SSLSocket.java

diff --git a/ojluni/src/main/java/javax/net/ssl/SSLSocket.java b/ojluni/src/main/java/javax/net/ssl/SSLSocket.java
index 7487de1..80b7a92 100755
--- a/ojluni/src/main/java/javax/net/ssl/SSLSocket.java
+++ b/ojluni/src/main/java/javax/net/ssl/SSLSocket.java
@@ -321,7 +321,7 @@
  *         <tr>
  *             <td>SSL_RSA_WITH_RC4_128_SHA</td>
  *             <td>9+</td>
- *             <td>9+</td>
+ *             <td>9&ndash;23</td>
  *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</td>
@@ -448,6 +448,11 @@
  *             <td>20+</td>
  *             <td>20+</td>
  *         </tr>
+ *         <tr>
+ *             <td>TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</td>
+ *             <td>24+</td>
+ *             <td>24+</td>
+ *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_ECDHE_ECDSA_WITH_NULL_SHA</td>
  *             <td>11&ndash;22</td>
@@ -456,7 +461,7 @@
  *         <tr>
  *             <td>TLS_ECDHE_ECDSA_WITH_RC4_128_SHA</td>
  *             <td>11+</td>
- *             <td>11+</td>
+ *             <td>11&ndash;23</td>
  *         </tr>
  *         <tr>
  *             <td>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA</td>
@@ -468,6 +473,11 @@
  *             <td>21+</td>
  *             <td>21+</td>
  *         </tr>
+ *         <tr>
+ *             <td>TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256</td>
+ *             <td>24+</td>
+ *             <td>24+</td>
+ *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</td>
  *             <td>11&ndash;22</td>
@@ -511,7 +521,7 @@
  *         <tr>
  *             <td>TLS_ECDHE_RSA_WITH_RC4_128_SHA</td>
  *             <td>11+</td>
- *             <td>11+</td>
+ *             <td>11&ndash;23</td>
  *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</td>
@@ -688,6 +698,11 @@
  *             <td>20+</td>
  *             <td>20+</td>
  *         </tr>
+ *         <tr>
+ *             <td>TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</td>
+ *             <td>24+</td>
+ *             <td>24+</td>
+ *         </tr>
  *         <tr class="deprecated">
  *             <td>TLS_RSA_WITH_NULL_SHA256</td>
  *             <td>20&ndash;22</td>
@@ -843,7 +858,7 @@
  *             <td>RC4-SHA</td>
  *             <td>SSL_RSA_WITH_RC4_128_SHA</td>
  *             <td>1+</td>
- *             <td>1+</td>
+ *             <td>1&ndash;23</td>
  *         </tr>
  *     </tbody>
  * </table>