mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 11:46:10 +02:00
Code

http: correct curl version check for CURLOPT_PINNEDPUBLICKEY 

In aeff8a6121 (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.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-09-13 16:51:27 +02:00 committed by Junio C Hamano
parent 2a7f64616a
commit 905a028804
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
http.c
View File

@ -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