|
 |
9048b9f |
From f0f51d75c160baeb212090940ec1dc35af9bd565 Mon Sep 17 00:00:00 2001
|
|
|
9048b9f |
From: Todd Zullinger <tmz@pobox.com>
|
|
|
9048b9f |
Date: Sun, 26 Aug 2018 01:31:13 -0400
|
|
|
9048b9f |
Subject: [PATCH] Use system-wide crypto policy
|
|
|
9048b9f |
|
|
|
9048b9f |
Reference: https://fedoraproject.org/wiki/Packaging:CryptoPolicies
|
|
|
9048b9f |
---
|
|
|
9048b9f |
src/Socket.cpp | 17 +++--------------
|
|
|
9048b9f |
1 file changed, 3 insertions(+), 14 deletions(-)
|
|
|
9048b9f |
|
|
|
9048b9f |
diff --git a/src/Socket.cpp b/src/Socket.cpp
|
|
|
9048b9f |
index fa510462..e40c76ea 100644
|
|
|
9048b9f |
--- a/src/Socket.cpp
|
|
|
9048b9f |
+++ b/src/Socket.cpp
|
|
|
9048b9f |
@@ -28,21 +28,10 @@
|
|
|
9048b9f |
#endif
|
|
|
9048b9f |
|
|
|
9048b9f |
#ifdef HAVE_LIBSSL
|
|
|
9048b9f |
-// Copypasted from
|
|
|
9048b9f |
-// https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29
|
|
|
9048b9f |
-// at 2018-04-01
|
|
|
9048b9f |
+// Use system-wide crypto policy
|
|
|
9048b9f |
+// https://fedoraproject.org/wiki/Packaging:CryptoPolicies
|
|
|
9048b9f |
static CString ZNC_DefaultCipher() {
|
|
|
9048b9f |
- return "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-"
|
|
|
9048b9f |
- "ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-"
|
|
|
9048b9f |
- "AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-"
|
|
|
9048b9f |
- "SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-"
|
|
|
9048b9f |
- "RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:"
|
|
|
9048b9f |
- "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-"
|
|
|
9048b9f |
- "SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:"
|
|
|
9048b9f |
- "DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:"
|
|
|
9048b9f |
- "ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:"
|
|
|
9048b9f |
- "AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-"
|
|
|
9048b9f |
- "SHA:DES-CBC3-SHA:!DSS";
|
|
|
9048b9f |
+ return "PROFILE=SYSTEM";
|
|
|
9048b9f |
}
|
|
|
9048b9f |
#endif
|
|
|
9048b9f |
|
|
|
9048b9f |
--
|
|
|
9048b9f |
2.19.0.rc0
|
|
|
9048b9f |
|