summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-07-31 20:58:06 -0400
committerJune McEnroe <june@causal.agency>2020-07-31 23:10:24 -0400
commitd5fc754c283290ea5279b9e6be3d4d2ee8355415 (patch)
treef6041a75dd6a12cbcd8ff4cef946f920d95fc5bd
parenttls_internal: Replace default ciphers with compat (diff)
downloadlibretls-d5fc754c283290ea5279b9e6be3d4d2ee8355415.tar.gz
libretls-d5fc754c283290ea5279b9e6be3d4d2ee8355415.zip
tls_config: Replace constant with X509_get_default_cert_file()
Diffstat (limited to '')
-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"
t'> Otherwise we can't easily embed links to other /about/ pages. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2015-08-12filters: apply HTML escapingLazaros Koromilas http://www.w3.org/International/questions/qa-escapes#use 2015-08-12git: update to v2.5.0Christian Hesse Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse <mail@eworm.de> 2015-08-12Fix processing of repo.hide and repo.ignoreDaniel Reichelt