[glib-networking] Remove CA path build option again



commit 1960a16650b0fbcb41b28f2c66948d21851dbaea
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Feb 4 10:11:47 2019 -0600

    Remove CA path build option again
    
    Let's use the default trust paths, like the GnuTLS backend does since
    2.58.
    
    Fixes #53

 detect_certificates.py            | 16 ----------------
 meson.build                       | 21 ---------------------
 tls/openssl/gtlsbackend-openssl.c |  5 -----
 3 files changed, 42 deletions(-)
---
diff --git a/meson.build b/meson.build
index 2da1d76..d979680 100644
--- a/meson.build
+++ b/meson.build
@@ -128,27 +128,6 @@ elif cc.get_id() == 'msvc'
   backends += ['openssl']
 endif
 
-if backends.contains('openssl') and host_machine.system() != 'windows'
-  ca_certificates = get_option('ca_certificates')
-  if ca_certificates == 'no'
-    message('CA certificates disabled')
-  else
-    if ca_certificates == ''
-      detect_certificates = run_command(join_paths(meson.source_root(), 'detect_certificates.py'))
-
-      if detect_certificates.returncode() == 1
-        error('Could not find certificates. Use -Dca_certificates=path to set, or -Dca_certificates=no to 
disable it')
-      endif
-
-      ca_certificates = detect_certificates.stdout().strip()
-    endif
-
-    message('CA certificates: ' + ca_certificates)
-
-    config_h.set_quoted('GTLS_SYSTEM_CA_FILE', ca_certificates)
-  endif
-endif
-
 if backends.length() == 0
   error('No TLS backends enabled. Please enable at least one TLS backend')
 endif
diff --git a/tls/openssl/gtlsbackend-openssl.c b/tls/openssl/gtlsbackend-openssl.c
index 6515c77..34837cf 100644
--- a/tls/openssl/gtlsbackend-openssl.c
+++ b/tls/openssl/gtlsbackend-openssl.c
@@ -196,11 +196,6 @@ g_tls_backend_openssl_real_create_database (GTlsBackendOpenssl  *self,
     }
 #endif
 
-#ifdef GTLS_SYSTEM_CA_FILE
-  if (anchor_file == NULL)
-    anchor_file = g_strdup (GTLS_SYSTEM_CA_FILE);
-#endif
-
   if (anchor_file == NULL)
     {
       const gchar *openssl_cert_file;


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