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 10c1d7d6079..3189b4480c0 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 f7d61c6d01a..ddcee2f7b5c 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 @@ hadoop.ssl.enabled.protocols - TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2 + TLSv1.1,TLSv1.2 - The supported SSL protocols. + The supported SSL protocols. The parameter will only used from + DatanodeHttpServer.