Re: [PATCH v2 6/8] http: correct curl version check for CURLOPT_PINNEDPUBLICKEY

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 10, 2021, 17:00 UTC
Message-ID: <xmqqfsuctlfm.fsf@gitster.g>
In-Reply-To: <patch-v2-6.8-397d54a1352-20210910T105523Z-avarab@gmail.com>

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> In aeff8a61216 (http: implement public key pinning, 2016-02-15) a
> dependency and warning() was added if curl older than 7.44.0 was used,
> but the relevant code depended on CURLOPT_PINNEDPUBLICKEY, introduced
> in 7.39.0.

[PATCH 7/8] should make the difference irrelevant, but OK ;-)

Show 41 quoted lines

>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  http.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/http.c b/http.c
> index b82b5b7a532..543faad9879 100644
> --- a/http.c
> +++ b/http.c
> @@ -59,7 +59,7 @@ static struct {
>  static const char *ssl_key;
>  static const char *ssl_capath;
>  static const char *curl_no_proxy;
> -#if LIBCURL_VERSION_NUM >= 0x072c00
> +#if LIBCURL_VERSION_NUM >= 0x072700
>  static const char *ssl_pinnedkey;
>  #endif
>  static const char *ssl_cainfo;
> @@ -373,10 +373,10 @@ static int http_options(const char *var, const char *value, void *cb)
>  	}
>  
>  	if (!strcmp("http.pinnedpubkey", var)) {
> -#if LIBCURL_VERSION_NUM >= 0x072c00
> +#if LIBCURL_VERSION_NUM >= 0x072700
>  		return git_config_pathname(&ssl_pinnedkey, var, value);
>  #else
> -		warning(_("Public key pinning not supported with cURL < 7.44.0"));
> +		warning(_("Public key pinning not supported with cURL < 7.39.0"));
>  		return 0;
>  #endif
>  	}
> @@ -845,7 +845,7 @@ static CURL *get_curl_handle(void)
>  		curl_easy_setopt(result, CURLOPT_SSLKEY, ssl_key);
>  	if (ssl_capath != NULL)
>  		curl_easy_setopt(result, CURLOPT_CAPATH, ssl_capath);
> -#if LIBCURL_VERSION_NUM >= 0x072c00
> +#if LIBCURL_VERSION_NUM >= 0x072700
>  	if (ssl_pinnedkey != NULL)
>  		curl_easy_setopt(result, CURLOPT_PINNEDPUBLICKEY, ssl_pinnedkey);
>  #endif