Repository: hadoop Updated Branches: refs/heads/branch-2 f504d95e8 -> 64add87f5
HADOOP-11218. Add TLSv1.1,TLSv1.2 to KMS, HttpFS, SSLFactory. Contributed by Vijay Singh. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/64add87f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/64add87f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/64add87f Branch: refs/heads/branch-2 Commit: 64add87f5cff2a0bb3a340488a91be79574cd393 Parents: f504d95 Author: Haohui Mai <[email protected]> Authored: Sun Nov 22 16:00:34 2015 -0800 Committer: Haohui Mai <[email protected]> Committed: Sun Nov 22 16:00:44 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-kms/src/main/tomcat/ssl-server.xml.conf | 2 +- .../hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/64add87f/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 35cfdf2..7ce69f3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -810,6 +810,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11901. BytesWritable fails to support 2G chunks due to integer overflow. (Reynold Xin via wheat9) + HADOOP-11218. Add TLSv1.1,TLSv1.2 to KMS, HttpFS, SSLFactory. + (Vijay Singh via wheat9) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/64add87f/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf index b60da47..05b53e0 100644 --- a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf +++ b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf @@ -70,7 +70,7 @@ described in the APR documentation --> <Connector port="${kms.http.port}" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="${kms.max.threads}" scheme="https" secure="true" - clientAuth="false" sslEnabledProtocols="TLSv1,SSLv2Hello" + clientAuth="false" sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2,SSLv2Hello" truststorePass="_kms_ssl_truststore_pass_" keystoreFile="${kms.ssl.keystore.file}" keystorePass="_kms_ssl_keystore_pass_"/> http://git-wip-us.apache.org/repos/asf/hadoop/blob/64add87f/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml index c91c2e2..287c9f5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml @@ -70,7 +70,7 @@ described in the APR documentation --> <Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslEnabledProtocols="TLSv1,SSLv2Hello" + clientAuth="false" sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2,SSLv2Hello" keystoreFile="${httpfs.ssl.keystore.file}" keystorePass="${httpfs.ssl.keystore.pass}"/>
