Repository: hadoop Updated Branches: refs/heads/branch-2.6 905b339a3 -> c0b17bf10
HADOOP-11217. Disable SSLv3 in KMS. (Robert Kanter via kasha) (cherry picked from commit 1a780823384a9c4289b8bb0b3c73e6b886d78fd0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3e901e63 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e901e63 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e901e63 Branch: refs/heads/branch-2.6 Commit: 3e901e63e4995d7516f085aec44aa317b366c3c0 Parents: 905b339 Author: Karthik Kambatla <[email protected]> Authored: Tue Oct 28 17:18:24 2014 -0700 Committer: Karthik Kambatla <[email protected]> Committed: Tue Oct 28 17:34:27 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e901e63/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 a7194e3..b9aed50 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -639,6 +639,8 @@ Release 2.6.0 - UNRELEASED HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by a peer. (Arun Suresh and Gregory Chanan via kasha) + HADOOP-11217. Disable SSLv3 in KMS. (Robert Kanter via kasha) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e901e63/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml index 6235b8b..531ad15 100644 --- a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml +++ b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml @@ -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" sslProtocol="TLS" + clientAuth="false" sslEnabledProtocols="TLSv1" keystoreFile="${kms.ssl.keystore.file}" keystorePass="${kms.ssl.keystore.pass}"/>
