You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jz...@apache.org on 2017/05/15 23:30:13 UTC

[1/2] hadoop git commit: HADOOP-14417. Update default SSL cipher list for KMS. Contributed by John Zhuge.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d370edc6a -> da7c900fe


HADOOP-14417. Update default SSL cipher list for KMS. 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/2be559b8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2be559b8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2be559b8

Branch: refs/heads/branch-2
Commit: 2be559b8429a2d8b9d924bb16a67ad67d9bd7f40
Parents: d370edc
Author: John Zhuge <jz...@apache.org>
Authored: Fri May 12 07:52:32 2017 -0700
Committer: John Zhuge <jz...@apache.org>
Committed: Mon May 15 16:24:45 2017 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2be559b8/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh b/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh
index 009f9c4..210b87a 100644
--- a/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh
+++ b/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh
@@ -192,11 +192,6 @@ if [ "${KMS_SSL_CIPHERS}" = "" ]; then
   KMS_SSL_CIPHERS+=",TLS_RSA_WITH_AES_128_CBC_SHA256"
   KMS_SSL_CIPHERS+=",TLS_RSA_WITH_AES_128_CBC_SHA"
   KMS_SSL_CIPHERS+=",TLS_RSA_WITH_3DES_EDE_CBC_SHA"
-  KMS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
-  KMS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
-  KMS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
-  KMS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
-  KMS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
   print "Setting KMS_SSL_CIPHERS:           ${KMS_SSL_CIPHERS}"
 else
   print "Using   KMS_SSL_CIPHERS:           ${KMS_SSL_CIPHERS}"


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


[2/2] hadoop git commit: HDFS-11816. Update default SSL cipher list for HttpFS. Contributed by John Zhuge.

Posted by jz...@apache.org.
HDFS-11816. Update default SSL cipher list for HttpFS. 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/da7c900f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da7c900f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da7c900f

Branch: refs/heads/branch-2
Commit: da7c900fe3ecbee80bd17bf5a6990e22e6e728c9
Parents: 2be559b
Author: John Zhuge <jz...@apache.org>
Authored: Fri May 12 07:52:58 2017 -0700
Committer: John Zhuge <jz...@apache.org>
Committed: Mon May 15 16:26:39 2017 -0700

----------------------------------------------------------------------
 .../hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh        | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/da7c900f/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
index 7e47cb7..0f5c25e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
@@ -171,11 +171,6 @@ if [ "${HTTPFS_SSL_CIPHERS}" = "" ]; then
   HTTPFS_SSL_CIPHERS+=",TLS_RSA_WITH_AES_128_CBC_SHA256"
   HTTPFS_SSL_CIPHERS+=",TLS_RSA_WITH_AES_128_CBC_SHA"
   HTTPFS_SSL_CIPHERS+=",TLS_RSA_WITH_3DES_EDE_CBC_SHA"
-  HTTPFS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
-  HTTPFS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
-  HTTPFS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
-  HTTPFS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
-  HTTPFS_SSL_CIPHERS+=",TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
   print "Setting HTTPFS_SSL_CIPHERS: ${HTTPFS_SSL_CIPHERS}"
 else
   print "Using   HTTPFS_SSL_CIPHERS: ${HTTPFS_SSL_CIPHERS}"


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