aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authormoparisthebest <admin@moparisthebest.com>2016-04-21 21:21:45 -0400
committerDaniel Stenberg <daniel@haxx.se>2016-04-24 12:27:39 +0200
commit33623d7196dd95bfeeb2b4008911459aa165d876 (patch)
tree0c4411a7dbee612ffbb734cb08feb51f15fb349d /docs
parent7639a9cfc9d4e9a97ee931c1177a544b4bec8f6f (diff)
PolarSSL: Implement public key pinning
Diffstat (limited to 'docs')
-rw-r--r--docs/curl.113
-rw-r--r--docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.314
2 files changed, 20 insertions, 7 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index 2ed24dba0..8f7c4763f 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -589,9 +589,16 @@ 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.
-Added in 7.39.0 for OpenSSL, GnuTLS and GSKit. Added in 7.43.0 for NSS and
-wolfSSL/CyaSSL. sha256 support added in 7.44.0 for OpenSSL,
-GnuTLS, NSS and wolfSSL/CyaSSL. Other SSL backends not supported.
+PEM/DER support:
+ 7.39.0: OpenSSL, GnuTLS and GSKit
+ 7.43.0: NSS and wolfSSL/CyaSSL
+ 7.47.0: mbedtls
+ 7.49.0: PolarSSL
+sha256 support:
+ 7.44.0: OpenSSL, GnuTLS, NSS and wolfSSL/CyaSSL.
+ 7.47.0: mbedtls
+ 7.49.0: PolarSSL
+Other SSL backends not supported.
If this option is used several times, the last one will be used.
.IP "--cert-status"
diff --git a/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 b/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3
index ff1fe740e..4e673bd4d 100644
--- a/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3
+++ b/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3
@@ -90,10 +90,16 @@ footer:
-----END PUBLIC KEY-----
.fi
.SH AVAILABILITY
-Added in 7.39.0 for OpenSSL, GnuTLS and GSKit. Added in 7.43.0 for
-NSS and wolfSSL/CyaSSL. Added for mbedtls in 7.47.0, sha256 support
-added in 7.44.0 for OpenSSL, GnuTLS, NSS and wolfSSL/CyaSSL. Other
-SSL backends not supported.
+PEM/DER support:
+ 7.39.0: OpenSSL, GnuTLS and GSKit
+ 7.43.0: NSS and wolfSSL/CyaSSL
+ 7.47.0: mbedtls
+ 7.49.0: PolarSSL
+sha256 support:
+ 7.44.0: OpenSSL, GnuTLS, NSS and wolfSSL/CyaSSL.
+ 7.47.0: mbedtls
+ 7.49.0: PolarSSL
+Other SSL backends not supported.
.SH RETURN VALUE
Returns CURLE_OK if TLS enabled, CURLE_UNKNOWN_OPTION if not, or
CURLE_OUT_OF_MEMORY if there was insufficient heap space.