aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Dudka <kdudka@redhat.com>2013-01-28 14:07:32 +0100
committerKamil Dudka <kdudka@redhat.com>2013-01-28 14:12:57 +0100
commit11dde6ac7237f9f2cd43778ad2ea58dba0ed480b (patch)
tree2b5a21de07fc8ed94ba6555541a5d8aa1b8a37fa
parent0494da830bfe57c7624a8fbf5151a4a07d6acae5 (diff)
docs: update the comments about loading CA certs with NSS
Bug: https://bugzilla.redhat.com/696783
-rw-r--r--docs/curl.17
-rw-r--r--docs/libcurl/curl_easy_setopt.34
2 files changed, 4 insertions, 7 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index c2b6887d2..1aeeb4650 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -423,11 +423,8 @@ The windows version of curl will automatically look for a CA certs file named
\'curl-ca-bundle.crt\', either in the same directory as curl.exe, or in the
Current Working Directory, or in any folder along your PATH.
-If curl is built against the NSS SSL library then this option tells
-curl the nickname of the CA certificate to use within the NSS database
-defined by the environment variable SSL_DIR (or by default /etc/pki/nssdb).
-If the NSS PEM PKCS#11 module (libnsspem.so) is available then PEM files
-may be loaded.
+If curl is built against the NSS SSL library, the NSS PEM PKCS#11 module
+(libnsspem.so) needs to be available for this option to work properly.
If this option is used several times, the last one will be used.
.IP "--capath <CA certificate directory>"
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 9d712a45e..3d31aef7c 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -2260,8 +2260,8 @@ even indicate an accessible file.
This option is by default set to the system path where libcurl's cacert bundle
is assumed to be stored, as established at build time.
-When built against NSS, this is the directory that the NSS certificate
-database resides in.
+If curl is built against the NSS SSL library, the NSS PEM PKCS#11 module
+(libnsspem.so) needs to be available for this option to work properly.
.IP CURLOPT_ISSUERCERT
Pass a char * to a zero terminated string naming a file holding a CA
certificate in PEM format. If the option is set, an additional check against