From nobody Wed Dec 13 20:07:02 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 4Sr62Z588qz54FMX; Wed, 13 Dec 2023 20:07:02 +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 4Sr62Z3sMGz4bhn; Wed, 13 Dec 2023 20:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702498022; 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=cQVAj9QYL1+nx0fI5hb0ypQuhHq7tZHG9r54xiz+sdI=; b=sdJ4843UxH6l45C4evssc5YQfEf4XsB6lqSKpIMDmZZ6L4YLY8uTCLVcSedv9Ugo2Udnij 3o7sjs2KZUocOuRWqcEAyd89q1h3xHRmrUOUeG04M7RJ8fuR7AyQL96iOlnCtXowBBd5n1 Qa2dCAMty3CVB8716icwrnLpaydrUL2LtwFyrOVDq7KU6jSCnq/P206WjUVOwFvjOZC0W3 qmVb/gUDfhoZuB02jvS4NLBmjJO5uWxh8fvbVF2cS+hJXZaJ0Trl6afRziLZv7OOwbwBJS yyapW7RoPlPJakLou1D9zKZjiEDhC2riGOJCk8mYp0dnyD2X4Bx10iA0YTaJ8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702498022; a=rsa-sha256; cv=none; b=AXM92K8utj88QWqw2ZzY2FJH4u5bVBx+BaELHXCmg8+c6RW5ReCDMvr3eweSt8c9fydCbr JzADbcxWg4OOCftbvQmWjqte8pZUpZW9y6ljMQWhXz+QRpDik1DtEOCzViBxviAqRk0nj1 1O1GrJGJGb9r/xbbbmR3txprOZYbVtwtQtsZHxhfwy+cdvdgXpRAUB0oxHM94Qo9igrptL jUJm0AhHOZZXCyTONNfT0rbv6IN+9lSUphJymYOloV72G24ryjcTZZ+QQ0Kl3ziGqENIad mafS4bOWr3Q1PR1L5ml522oEAuz4mOK9c5Yd/9IRbqFGnUJ/cEMo+8VN6iJBmw== 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=1702498022; 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=cQVAj9QYL1+nx0fI5hb0ypQuhHq7tZHG9r54xiz+sdI=; b=VmHFA+UXoR7QBOWVoTrL3NSv0z5XHTcrh4eiKdnxMzhwo/f7MT4xdLVyDf0JWANmtoqfJx aA8jqdl8w2cpkGjApV7lXkqEyLEdY1H/N74oPk2CJE2zso7wBGZEqrkhGx3da0eTqC+Lw2 3jIXZzHGG9ikudmLtQ41QHIWD3mRLY2SjzxUEwo54QZujddZS7mQbCJ8RfrP5D5ZD6sp/n MSMs99K2ijN7r/bzcr6GeYmE4eGui/+AmkHnTIb66Hd9Xi4RuuBuPaPSKJGnFnbaL3iaRg Qo2VlYhDAVxCE2vuh/k+0QlrdzXYRWtSPwHhENEJ1P95pTP0UDpIYqz3chM0lg== 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 4Sr62Z2y0Rz1C3K; Wed, 13 Dec 2023 20:07:02 +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 3BDK72Ah088101; Wed, 13 Dec 2023 20:07:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDK72Fw088099; Wed, 13 Dec 2023 20:07:02 GMT (envelope-from git) Date: Wed, 13 Dec 2023 20:07:02 GMT Message-Id: <202312132007.3BDK72Fw088099@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: 6d0ea82cc252 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 6d0ea82cc2520726e49d9f03e1b67734608139e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6d0ea82cc2520726e49d9f03e1b67734608139e7 commit 6d0ea82cc2520726e49d9f03e1b67734608139e7 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-08 04:35:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-12-13 16:23:57 +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 9082f338f7c1..5f7489799cf6 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