From e6a6e935e98f426c7000b2bf4086f87101f4441c Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Fri, 3 Oct 2014 04:03:25 -0700
Subject: Add support for TLS_FALLBACK_SCSV

Bug: 17750026
Change-Id: I8dec89ae59a6f745f63120b11b4f6dbe9b21a139
---
 luni/src/main/java/javax/net/ssl/SSLEngine.java | 5 +++++
 luni/src/main/java/javax/net/ssl/SSLSocket.java | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'luni/src/main/java/javax')

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>
-- 
cgit v1.1