commit 5887bd88d613280a7bdf88281abade0d7fd5fc23
author Adam Vartanian <flooey@google.com> Tue May 23 11:11:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 23 11:11:42 2017 +0000
tree fadc7e3f62225c5f6baa62eb120404ee3d855ecc
parent 0e1534335b1d207c33000561137805daa168a12c
parent d222b998caf7730924646e186fa70a09f3ef2db6

Merge "Update a few SSL version TBDs that were missed previously."

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 20d7fa9..a513c49 100644
--- a/ojluni/src/main/java/javax/net/ssl/SSLEngine.java
+++ b/ojluni/src/main/java/javax/net/ssl/SSLEngine.java
@@ -382,7 +382,7 @@
  *     <tbody>
  *         <tr class="deprecated">
  *             <td>SSLv3</td>
- *             <td>1&ndash;TBD</td>
+ *             <td>1&ndash;25</td>
  *             <td>1&ndash;22</td>
  *         </tr>
  *         <tr>

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 875ae34..1c863cb 100644
--- a/ojluni/src/main/java/javax/net/ssl/SSLSocket.java
+++ b/ojluni/src/main/java/javax/net/ssl/SSLSocket.java
@@ -155,7 +155,7 @@
  *     <tbody>
  *         <tr class="deprecated">
  *             <td>SSLv3</td>
- *             <td>1&ndash;TBD</td>
+ *             <td>1&ndash;25</td>
  *             <td>1&ndash;22</td>
  *         </tr>
  *         <tr>
@@ -188,7 +188,7 @@
  *     <tbody>
  *         <tr class="deprecated">
  *             <td>SSLv3</td>
- *             <td>1&ndash;TBD</td>
+ *             <td>1&ndash;25</td>
  *             <td>1&ndash;22</td>
  *         </tr>
  *         <tr>
@@ -849,13 +849,13 @@
  *         <tr class="deprecated">
  *             <td>RC4-MD5</td>
  *             <td>SSL_RSA_WITH_RC4_128_MD5</td>
- *             <td>1&ndash;TBD</td>
+ *             <td>1&ndash;25</td>
  *             <td>1&ndash;19</td>
  *         </tr>
  *         <tr class="deprecated">
  *             <td>RC4-SHA</td>
  *             <td>SSL_RSA_WITH_RC4_128_SHA</td>
- *             <td>1&ndash;TBD</td>
+ *             <td>1&ndash;25</td>
  *             <td>1&ndash;23</td>
  *         </tr>
  *     </tbody>