From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 3F1EE1F8C6 for ; Fri, 10 Sep 2021 11:04:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232609AbhIJLGA (ORCPT ); Fri, 10 Sep 2021 07:06:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232563AbhIJLFx (ORCPT ); Fri, 10 Sep 2021 07:05:53 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2FAAC061574 for ; Fri, 10 Sep 2021 04:04:42 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id s24so921029wmh.4 for ; Fri, 10 Sep 2021 04:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R0MfkI47ZKJnsiLXFRP0qdKwbb8lMPMQJbi8RFlxmIE=; b=dsEYgEeoSgRQe9l7kOd2EjhuJqdUsJ/RRGMWDTD0Do+AgIZxMWMcgZCAF8eXJVh7hS Cy+NuKRXYMJzTIYPWsghLLZ2LFZIwcyIaGIflUsAnIBSCw6FJZ6WnwQOpJLTLpIZrfGq Q1YllJ6vbJt8ARRti+Y4/lntzcOlpXI3LbGWYkkBck1UqjIs5Zu4/Nx13G3xi/cf81oV j+mVWGcxrvZmxS6djsjBaDqa1rczfIzXk/i1fzfbhEBaR2oVm/+cfqJMP/xH+A46yib7 pJGGID2ybBTIIZOr+PlNvVbsHUyCna6JDfxX/7yAoPUoyVbgt1Y5f4uEvDM3BuXv7O7H h6Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R0MfkI47ZKJnsiLXFRP0qdKwbb8lMPMQJbi8RFlxmIE=; b=59SjSqSAp1FImM4NvRW5d/zrGI/r6SACgy7Hv5yx2k0nhSCyhOeRKzFVfq+ZZNA0// Dzx6ChjblyMwYZX7aSVAed5fVOcIMyJENNv8RHVFiM0ce+Uu/U/5x+9q8cE2K/FwNk1f gRbzdOu3+vNpUQBihqrmwXZP/3T/vFJdU92L4uO/jFcpKrxKduxv2C0iQf35348IcqOU ZljpbzCTmuHVveNFoPTyP9ZwCBBsjloAQvOMPTFQSIo9wCG0pKihqY7rlLRlyNMUbhsD sUbXJV9+VOIAwV1RRyevjVZOaW52AD7D1tX6ntRz1hrBXaTU7AWXD6EzKylERAjCIuoy fJrg== X-Gm-Message-State: AOAM531YrHWUGFjboxKgyIbSrsJysSgchuuzejhXfFdu8iqgVl13Tq06 FDZHpLX2LvRGwIJogBc0y0q4oZ5wkH9xOQ== X-Google-Smtp-Source: ABdhPJyLEYu1hAtzJYRWif30QHJOin+UuB3WdpopP+E/96E8El5GqwnaUBfnRUTy1DkhVwuj6JCPQQ== X-Received: by 2002:a1c:1b17:: with SMTP id b23mr7644757wmb.139.1631271881317; Fri, 10 Sep 2021 04:04:41 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id q201sm1013631wme.2.2021.09.10.04.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 04:04:40 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , "brian m . carlson" , Bagas Sanjaya , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v2 6/8] http: correct curl version check for CURLOPT_PINNEDPUBLICKEY Date: Fri, 10 Sep 2021 13:04:31 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.873.g125ff7b9940 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In aeff8a61216 (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 --- http.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/http.c b/http.c index b82b5b7a532..543faad9879 100644 --- a/http.c +++ b/http.c @@ -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 -- 2.33.0.873.g125ff7b9940