aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorKamil Dudka <kdudka@redhat.com>2015-03-25 13:48:41 +0100
committerKamil Dudka <kdudka@redhat.com>2015-04-22 13:21:31 +0200
commitb47c17d67c9b5c9e985375b090f0140bf43cb146 (patch)
treeeae985fca8853c0dcbf72e5556d070637f86db56 /docs
parent1fd33e3ec8fcfe6f5797b212980ececd6bdb9d03 (diff)
nss: implement public key pinning for NSS backend
Bug: https://bugzilla.redhat.com/1195771
Diffstat (limited to 'docs')
-rw-r--r--docs/curl.13
-rw-r--r--docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.32
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index 908f64899..0e567159e 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -548,7 +548,8 @@ indicating its identity. A public key is extracted from this certificate and
if it does not exactly match the public key provided to this option, curl will
abort the connection before sending or receiving any data.
-This is currently only implemented in the OpenSSL, GnuTLS and GSKit backends.
+This is currently only implemented in the OpenSSL, GnuTLS, NSS and GSKit
+backends.
If this option is used several times, the last one will be used.
(Added in 7.39.0)
diff --git a/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 b/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3
index 2d8639275..4cc68b1d3 100644
--- a/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3
+++ b/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3
@@ -52,7 +52,7 @@ if(curl) {
.fi
.SH AVAILABILITY
If built TLS enabled. This is currently only implemented in the OpenSSL,
-GnuTLS and GSKit backends.
+GnuTLS, NSS and GSKit backends.
Added in libcurl 7.39.0
.SH RETURN VALUE