aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2008-11-21 06:36:21 +0000
committerDan Fandrich <dan@coneharvesters.com>2008-11-21 06:36:21 +0000
commitc4f4fa4089422bed414105dc4ae917b053f07c1e (patch)
tree2d74ac7c4eba41835d2d0e4bb21ad8a613878bf9
parent32634b0771dbaf6f0e06c916955cee62a606ee28 (diff)
Automatically detect OpenBSD's CA cert bundle.
-rw-r--r--CHANGES3
-rw-r--r--acinclude.m42
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 5f2c2d140..3f25a54df 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
Changelog
+Daniel Fandrich (20 Nov 2008)
+- Automatically detect OpenBSD's CA cert bundle.
+
Daniel Stenberg (19 Nov 2008)
- I removed the default use of "Pragma: no-cache" from libcurl when a proxy is
used. It has been used since forever but it was never a good idea to use
diff --git a/acinclude.m4 b/acinclude.m4
index bfe5b1890..71cf5e21a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2541,6 +2541,7 @@ dnl /etc/ssl/certs/ca-certificates.crt Debian systems
dnl /etc/pki/tls/certs/ca-bundle.crt Redhat and Mandriva
dnl /usr/share/ssl/certs/ca-bundle.crt old(er) Redhat
dnl /usr/local/share/certs/ca-root.crt FreeBSD
+dnl /etc/ssl/cert.pem OpenBSD
dnl /etc/ssl/certs/ (ca path) SUSE
AC_DEFUN([CURL_CHECK_CA_BUNDLE], [
@@ -2603,6 +2604,7 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
/etc/pki/tls/certs/ca-bundle.crt \
/usr/share/ssl/certs/ca-bundle.crt \
/usr/local/share/certs/ca-root.crt \
+ /etc/ssl/cert.pem \
"$cac"; do
if test -f "$a"; then
ca="$a"