Skip to content

Commit bc2d3a7

Browse files
Daisuke Kobayashijojochuang
authored andcommitted
HADOOP-16549. Remove Unsupported SSL/TLS Versions from Docs/Properties. Contributed by Daisuke Kobayashi.
Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> Reviewed-by: Akira Ajisaka <aajisaka@apache.org>
1 parent 650c4ce commit bc2d3a7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public enum Mode { CLIENT, SERVER }
7272
public static final String SSL_ENABLED_PROTOCOLS_KEY =
7373
"hadoop.ssl.enabled.protocols";
7474
public static final String SSL_ENABLED_PROTOCOLS_DEFAULT =
75-
"TLSv1.1,TLSv1.2";
75+
"TLSv1.2";
7676

7777
public static final String SSL_SERVER_NEED_CLIENT_AUTH =
7878
"ssl.server.need.client.auth";

hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,9 +2703,9 @@
27032703

27042704
<property>
27052705
<name>hadoop.ssl.enabled.protocols</name>
2706-
<value>TLSv1.1,TLSv1.2</value>
2706+
<value>TLSv1.2</value>
27072707
<description>
2708-
The supported SSL protocols. The parameter will only used from
2708+
The supported SSL protocols. The parameter will only be used from
27092709
DatanodeHttpServer.
27102710
</description>
27112711
</property>

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To enable encrypted shuffle, set the following properties in core-site.xml of al
4646
| `hadoop.ssl.keystores.factory.class` | `org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory` | The KeyStoresFactory implementation to use |
4747
| `hadoop.ssl.server.conf` | `ssl-server.xml` | Resource file from which ssl server keystore information will be extracted. This file is looked up in the classpath, typically it should be in Hadoop conf/ directory |
4848
| `hadoop.ssl.client.conf` | `ssl-client.xml` | Resource file from which ssl server keystore information will be extracted. This file is looked up in the classpath, typically it should be in Hadoop conf/ directory |
49-
| `hadoop.ssl.enabled.protocols` | `TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2` | The supported SSL protocols |
49+
| `hadoop.ssl.enabled.protocols` | `TLSv1.2` | The supported SSL protocols. The parameter will only be used from DatanodeHttpServer. |
5050

5151
**IMPORTANT:** Currently requiring client certificates should be set to false. Refer the [Client Certificates](#Client_Certificates) section for details.
5252

0 commit comments

Comments
 (0)