summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--tls_config.c6
-rw-r--r--tls_internal.h4
2 files changed, 3 insertions, 7 deletions
diff --git a/tls_config.c b/tls_config.c
index 2f7a492..6c3404c 100644
--- a/tls_config.c
+++ b/tls_config.c
@@ -25,16 +25,16 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <openssl/x509.h>
+
 #include <tls.h>
 
 #include "tls_internal.h"
 
-static const char default_ca_file[] = TLS_DEFAULT_CA_FILE;
-
 const char *
 tls_default_ca_cert_file(void)
 {
-	return default_ca_file;
+	return X509_get_default_cert_file();
 }
 
 int
diff --git a/tls_internal.h b/tls_internal.h
index be82c85..adc6252 100644
--- a/tls_internal.h
+++ b/tls_internal.h
@@ -28,10 +28,6 @@
 
 __BEGIN_HIDDEN_DECLS
 
-#ifndef TLS_DEFAULT_CA_FILE
-#define TLS_DEFAULT_CA_FILE 	"/etc/ssl/cert.pem"
-#endif
-
 #define TLS_CIPHERS_DEFAULT	TLS_CIPHERS_COMPAT
 #define TLS_CIPHERS_COMPAT	"HIGH:!aNULL"
 #define TLS_CIPHERS_LEGACY	"HIGH:MEDIUM:!aNULL"
/commit/Makefile?h=1.3.0&id=eeaffc33432d3cf91902cac3eab50c0598bdaa19&follow=1'>Bump version.Jason A. Donenfeld 2014-06-29remove debug fprinf() calls that sneaked in with commit 79c985Christian Hesse 2014-06-28git: update to 2.0.1Christian Hesse 2014-06-28ui-patch: Flush stdout after outputting dataJohn Keeping 2014-06-28ui-log: ignore unhandled argumentsJohn Keeping 2014-06-28git: update for git 2.0Christian Hesse 2014-04-17remove trailing whitespaces from source filesChristian Hesse 2014-04-12git: update to 1.9.2Christian Hesse 2014-04-05Fix cgit_parse_url when a repo url is contained in another repo urlJulian Maurice 2014-03-20Makefile: use more reliable git tarball mirrorJason A. Donenfeld 2014-03-20git: update to 1.9.1Christian Hesse