Repository: hadoop Updated Branches: refs/heads/branch-2 779a69e28 -> f864faaaf
HADOOP-12817. Enable TLS v1.1 and 1.2 (rkanter) (cherry picked from commit a365a3941cf96a31c289cb22678a602738880f74) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f864faaa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f864faaa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f864faaa Branch: refs/heads/branch-2 Commit: f864faaafafcddb2bbcfd1171b4597e3e51e5c3d Parents: 779a69e Author: Robert Kanter <[email protected]> Authored: Thu Feb 18 11:09:50 2016 -0800 Committer: Robert Kanter <[email protected]> Committed: Thu Feb 18 11:11:32 2016 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../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 +- 4 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f864faaa/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4332c6c..e122df6 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -41,6 +41,8 @@ Release 2.9.0 - UNRELEASED HADOOP-12710. Remove dependency on commons-httpclient for TestHttpServerLogs (Wei-Chiu Chuang via iwasakims) + HADOOP-12817. Enable TLS v1.1 and 1.2 (rkanter) + BUG FIXES HADOOP-12605. Fix intermittent failure of TestIPC.testIpcWithReaderQueuing http://git-wip-us.apache.org/repos/asf/hadoop/blob/f864faaa/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 edec347..518de80 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 @@ -69,7 +69,8 @@ public class SSLFactory implements ConnectionConfigurator { public static final String SSL_ENABLED_PROTOCOLS = "hadoop.ssl.enabled.protocols"; - public static final String DEFAULT_SSL_ENABLED_PROTOCOLS = "TLSv1"; + public static final String DEFAULT_SSL_ENABLED_PROTOCOLS = + "TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2"; private Configuration conf; private Mode mode; http://git-wip-us.apache.org/repos/asf/hadoop/blob/f864faaa/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 e1cd883..839deed 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 @@ -1646,9 +1646,9 @@ for ldap providers in the same way as above does. <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/f864faaa/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.
