From e4272fe6c14789b3d7f43a6d8adde0776f066ee3 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Thu, 25 Jan 2018 16:47:49 -0500 Subject: [PATCH] GSKit: restore pinnedpubkey functionality inadvertently removed in 283babfaf8d8f3bab9d3c63cea94eb0b84e79c37 --- docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 | 4 +++- 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 */