libcurl 7.44.0 was released in August 2015, which is over nine years ago, and no major operating system vendor is still providing security support for it. Debian 9 and Ubuntu 16.04, both of which are out of mainstream security support, have supported a newer version, and RHEL 8, which is still in support, also has a newer version. Remove the check for this version and use this functionality unconditionally. Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> --- git-curl-compat.h | 10 ---------- http.c | 4 ---- 2 files changed, 14 deletions(-) diff --git a/git-curl-compat.h b/git-curl-compat.h index cd970e34d6..6b05d70d42 100644 --- a/git-curl-compat.h +++ b/git-curl-compat.h @@ -28,16 +28,6 @@ * introduced, oldest first, in the official version of cURL library. */ -/** - * CURLSSLOPT_NO_REVOKE was added in 7.44.0, released in August 2015. - * - * The CURLSSLOPT_NO_REVOKE is, has always been a macro, not an enum - * field (checked on curl version 7.78.0) - */ -#if LIBCURL_VERSION_NUM >= 0x072c00 -#define GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE 1 -#endif - /** * CURLOPT_PROXY_CAINFO was added in 7.52.0, released in August 2017. */ diff --git a/http.c b/http.c index 945df9a628..bdf8bf7b59 100644 --- a/http.c +++ b/http.c @@ -1048,11 +1048,7 @@ static CURL *get_curl_handle(void) if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) && !http_schannel_check_revoke) { -#ifdef GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE); -#else - warning(_("CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0")); -#endif } if (http_proactive_auth != PROACTIVE_AUTH_NONE)