aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-02-21 10:35:53 -0800
committerJunio C Hamano <gitster@pobox.com>2025-02-21 10:35:54 -0800
commit84a5ce3f03aa409d9b0b22f532a943ddb3e11740 (patch)
treec5051281cb8f004b76970fec9db57221edfae100
parent0fbe93b36c05bbf4156c157f27998938ce312265 (diff)
parent3eeed876a909c45695f2f3a3edd4141be331a3be (diff)
downloadgit-84a5ce3f03aa409d9b0b22f532a943ddb3e11740.tar.xz
Merge branch 'ac/doc-http-ssl-type-config'
Two configuration variables about SSL authentication material that weren't mentioned in the documentations are now mentioned. * ac/doc-http-ssl-type-config: docs: indicate http.sslCertType and sslKeyType
-rw-r--r--Documentation/config/http.adoc15
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc
index a14371b5c9..22a8803dea 100644
--- a/Documentation/config/http.adoc
+++ b/Documentation/config/http.adoc
@@ -216,6 +216,21 @@ http.sslBackend::
This option is ignored if cURL lacks support for choosing the SSL
backend at runtime.
+http.sslCertType::
+ Type of client certificate used when fetching or pushing over HTTPS.
+ "PEM", "DER" are supported when using openssl or gnutls backends. "P12"
+ is supported on "openssl", "schannel", "securetransport", and gnutls 8.11+.
+ See also libcurl `CURLOPT_SSLCERTTYPE`. Can be overridden by the
+ `GIT_SSL_CERT_TYPE` environment variable.
+
+http.sslKeyType::
+ Type of client private key used when fetching or pushing over HTTPS. (e.g.
+ "PEM", "DER", or "ENG"). Only applicable when using "openssl" backend. "DER"
+ is not supported with openssl. Particularly useful when set to "ENG" for
+ authenticating with PKCS#11 tokens, with a PKCS#11 URL in sslCert option.
+ See also libcurl `CURLOPT_SSLKEYTYPE`. Can be overridden by the
+ `GIT_SSL_KEY_TYPE` environment variable.
+
http.schannelCheckRevoke::
Used to enforce or disable certificate revocation checks in cURL
when http.sslBackend is set to "schannel". Defaults to `true` if