Repository: hadoop Updated Branches: refs/heads/branch-2.8 bfd8fb309 -> 0ab74b21a
HADOOP-12817. Enable TLS v1.1 and 1.2 (rkanter) (cherry picked from commit a365a3941cf96a31c289cb22678a602738880f74) (cherry picked from commit f864faaafafcddb2bbcfd1171b4597e3e51e5c3d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0ab74b21 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0ab74b21 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0ab74b21 Branch: refs/heads/branch-2.8 Commit: 0ab74b21ab891e0b77382562d35b8cf04bb5554e Parents: bfd8fb3 Author: Robert Kanter <rkan...@apache.org> Authored: Thu Feb 18 11:09:50 2016 -0800 Committer: Brahma Reddy Battula <bra...@apache.org> Committed: Thu Feb 15 00:32:54 2018 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java | 3 ++- .../hadoop-common/src/main/resources/core-default.xml | 4 ++-- .../src/site/markdown/EncryptedShuffle.md | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ab74b21/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java ---------------------------------------------------------------------- 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 7148a65..45532bc 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 @@ -76,9 +76,10 @@ public class SSLFactory implements ConnectionConfigurator { public static final String SSL_ENABLED_PROTOCOLS_KEY = "hadoop.ssl.enabled.protocols"; - public static final String SSL_ENABLED_PROTOCOLS_DEFAULT = "TLSv1"; public static final String SSL_SERVER_EXCLUDE_CIPHER_LIST = "ssl.server.exclude.cipher.list"; + public static final String SSL_ENABLED_PROTOCOLS_DEFAULT = + "TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2"; private Configuration conf; private Mode mode; http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ab74b21/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml ---------------------------------------------------------------------- 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 6ef91b1..875ad53 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 @@ -1850,9 +1850,9 @@ <property> <name>hadoop.ssl.enabled.protocols</name> - <value>TLSv1</value> + <value>TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2</value> <description> - Protocols supported by the ssl. + The supported SSL protocols. </description> </property> http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ab74b21/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md index c23be7a..4083182 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md @@ -44,7 +44,7 @@ To enable encrypted shuffle, set the following properties in core-site.xml of al | `hadoop.ssl.keystores.factory.class` | `org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory` | The KeyStoresFactory implementation to use | | `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 | | `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 | -| `hadoop.ssl.enabled.protocols` | `TLSv1` | The supported SSL protocols (JDK6 can use **TLSv1**, JDK7+ can use **TLSv1,TLSv1.1,TLSv1.2**) | +| `hadoop.ssl.enabled.protocols` | `TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2` | The supported SSL protocols | **IMPORTANT:** Currently requiring client certificates should be set to false. Refer the [Client Certificates](#Client_Certificates) section for details. --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
