diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-09-24 10:08:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-27 17:58:07 (GMT) |
| commit | 3e8084f1884ffea25b80f76b7a1bd0e5b3200c8a (patch) | |
| tree | 5fd59e4a63a3c8a43d84d89c7cb884e1e10a506d /git-curl-compat.h | |
| parent | ddb1055343948e0d0bc81f8d20245f1ada6430a0 (diff) | |
| download | git-3e8084f1884ffea25b80f76b7a1bd0e5b3200c8a.zip git-3e8084f1884ffea25b80f76b7a1bd0e5b3200c8a.tar.gz git-3e8084f1884ffea25b80f76b7a1bd0e5b3200c8a.tar.bz2 | |
http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors
Change the error shown when a http.pinnedPubKey doesn't match to point
the http.pinnedPubKey variable added in aeff8a61216 (http: implement
public key pinning, 2016-02-15), e.g.:
git -c http.pinnedPubKey=sha256/someNonMatchingKey ls-remote https://github.com/git/git.git
fatal: unable to access 'https://github.com/git/git.git/' with http.pinnedPubkey configuration: SSL: public key does not match pinned public key!
Before this we'd emit the exact same thing without the " with
http.pinnedPubkey configuration". The advantage of doing this is that
we're going to get a translated message (everything after the ":" is
hardcoded in English in libcurl), and we've got a reference to the
git-specific configuration variable that's causing the error.
Unfortunately we can't test this easily, as there are no tests that
require https:// in the test suite, and t/lib-httpd.sh doesn't know
how to set up such tests. See [1] for the start of a discussion about
what it would take to have divergent "t/lib-httpd/apache.conf" test
setups. #leftoverbits
1. https://lore.kernel.org/git/YUonS1uoZlZEt+Yd@coredump.intra.peff.net/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-curl-compat.h')
| -rw-r--r-- | git-curl-compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-curl-compat.h b/git-curl-compat.h index a308bdb..56a83b6 100644 --- a/git-curl-compat.h +++ b/git-curl-compat.h @@ -67,10 +67,11 @@ /** * CURLOPT_PINNEDPUBLICKEY was added in 7.39.0, released in November - * 2014. + * 2014. CURLE_SSL_PINNEDPUBKEYNOTMATCH was added in that same version. */ #if LIBCURL_VERSION_NUM >= 0x072c00 #define GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY 1 +#define GIT_CURL_HAVE_CURLE_SSL_PINNEDPUBKEYNOTMATCH 1 #endif /** |