From nobody Wed Dec 13 20:06:26 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sr61v1dlzz54FnV; Wed, 13 Dec 2023 20:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sr61v080bz4Z3j; Wed, 13 Dec 2023 20:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702497987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BIvybEcBQJ92/4OVPqHZwsyCuoqVB/8R7Ou4A8jFyAc=; b=xZI1h41VNMJA/tKJB9UlBIk3aMu9zQIQ1Lx6zIZHOlUh7b4j/r0jrEdu0EgEhscT7dD/zm UPUF4h6QiIBb1aDgUtM2qwNXiP7wPT7Thzxi76xHEICr+lptACfe9hFS/6F9171FbdZyNm AJhxtYy8tQfu6KXW3ga/+KsgfAxdVeDjxyaaQVAtYHXklZSwnR5XYG8gk1QPMo4P0JzlPy kB9T6YyooIvnPjVH5FNS7z+Q+bdTOd/X91WQaEkW7Lae7UiOFS8jRyT6tb/A5xROzrIfTS +hkLbPXj6SlPXlFwwu+PUiC7X2pvEI8c7PWlz96BmKCG0L97m+wN4TBReLlU3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702497987; a=rsa-sha256; cv=none; b=wzSa273y6AqDcIlWL4u2japAuvGQmdXMXlwOyAgCX5SQwcSFMmWBkQxStJ417kx4jUc1Hm ZPeHeB2YGull/h7IIRZcZKIVWgSkEqFI6pcLUU/yqKLqmDsu6xjh1jkftcFW3ex6dseMSJ kBehi8v/lqi3U55+NW/6PZf7GVuEDs2kzoDtipD3QUGwZfKJSPWT7vqvN03AMMaOgQ+RVW 3cVmkCg6SUXNCC3AfqNV7kirSBLtH03lcKKaqpsgHc4wXHBTc432e9aRvaPlor8V6MHRsi AMLilCoCCPFDfiqrep8blGcRjvnVFOGUnDCc90UL44/zx/9pI+TUtYh3vVd0EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702497987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BIvybEcBQJ92/4OVPqHZwsyCuoqVB/8R7Ou4A8jFyAc=; b=aH6I2ABqZfJGIfVO7zOkclo4l2xlhQ1gvW7HBTsQBbhY701RX6Vr3COqVtx2i1/5QT7PqE 1NGcT5IX6udTetRXccdy+shou9u0y+8/85y9jxeelRnUqtQ0A4rF1aHmx/WfwbLSuwfBuv vEyAFOSBaS3fYjo68M/k0ENvsNed6vDDSBIqVqWgI4q4J7vOM58DGWLccf5wAVd55/Lgc0 Bnt98vi2r5Tn8raSnDnnsq7t95jGRhkS9W7AMa0tvDy9U0zDIcDsM9Y8u+1v5OkEtkoFvk QE1FUFJDpnbG73ScUNduiDfL4DQ3zPrMJbQJsJcu9ymWr5qPWNHeGBRwkg3OnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sr61t5pX7z1C0q; Wed, 13 Dec 2023 20:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BDK6Q9W087270; Wed, 13 Dec 2023 20:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDK6Qkb087267; Wed, 13 Dec 2023 20:06:26 GMT (envelope-from git) Date: Wed, 13 Dec 2023 20:06:26 GMT Message-Id: <202312132006.3BDK6Qkb087267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: dc7d88c71d2b - stable/13 - libfetch, fetch: Stop recommending the use of ca_root_nss. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dc7d88c71d2be3363c94045fe439e21b8a838687 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=dc7d88c71d2be3363c94045fe439e21b8a838687 commit dc7d88c71d2be3363c94045fe439e21b8a838687 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-08 04:35:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-12-13 16:21:29 +0000 libfetch, fetch: Stop recommending the use of ca_root_nss. MFC after: 3 days Reviewed by: kevans, emaste Differential Revision: https://reviews.freebsd.org/D42119 (cherry picked from commit 2821a7498f65d357c68166e1978b491abef1ca4a) --- lib/libfetch/fetch.3 | 15 +-------------- usr.bin/fetch/fetch.1 | 14 ++------------ 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3 index 34047d253991..663209f8fc79 100644 --- a/lib/libfetch/fetch.3 +++ b/lib/libfetch/fetch.3 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 24, 2020 +.Dd October 7, 2023 .Dt FETCH 3 .Os .Sh NAME @@ -409,19 +409,6 @@ library, is currently unimplemented. .Sh HTTPS SCHEME Based on HTTP SCHEME. -By default the peer is verified using the CA bundle located in -.Pa /usr/local/etc/ssl/cert.pem . -If this file does not exist, -.Pa /etc/ssl/cert.pem -is used instead. -If neither file exists, and -.Ev SSL_CA_CERT_PATH -has not been set, -OpenSSL's default CA cert and path settings apply. -The certificate bundle can contain multiple CA certificates. -A common source of a current CA bundle is -.Pa \%security/ca_root_nss . -.Pp The CA bundle used for peer verification can be changed by setting the environment variables .Ev SSL_CA_CERT_FILE diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1 index 2737373c98bf..7238226998fc 100644 --- a/usr.bin/fetch/fetch.1 +++ b/usr.bin/fetch/fetch.1 @@ -28,7 +28,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 29, 2020 +.Dd October 7, 2023 .Dt FETCH 1 .Os .Sh NAME @@ -131,18 +131,8 @@ only. .It Fl -ca-cert= Ns Ar file [SSL] Path to certificate bundle containing trusted CA certificates. -If not specified, -.Pa /usr/local/etc/ssl/cert.pem -is used. -If this file does not exist, -.Pa /etc/ssl/cert.pem -is used instead. -If neither file exists and no CA path has been configured, +Otherwise, OpenSSL's default CA cert and path settings apply. -The certificate bundle can contain multiple CA certificates. -The -.Pa security/ca_root_nss -port is a common source of a current CA bundle. .It Fl -ca-path= Ns Ar dir [SSL] The directory