From 1ea29b7385bc1545d7aa452549073d81f0c24b36 Mon Sep 17 00:00:00 2001
From: Gabor Bota <gabor.bota@cloudera.com>
Date: Wed, 12 Dec 2018 07:28:35 +0100
Subject: [PATCH] HADOOP-16000. Remove TLSv1 and SSLv2Hello from the default
 value of hadoop.ssl.enabled.protocols

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
---
 .../main/java/org/apache/hadoop/security/ssl/SSLFactory.java | 2 +-
 .../hadoop-common/src/main/resources/core-default.xml        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java
index 10c1d7d607..3189b4480c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java
@@ -72,7 +72,7 @@ public enum Mode { CLIENT, SERVER }
   public static final String SSL_ENABLED_PROTOCOLS_KEY =
       "hadoop.ssl.enabled.protocols";
   public static final String SSL_ENABLED_PROTOCOLS_DEFAULT =
-      "TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2";
+      "TLSv1.1,TLSv1.2";
 
   public static final String SSL_SERVER_NEED_CLIENT_AUTH =
       "ssl.server.need.client.auth";
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index f7d61c6d01..ddcee2f7b5 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -2417,9 +2417,10 @@
 
 <property>
   <name>hadoop.ssl.enabled.protocols</name>
-  <value>TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2</value>
+  <value>TLSv1.1,TLSv1.2</value>
   <description>
-    The supported SSL protocols.
+    The supported SSL protocols. The parameter will only used from
+    DatanodeHttpServer.
   </description>
 </property>