[nutch] branch master updated: NUTCH-2794 Add additional ciphers to HTTP base's default cipher suite

[markus]

This is an automated email from the ASF dual-hosted git repository.

markus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c2e411  NUTCH-2794 Add additional ciphers to HTTP base's default 
cipher suite
1c2e411 is described below

commit 1c2e4110ca4f4d739c6f9cde42d7a54ab52fa860
Author: Markus Jelsma <mar...@apache.org>
AuthorDate: Wed Jun 17 13:21:24 2020 +0200

    NUTCH-2794 Add additional ciphers to HTTP base's default cipher suite
---
 .../src/java/org/apache/nutch/protocol/http/api/HttpBase.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git 
a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java 
b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
index d7e330e..30e2432 100644
--- 
a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
+++ 
b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
@@ -311,6 +311,14 @@ public abstract class HttpBase implements Protocol {
     String[] protocols = conf.getStrings("http.tls.supported.protocols",
         "TLSv1.2", "TLSv1.1", "TLSv1", "SSLv3");
     String[] ciphers = conf.getStrings("http.tls.supported.cipher.suites",
+        "ECDHE-ECDSA-AES128-GCM-SHA256",
+        "ECDHE-RSA-AES128-GCM-SHA256",
+        "ECDHE-ECDSA-AES256-GCM-SHA384",
+        "ECDHE-RSA-AES256-GCM-SHA384",
+        "ECDHE-ECDSA-CHACHA20-POLY1305",
+        "ECDHE-RSA-CHACHA20-POLY1305",
+        "DHE-RSA-AES128-GCM-SHA256",
+        "DHE-RSA-AES256-GCM-SHA384",
         "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
         "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
         "TLS_RSA_WITH_AES_256_CBC_SHA256",