From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 6 Sep 2019 19:02:59 +0000 (+0200)
Subject: - updated SSL ciphers, now we allow 128 bit, but no weak ciphers
X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=commitdiff_plain;h=89f2bfa15d71bd860e0b12ffe999d78cc715e8c0

- updated SSL ciphers, now we allow 128 bit, but no weak ciphers
- keep few variants of SSL ciphers for users to choose from
---

diff --git a/apache-mod_ssl.conf b/apache-mod_ssl.conf
index cc1a2a2..ae1bdc9 100644
--- a/apache-mod_ssl.conf
+++ b/apache-mod_ssl.conf
@@ -69,7 +69,26 @@ SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
 #   SSL Cipher Suite:
 #   List the ciphers that the client is permitted to negotiate.
 #   See the mod_ssl documentation for a complete list.
-SSLCipherSuite HIGH:!aNULL:!MD5:!3DES:!CAMELLIA128:!AES128:!RSA
+
+# High security: no weak ciphers, at least 256 bit
+# (except TLS_AES_128_GCM_SHA256 which is required by TLSv1.3)
+#SSLCipherSuite HIGH:!aNULL:!AES128:!ARIA128:!CAMELLIA128:!RSA:!SHA:!SHA256:!SHA384
+
+# If you don't care about TLSv1.3 requirements and don't want any 128 bit
+# cipher you can disable TLS_AES_128_GCM_SHA256 by uncommenting line below
+#SSLCipherSuite TLSv1.3 TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384
+
+# Strong security: no weak ciphers, at least 128 bit
+# Recommended setting if you are not paranoid
+SSLCipherSuite HIGH:!aNULL:!RSA:!SHA:!SHA256:!SHA384
+
+# Medium security: includes some weak ciphers, at least 256 bit
+# (except TLS_AES_128_GCM_SHA256 which is required by TLSv1.3)
+#SSLCipherSuite HIGH:!aNULL:!AES128:!ARIA128:!CAMELLIA128:!RSA
+
+# Low security: includes some weak ciphers, at least 128 bit
+#SSLCipherSuite HIGH:!aNULL:!RSA
+
 SSLHonorCipherOrder on
 SSLCompression off
 SSLSessionTickets off
diff --git a/apache.spec b/apache.spec
index b0b5ded..811b3dc 100644
--- a/apache.spec
+++ b/apache.spec
@@ -36,7 +36,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.41
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2