[07/50] [abbrv] hadoop git commit: HADOOP-14340. Enable KMS and HttpFS to exclude SSL ciphers. Contributed by John Zhuge.

2017-05-02 Thread inigoiri 
HADOOP-14340. Enable KMS and HttpFS to exclude SSL ciphers. Contributed by John 
Zhuge.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7ceb8f1e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7ceb8f1e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7ceb8f1e

Branch: refs/heads/HDFS-10467
Commit: 7ceb8f1e53321327410bbc1ebbc8ccb01210661e
Parents: 9ad8130
Author: John Zhuge 
Authored: Thu Apr 20 21:22:06 2017 -0700
Committer: Inigo 
Committed: Tue May 2 14:52:02 2017 -0700

--
 .../src/main/java/org/apache/hadoop/http/HttpServer2.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ceb8f1e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
index bd10f93..cbabb33 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
@@ -384,6 +384,7 @@ public final class HttpServer2 implements FilterContainer {
   getPassword(sslConf, SSLFactory.SSL_SERVER_TRUSTSTORE_PASSWORD),
   sslConf.get(SSLFactory.SSL_SERVER_TRUSTSTORE_TYPE,
   SSLFactory.SSL_SERVER_TRUSTSTORE_TYPE_DEFAULT));
+  excludeCiphers(sslConf.get(SSLFactory.SSL_SERVER_EXCLUDE_CIPHER_LIST));
 }
 
 public HttpServer2 build() throws IOException {


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-14340. Enable KMS and HttpFS to exclude SSL ciphers. Contributed by John Zhuge.

2017-04-26 Thread jzhuge 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 93fa48fcf -> edd693833


HADOOP-14340. Enable KMS and HttpFS to exclude SSL ciphers. Contributed by John 
Zhuge.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/edd69383
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/edd69383
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/edd69383

Branch: refs/heads/trunk
Commit: edd693833b468623562c1b1085f79cbafbee9f15
Parents: 93fa48f
Author: John Zhuge 
Authored: Thu Apr 20 21:22:06 2017 -0700
Committer: John Zhuge 
Committed: Wed Apr 26 11:44:59 2017 -0700

--
 .../src/main/java/org/apache/hadoop/http/HttpServer2.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/edd69383/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
index bd10f93..cbabb33 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
@@ -384,6 +384,7 @@ public final class HttpServer2 implements FilterContainer {
   getPassword(sslConf, SSLFactory.SSL_SERVER_TRUSTSTORE_PASSWORD),
   sslConf.get(SSLFactory.SSL_SERVER_TRUSTSTORE_TYPE,
   SSLFactory.SSL_SERVER_TRUSTSTORE_TYPE_DEFAULT));
+  excludeCiphers(sslConf.get(SSLFactory.SSL_SERVER_EXCLUDE_CIPHER_LIST));
 }
 
 public HttpServer2 build() throws IOException {


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org