? ads
? boinc.log
? build-ip4
? build-win
? checkcdate.pl
? config
? cookielist-leak.patch
? debug
? diff-exclude
? dump
? files
? http.sh
? libcurlapps
? mirror-contacts
? mirror-contacts2
? mirrorping.pl
? moo.c
? myconfigure
? myconfigure-c-ares
? myconfigure-codecoverage
? myconfigure-gnutls
? myconfigure-libssh2
? myconfigure-nss
? myconfigure-yassl
? patches
? proxy-connect-close.patch
? proxyftp
? proxytest
? psuedo-multisocket.c
? roundrobin.c
? run
? run-sftp
? scptest.sh
? scpultest.sh
? sftplisttest.sh
? sftptest.sh
? ssl-conn-state.patch
? stunnel.sh
? test-boinc.sh
? testftp
? testing.pl
? testit.sh
? timeout-refactor.patch
? tmp
? ares/ANNOUNCE
? ares/acountry
? ares/acountry.c.org
? ares/ares-localbind.patch
? ares/ares-localbind2.patch
? ares/c-ares-1.5.0.tar.gz
? ares/c-ares-1.5.0.tar.gz.asc
? ares/c-ares-1.5.1.tar.gz
? ares/c-ares-1.5.1.tar.gz.asc
? ares/libcares.pc
? ares/ms.patch
? ares/myconfigure
? ares/patches
? docs/examples/threaded-ssl
? docs/libcurl/dump
? hiper/.http.pid
? hiper/hiper
? hiper/hipev
? hiper/shiper
? hiper/ulimiter
? include/curl/fixall.sh
? include/curl/stamp-h3
? lib/Makefile.vc8.dist
? lib/certdata.txt
? lib/cscope.out
? lib/dump
? lib/escape.pl
? lib/libcurl.plist.dist
? lib/strerror.txt
? lib/tsplay
? packages/OS400/makefile
? src/time-test.patch
? tests/.ccache
? tests/DISABLED.patch
? tests/dump_1
? tests/dump_2
? tests/runtests.patch
? tests/data/fix.sh
? tests/data/fixmany.sh
? tests/server/.http.pid
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/curl/curl/acinclude.m4,v
retrieving revision 1.136
diff -u -r1.136 acinclude.m4
--- acinclude.m4	24 Oct 2007 16:40:59 -0000	1.136
+++ acinclude.m4	18 Feb 2008 07:52:52 -0000
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -2491,3 +2491,50 @@
   esac
 ])
 
