[Libreoffice-commits] online.git: loolwsd.xml.in net/Ssl.cpp

[Michael Meeks]

 loolwsd.xml.in |    1 +
 net/Ssl.cpp    |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ec80d623b82e203bef5adb31d3ccf60fe6bca220
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Nov 22 16:47:05 2017 +0000

    Edit the right configuration XML file.
    
    Change-Id: If72006918550ee5c440ad6b2ff26a5bd0d1efef1

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index abec21ca..754aa6c3 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -66,6 +66,7 @@
         <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
         <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
         <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>
+        <cipher_list desc="List of OpenSSL ciphers to accept" default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"></cipher_list>
         <hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false">
             <max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age>
             <report_uri desc="HPKP's report-uri directive - pin validation failure are reported at this URL" enable="false"></report_uri>
diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index cd28f53b..dd0094b8 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -26,7 +26,7 @@ extern "C"
     };
 }
 
-#define DEFAULT_CIPHER_SET "ALL:!RC4:!SEED:!ADH:!LOW:!EXP:!MD5:@STRENGTH"
+#define DEFAULT_CIPHER_SET "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"
 
 std::unique_ptr<SslContext> SslContext::Instance(nullptr);