diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-24 13:25:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-24 13:25:58 -0800 |
| commit | e79112d21024beb997951381db21a70b087d459d (patch) | |
| tree | 704e66558f2e558b07506a605f0829ce72cfa238 /Documentation/config.txt | |
| parent | 65ba75ba7daae3298139f18cf866a23d01f4dd48 (diff) | |
| parent | aeff8a61216bf6e0d663c08c583bc8552fa3c344 (diff) | |
| download | git-e79112d21024beb997951381db21a70b087d459d.tar.gz | |
Merge branch 'ce/https-public-key-pinning'
You can now set http.[<url>.]pinnedpubkey to specify the pinned
public key when building with recent enough versions of libcURL.
* ce/https-public-key-pinning:
http: implement public key pinning
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 542cb229c8..2cd6bdd7d2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1733,6 +1733,14 @@ http.sslCAPath:: with when fetching or pushing over HTTPS. Can be overridden by the 'GIT_SSL_CAPATH' environment variable. +http.pinnedpubkey:: + Public key of the https service. It may either be the filename of + a PEM or DER encoded public key file or a string starting with + 'sha256//' followed by the base64 encoded sha256 hash of the + public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will + exit with an error if this option is set but not supported by + cURL. + http.sslTry:: Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed |