about summary refs log tree commit diff
diff options
context:
space:
mode:
authorC. McEnroe <june@causal.agency>2020-07-31 20:58:06 -0400
committerC. McEnroe <june@causal.agency>2020-07-31 23:10:24 -0400
commitd5fc754c283290ea5279b9e6be3d4d2ee8355415 (patch)
treef6041a75dd6a12cbcd8ff4cef946f920d95fc5bd
parenttls_internal: Replace default ciphers with compat (diff)
tls_config: Replace constant with X509_get_default_cert_file()
-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"