diff options
| author | moparisthebest <admin@moparisthebest.com> | 2018-01-25 16:47:49 -0500 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-01-25 23:16:14 +0100 |
| commit | 5c497343d9e13915733792597fe18e4b361fc961 (patch) | |
| tree | 969d16c745b8b7aab753475f14a2c83f5d3528bf | |
| parent | f8475c69410dc401974ffe54691c1f44b0577141 (diff) | |
| download | curl-5c497343d9e13915733792597fe18e4b361fc961.tar.gz | |
GSKit: restore pinnedpubkey functionality
inadvertently removed in 283babfaf8d8f3bab9d3c63cea94eb0b84e79c37
Closes #2263
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 | 4 | ||||
| -rw-r--r-- | lib/vtls/gskit.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 b/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 index dd8ed4ffa..35ffa620a 100644 --- a/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 +++ b/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 @@ -95,7 +95,9 @@ footer: .SH AVAILABILITY PEM/DER support: - 7.39.0: OpenSSL, GnuTLS and GSKit + 7.39.0: OpenSSL, GnuTLS + + 7.39.0-7.48.0,7.58.1+: GSKit 7.43.0: NSS and wolfSSL/CyaSSL diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c index 8f0cc0bb8..afc90a859 100644 --- a/lib/vtls/gskit.c +++ b/lib/vtls/gskit.c @@ -1355,7 +1355,7 @@ const struct Curl_ssl Curl_ssl_gskit = { 0, /* have_ca_path */ 1, /* have_certinfo */ - 0, /* have_pinnedpubkey */ + 1, /* have_pinnedpubkey */ 0, /* have_ssl_ctx */ /* TODO: convert to 1 and fix test #1014 (if need) */ 0, /* support_https_proxy */ |