[glib-networking/remove-profile-system] openssl: remove PROFILE=SYSTEM cipher list



commit 533c8c79d3d16300ada5f4c21f53e506333bb69f
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date:   Fri Feb 8 15:36:57 2019 +0100

    openssl: remove PROFILE=SYSTEM cipher list
    
    This seems to be fedora specific so until this gets to be upstream
    fedora can override the cipher list using the G_TLS_OPENSSL_CIPHER_LIST
    env var or they can patch glib-networking.
    
    Fixes #61

 tls/openssl/gtlsclientconnection-openssl.c | 6 +-----
 tls/openssl/gtlsserverconnection-openssl.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/tls/openssl/gtlsclientconnection-openssl.c b/tls/openssl/gtlsclientconnection-openssl.c
index c4bcdf6..be7c01a 100644
--- a/tls/openssl/gtlsclientconnection-openssl.c
+++ b/tls/openssl/gtlsclientconnection-openssl.c
@@ -35,11 +35,7 @@
 #include "gtlscertificate-openssl.h"
 #include <glib/gi18n-lib.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-#  define DEFAULT_CIPHER_LIST "HIGH:!DSS:!aNULL@STRENGTH"
-#else
-#  define DEFAULT_CIPHER_LIST "PROFILE=SYSTEM"
-#endif
+#define DEFAULT_CIPHER_LIST "HIGH:!DSS:!aNULL@STRENGTH"
 
 typedef struct _GTlsClientConnectionOpensslPrivate
 {
diff --git a/tls/openssl/gtlsserverconnection-openssl.c b/tls/openssl/gtlsserverconnection-openssl.c
index 450b5da..b23080e 100644
--- a/tls/openssl/gtlsserverconnection-openssl.c
+++ b/tls/openssl/gtlsserverconnection-openssl.c
@@ -30,11 +30,7 @@
 #include "openssl-include.h"
 #include <glib/gi18n-lib.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-#  define DEFAULT_CIPHER_LIST "HIGH:!DSS:!aNULL@STRENGTH"
-#else
-#  define DEFAULT_CIPHER_LIST "PROFILE=SYSTEM"
-#endif
+#define DEFAULT_CIPHER_LIST "HIGH:!DSS:!aNULL@STRENGTH"
 
 typedef struct _GTlsServerConnectionOpensslPrivate
 {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]