+
+dnl CURL_CHECK_CA_BUNDLE
+dnl -------------------------------------------------
+dnl Check if a default ca-bundle should be used
+dnl
+dnl regarding the paths this will scan:
+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
+
+AC_DEFUN([CURL_CHECK_CA_BUNDLE], [
+
+  AC_MSG_CHECKING([default CA cert bundle])
+
+  AC_ARG_WITH(ca-bundle,
+AC_HELP_STRING([--with-ca-bundle=FILE], [File name to use as CA bundle])
+AC_HELP_STRING([--without-ca-bundle], [Don't use a default CA bundle]),
+  [ ca="$withval" ],
+  [
+    dnl the path we previously would have installed the curl ca bundle
+    dnl to, and thus we now check for an already existing cert in that place
+    dnl in case we find no other
+    if test "x$prefix" != xNONE; then
+      cac="\${prefix}/share/curl/curl-ca-bundle.crt"
+    else
+      cac="$ac_default_prefix/share/curl/curl-ca-bundle.crt"
+    fi
+
+    for a in /etc/ssl/certs/ca-certificates.crt \
+             /etc/pki/tls/certs/ca-bundle.crt \
+             /usr/share/ssl/certs/ca-bundle.crt \
+             "$cac"; do
+      if test -f $a; then
+        ca="$a"
+        break
+      fi
+    done
+    ]
+  )
+
+  if test "x$ca" != "xno"; then
+    CURL_CA_BUNDLE='"'$ca'"'
+    AC_SUBST(CURL_CA_BUNDLE)
+  fi
+  AC_MSG_RESULT([$ca])
+])
+
Index: configure.ac
===================================================================
RCS file: /cvsroot/curl/curl/configure.ac,v
retrieving revision 1.274
diff -u -r1.274 configure.ac
--- configure.ac	17 Feb 2008 04:36:08 -0000	1.274
+++ configure.ac	18 Feb 2008 07:52:52 -0000
@@ -1610,28 +1610,7 @@
 dnl Check for the CA bundle
 dnl **********************************************************************
 
-if test X"$SSL_ENABLED" != "X"; then
-
-  AC_MSG_CHECKING([CA cert bundle install path])
-
-  AC_ARG_WITH(ca-bundle,
-AC_HELP_STRING([--with-ca-bundle=FILE], [File name to install the CA bundle as])
-AC_HELP_STRING([--without-ca-bundle], [Don't install the CA bundle]),
-    [ ca="$withval" ],
-    [
-      if test "x$prefix" != xNONE; then
-        ca="\${prefix}/share/curl/curl-ca-bundle.crt"
-      else
-        ca="$ac_default_prefix/share/curl/curl-ca-bundle.crt"
-      fi
-    ] )
-
-    if test "x$ca" != "xno"; then
-      CURL_CA_BUNDLE='"'$ca'"'
-      AC_SUBST(CURL_CA_BUNDLE)
-    fi
-    AC_MSG_RESULT([$ca])
-fi dnl only done if some kind of SSL was enabled
+CURL_CHECK_CA_BUNDLE
 
 AM_CONDITIONAL(CABUNDLE, test x$ca != xno)
 
Index: docs/SSLCERTS
===================================================================
RCS file: /cvsroot/curl/curl/docs/SSLCERTS,v
retrieving revision 1.10
diff -u -r1.10 SSLCERTS
--- docs/SSLCERTS	8 Feb 2008 21:04:24 -0000	1.10
+++ docs/SSLCERTS	18 Feb 2008 07:52:52 -0000
@@ -1,17 +1,21 @@
                       Peer SSL Certificate Verification
                       =================================
 
-libcurl performs peer SSL certificate verification by default. This is done by
-installing a default CA cert bundle on 'make install' (or similar), that CA
-bundle package is used by default on operations against SSL servers.
+libcurl performs peer SSL certificate verification by default.  This is done
+by using CA cert bundle that the SSL library can use to make sure the peer's
+server certificate is valid.
 
 If you communicate with HTTPS or FTPS servers using certificates that are
 signed by CAs present in the bundle, you can be sure that the remote server
 really is the one it claims to be.
 
-If the remote server uses a self-signed certificate, if you don't install
-curl's CA cert bundle, if the server uses a certificate signed by a CA that
-isn't included in the bundle or if the remote host is an impostor
+Up until recently, curl bundled a severely outdated ca bundle file that was
+installed by default. These days, the curl archives include no ca certs at
+all. You need to get them elsewhere. See below for example.
+
+If the remote server uses a self-signed certificate, if you don't install a CA
+cert bundle, if the server uses a certificate signed by a CA that isn't
+included in the bundle you use or if the remote host is an impostor
 impersonating your favorite site, and you want to transfer files from this
 server, do one of the following:
 
@@ -27,10 +31,8 @@
     With the curl command line tool: --cacert [file]
 
  3. Add the CA cert for your server to the existing default CA cert bundle.
-    The default path of the CA bundle installed with the curl package is:
-    /usr/local/share/curl/curl-ca-bundle.crt, which can be changed by running
-    configure with the --with-ca-bundle option pointing out the path of your
-    choice.
+    The default path of the CA bundle used can be changed by running configure
+    with the --with-ca-bundle option pointing out the path of your choice.
 
     To do this, you need to get the CA cert for your server in PEM format and
     then append that to your CA cert bundle.