From nobody Fri Jul 7 20:11:08 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 4QyPfh5Drlz4ljpX; Fri, 7 Jul 2023 20:11:08 +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 4QyPfh4qsqz41Vf; Fri, 7 Jul 2023 20:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688760668; 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=zgiV7KQMPRSpFwAiWGhCLbEwF4lBIElVTpei3qtIz0g=; b=WDLqA4cZiH2188nNqQPeJ23632smm/JxckINIxruLDnQG4wVVBiVZx+Wuy8Pq12KJYkrvi C99pHmWzrfO/HxAryxj08XtWnLN1JinU+kJCorZnizlW31xRyngzs3ifIL4UOKVfUMFtAC SS/FgT+xI+okFR7rQ7FEudOFUPN4sPoJCAPACAwnVfDSAEExaeQquT6SInVs9phJqxEc7H 4z+G0WbsXevM80uxFnoKH80dTsIVauVI/Yqzli1Cd2Xfz2Kyk+mxnM+xb7Co49XumQepi7 ZNlAPIVac3FAZgMGUzvzDpsFwF/Ixn5yyce0/qXLn6ZW2KT5eVkBpn97LwnZJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688760668; 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=zgiV7KQMPRSpFwAiWGhCLbEwF4lBIElVTpei3qtIz0g=; b=nAbOgQPMnANGtAyOm44sX3z/FPmR1G6tNWcFGMdaYM+n6pWcWxvKTA0dKv5OhkqQqrkiBj 9AMsxtKz1oMGhsxJeTyXfcynlT8jx579D7NvXKJqDLSA7e5/p6ODtTrpN0ThtJpv/XV1GF rV3VvQ9T5iAxp5Zhz+PwBRsZxnVoIJx0JptgBgLVqjxfCrmX7qfKeLvKRWgVjbCVGDvZZ9 7/USyIonCIh5b4Ch5l35Al7Yr0p9QWOEJF62OKNIorHf+snOG87EGbRMP9aEV+b9T9aXf1 mTwaVXlq0XeL2nEJe4BJCZO96bQXxvYWI64snhZthGlmEJYRO0gXZDRDyKAFUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688760668; a=rsa-sha256; cv=none; b=xhmABFg5OpZtgQcgcZm8DQdHGG5f3FuzdeVLw3ohhjciB8EWJejIQF9lgwN6iHANn7dfBp XMBRWBeSQvsk1klheApUzpoMH0Ea1aHL1JGO9twNoxtatW3Rqy/SjckiFrf5wgIdbXqXXF gOdhFNdn/oYO2unIn4E5miX8vzf92SIWJ0JteWMvSclHPEB4C9R5MjaNcjTUxgM7acwtYt PCQ1TsP6luHMVgOmT94dn9kzfEVutn67mLIX+AUMnuWz6ATrda2EUJSAQ1GbOEYU0zWwis SIvQubiHOhjxKI1TNVBkgR76TevavY/XYL4PDKQr5MV9QZyIoqRNTwKebavikQ== 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 4QyPfh3vyhzsK0; Fri, 7 Jul 2023 20:11:08 +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 367KB81e039407; Fri, 7 Jul 2023 20:11:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367KB8Ep039406; Fri, 7 Jul 2023 20:11:08 GMT (envelope-from git) Date: Fri, 7 Jul 2023 20:11:08 GMT Message-Id: <202307072011.367KB8Ep039406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: a81d4240b346 - stable/13 - release/DVD_PACKAGES: Update the names of drm-kmod ports 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a81d4240b346f1bda706e8e21d16ea649a85c8a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=a81d4240b346f1bda706e8e21d16ea649a85c8a6 commit a81d4240b346f1bda706e8e21d16ea649a85c8a6 Author: Li-Wen Hsu AuthorDate: 2023-07-04 20:24:52 +0000 Commit: Li-Wen Hsu CommitDate: 2023-07-07 20:10:19 +0000 release/DVD_PACKAGES: Update the names of drm-kmod ports When MFC, graphics/drm-515-kmod is not merged as it only suports 14+. Reviewed by: x11 (manu), re (gjb) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40770 (cherry picked from commit fea4a44c1965d4b709362a74abb0ab4b28ec29ac) --- release/scripts/pkg-stage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index e2a51e4ef2f0..3cb8afd43679 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,8 +15,8 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="archivers/unzip devel/git emulators/linux_base-c7 -graphics/drm-legacy-kmod -graphics/drm-stable-kmod +graphics/drm-kmod +graphics/drm-510-kmod misc/freebsd-doc-all net/mpd5 net/rsync From nobody Sun Jul 9 02:38:07 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 4QzBBm1MKpz4lMh8; Sun, 9 Jul 2023 02:38:08 +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 4QzBBl6WGvz3NMM; Sun, 9 Jul 2023 02:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688870287; 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=bKro98/speR+SRG0D8LmLdufZ2hHAjbO2IUrNDatL5c=; b=G/8yEFMvE+xbNLayuStBmlb3X+PpfSiJ9jHnPJu3ta4876izkFAijGsBk98tMus9ygf0G0 wLibNA76EeM1WwTGeIFFcUV8AeuEy8CmTqj3UToxej7vGJoV1Mg3W8voyDizaaomxx/iCv b/lD+315BynrsH3/Th0ukgInYDbbCFhIXJ81WJyQXQj1wvY0lSKui7QaabMVMErL1vBs2X /nVUu8TQbMsCV1P/yJ6a5H5FAMN3KVz582JGijEWnPlW4P8uhUaqSlmb2sMHutU5RihL8Y Fc/j1sQyl8ovK2Jbf2BDRDs+8YB9iaF2HPOfReiIinQxrygPCrn/rb7WRlOe4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688870287; 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=bKro98/speR+SRG0D8LmLdufZ2hHAjbO2IUrNDatL5c=; b=QoMy3NUk7NEDFGbc3VzBHspcCs0QINDhgWpueIs48faVF1cKDX6z0xjBhj99qQfkL3VCbj r9JQ4QkUa5gbd5kGI3Ug2JCACvlciKxFoxns7ttfT5+slBIot29Sc473fkfSfhhR/4gAcc ihvyRZv7VaE/luEkssRPk3mWfW/O3pn0slLFpSlkp9/adM5LKVWajFQEVRZ0ZDznJ9vHpE 0Tt5P7kae9AJRvgRur8fAojVooOgDr1K8l8j8t3fCd2cZzotRyV3n8G2Z87Pr28JPFKqtx DYc32HNtMQIpt5iecDD52+fPQ3UTefvvjLurGJpYHbUuvtzvYGa+ljJjxXQULQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688870287; a=rsa-sha256; cv=none; b=m1J/12JlWjqFRSxRZI6J3vpqb+XSN6krI/n21AN07DYM98cCFYXQd9To70V/tStXtdOWP+ YeFcJn6hPj4fVPVf8/odHo+5NFoBgGC2o1Kid9As7W125OB3FyW6hkHk7R2AAkthry/97w JZH7QWPQEAjuBNRI2z3gR74/618NcY9Vit580umXZZsLLUQpR7VZlLeT36PT2m615cdP2R b6mbJ0Tz1+UneiEJcO1axuanfCJGWbyZHg7ANXcTbDB3fFWjSwmdxxeJaOPXKe6YaWOYK7 fBvfZYCMk9gfdzpabYgbMUlcyTD9oUKe4YACA8l28IZhLlD31PKm7cChho0cxA== 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 4QzBBl5cPdzlcs; Sun, 9 Jul 2023 02:38:07 +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 3692c7AX055011; Sun, 9 Jul 2023 02:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3692c7jB055010; Sun, 9 Jul 2023 02:38:07 GMT (envelope-from git) Date: Sun, 9 Jul 2023 02:38:07 GMT Message-Id: <202307090238.3692c7jB055010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: d295e418ae7e - stable/13 - pam_krb5: Add missing patch 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d295e418ae7e60d87af6576ecdfad41a98d7442c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d295e418ae7e60d87af6576ecdfad41a98d7442c commit d295e418ae7e60d87af6576ecdfad41a98d7442c Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Cy Schubert CommitDate: 2023-07-08 05:44:29 +0000 pam_krb5: Add missing patch Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 (cherry picked from commit bfa51318dee8afd9307f15e49a6a521938dccd06) --- lib/libpam/modules/pam_krb5/pam_krb5.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 3972479a581f..3c7976297ed2 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -938,18 +938,6 @@ verify_krb_v5_tgt_begin(krb5_context context, char *pam_service, int debug, continue; break; } - if (retval != 0) { /* failed to find key */ - /* Keytab or service key does not exist */ - if (debug) { - const char *msg = krb5_get_error_message(context, - retval); - syslog(LOG_DEBUG, - "pam_krb5: verify_krb_v5_tgt(): %s: %s", - "krb5_kt_read_service_key()", msg); - krb5_free_error_message(context, msg); - } - retval = 0; - } if (keyblock) krb5_free_keyblock(context, keyblock); From nobody Sun Jul 9 02:38:31 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 4QzBCC6hmlz4lN5B; Sun, 9 Jul 2023 02:38:31 +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 4QzBCC6J61z3NRX; Sun, 9 Jul 2023 02:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688870311; 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=To5zgyZDjqh3Q8LM+HAZdH6H0M+vYbARORv3g1LAlLg=; b=HQPkiYFcbu8e6HzDrvlR8rEwwgHnkfmLpMJLSR5/FOCOkykMZ/uUhqZGVX8INKG4IQQd1g tjU90tAMpp54AIKZnBKCxqaS/UPvxYsBFE7WikH+kTVR4RmupBR0OYTcRZlz5hYFZWOkcz s6lec8a3f4kY81VOf61mJRbF94Gojz1xzkHar/BTS0/yi/ChBmDiwdSIm7aF/+NPyGOb6f p5bhJbbpeSUKO8kqENxv3rfBcbQ6sxLXwrD6OFds+ec7kNdEe2gRzHnW/GiAB9df7ObjzC ZjjfL88xZrU2rDR49qUFrY3Uuw5lFNi4OkRiEfWPXo0X3bGvx0RJ+wM5bl02hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688870311; 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=To5zgyZDjqh3Q8LM+HAZdH6H0M+vYbARORv3g1LAlLg=; b=vdvKN+e2m7epvUKdiAp5hLZn/Dmh19/r1ar0ou1MT7XqbwwH+sZrnRE8s1xhXgIPvgFZi7 ihNFsV3YDJ/llAfsHdeAJTWln+bSZNFWfu/UTPglbu/26SiV8exYvhgHLWe+k6n+WeS0CP fn1V3THxqQzq8j11hdkbQgvvUw+Mh+9Nvp5VZXl4j1pfULljVIvlpzKi2SjzSqQ5DXwVFM Po37c/9w277IVYator+s2n+t9Jvn6STZYenCKe8OJcRByxncPO1SmOV5aZ13wRAXnAaaeT 5bK0uC7kWCrltjN6jWIjmth+kqKZhA3jz/K/34FfLZvpXALgotpHBouZ9Xhf6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688870311; a=rsa-sha256; cv=none; b=Ln8XESBolV4I7eeiWZm3+OKwWpYtiJASO/ft00dhlkjFF2GVBSKkRfELM3DRULGjqqqQhc ogunDzFeUNBzmU3gXhznDCbEPGep86nhNLuvj1g6usJp8uq35utjqOiOZQ78ygrpShNr73 xykp/KEjVJwvifC5H/q+BSXEoBB9bvz45tDXiP0vXEO6gCCsmu7iL58NsFXFqJsBkGiMk3 V0E+BehuRAdrhqbAPRCBLkjQFeJs5FjJmmCCh6C5xxR7JzWoDlhzmIH457QEg8uaJG5Bwy KgMnFfXApFRXbJBmqmIWYzoJ5IKHyP739FAHwPs0CRpWr1FMTnT/c5zjFz6/Pg== 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 4QzBCC5LJ3zlP5; Sun, 9 Jul 2023 02:38:31 +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 3692cVSq055242; Sun, 9 Jul 2023 02:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3692cVBR055241; Sun, 9 Jul 2023 02:38:31 GMT (envelope-from git) Date: Sun, 9 Jul 2023 02:38:31 GMT Message-Id: <202307090238.3692cVBR055241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 6edaf8c7aead - stable/12 - pam_krb5: Add missing patch 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6edaf8c7aeada2ab6b84c8ce56fc179d5cf2eecd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6edaf8c7aeada2ab6b84c8ce56fc179d5cf2eecd commit 6edaf8c7aeada2ab6b84c8ce56fc179d5cf2eecd Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Cy Schubert CommitDate: 2023-07-08 05:44:51 +0000 pam_krb5: Add missing patch Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 (cherry picked from commit bfa51318dee8afd9307f15e49a6a521938dccd06) --- lib/libpam/modules/pam_krb5/pam_krb5.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 3972479a581f..3c7976297ed2 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -938,18 +938,6 @@ verify_krb_v5_tgt_begin(krb5_context context, char *pam_service, int debug, continue; break; } - if (retval != 0) { /* failed to find key */ - /* Keytab or service key does not exist */ - if (debug) { - const char *msg = krb5_get_error_message(context, - retval); - syslog(LOG_DEBUG, - "pam_krb5: verify_krb_v5_tgt(): %s: %s", - "krb5_kt_read_service_key()", msg); - krb5_free_error_message(context, msg); - } - retval = 0; - } if (keyblock) krb5_free_keyblock(context, keyblock); From nobody Sun Jul 9 15:25:11 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 4QzWCr0JQZz4mW8h; Sun, 9 Jul 2023 15:25:12 +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 4QzWCq70MJz4MZy; Sun, 9 Jul 2023 15:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688916312; 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=WwWlqtjCRwyTl7wtwZqrTRPQURCtbbZku+Y9ylPk+tg=; b=fjuY0h21hSRVXWBMjVLDo6GytyibV2xUsFeGbOFXrqSfkmW2WHEFWwpMGEvYg6nDwu//g0 HQ9Ufz7Z7Q8wwnVRJJ7JzLneEkTkRau9MfnHMmHk0lTcNBIUItGaqnlTGdHm0lFtAnWZ8L tpt2MOJHYmnnWY4ihE6w6ZELmkv4/6nlopLbJmiv6zdq34jeTe/3URssTiqIMo6E71KmQ8 ULvOY7uFbidoBZPXjShqJ/weRTDLHJ+nOV2jqChdBqNB2zYqJV/XKrQ74Q7ksiKTTrNEfV +Vo/kUzNQM5EK0iFgQjMSd0ZX0RV6b+vY/8nE8Dmh/cVyx548aJVaYoNs0zAQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688916312; 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=WwWlqtjCRwyTl7wtwZqrTRPQURCtbbZku+Y9ylPk+tg=; b=Kl+yI6pPK0r+g6zX+LrtUoiQVjDjWiWd0p6wfVwPZN+JlbU1HiyPyJTXC744LS5ZsQvaPG puLSrEx+n3YndKdT7JiiXlRgnWSyqztejIDMOPNqiMJXqg6YF5Q9l1fOS4I1qOCHaJDJrj 6Y/fsQv1/GT+kOZ7Nur3fl7Ax0iD9EO1p6D0572VnF4r37TYIHuRfcuATDfnXbMmnJ+uKc p8f29Lf6kVj36ZJq9pkV51iI9rHlwwAONPak2ThQDPZdoKN90XUQXU2dd5wzGhcvAGU+ls tk6A2+kEZwNUyJcqRIq6aaSSoPWQtfJcrKqsEHWx11M6SpTY+xGQ8OCNodYj+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688916312; a=rsa-sha256; cv=none; b=imoBfrW+EuplLcGp8rLzkA/s0C1EReUyhmwbE3bGLIPcUYL/x3A9SB/ro26xSvOkpFXAkK YYoM4q5Gg8zl3hGcbix+44COpVbeD9lUlCTWywRmz55x1h8TFX4PUtFw41uzZNZleHi4Hr w5lHkRMlofsDe71GA4mbgvHo5p/yMZG9uoba+Ois7SLRkcn/vZ+EMEmz9aispHZSum58PQ kUDDZuPg8BDIkVeGfOP3+tq/9a47XsEWCHzDZLx5fEldoonHQAIca6+83X0iyx4fsH+4kB 1/xA9yXBABeyg1Q/WzP5fbhhd3bALh9DMJ+iuQqZzGbdECLNFJRqIe0Rjr3d3A== 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 4QzWCq5ytvz17YQ; Sun, 9 Jul 2023 15:25:11 +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 369FPBVT052808; Sun, 9 Jul 2023 15:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369FPB5P052807; Sun, 9 Jul 2023 15:25:11 GMT (envelope-from git) Date: Sun, 9 Jul 2023 15:25:11 GMT Message-Id: <202307091525.369FPB5P052807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: a1784b7d8c21 - stable/13 - if_bridge: fix potential panic 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a1784b7d8c21ad5862c96b83cf328d1970ac72aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a1784b7d8c21ad5862c96b83cf328d1970ac72aa commit a1784b7d8c21ad5862c96b83cf328d1970ac72aa Author: Kristof Provost AuthorDate: 2023-05-18 18:04:45 +0000 Commit: Kristof Provost CommitDate: 2023-07-09 12:27:05 +0000 if_bridge: fix potential panic When a new bridge_rtnode is added it is added with a NULL brt_dst. The brt_dst is set after the entry is added. This means there's a small window where another core could also attempt to add this node, leading to the code attempting to log that the MAC addresses moved to a new interface. Aside from that being a spurious log entry it also panics, because obif is NULL (and we attempt to dereference it). Avoid this by settings brt_dst before we insert the bridge_rtnode. Assert that obif is non-NULL, as an extra precaution. Reported by: olivier@ Reviewed by: zlei@ Differential Revision: https://reviews.freebsd.org/D40147 (cherry picked from commit f3546eacf0daac55fe08b6ad5849b0e440f75ffb) --- sys/net/if_bridge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index cd2fbff3a85c..29620d5740fd 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2821,12 +2821,12 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, memcpy(brt->brt_addr, dst, ETHER_ADDR_LEN); brt->brt_vlan = vlan; + brt->brt_dst = bif; if ((error = bridge_rtnode_insert(sc, brt)) != 0) { uma_zfree(V_bridge_rtnode_zone, brt); BRIDGE_RT_UNLOCK(sc); return (error); } - brt->brt_dst = bif; bif->bif_addrcnt++; BRIDGE_RT_UNLOCK(sc); @@ -2834,6 +2834,8 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC && (obif = brt->brt_dst) != bif) { + MPASS(obif != NULL); + BRIDGE_RT_LOCK(sc); brt->brt_dst->bif_addrcnt--; brt->brt_dst = bif; From nobody Sun Jul 9 15:25:17 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 4QzWCy2HC6z4mW8p; Sun, 9 Jul 2023 15:25:18 +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 4QzWCy1pL4z4MyM; Sun, 9 Jul 2023 15:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688916318; 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=IZgHrqKC406Dvv6hAtwbZx9zjAxnccAfSdLAzes4HmU=; b=iwxu7ur6UrNgTWU1EEpLaYBHqIEygVVWmm9BJERe4+4+/AsCSPekT17t059vLcZmzPAqq4 zEJ0GUqt6kRUyyDMH8l1cQiuot1WJj1nbIHHX+wdlJKa7uYir5d37FaBxuPOSURx/GE2Kh vBsyVMXtIS8aqq0H/Mf+LGTdhvZbwjWWqQuJYq3u4BpGIJlxpXnGW3+9U0V2ylotBQfPg5 FAxbp3FsstFXtCTFAy+FA6CaRhvuG6SpXZM2YrGPdue7ZIM1giDF4P/RtDzgrmE+nq0ImI MPULoC9XP8vhs67umxpLPA42EOrCdm5LO9qtzJZjKt09nHClq24G//xVMMrMNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688916318; 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=IZgHrqKC406Dvv6hAtwbZx9zjAxnccAfSdLAzes4HmU=; b=MpiJsROsDNXlnyuIdDw6orqKCz/Wi9zZ0feniFz1JKikbQ4DO4pSytf84ONRMq4xo1sc13 w+95WAPL9yS8wIigr67VPie6Y2yFaClYg768oIv4C/1wtfJv/tTGa/8bJejGbZYFwKzhXF Sqrgbb0Cji0yFGvXKADO3pCihPyplBIkckScW7m5UBuKdMlUMlTgekiYy8PExHa04aOOVc 2gMpqSzZoE4OgnlO37sPlckJcrw58KUUn/AoHg51qVMkaHlpnNitixnvSagl1JhlAjS2oe nIfg4WJECxPShwQuZRFjLHJg2Naoen6w6kp79F8FHHBIDZ47lpe56jGOjvbJAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688916318; a=rsa-sha256; cv=none; b=UHfZWFfI4bW6VKNU0A0F7t6d+Ch96G6SYAj9DU1fCaYAGrrQbqzUFuS9MoO+V0LaQZTGu0 hfhd3zSO8oVvHrBjqjG8yBKr1jUs2FJoqBfGe0L1D3fHTfJXPUNlx4HB8s0STXurbkTU3K NCxsayR1++MB/aolrkW0Pz77OjZuuS9zLNXf3VYqTbOBNv88sdvQzJH8DTUn9jia0h69Ho 0Vnc2ERLKg0P7XKE5m4KBgmK3OAmfJf9TxYHE0/pho0zM61TtUMWXMJC6zaYRYxq/oD2Bc IoUnMYduyQq4ZQREnZXTWbzbfFtKdY3BY3lbgIDcTdGglROA8gGt8ssBiQSivw== 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 4QzWCy0dY4z177l; Sun, 9 Jul 2023 15:25:18 +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 369FPH2k052930; Sun, 9 Jul 2023 15:25:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369FPH3F052929; Sun, 9 Jul 2023 15:25:17 GMT (envelope-from git) Date: Sun, 9 Jul 2023 15:25:17 GMT Message-Id: <202307091525.369FPH3F052929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9835aa0d7dea - stable/12 - if_bridge: fix potential panic 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9835aa0d7dea7776165c770d059de4d9ead86dd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9835aa0d7dea7776165c770d059de4d9ead86dd1 commit 9835aa0d7dea7776165c770d059de4d9ead86dd1 Author: Kristof Provost AuthorDate: 2023-05-18 18:04:45 +0000 Commit: Kristof Provost CommitDate: 2023-07-09 12:27:01 +0000 if_bridge: fix potential panic When a new bridge_rtnode is added it is added with a NULL brt_dst. The brt_dst is set after the entry is added. This means there's a small window where another core could also attempt to add this node, leading to the code attempting to log that the MAC addresses moved to a new interface. Aside from that being a spurious log entry it also panics, because obif is NULL (and we attempt to dereference it). Avoid this by settings brt_dst before we insert the bridge_rtnode. Assert that obif is non-NULL, as an extra precaution. Reported by: olivier@ Reviewed by: zlei@ Differential Revision: https://reviews.freebsd.org/D40147 (cherry picked from commit f3546eacf0daac55fe08b6ad5849b0e440f75ffb) --- sys/net/if_bridge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 28e8e8856b8e..23c1c4171761 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2882,12 +2882,12 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, memcpy(brt->brt_addr, dst, ETHER_ADDR_LEN); brt->brt_vlan = vlan; + brt->brt_dst = bif; if ((error = bridge_rtnode_insert(sc, brt)) != 0) { uma_zfree(V_bridge_rtnode_zone, brt); BRIDGE_RT_UNLOCK(sc); return (error); } - brt->brt_dst = bif; bif->bif_addrcnt++; BRIDGE_RT_UNLOCK(sc); @@ -2895,6 +2895,8 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC && (obif = brt->brt_dst) != bif) { + MPASS(obif != NULL); + BRIDGE_RT_LOCK(sc); brt->brt_dst->bif_addrcnt--; brt->brt_dst = bif; From nobody Sun Jul 9 16:09:52 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 4QzXCN6QMbz4lWP8; Sun, 9 Jul 2023 16:09:52 +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 4QzXCN5y0fz3FTl; Sun, 9 Jul 2023 16:09:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688918992; 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=tEmsI4k0D32Vj6aiFmXQX5HTK7/Gn7/CWAn4Q3tU8u4=; b=pTgU5Bb4OfUNEZ26X1DClOP9sd5W6O1Ns5j4DFMrf/a0/EejMJPZjWOnYp66y3yv9Fz6Gj 8m1xFbmdk/fCVcGJVYP5mfEq/0Gp9ed26LcRlxBFCMCaZnEd62ouAib87AVMGnc27EpOnX BkTBNfbXNrrWXnL8ynGhohVlQjsM/tqYnQWTzFzqrdWJPQZf4m+gFdg7vtM5/FJgudP5gh HLlr0KGqDcnusxtW98PpV6JGGANbkG5smaC2NFoxDLqSXGWFgOpkYu2I/23IjNEHgxlRj5 Ere8MpUW5n4GsZQxWX6KSF9Xnp3FnTOGqH39xr8/YFzi9yqE/XfM5n3tIalJ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688918992; 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=tEmsI4k0D32Vj6aiFmXQX5HTK7/Gn7/CWAn4Q3tU8u4=; b=dNHgsXVCTCd0GWRiOrgTo5LDA3ewN1R+GhG6BZXkzwZsvHAm5JQeqLNGNUmazKpE6QTS2D mhhG7FgHIzmv6WiGqasT0vFQFNifXyuYFX0tfDN02JW+oCVwM+I+7VRGWJOm1yUHx90EPs DSWZvX/oR+qnPCr1sC1eG8+U0IcSn1ziGugcV5k+Ly+EzEJ75FA28SeLEbnRS05Idb9Aks P/P3K8RnGWcrkW1rR6n8c+sgnjS1SWuEOkrSKFiyjGrxwre1+bv0eLCqrUbE7h82LrjKF4 GWImpvA6bjXNJzc77ZjGkUJqw2tS5O/lVq7tuf/lEXzr8ZAvW+KXyPXPbFwFiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688918992; a=rsa-sha256; cv=none; b=X6ePJYLUO/SZa8XRNCHwRKcVbanME5iE4ly4qdc6TeIbY/glNJE8ViZ147qyrzVLVyVEKt 4Nrzs+C60s5haP3QWTgwlo6JAB+Josqxt9rjLAEZePqQlTQvtOoopx0Huk/LqU3QtJ/m3D NJJ7NZ4dzn4mgrM1vC1CVDXXBiwgGs0S/ILLyek+zfc105pOej0xCtGQ6j4ETDyuUxgjfF DKiVNcPrGUKkVPJaJiq8HXurrMalmJ9yjvmm3IYhMreGTyMOl6cJMN4LNFShsP3/wA/Kx9 LSsud0dFSltsyk78OzB94Z4dT7XRbmALx/Zp+uifEpGcyKFgYUYAkuttGBOBbg== 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 4QzXCN4tfxz18L4; Sun, 9 Jul 2023 16:09:52 +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 369G9qLM021055; Sun, 9 Jul 2023 16:09:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369G9qfL021054; Sun, 9 Jul 2023 16:09:52 GMT (envelope-from git) Date: Sun, 9 Jul 2023 16:09:52 GMT Message-Id: <202307091609.369G9qfL021054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 18ca9e6c5ff1 - stable/13 - hier(7): remove entry for non-existent /usr/compat 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 18ca9e6c5ff1fd08448d3c53debc8d4dac92a32e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=18ca9e6c5ff1fd08448d3c53debc8d4dac92a32e commit 18ca9e6c5ff1fd08448d3c53debc8d4dac92a32e Author: Mitchell Horne AuthorDate: 2023-07-06 14:11:21 +0000 Commit: Mitchell Horne CommitDate: 2023-07-09 16:09:07 +0000 hier(7): remove entry for non-existent /usr/compat This is historical (?), but today /compat is the default according to linux(4). The only remaining reference to /usr/compat in the src tree is under tools/test/stress2. Add a next-level entry for /compat/linux. PR: 261349 Reviewed by: grahamperrin, karels, dchagin MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40876 (cherry picked from commit 5e7308a7bcb6675de6049afd4a5dd9d6795057b2) --- share/man/man7/hier.7 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index c4097795cf5c..a4819e8a891a 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,7 +28,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd June 29, 2023 +.Dd July 6, 2023 .Dt HIER 7 .Os .Sh NAME @@ -79,11 +79,15 @@ third-party loadable kernel modules, such as those associated with pool cache files .El .It Pa /compat/ -normally a link to -.Pa /usr/compat . -If not, then the -.Pa /usr/compat -comments apply +files supporting binary compatibility with other operating systems +.Pp +.Bl -tag -width "nvmecontrol/" -compact +.It Pa linux/ +default location for +.Xr linux 4 +compatibility run-time +.El +.Pp .It Pa /dev/ the normal mount point for .Xr devfs 5 @@ -200,9 +204,6 @@ contains the majority of user utilities and applications .Bl -tag -width "freebsd-dist/" -compact .It Pa bin/ common utilities, programming tools, and applications -.It Pa compat/ -files needed to support binary compatibility with other operating systems; see -.Xr linux 4 .It Pa freebsd-dist/ distribution files .Pq like base.txz ; see From nobody Tue Jul 11 00:21:14 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 4R0M3t2w4Fz3cM5V; Tue, 11 Jul 2023 00:21:14 +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 4R0M3t2FGXz47NX; Tue, 11 Jul 2023 00:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689034874; 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=Fz10KR6pcsorGnZ+6cYwlbxklm/1T2tpQg00kCyJx1s=; b=PW0YGoh5LhfInMpIode2/6D6JnCBYbi+bdaI/gJf/Y4JJoGW5y4q0SY/JlMB7a5wFLoK8Y ACUaeCkkM/G3bwUkejD/OIWMJls15VrYOK8ASQzG8X39yy2LcHRY3DtOWLCEdZZvmHQNjT IcsB0U+Xncd4UmJ61hN9tHdhZoBEqcUB5/4KKsp+QtQsAt61U+M989eiwfGBT8tVFzJx85 Jr8fV/Y2RWFAHMVY1r+0MLRC1fgsybd/A080DZ0lnxgU7EUqJxJ/ZJNEyhRyNQg8sMCEPY ykCzzL1jpjcFb5bRqN0auDQXWfCVmWNq90uMbkS3XhsHOZ1DR0S7fAEj+TQJuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689034874; 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=Fz10KR6pcsorGnZ+6cYwlbxklm/1T2tpQg00kCyJx1s=; b=DMBBdCd1Eru4aVpwal1ALharchPJ68KJ5lPEYqexezHRA9qWYJS3eOK2BNTWf8J/E1Zo25 GJm60fdnXWcTQ01aoTYZLPtHqpbu7CbwO2ualSCtUEMhDh/jIvFMwrRwF+GcpUVYrzmXbJ GnRojEyoBMQDdcSq7HbeIREtQDl4alR+WsdS259yKZnQrrjPsB6Xole3OL/SA6whod816+ mBytbGCSNwGLRfxtDb6H4NYaeu+l6+i7QaLjOqZ2XcYjI3GfN812oxH3/g6JHvmAI26zkJ Wtf81vmKvRRZ6q4QxAjFtuLV2v2VrhluNXXc4IFoeAD875jkkbY03/Lkq898Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689034874; a=rsa-sha256; cv=none; b=SegBdRxcBDNitYpMeZMRMytywFcZzaxgDV/uBSruvFyt+1jyvbAhiGg0niKwBMvKA3Z1TI SqYx//KNXcvcVbrFq/uD1Xw1CZlDgoLpBhLhCJArvtr98laa+ngUWYBnlFnQCUIOzni1lW 7sZpkSiHnEWI+i7S8vfqbJ8/T2Y7WwDpGfaANXhETs3AbADhCbm7dHOIGdujX6CqInu9Os 3xokIvl4KE9cuqW5hmQS8YD+bx17qq7FU+jr49Uo+2bm0SErbfa8uj3gIwN3szdHqWJx3z /YACSh+1joIE8KUn5Dwt4oaRc6jMrCSYZiZnNAS9+Ddwz1gzI3amssmd5rw3Lg== 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 4R0M3t1JJqz15HY; Tue, 11 Jul 2023 00:21:14 +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 36B0LE6C044656; Tue, 11 Jul 2023 00:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B0LETi044655; Tue, 11 Jul 2023 00:21:14 GMT (envelope-from git) Date: Tue, 11 Jul 2023 00:21:14 GMT Message-Id: <202307110021.36B0LETi044655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Koichiro Iwao Subject: git: 384789947054 - stable/13 - ifconfig.8: Document limitation of groupname 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: meta X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 38478994705468fcc878a6c40693cd9a3f29e086 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by meta: URL: https://cgit.FreeBSD.org/src/commit/?id=38478994705468fcc878a6c40693cd9a3f29e086 commit 38478994705468fcc878a6c40693cd9a3f29e086 Author: Koichiro Iwao AuthorDate: 2023-06-20 10:14:39 +0000 Commit: Koichiro Iwao CommitDate: 2023-07-11 00:20:03 +0000 ifconfig.8: Document limitation of groupname Approved by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40645 (cherry picked from commit 9aca30d87804b9b9f646f9ef3ad5ae6af81fd40a) --- sbin/ifconfig/ifconfig.8 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 99a858aec021..e7d41da45bec 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd July 11, 2022 +.Dd June 20, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -467,6 +467,9 @@ This action does not automatically disable routes using the interface. .It Cm group Ar groupname Assign the interface to a .Dq group . +The +.Ar groupname +may not be longer than 15 characters and must not end in a digit. Any interface can be in multiple groups. .Pp Cloned interfaces are members of their interface family group by default. From nobody Tue Jul 11 00:46:23 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 4R0Mcv632Jz4dNP2; Tue, 11 Jul 2023 00:46:23 +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 4R0Mcv5ddsz4F8d; Tue, 11 Jul 2023 00:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036383; 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=bDuhOMfyqPlfO22tGDZ4ZYzcGibkJBui+2S0plZpEms=; b=c03HT+qaKFsFxYDpv55lyx2dD0B/dMKPTD1RL649Aqp8uhyio+aRp0rYYLLuo5UHlb62Xm CRfBofVbjxHeRmM6bYcFwS4GoFdD3v3sWKtfCF+zqcYvDH2Ojx6VtqvqgOVQhGLoPMlsFe /MH523auWbyPu78ZTgRbzCXKzTYqP5aeA2gVvEptpnz8kY0fWzezxVUi8TZVuUsYPyl5I0 0wNS3zdHzqG1ox4zq2W/XBEe0zEI+itr7CH9dxa47onfmzf719AkN93J9LL1hBSZrP89Ow IttQUjM3zOg/viw/bQQ9elrEfyBhjMxGRNBTlxrWyr+SK6wQ4ANwgHWisFdd+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036383; 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=bDuhOMfyqPlfO22tGDZ4ZYzcGibkJBui+2S0plZpEms=; b=GQgMWJl7vQLgELu5pcEnj7pD2XCa5/z2xBziSdENWX3OoPWHqZJ6DYbRzZHRlRJBGKLL1Q t0vhTsulzdZyAaYE6cQEpHN+vTI3HGkaim+oZ/ysjQGBRo//bi+992l7gn8hSFjCsdkEO1 jUgiNdd2JOjCtSu2AIIpnueeRSN8//bGFVi88p/tx2f8WBxxKRFqPfxJ8GzzQGBjqTI33K w1dCJ/5r4d/dqUKPWdi/PNkPVrnZrO06/xMCvXCtaTo2a2BcOU0qRw8g0fU4SYPML8ESGQ N0x/gJHDx0aLf/MWJMZ6TGQ8Boe4tKq4NE4BdO6NeZqNJIxf2GoR2Rsuq57CNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689036383; a=rsa-sha256; cv=none; b=SEus8dSbL6wJe/nGy/RWOjVbcT2ODf6t3lEAPzloQ5Hd+6WuDm4YdZeR+oKWSd98FFGgND pRd9FCpc/9x2I9ITxLAzGt2a1PaFwpEk2MgPVIFjh3f05YZPWLMAyatZu+zmeFJcPW+e/E OmL5XGOZres7rvCTWMZZ/rtRTqDp3f7yQeeKKSfQBu5V7UfFyWUwfJLu7P5PgBpRZfm+8g Gcvo4GffSQKSmgvXNLZWND5Ao2nrrry4SivIOyr1gIPfxL1E3upT8NEei64ZCR7xBpF2mp fj4lJCpBFB0uDZdPUC3JDNcgtTokNpEZdxKhFX9hk3uSBYM8nQYLFvbVwJyUJw== 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 4R0Mcv4bCXz15lk; Tue, 11 Jul 2023 00:46:23 +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 36B0kNC9082111; Tue, 11 Jul 2023 00:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B0kNbv082110; Tue, 11 Jul 2023 00:46:23 GMT (envelope-from git) Date: Tue, 11 Jul 2023 00:46:23 GMT Message-Id: <202307110046.36B0kNbv082110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a48de695e69e - stable/13 - sys_setpgid(): style, remove extra ()s 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a48de695e69ea43d70669bf0cfa71aa913675c96 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a48de695e69ea43d70669bf0cfa71aa913675c96 commit a48de695e69ea43d70669bf0cfa71aa913675c96 Author: Konstantin Belousov AuthorDate: 2023-07-07 16:59:41 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-11 00:46:02 +0000 sys_setpgid(): style, remove extra ()s (cherry picked from commit ed84cb591df70b860f988c455d70731e6df15186) --- sys/kern/kern_prot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 9710f6ca1fe0..cf88cae3a72d 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -454,7 +454,7 @@ sys_setpgid(struct thread *td, struct setpgid_args *uap) } done: sx_xunlock(&proctree_lock); - KASSERT((error == 0) || (newpgrp != NULL), + KASSERT(error == 0 || newpgrp != NULL, ("setpgid failed and newpgrp is NULL")); uma_zfree(pgrp_zone, newpgrp); return (error); From nobody Tue Jul 11 00:46:24 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 4R0Mcw6rwzz4dNXX; Tue, 11 Jul 2023 00:46:24 +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 4R0Mcw6RQ6z4FQs; Tue, 11 Jul 2023 00:46:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036384; 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=zfYNp9sDXCbRUzFWcSEoR+ujx15D7XO0KfnDVoUW9uc=; b=jt/XNTFV/Nforee4LItMHj1uRS7L5vVszxbUx88GtP0o2h6lcWki+VLcIFoUwOHs6t7nYG nChbTEUeaDUefk/+rqILNpwOJSZxzRV+/D5g0dQ/2FptEv0kLZq0C3evrGqLWCW0X1NCq4 Ea1SlqvdJvdxZH7WbW3YhS1sFgKezdIc/dPMVQBxsXbgqrbX7zjeXGfdTQIyvfPSuzssIk 98hxXAN1qdyxarKq+SRs2BbzB1gpnRibLykmgQTN1xsyq4TpmgumNoxWnU4p/CRkWZ0yRL k3FL5ELVp/Myb+Do+VDvgIS/98z4YC2caz0/BhCu6CTd1EYF+dxEd/Noalok3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036384; 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=zfYNp9sDXCbRUzFWcSEoR+ujx15D7XO0KfnDVoUW9uc=; b=qnCjMrar909WmOOK3M0hTKWq9XLAZH6DNxqTwf8+2dyeMekIqEvspK6ZRiaWgq+bBzmWhL F+4+E74esEqNJh/E5U8h8nMX+nU4jZ1ctFZx2TRHcyZPFjTT+1kLyCKimYdmeYZCOnhUQr cP8xRhgtRbQFk77m+UTQKO8pWXKHCBo+NK39qWFqvPfv/OeDdauUlfQhM5uogxo1CBJdha 6FtwYRNZnhvm8NnKr2h4jeUWyHgBqAsECD42cD9Kk/lG0LLoJ10ix0fOaYIceYySMuekZW SSS77bWygJMT5O3dJeJxbpE/T7d5tu8elPL0ccJ/w7l7RMsQ6m/rEDrnPZAz+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689036384; a=rsa-sha256; cv=none; b=P/QvfFFAlj2gyFaxQ/LukLXqp04yUymPxMpS5TBmSSAN6Q5x3QysdiLGVXzr1Kd4SyHrNd 5QOUPt4rKx7WIkGAN0s5/MZiavxNe9pQC2xb+8jeeXKLKj4zgqqXeG6/ob99kMOn3tM8YX P+65ECzCwRRqqZjF+L/NJ/5/pcde2QxbRqS9DG6IJzPth+9+yM/lUAMGuGseLmA36bjV92 VcSs2IFyekWvEjtxYpmcFwT4Zeps2xq+oWcKcA0p/oTj5FytmJwCeayTPiH7ivw1zzFElq PqJKGYcIqYVjBr1RWfQldseDPejwh9ZsG5dVsq8l/k/WcAJJx1ZL6A1tQtdDtg== 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 4R0Mcw5GX6z15ZW; Tue, 11 Jul 2023 00:46:24 +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 36B0kOGL082130; Tue, 11 Jul 2023 00:46:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B0kOdU082129; Tue, 11 Jul 2023 00:46:24 GMT (envelope-from git) Date: Tue, 11 Jul 2023 00:46:24 GMT Message-Id: <202307110046.36B0kOdU082129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e9162c32069e - stable/13 - vn_path_to_global_path_hardlink(): avoid freeing non-initialized pointer 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e9162c32069e5276f5ec161dddaf6e45a27f5d67 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9162c32069e5276f5ec161dddaf6e45a27f5d67 commit e9162c32069e5276f5ec161dddaf6e45a27f5d67 Author: Konstantin Belousov AuthorDate: 2023-07-03 17:22:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-11 00:46:02 +0000 vn_path_to_global_path_hardlink(): avoid freeing non-initialized pointer (cherry picked from commit d6b900c915c19ac1bb5d57659695fd143864be66) --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index b9e07a2b8dcb..b20bce7572be 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3851,7 +3851,7 @@ vn_path_to_global_path_hardlink(struct thread *td, struct vnode *vp, if (error != 0) { vrele(vp); - goto out; + return (error); } if (strlen(rpath) >= pathlen) { From nobody Tue Jul 11 00:46:25 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 4R0Mcy1CRkz4dNJn; Tue, 11 Jul 2023 00:46:26 +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 4R0Mcy0V5zz4FJB; Tue, 11 Jul 2023 00:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036386; 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=Y1FhKts+6J22427FK167oLOxUf37MWmx5hj9J+pSFLA=; b=ZIbd2dRALn8ceT5dckWfj4o2xxdj9vYYVokMwDH4Y6y0NRKXjyy86YjxybNARKP+vftaFc hSOJU9aX0/SNryuslD7ECozQNNyBFQsrJ3G8iByDIaAQCLkovGpESq87KPyWoA1LSBhTEb KPfdo1J8RsFywvLGmmkckDDy0hoQVZ8UWHCZT5AO8ShpcYcAbuQplqFWOV7jt8vxLAGhnc XIpfxjQWul2l1pqSmyU9AgeNZdDO1wYgzYn9Bbb/wdfUZUpCbkGEMJ+FFa134rnaObPrIo X1lRm+zxrtE2GA7wgj687itVCT+L7wfRIXmod0cRBLlrdEmyRRYkERiWmsQbfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036386; 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=Y1FhKts+6J22427FK167oLOxUf37MWmx5hj9J+pSFLA=; b=TcADegvV9X7XfXliTG3DtJxorBCIuZR0/wHjeImX5LbxeNf8mKzX0KZ9/NfXYM4IhfZoSS WChr4DYdiKnMcN0Rz7+lYbHwvYc/BZOi+BOFH4Nhfdmq4eHl4y70pVheGL5rHtouq7IQDN g1caj3y1+AfhbcDQD6JAFpGKO6sOOIaLHhc79NTQ+YrXqlq+10H1/92yO0oD/JfXbw9D7o AfjaQ8bEJy/33M7Fzk02eUg+iG2roa/7JzoKHGZ5tnr31b30m0cZEIlLZ+0iY30t9WLuBO wmb/ddGeDPXD4YnMixI1tL1YcrSFoA55Fw2eDyc8ri4ErnFh2VV73dqfxmgaYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689036386; a=rsa-sha256; cv=none; b=r3ZLuve0DG28DIwZcgQbcySVwwqgFArc8FcYuMoJyuB8JYTjchANZFnxtMzfVo4PUpkTna nmRb8+aGzElWOpBZaTFk9jWNw/AeUSxQ7s4I0RD/VDYI5ZKuy4Fkws9FgdhGswNactebjX STDAqp7AuR/xHG5kAwBSZvyd19JztZ5SIJNnmG/FR+USyVNg77aJaQ1EstaiQmE0JbGWeD QF8FnVctAOChSDgsujmPGXNdU2Mhf+9B9Nv950UZyiK5fXdN3uNAtB+wikPfgLsJCwGgYP DNSZ6H9x/Us13wxCnoG55foYBA84cRdYQ4z7hs2Y1tr0ZHK4TSXSAqdbIuMLXQ== 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 4R0Mcx6Cnbz15Ts; Tue, 11 Jul 2023 00:46:25 +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 36B0kPnD082156; Tue, 11 Jul 2023 00:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B0kPBj082155; Tue, 11 Jul 2023 00:46:25 GMT (envelope-from git) Date: Tue, 11 Jul 2023 00:46:25 GMT Message-Id: <202307110046.36B0kPBj082155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b73d66d00394 - stable/13 - vn_path_to_global_path_hardlink(): initialize len 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b73d66d00394cd19392cc40140404889c940b0da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b73d66d00394cd19392cc40140404889c940b0da commit b73d66d00394cd19392cc40140404889c940b0da Author: Konstantin Belousov AuthorDate: 2023-07-04 07:46:15 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-11 00:46:02 +0000 vn_path_to_global_path_hardlink(): initialize len (cherry picked from commit d7614c010c762dcb29110073e7fbecf048fa3a32) --- sys/kern/vfs_cache.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index b20bce7572be..36ac9c2ed6ab 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3846,6 +3846,7 @@ vn_path_to_global_path_hardlink(struct thread *td, struct vnode *vp, * name. */ VOP_UNLOCK(vp); + len = pathlen; error = vn_fullpath_hardlink(vp, dvp, leaf_name, leaf_length, &rpath, &fbuf, &len); From nobody Tue Jul 11 04:50:42 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 4R0T2p3wV2z4gnnQ; Tue, 11 Jul 2023 04:50:42 +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 4R0T2p3Sq7z42bR; Tue, 11 Jul 2023 04:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689051042; 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=6FjCpP8MEomFRdn+jyJ1eAwvXdrefE9DecSGgmRU3Ck=; b=b6huUW3a6PUHaZKr+LYEDIKxLUCQyRoQQzxyViWLRjk1bo3ZTWmmLWlqnbArzKhqqvZcBl uCuB9EDpGxRxZDMLgz0HoVAjHDlwRqU1+pRL/uTW9Ja5iY93amGK8hlWKtDLDZIB0wjzvV LhQZOdlfczWHxe3+1+2wkL/bxLwzPiLk/EeDKeUoQ8MKkuo700DXkLkceJIslNhEButPsg bZ5tNkW/wt9kuOT5eG3yVG47YGN9sEnpcLEf66yKrEs0BNclkdBWPcHwLTAyxb7nY75dVX 40ZHDMnQX0PMAJ6r9ePgz0XXYrVFouSS8YWNDRvA9nAKVp2h+f88PJouhxa/Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689051042; 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=6FjCpP8MEomFRdn+jyJ1eAwvXdrefE9DecSGgmRU3Ck=; b=VuRBKpNfKPKSsvZhDbZYDpWVoRrlqPZlewYmQ5AxJClB+oihhCj4zWNe5EAoLr2fReUrOF nNdmwyN0rc5XE5hHw4GyCYC+nfA4UQRZS4xLXQRiYWdNczzlh+Lb7sI9r8NuAv1pBqr4My iBo8IHazgGVIarGFFlZV2ob9m5u3kQmMh7AOl5CkLWMmpdUEygLhtSAag3XjZ9aH4Nidio nN1KfgT+jV0g32+jtVGYtEIE9igLPYMOnjamMjxhZoR1n+ViizaVJ4nDPIFzDbtGvcZ5Bm T7bMz69NKX64A924axosdR3nBd1YuiSJXuE3/0dsdj3CBjnf4QIT4HHdlpV+rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689051042; a=rsa-sha256; cv=none; b=EMFu/+B3qaDmH/Z7n4wAOKxpm76RApL66EtBJQu4ZlnRSANasky069UVte48j6YYAqeLvz ZXk5rGj5XRBumu7jUz5jrs2mDyPE8tZ6twZIa+rpQX8ehAuWdfgvZOLij7sRJ2g2kjOMD1 yCoXSQbKfQM0cW5FTHrQiav7jpt8U/bpiKD93N2v9cYsAYF0HcYA13t5DCDM0Abzz2wLT4 kun95TC5DOMI14dwr0yrS9as3uQKHCAO9kcPrSNty5BxeCodIZDWYNL1R6dsldVwGYBSNS 67pPgReYEJrNt4WpI/exjiiw9HT3zeJ//lbZCX33O44Ra9OnUgZmwwK3MyoWZA== 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 4R0T2p2XfTz1CV2; Tue, 11 Jul 2023 04:50:42 +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 36B4og98088689; Tue, 11 Jul 2023 04:50:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B4ogI3088688; Tue, 11 Jul 2023 04:50:42 GMT (envelope-from git) Date: Tue, 11 Jul 2023 04:50:42 GMT Message-Id: <202307110450.36B4ogI3088688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Koichiro Iwao Subject: git: 8cf8bbfef509 - stable/12 - ifconfig.8: Document limitation of groupname 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: meta X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8cf8bbfef50908edd2a61356e13c94044ef49fc3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by meta: URL: https://cgit.FreeBSD.org/src/commit/?id=8cf8bbfef50908edd2a61356e13c94044ef49fc3 commit 8cf8bbfef50908edd2a61356e13c94044ef49fc3 Author: Koichiro Iwao AuthorDate: 2023-06-20 10:14:39 +0000 Commit: Koichiro Iwao CommitDate: 2023-07-11 04:49:34 +0000 ifconfig.8: Document limitation of groupname Approved by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40645 (cherry picked from commit 9aca30d87804b9b9f646f9ef3ad5ae6af81fd40a) --- sbin/ifconfig/ifconfig.8 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 5c3a554c2b46..14b5d41de759 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd July 11, 2022 +.Dd June 20, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -357,6 +357,9 @@ This action does not automatically disable routes using the interface. .It Cm group Ar groupname Assign the interface to a .Dq group . +The +.Ar groupname +may not be longer than 15 characters and must not end in a digit. Any interface can be in multiple groups. .Pp Cloned interfaces are members of their interface family group by default. From nobody Wed Jul 12 03:10:51 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 4R12n75zhpz4h3Y6; Wed, 12 Jul 2023 03:10:51 +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 4R12n75CNWz487M; Wed, 12 Jul 2023 03:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131451; 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=9OjtHb6+Rg9DTk4SBgJcNpzJfm2IfpDELDUbLEhtsRA=; b=XSgvylWcMO3jPL8YBdchhobNtGYrPBH9JZ/eVJpH15FLLKgTgD8oAbpa9ElatP+3QzIcE9 Sj+GBYtAkSJAA8YWNaKV6V9LcnY0zt7iyxrDvekj2VRBVtG0t0DCNuITIAXAxtKUkDkF2K XzFURv9ovgyo/jjFeqHag7CqawbChRyxm/Jw9ZzsPCuYB30sBeHYk3vjejyYmWLL3ANkI7 OQYfCjhHFlRH3ZceFpInx7aKffhL2lzE0wTqso8vzab8QOjFr5ayGcCjIzvaTknFJbs4bq EaCfP1cXo9WyD0+4r/WO1sVZAoUDK3vrGSU1HhZBnCcDGv/I+YpPS7PsBqMqew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131451; 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=9OjtHb6+Rg9DTk4SBgJcNpzJfm2IfpDELDUbLEhtsRA=; b=CT/QL7j/hMtoGwPcbOla/3WMu7AkTtkQ5PHynFtYPaDqSTOQdFWKek3QNmhWvcxtLMQty4 m0uIz/BbrmwBa6w3hMxKu5glDkkqTU0eXd7f8nzlhy6f2wLPafwNm1Qcm03wVi90FMvR7B v4R2YV778x+5eBQp3lfRN//zlbSnowAD3K/r4odIDyf2jl7mLFNBpJnZmc3xykkWgVjUOg hIb6Hvajvb0or/+9Ql801mwunZeooFN/QWx0/rNhe4HmzDeRs3gSJpzXn3XD7vF8p4BbHb 6L/flDv43l3ByJkJsRJ+3GBSRu7Fzhsy43RrPOgJ2Tm71PlJREInDXs3OSfziQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131451; a=rsa-sha256; cv=none; b=MHCtyLtFn7bJPu+WDIviYgh632XPLGGoRgWbR+6yTu+s6A83ciZK12wYdF7BcO5S9o+eIe cWzFGmvNGIMx3ezV9b0KnHJ3C9d8YaXBwAhPJp9y2tHaescAlUY/VNFozmAXPieMb/fKnj m5a1b9s4nhlYIFaI+WuLcY3JJgxfX6CBmNkl5ReVp+eqFz5dWAvPmWx+nLBcb8z+OYHfUr FpECSn1mM3c4e5wsKaZPa5EfKI0wyd5yWoyqJOz51YxJ3XmtN2BFtBqs+ixib7MA5VIHfc uqgjNTL8zlL/bg9FoIt3IdThCQrhwLtWGMGgmPmpzN3Sh7qJ9sN0FAbmTWLJhA== 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 4R12n73m1VzsWh; Wed, 12 Jul 2023 03:10:51 +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 36C3Apg4010345; Wed, 12 Jul 2023 03:10:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3ApnO010344; Wed, 12 Jul 2023 03:10:51 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:51 GMT Message-Id: <202307120310.36C3ApnO010344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: fa06d178ffa4 - stable/13 - acl_is_trivial_np(3): minor fixes 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fa06d178ffa404b08b610562c8f5b4674028c356 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fa06d178ffa404b08b610562c8f5b4674028c356 commit fa06d178ffa404b08b610562c8f5b4674028c356 Author: Kyle Evans AuthorDate: 2023-06-19 05:31:16 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:05:26 +0000 acl_is_trivial_np(3): minor fixes - Correct the document title - This function has an _np suffix - acl_strip_np has a manpage, xref it - RETURN VALUES should describe acl_is_trivial_np, not acl_get_tag_type Sponsored by: Klara, Inc. (cherry picked from commit 0e96337b11910b444763439a722c89983d660a09) --- lib/libc/posix1e/acl_is_trivial_np.3 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/libc/posix1e/acl_is_trivial_np.3 b/lib/libc/posix1e/acl_is_trivial_np.3 index bd00d88191b4..28fac67a20f6 100644 --- a/lib/libc/posix1e/acl_is_trivial_np.3 +++ b/lib/libc/posix1e/acl_is_trivial_np.3 @@ -26,8 +26,8 @@ .\" .\" $FreeBSD$ .\" -.Dd November 12, 2013 -.Dt ACL_STRIP_NP 3 +.Dd June 19, 2023 +.Dt ACL_IS_TRIVIAL_NP 3 .Os .Sh NAME .Nm acl_is_trivial_np @@ -41,7 +41,7 @@ .Fn acl_is_trivial_np "const acl_t aclp" "int *trivialp" .Sh DESCRIPTION The -.Fn acl_is_trivial +.Fn acl_is_trivial_np function determines whether the ACL pointed to by the argument .Va acl is trivial. @@ -56,13 +56,14 @@ any access rules. For POSIX.1e ACLs, ACL is trivial if it has the three required entries, one for owner, one for owning group, and one for other. For NFSv4 ACLs, ACL is trivial if it is identical to the ACL generated by -.Fn acl_strip_np 3 . +.Xr acl_strip_np 3 . Files that have non-trivial ACL have a plus sign appended after mode bits in "ls -l" output. .Sh RETURN VALUES -.Rv -std acl_get_tag_type +.Rv -std acl_is_trivial_np .Sh SEE ALSO .Xr acl 3 , +.Xr acl_strip_np 3 , .Xr posix1e 3 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. From nobody Wed Jul 12 03:10:52 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 4R12n90FSMz4h3bb; Wed, 12 Jul 2023 03:10:53 +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 4R12n867bWz48mP; Wed, 12 Jul 2023 03:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131452; 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=Z1N9jOeISD+iJUGVKBL8mkPGEA63SNzjBrmUphZakGo=; b=YDuwikOgSMmKkIvrRgwzdioUpx4Rk4HEbd+zUt9B87+FM7GbphmaeJxNj8w+i7MDuvUDN1 PkaoExrOtYbDVrKgjFWvpZw/H6eatOL5+3n84UsMKul/RwAi56ed0ePQQ+6hUxq+5EZ4gd BoSraTdJ/y8AmMGd0y87XP1VTTV351mrC/EcqvnkeeweXl/IKfK728Yo3lVHMw+NneAtdT LCPvmuOGk2R3ulMv6ihK/OINoprvIZWVTMlL10IL8n5HrocrQ4/nKo6T0cfrP6ObJb6kzL TnZRk6eZZKaEkXTsX3QRQZS4qiU7qZd52yD/EjnLhToGSl0hvpp8jftcsqvBQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131452; 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=Z1N9jOeISD+iJUGVKBL8mkPGEA63SNzjBrmUphZakGo=; b=AL2YgHHcCvOYBa+YiSDmzopF+HmRWs4gQQfy7JOhCKTbkM02RF9DCFEglwonBsWH/jwixi +BXOMsFkaPTX1J9zMwxsMxc5AXYIlgCFfXeWym3SIs4xEuNlFYYyJN+V4mepvM5IF1QE26 PB5oT97H/y0gsBuZrPZdvqCWFa8gPo44jsVsfw09Qt1aT00QV/pHIuXfIJhLlhu7LVXSVN cUClqcTVXJ7PJHLw9Eay8gdtQMEoRJ9jJqNqH6BlOc8aPyy7U9BfYFOykp+Rx1nm+Hf/JT Ne3U2foqbjiNOb9oQSWl+CWwN79wcNOSTQAderByehiG98qCahpkFGl3kmhTkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131452; a=rsa-sha256; cv=none; b=wXqzwAcV4Z5Nh6KEgVv/UnYFJK8PYSMN1Pe9hCsB7RKRc9caJZzm465jga5B+VAHl9wvng hoctRRiwahwTI22ep6Y8nsSy9uGHwH96BqV9bpxp8HCX0xSGaCZu5LIVQ6MSrYZQ9HJx/h +hVuSK6jxCIOT8v266p1aft2D6XHM/BFF4C5sySOuogedCXNI7Ycp8iPF0pjyzWZF8KgO9 XpuQ2oP6kt+9S9TrBnkxulnFFTmdXEZ/DmNI1bJI+xNT9x3jIoajFYbXV+sriB2Zg+rZ93 SNhLcOWQslDhbQk4tbb6oNCgiEeRKLUeIvYysUjbgjh7NxAwKWRjfp6Y5RKqZg== 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 4R12n84g2Dzsc0; Wed, 12 Jul 2023 03:10:52 +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 36C3Aqak010364; Wed, 12 Jul 2023 03:10:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3AqiU010363; Wed, 12 Jul 2023 03:10:52 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:52 GMT Message-Id: <202307120310.36C3AqiU010363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6fa0b2b484d9 - stable/13 - getfacl: free `acl` in print_acl error path 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6fa0b2b484d94086f07860e03b8a63567420b317 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6fa0b2b484d94086f07860e03b8a63567420b317 commit 6fa0b2b484d94086f07860e03b8a63567420b317 Author: Kyle Evans AuthorDate: 2023-06-22 04:58:33 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:05:29 +0000 getfacl: free `acl` in print_acl error path Sponsored by: Klara, Inc. (cherry picked from commit 781624ca2d054430052c828ba8d2c2eaf2d733e7) --- bin/getfacl/getfacl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c index d59ddbcfc871..187b928a981b 100644 --- a/bin/getfacl/getfacl.c +++ b/bin/getfacl/getfacl.c @@ -248,6 +248,7 @@ print_acl(char *path, acl_type_t type, int hflag, int iflag, int nflag, acl_text = acl_to_text_np(acl, 0, flags); if (!acl_text) { warn("%s: acl_to_text_np() failed", path); + (void)acl_free(acl); return(-1); } From nobody Wed Jul 12 03:10:53 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 4R12nB3Fkjz4h3Qf; Wed, 12 Jul 2023 03:10:54 +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 4R12nB2Qsbz48mG; Wed, 12 Jul 2023 03:10:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131454; 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=+xFAFV0+bX9b7plSup4dNbeFlez4W3aN+CEmI4xhwgA=; b=OjEfUricmtAXxLnWblQMx9mPUH5sVcAqNCaVqtsgnySkyK79A9ZYCSQfDKbtP1C0Mwx4G2 4KTan2a/UdhrQEpSCA6VHO8BQGjYmqyZifd0dhTMJRBF7TmMSKVBKZTso6m/oHJ2mXyUNb JBJ7K7PsvB+WXzKBg4sghhM4O8YT3/Son+kuiMqoecSj/42M5/90xGPsyAgll/8ehzQagu f174DxCeJfeCALNRbZ0ox++xI4dDCpluF16Q/oNM8Ft5QgsmOYOYmnOWXtKoKfpvLoDqOP NOotY//WeQHx97uIDenbpxkn0SxzwXy/Dw+TQ9mjXo2i9R/yo1Aa900M7Vr5Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131454; 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=+xFAFV0+bX9b7plSup4dNbeFlez4W3aN+CEmI4xhwgA=; b=sfRGAM6F44MwPJ43EnVXM+EK8xdlvw1w9wTbDk+SnS5ekPInY8mK1ZLK3qNec3iExSq6h1 XJkOTxJ9AclCekulPXrl1kgHteiOzcPo30VdU74PtCkID+c9huVUylh/6a6TI+N2PbOnRk HfWtlO1S5gjz0r36AB6GXNLUU78fmt4inyevdFDCPI3/6zCqepAqCJJtWAtDZLN+nQg7aG YEWnjpynkJoL03iWG6v988gqpnP2JjzZ2q0Zu/i8OoQ52WlUx2VLUa65ZdjR/G3zaX9NHa ij9iNR5gVbEj4wkxMCm7wFVEqhhxjY5McLYyd8Jh5x5jbssx3w+I5V+8s/QKQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131454; a=rsa-sha256; cv=none; b=cYNqnV7syOpxPyoorP7H4RMDMZCw+OqvsjRguVdpjn0JLPmncflXZPjRpvozSQTFwSxjfh 9Vx/XU4EYOhqoURgXOEXE+BtJlF2U/Fd9HozT2RQQ/XD/RkUMDBrfLsJxdh31Bz25adpJJ whef7car4DoRm2vwjs96GvrPfzxesydDsCIusX8FsNNkpXGcyF8Ihi1iWRZV30Lb0jOgsj ZIH0jeeow0EP+8VBuZIOWq3oMel6XMRUJYIcT9h9XeEq0JIuWZtfntX5cVeETCbDFGafqD CEq9wWyt64vbfPzoeh5dYWAENDKqOp9KV5nQjt4AxHme5S1G9AB3AzF9VOujVw== 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 4R12n95MCRzsWj; Wed, 12 Jul 2023 03:10:53 +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 36C3Ar17010386; Wed, 12 Jul 2023 03:10:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3ArB2010385; Wed, 12 Jul 2023 03:10:53 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:53 GMT Message-Id: <202307120310.36C3ArB2010385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 679ff7a0c58a - stable/13 - bug: efi_print_global only checks for the first 5 letters of "Driver" 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 679ff7a0c58a64ca5d11e235b7ba74fdebc3bc37 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=679ff7a0c58a64ca5d11e235b7ba74fdebc3bc37 commit 679ff7a0c58a64ca5d11e235b7ba74fdebc3bc37 Author: Alfonso Gregory AuthorDate: 2023-05-08 21:48:50 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:05:31 +0000 bug: efi_print_global only checks for the first 5 letters of "Driver" As a result, it is only really checking for the word Drive, making "Drive" appended to anything else considered for efi env. Reviewed by: imp, kevans (cherry picked from commit 39ae24e3bf1c8e7d053d0249a6bc88f65eff6de1) --- stand/efi/libefi/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/libefi/env.c b/stand/efi/libefi/env.c index 77e232343040..1d70e78e2a64 100644 --- a/stand/efi/libefi/env.c +++ b/stand/efi/libefi/env.c @@ -537,7 +537,7 @@ efi_print_global(const CHAR16 *varnamearg, uint8_t *data, UINTN datasz) goto done; } if (strncmp("Boot", var, 4) == 0 || - strncmp("Driver", var, 5) == 0 || + strncmp("Driver", var, 6) == 0 || strncmp("SysPrep", var, 7) == 0 || strncmp("OsRecovery", var, 10) == 0) { UINT16 filepathlistlen; From nobody Wed Jul 12 03:10:54 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 4R12nC1qjhz4h3bg; Wed, 12 Jul 2023 03:10:55 +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 4R12nC0l0Yz493x; Wed, 12 Jul 2023 03:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131455; 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=m29nOpifYEUyUwR2FnRB0Ja6HV4BgmJ6EUe905zwTRk=; b=WoZwQHZqvnWRwlWHXjMCjMDsNP7O66CJXPw8oS2TwUgM5Gfn24B+LGx5mVtgjGpYmJRxyj Cc7nxJH/+k8Hh3tZdzptPUZhfyUIF6feFqEf1CHbCSVcjHZsEURrJOHDv1WEPNh9ezk1En K3BCvjoJgQkjRREzzqJf8/AMTty/UkcV3qajMWF1DyTpzS4H7Wil3ExoAHowGqjO8k7zI4 av+kzr2iCET27Cf11QSFDrMEZLxjMj+u8KS6qxNFw67V6Nu0h48MktZBlLBw9oUP0VDdez 5fvR9rVofR4C+gWJonQZ+DRVMtx3HE1mrQHNkM0hhQUqnIrQbEKwPDC8/wvQ8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131455; 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=m29nOpifYEUyUwR2FnRB0Ja6HV4BgmJ6EUe905zwTRk=; b=L/t+cbfpoEEPc7fZwkL2+sABx82t9zSyUEHgx6ylpsJB0uNd0+95GMMfiRUGj/sq7ZukZo it7fbhLb+BwCZ3VJwJBUf2VEtKOfQR9nmtpNnDwwNpBQfLgl7OExLQ/W0PMQRkfrFIBYiE SkwnnxwHGjte38iySFqTfT7liQ4jSPG/TGrKQrjM8DYLIPytOusd9kYir/gYCfi03fHYKP aWH2DXokizeqWcjHdrIZzg8Y44W2smFgAS/bbNZjLUgahz/snTbenaAvCZoiES6uSgPtTV w70HBT9IguaU6OER0XE4FM0/FoqPiSLhAJkqWIaoeAipX28Q2VcdQEjdW8HEVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131455; a=rsa-sha256; cv=none; b=kMioGW6FZrKqg6JuXF4VzZ3R8cNKDtY15/YoXx64CktuCBPwiuQandng3qsambjU7q70i0 z3mNC57NykEjWptXWnOV/cmgsQ2F04BCze/Z2dQvm9GNjSJ/ZSWgCbubWrcmxtHso9M7IT DKS2u0EzEZ5aTqrQhpQ7bUI40vwAbbxoGiz+A141M4u8a34B2dJAf1U/6kan8VsxOzmO78 eymDusSsDzK3Usj5AjbCAwvKqJrEOFaKRuNrT/K66T4vpyjp/BY6tXhPC2dDYFXnU1JzcP SuemX/ZOv5RFxgcB0FooU55OwcWqmT4kUxbGsHabeMUVtbsBtpcvISeLGHNZmg== 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 4R12nB6YhqzsNN; Wed, 12 Jul 2023 03:10:54 +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 36C3Asew010411; Wed, 12 Jul 2023 03:10:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3AsLB010410; Wed, 12 Jul 2023 03:10:54 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:54 GMT Message-Id: <202307120310.36C3AsLB010410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ea2a3ed3bcf7 - stable/13 - wg: fix MOD_LOAD to fail properly if cookie_init() fails 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ea2a3ed3bcf7e792ba0c0625602ada29424c337c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ea2a3ed3bcf7e792ba0c0625602ada29424c337c commit ea2a3ed3bcf7e792ba0c0625602ada29424c337c Author: Kyle Evans AuthorDate: 2023-06-23 16:41:07 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:05:38 +0000 wg: fix MOD_LOAD to fail properly if cookie_init() fails Previously we'd jump to the `free_crypto` label, but never set `ret` to a failure value -- it would retain success from the call just prior. Set ret up properly. (cherry picked from commit ad9f4e6351fb23ee81bc940638d20af3ca7c278d) --- sys/dev/wg/if_wg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 9c4ebe5dd393..8ba1d229da4f 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2998,7 +2998,8 @@ wg_module_init(void) ret = crypto_init(); if (ret != 0) goto free_zone; - if (cookie_init() != 0) + ret = cookie_init(); + if (ret != 0) goto free_crypto; wg_osd_jail_slot = osd_jail_register(NULL, methods); From nobody Wed Jul 12 03:10:55 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 4R12nD2hpcz4h3bl; Wed, 12 Jul 2023 03:10:56 +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 4R12nD1HQvz49WC; Wed, 12 Jul 2023 03:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131456; 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=MrKXVY76+OvCxvnWWt2v9L2tU/brK4mbYIKARwzXXGc=; b=oJcVhmPAXhundK0ghKGglNJ5U0ypR0x/zc5JWD6nbymD1HwKjttWtuCHEPsprVW1vVP+yF nAyfjAjjjXU55SNs7Y/r//TPylyLhfxPEHY64Lz+NUZTtJHfS457q0fspmSiCId/IcgcTB tcnhQ2cs2x5ShuHiRDcMVOlWXJDG+hbpRp3UKi1afEPqwFD+Y+r2D5BW2AZcd0vuOAb6/y DFKiFmRnAigho/RlYRGwOG6g8qJLxs9f81Nf5blKnQPsCT31v4RcCrvt9gQJDlah2ruHGi Hq+fOX57+Y6zL9yKYdswZPJ3s455aOEhRVMcChFIKthlq6rUQp41CrEtJ/qPPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131456; 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=MrKXVY76+OvCxvnWWt2v9L2tU/brK4mbYIKARwzXXGc=; b=CNNpw8uFLoqK+SDPi8ab4YlOx4o5N/FggljRc/d//Jr+cWhs098WGJTf0YSH9jP9sJednR I+1N2l7H5c1COZ0OhIgSZdg8Q4xiVzYoUYIkwbxDa2A9JdX8koYKST/5TXHlRIRzI1LEvt RMjUl0w4LGLVz8F7Jykm+49wRBH6tSlp6RV7aCH7b3r/FNVmiWzDxs/dJQS710eiohtsJv UUYk6IzRM8+vQgkiTmIatk1bjXYsXI6hqWxWWruXMNmLLF7Bgp/KRV7nmhZZoNfwwI1Xsq ebGhUJA5EsC9ndflaCHPk8Cl8g0E85NaY17rY6wfNjkTnXbV+hd4HKxepiKhfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131456; a=rsa-sha256; cv=none; b=wPG01jiiWu/bYCx4N5C/YM1OnTYF0Peu1kNZQDFMnMzK506VG4hkQgcvyKHH5SnG09t9FB 4XGWeZw2na9SM3KIfp9fBdrHPvDdpqmtuZAsGftx+KuCWlLq2531OSa6wmuEXsDa1/ld/4 llmYCIKVoB9A873LU7mMrwF7nNEcPG8IMioU1jszFi90WEK1OPnILHKVQpChvzmU1C3zKo O0jgPP57Z7DRD2KnH03z30d1n9ugPHJjaph2gwvQYbRznN9W8bOEl5AYMk8z7x22Mvp82G iPvh4YyXzvysYB/kY16fFXxaKAg1ioHqYL9VO8zVZTu/QilWrFjH0cthv639gw== 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 4R12nD0NxWzsc1; Wed, 12 Jul 2023 03:10:56 +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 36C3At9S010431; Wed, 12 Jul 2023 03:10:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3AtY3010430; Wed, 12 Jul 2023 03:10:55 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:55 GMT Message-Id: <202307120310.36C3AtY3010430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b39545f7bc38 - stable/13 - wg: fix a number of issues with module load failure handling 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b39545f7bc38ec9865ac9cb4e703a6344ad8310b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b39545f7bc38ec9865ac9cb4e703a6344ad8310b commit b39545f7bc38ec9865ac9cb4e703a6344ad8310b Author: Kyle Evans AuthorDate: 2023-06-21 18:56:58 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:05:45 +0000 wg: fix a number of issues with module load failure handling If MOD_LOAD fails, then MOD_UNLOAD will be called to unwind module state, but wg_module_init() will have already deinitialized everything it needs to in a manner that renders it unsafe to call MOD_UNLOAD after (e.g., freed zone not reset to NULL, wg_osd_jail_slot not reset to 0). Let's simply stop trying to handle freeing everything in wg_module_init() to simplify it; let the subsequent MOD_UNLOAD deal with it, and let's make that robust against partially-constructed state. jhb@ notes that MOD_UNLOAD being called if MOD_LOAD fails is kind of an anomaly that doesn't match other paradigms in the kernel; e.g., if device_attach() fails, we don't invoke device_detach(). It's likely that a future commit will revert this and instead stop calling MOD_UNLOAD if MOD_LOAD fails, expecting modules to clean up after themselves in MOD_LOAD upon failure. Some other modules already do this and may see similar problems to the wg module (see: carp). The proper fix is decidedly a bit too invasive to do this close to 14 branching, and it requires auditing all kmods (base + ports) for potential leaks. PR: 272089 Reviewed by: emaste (cherry picked from commit b08ee10c0646e683cd03c9e28f537d9a7ba306af) --- sys/dev/wg/if_wg.c | 28 +++++++++------------------- sys/dev/wg/wg_cookie.c | 9 ++++++++- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 8ba1d229da4f..e8a258edc4da 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2986,39 +2986,27 @@ static inline bool wg_run_selftests(void) { return true; } static int wg_module_init(void) { - int ret = ENOMEM; - + int ret; osd_method_t methods[PR_MAXMETHOD] = { [PR_METHOD_REMOVE] = wg_prison_remove, }; if ((wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet), NULL, NULL, NULL, NULL, 0, 0)) == NULL) - goto free_none; + return (ENOMEM); ret = crypto_init(); if (ret != 0) - goto free_zone; + return (ret); ret = cookie_init(); if (ret != 0) - goto free_crypto; + return (ret); wg_osd_jail_slot = osd_jail_register(NULL, methods); - ret = ENOTRECOVERABLE; if (!wg_run_selftests()) - goto free_all; + return (ENOTRECOVERABLE); return (0); - -free_all: - osd_jail_deregister(wg_osd_jail_slot); - cookie_deinit(); -free_crypto: - crypto_deinit(); -free_zone: - uma_zdestroy(wg_packet_zone); -free_none: - return (ret); } static void @@ -3036,10 +3024,12 @@ wg_module_deinit(void) VNET_LIST_RUNLOCK(); NET_EPOCH_WAIT(); MPASS(LIST_EMPTY(&wg_list)); - osd_jail_deregister(wg_osd_jail_slot); + if (wg_osd_jail_slot != 0) + osd_jail_deregister(wg_osd_jail_slot); cookie_deinit(); crypto_deinit(); - uma_zdestroy(wg_packet_zone); + if (wg_packet_zone != NULL) + uma_zdestroy(wg_packet_zone); } static int diff --git a/sys/dev/wg/wg_cookie.c b/sys/dev/wg/wg_cookie.c index 16fa5d7fb52d..6ff9325c6613 100644 --- a/sys/dev/wg/wg_cookie.c +++ b/sys/dev/wg/wg_cookie.c @@ -55,6 +55,7 @@ struct ratelimit { struct callout rl_gc; LIST_HEAD(, ratelimit_entry) rl_table[RATELIMIT_SIZE]; size_t rl_table_num; + bool rl_initialized; }; static void precompute_key(uint8_t *, @@ -102,7 +103,8 @@ cookie_deinit(void) #ifdef INET6 ratelimit_deinit(&ratelimit_v6); #endif - uma_zdestroy(ratelimit_zone); + if (ratelimit_zone != NULL) + uma_zdestroy(ratelimit_zone); } void @@ -350,16 +352,21 @@ ratelimit_init(struct ratelimit *rl) for (i = 0; i < RATELIMIT_SIZE; i++) LIST_INIT(&rl->rl_table[i]); rl->rl_table_num = 0; + rl->rl_initialized = true; } static void ratelimit_deinit(struct ratelimit *rl) { + if (!rl->rl_initialized) + return; mtx_lock(&rl->rl_mtx); callout_stop(&rl->rl_gc); ratelimit_gc(rl, true); mtx_unlock(&rl->rl_mtx); mtx_destroy(&rl->rl_mtx); + + rl->rl_initialized = false; } static void From nobody Wed Jul 12 03:10:57 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 4R12nF4Grdz4h3Ss; Wed, 12 Jul 2023 03:10:57 +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 4R12nF1syQz49QS; Wed, 12 Jul 2023 03:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131457; 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=OGLYTWeHKmoiaNlMkgJOZaGgcStk9lsCerAa1Zi8M7s=; b=M62wIRC3vzY+bDVaGsppRJV2TcdeXYB3SRza8DcS3vXWEHEHoooQx4xofkGVpXTmzWwiha 5HwX3o/+jNB1uVOvd0tNRbMnZBEHpoMcC+PiPNdqhd8kG3V8nNLQIZL0WUXk3SX3N/xzb8 wbC5GbYogqSbKeRqYPsqJ3t576vNZ6yiEiE23uBDFhUpqV2iZBsXvDUXuKLZ00e7p138vE LmJmqtfFywGx4QkUeslPVjHaBQ6vYFdnJMD7koo+pK/1s/7OaR17jQaSRya8btlvdwr3ha SJa1c9tPGmcSt109mMjDQ7aUpTHWN2FobOo6LZ7WT0cxM4PDTSSejQH/1DnUPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131457; 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=OGLYTWeHKmoiaNlMkgJOZaGgcStk9lsCerAa1Zi8M7s=; b=kT8Kmq4tkXmNFhp1FAQs5Hjw0Uvo8Re/qOnx4t76c8HLjqRtdfnxk3EhXP9uIaBTC1F1hA p7DYU/SyKhOfenLQUGYORsyTolp+m2ALUP+MofEHr2Mb69KclfgjfXJsh4N9PhRTN4R9xn I4qmvqArpSDExkiM9vrXM4p3vZIqbIsBP34Ar4RKdt7XjzBm7PJcgiMnQtw4Ja1atocpfV m7oSRu26Dk1/NwoUoKye/BxvRyyq4E260BrE/7S/lA16vkDjDTWVwIJm979PhvI2V8YXWj k4Bzob3wmZn64FYo40Pv6hbX+8hTVje+gHltCDnLouG9M+f6JYF1CEe/kG4nVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131457; a=rsa-sha256; cv=none; b=XLPlLkzzWou7wX2V/CyLdJbtPbHN0IdML6Zq3jZ/K2kD2qdKI4/XCPKODfreeyCd4lGW+3 kH5EvB7RC94NiqHBhm10Izs91Vg6tFeox6CngpITTzjoC+3MTRkhrtRt4V+30VcpSBTnz5 85cZw9Vv8nWtfoX6iR4XUUWjWY6FwG7QRvesV14VDsofrKki5htepIAG0F6M3o+ussFzup wruULQCnQoPqAS8qUEysqCTz2h1tWptHH6nj4BXsMHpQs5dCuR09jpzQD/FDgZnpP1xIvT AkKU+01nfF+dN232+RaPZw0sDh1/m30KUAkm7y1UXIijRoQqrT5Q+p/pdKAFSA== 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 4R12nF0yYlzsWl; Wed, 12 Jul 2023 03:10:57 +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 36C3Av5c010450; Wed, 12 Jul 2023 03:10:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3AvIb010449; Wed, 12 Jul 2023 03:10:57 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:57 GMT Message-Id: <202307120310.36C3AvIb010449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 565712db0dfa - stable/13 - caroot: add new certs 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 565712db0dfa62eb876147c0f605903f451725b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=565712db0dfa62eb876147c0f605903f451725b3 commit 565712db0dfa62eb876147c0f605903f451725b3 Author: Kyle Evans AuthorDate: 2023-06-25 23:47:49 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:05:57 +0000 caroot: add new certs Based on dates, these were likely just missed in the last update... add them now. - Twenty (20) new (cherry picked from commit ee0aa1ce12b3caea34477a31e9d2111a329e33b9) --- secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 67 ++++++++++ secure/caroot/trusted/Certainly_Root_E1.pem | 66 ++++++++++ secure/caroot/trusted/Certainly_Root_R1.pem | 134 ++++++++++++++++++++ .../caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 79 ++++++++++++ .../caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 79 ++++++++++++ .../trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 67 ++++++++++ .../trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 134 ++++++++++++++++++++ .../trusted/E-Tugra_Global_Root_CA_ECC_v3.pem | 73 +++++++++++ .../trusted/E-Tugra_Global_Root_CA_RSA_v3.pem | 140 +++++++++++++++++++++ .../caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 68 ++++++++++ .../caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 136 ++++++++++++++++++++ secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 134 ++++++++++++++++++++ secure/caroot/trusted/ISRG_Root_X2.pem | 67 ++++++++++ .../trusted/Security_Communication_ECC_RootCA1.pem | 67 ++++++++++ .../trusted/Security_Communication_RootCA3.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/Telia_Root_CA_v2.pem | 138 ++++++++++++++++++++ secure/caroot/trusted/TunTrust_Root_CA.pem | 139 ++++++++++++++++++++ secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 67 ++++++++++ secure/caroot/trusted/vTrus_Root_CA.pem | 134 ++++++++++++++++++++ 20 files changed, 2059 insertions(+) diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem new file mode 100644 index 000000000000..889f140decc8 --- /dev/null +++ b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem @@ -0,0 +1,135 @@ +## +## BJCA Global Root CA1 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 55:6f:65:e3:b4:d9:90:6a:1b:09:d1:6c:3e:c0:6c:20 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA1 + Validity + Not Before: Dec 19 03:16:17 2019 GMT + Not After : Dec 12 03:16:17 2044 GMT + Subject: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA1 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:f1:66:08:bd:d9:c5:15:61:cb:84:04:41:a5:69: + 37:77:1d:c1:b0:7b:fa:c3:77:48:90:13:72:64:d1: + b8:7c:90:35:9d:18:79:88:e3:97:01:3c:47:81:f2: + 0e:a2:98:0d:9e:3f:37:e0:19:b2:90:f2:46:1c:92: + b1:3a:61:ce:fa:b7:46:9e:03:86:d7:33:6e:ed:f7: + 45:8c:76:37:de:6e:96:91:f7:d7:7e:2b:87:17:d5: + 8b:35:ee:84:91:72:57:dc:60:c3:c3:b9:e7:c7:67: + 24:23:4f:63:0a:63:f6:66:7d:4b:55:a7:3f:78:64: + 49:69:12:97:e0:4c:0d:d3:09:a0:32:30:3a:fa:9f: + c0:f2:9c:c5:12:2a:2e:1c:b5:04:33:da:a4:38:11: + 6a:de:c6:18:f6:47:3a:22:41:87:22:fc:c4:89:28: + 54:d8:8c:a5:30:0a:f8:17:16:ca:ac:37:fd:79:a7: + 91:17:78:38:99:ad:58:ed:b2:de:cc:89:7d:03:9c: + b3:89:65:e7:e3:3b:b1:22:86:8f:06:6d:78:07:fd: + 91:12:7f:b0:6b:1c:89:0d:f9:b8:cb:74:5b:07:c2: + c8:f4:35:d1:64:63:7a:e9:6e:9a:28:d6:30:bd:e6: + 1b:dd:15:af:84:ea:9c:c7:ca:f5:0e:ea:f2:5d:29: + 87:8f:69:73:39:be:2e:24:6f:45:21:ac:c5:d4:69: + 25:06:83:ad:7a:48:85:13:2c:0d:06:b8:6c:79:56: + fc:a3:67:32:81:f5:57:a5:ca:57:42:69:e9:5c:24: + 61:ef:e2:30:18:4e:44:98:55:6f:7a:c2:93:d8:19: + b6:de:7c:47:8a:11:4e:49:47:db:28:94:02:0b:94: + 4a:2c:f9:12:d0:4f:e8:31:7e:6c:7a:bf:a6:3f:9b: + 39:3d:02:16:a3:18:b3:67:ac:5b:3f:2c:83:2b:67: + 39:81:5c:b9:7e:94:d5:64:dd:9e:8f:6e:ae:e8:7c: + 5b:b4:d7:6a:47:48:d7:7e:b3:d4:2d:8e:56:76:4e: + cf:69:f1:6e:44:6c:d4:24:ea:8d:24:a1:18:bf:bd: + 57:fe:a9:99:35:b5:db:10:77:b8:3d:48:ba:d6:c1: + e7:f1:23:3e:d7:df:85:9d:27:3c:d4:40:bd:0a:0c: + bd:f5:e7:8d:25:d6:81:74:87:46:d4:29:75:a2:42: + 6c:f7:73:89:e7:7d:bf:7a:4a:1f:d3:22:c9:15:55: + cf:df:6f:7c:55:d0:a4:8b:07:11:37:5f:83:a6:26: + 57:a6:01:5b:7e:fe:58:68:07:a9:e9:7a:d9:b9:e8: + ff:50:1f:ab:c2:b4:c0:ce:e8:ea:fd:0f:bd:8d:4d: + b8:bc:71 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + C5:EF:ED:CC:D8:8D:21:C6:48:E4:E3:D7:14:2E:A7:16:93:E5:98:01 + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: sha256WithRSAEncryption + 52:82:ac:21:34:1f:23:f2:a2:d8:f9:b8:af:37:36:20:89:d1: + 37:03:d6:69:9f:b8:61:10:ba:a2:31:98:59:47:e8:d1:0d:25: + 1e:15:41:0c:e0:2a:55:d5:57:52:cb:f8:e4:c7:69:a3:1d:4d: + 71:02:5e:5f:21:45:60:48:5c:09:8e:49:10:c1:04:dc:a9:62: + 6b:02:f0:43:c8:4e:9d:38:49:74:c9:32:70:54:6d:c1:47:fc: + 8e:b4:36:9e:d4:9c:bd:dd:20:d6:53:c9:18:a9:b5:56:b9:76: + 8b:95:67:66:ee:bd:98:fe:ae:ef:be:6e:fb:60:f6:fd:59:c6: + 2a:1b:3f:23:4a:94:24:30:27:c8:89:bc:eb:44:24:9a:cb:3d: + be:4f:d5:7a:ce:8e:17:cb:62:c1:d9:de:1e:0e:7a:ff:43:86: + 34:52:bc:61:3f:3c:5f:bb:d9:76:b4:53:bc:97:b3:fe:8a:4c: + 12:2e:2b:f3:d7:ce:e1:a2:ff:dd:7b:70:fb:3b:a1:4d:a4:63: + 02:fd:38:97:95:3f:05:70:a0:6b:df:62:81:43:8b:b4:59:0d: + 4a:8c:54:9c:c5:bb:81:9f:cd:7d:a5:ef:0b:25:1e:3a:20:db: + 1c:fc:1f:98:67:02:0a:d4:73:44:13:db:51:84:1a:55:03:56: + e0:00:7e:74:06:ff:38:c4:72:1d:d3:a8:3f:68:31:5d:d3:09: + c7:2e:8c:5b:63:e0:e8:dc:1e:d2:ec:61:1e:f2:de:e5:ef:f6: + 99:76:60:2d:1e:94:72:71:c6:0b:2a:32:c7:92:4e:d5:46:d7: + 1d:f9:a9:19:0a:c8:fa:95:ce:6d:23:98:aa:0b:38:ad:9a:56: + 0d:6f:8d:f1:31:00:88:c1:17:9c:cd:19:36:35:fe:55:53:a0: + e0:3c:33:5f:96:5e:e2:32:e9:df:33:bb:06:4a:a9:d8:84:73: + ce:77:d2:c6:ac:71:e1:5c:a3:1d:0c:bb:0a:df:5f:e2:a3:71: + d8:da:37:5a:a0:78:2b:f4:d4:7d:eb:76:ed:f2:61:70:a5:65: + 9a:d3:89:34:18:ab:fb:72:3e:d7:b4:3d:79:5c:d8:1f:a1:33: + 7b:d9:82:50:0c:93:17:aa:6c:dc:c2:82:bb:02:57:36:af:98: + 27:2a:39:50:e1:b0:89:f5:25:97:7e:47:68:10:b4:ec:73:ca: + b3:97:d1:24:dc:f6:62:a0:28:d3:b5:a3:b8:64:b7:88:62:42: + cf:9d:53:cd:99:be:64:68:8f:4f:1e:12:48:f7:d2:29:c3:98: + 28:ca:f2:32:0b:93:8c:29:4f:3c:60:32:cd:05:96:61:ec:f2: + af:fe:b3:70:2c:2e:a6:f2 +SHA1 Fingerprint=D5:EC:8D:7B:4C:BA:79:F4:E7:E8:CB:9D:6B:AE:77:83:10:03:21:6A +-----BEGIN CERTIFICATE----- +MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBU +MQswCQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRI +T1JJVFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAz +MTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJF +SUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2Jh +bCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFmCL3Z +xRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZ +spDyRhySsTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O5 +58dnJCNPYwpj9mZ9S1WnP3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgR +at7GGPZHOiJBhyL8xIkoVNiMpTAK+BcWyqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll +5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRjeulumijWML3mG90Vr4Tq +nMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNnMoH1V6XK +V0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/ +pj+bOT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZO +z2nxbkRs1CTqjSShGL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXn +jSXWgXSHRtQpdaJCbPdzied9v3pKH9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+ +WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMBAAGjQjBAMB0GA1UdDgQWBBTF +7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4 +YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3Kli +awLwQ8hOnThJdMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u ++2D2/VnGKhs/I0qUJDAnyIm860Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88 +X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuhTaRjAv04l5U/BXCga99igUOLtFkN +SoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW4AB+dAb/OMRyHdOo +P2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmpGQrI ++pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRz +znfSxqxx4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9 +eVzYH6Eze9mCUAyTF6ps3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2 +YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4SSPfSKcOYKMryMguTjClPPGAyzQWWYezy +r/6zcCwupvI= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem new file mode 100644 index 000000000000..da44a530a038 --- /dev/null +++ b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem @@ -0,0 +1,67 @@ +## +## BJCA Global Root CA2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 2c:17:08:7d:64:2a:c0:fe:85:18:59:06:cf:b4:4a:eb + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA2 + Validity + Not Before: Dec 19 03:18:21 2019 GMT + Not After : Dec 12 03:18:21 2044 GMT + Subject: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA2 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:9d:cb:80:91:8d:53:67:b5:b9:50:b1:03:f8:e5: + 49:1f:41:22:09:b0:51:52:58:d6:2b:34:8f:c5:12: + 46:14:c5:8b:2f:2c:84:ff:2c:6e:a8:d5:f1:09:e3: + 03:21:14:c4:43:3d:7c:c1:2c:c4:4b:6a:4a:cd:e9: + 87:e0:7d:f6:22:be:fa:4a:51:b8:30:8a:fd:e1:de: + 18:12:0a:f6:47:b7:e7:17:bf:27:8a:d4:41:4c:96: + 3c:60:96:c1:fd:15:1c + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + D2:4A:B1:51:7F:06:F0:D1:82:1F:4E:6E:5F:AB:83:FC:48:D4:B0:91 + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:30:1a:bc:5b:d7:fe:a9:d2:54:0e:4a:5d:d2:6d:b1: + 40:dc:f4:43:d5:d2:4a:99:19:12:56:80:f7:83:34:e1:35:4e: + 48:6d:04:0f:57:31:30:30:2d:b1:aa:9d:03:38:db:06:02:31: + 00:cb:cc:87:53:cb:7a:df:20:51:73:90:c0:a8:5b:61:d0:c5: + 50:39:fd:85:fe:c1:e3:78:f8:a6:d6:4b:bd:9b:87:8f:0f:e5: + d6:53:96:ab:3c:c8:40:da:61:f7:53:a3:f7 +SHA1 Fingerprint=F4:27:86:EB:6E:B8:6D:88:31:67:02:FB:BA:66:A4:53:00:AA:7A:A6 +-----BEGIN CERTIFICATE----- +MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQsw +CQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJ +VFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgy +MVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJ +TkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2JhbCBS +b290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jlSR9B +IgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK+ ++kpRuDCK/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJK +sVF/BvDRgh9Obl+rg/xI1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD +AgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA +94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8gUXOQwKhbYdDFUDn9hf7B +43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Certainly_Root_E1.pem b/secure/caroot/trusted/Certainly_Root_E1.pem new file mode 100644 index 000000000000..0750f7128ae6 --- /dev/null +++ b/secure/caroot/trusted/Certainly_Root_E1.pem @@ -0,0 +1,66 @@ +## +## Certainly Root E1 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 06:25:33:b1:47:03:33:27:5c:f9:8d:9a:b9:bf:cc:f8 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Certainly, CN = Certainly Root E1 + Validity + Not Before: Apr 1 00:00:00 2021 GMT + Not After : Apr 1 00:00:00 2046 GMT + Subject: C = US, O = Certainly, CN = Certainly Root E1 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:de:6f:f8:7f:1c:df:ed:f9:47:87:86:b1:a4:c0: + 8a:f8:82:97:80:ea:8f:c8:4a:5e:2a:7d:88:68:a7: + 01:62:14:91:24:7a:5c:9e:a3:17:7d:8a:86:21:34: + 18:50:1b:10:de:d0:37:4b:26:c7:19:60:80:e9:34: + bd:60:19:36:40:d6:29:87:09:3c:91:7a:f6:bc:13: + 23:dd:59:4e:04:5e:cf:c8:02:1c:18:53:c1:31:d8: + da:20:e9:44:8d:e4:76 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + F3:28:18:CB:64:75:EE:29:2A:EB:ED:AE:23:58:38:85:EB:C8:22:07 + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:31:00:b1:8e:5a:20:c3:b2:19:62:4d:de:b0:4f:df: + 6e:d2:70:8a:f1:9f:7e:6a:8c:e6:ba:de:83:69:ca:69:b3:a9: + 05:b5:96:92:17:87:c2:d2:ea:d0:7b:ce:d8:41:5b:7c:ae:02: + 30:46:de:ea:cb:5d:9a:ec:32:c2:65:16:b0:4c:30:5c:30:f3: + da:4e:73:86:06:d8:ce:89:04:48:37:37:f8:dd:33:51:9d:70: + af:7b:55:d8:01:2e:7d:05:64:0e:86:b8:91 +SHA1 Fingerprint=F9:E1:6D:DC:01:89:CF:D5:82:45:63:3E:C5:37:7D:C2:EB:93:6F:2B +-----BEGIN CERTIFICATE----- +MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQsw +CQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlu +bHkgUm9vdCBFMTAeFw0yMTA0MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJ +BgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlubHkxGjAYBgNVBAMTEUNlcnRhaW5s +eSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4fxzf7flHh4axpMCK ++IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9YBk2 +QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4 +hevIIgcwCgYIKoZIzj0EAwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozm +ut6Dacpps6kFtZaSF4fC0urQe87YQVt8rgIwRt7qy12a7DLCZRawTDBcMPPaTnOG +BtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Certainly_Root_R1.pem b/secure/caroot/trusted/Certainly_Root_R1.pem new file mode 100644 index 000000000000..a4e6f28e33a6 --- /dev/null +++ b/secure/caroot/trusted/Certainly_Root_R1.pem @@ -0,0 +1,134 @@ +## +## Certainly Root R1 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 8e:0f:f9:4b:90:71:68:65:33:54:f4:d4:44:39:b7:e0 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = Certainly, CN = Certainly Root R1 + Validity + Not Before: Apr 1 00:00:00 2021 GMT + Not After : Apr 1 00:00:00 2046 GMT + Subject: C = US, O = Certainly, CN = Certainly Root R1 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:d0:36:d4:1f:ea:dd:ab:e4:d1:b6:e6:fb:22:c0: + dd:13:0d:6a:7b:22:13:1c:97:3c:68:63:66:32:9c: + 03:b5:8d:a4:81:83:da:78:30:11:cf:dc:b2:2b:be: + 92:bf:8e:e4:c4:13:be:a4:68:4c:da:02:68:16:74: + be:b2:dd:04:e4:6b:2a:dd:37:1f:60:2c:db:f5:f7: + a1:7c:95:b7:0c:70:86:2e:f1:3a:ef:52:f7:cc:d3: + 9b:f9:8b:be:0e:df:31:b7:9d:68:5c:92:a6:f5:e5: + f3:0a:34:b5:ff:7b:a2:e4:87:a1:c6:af:17:00:ef: + 03:91:ed:a9:1c:4e:71:3d:d2:8b:6c:89:f4:78:86: + e6:6a:49:a0:ce:b5:d2:b0:ab:9b:f6:f4:d4:2e:e3: + 72:f9:36:c6:eb:15:b7:25:8c:3a:fc:25:0d:b3:22: + 73:21:74:c8:4a:96:61:92:f5:2f:0b:18:a5:f4:ad: + e2:ee:41:bd:01:79:fa:96:8c:8d:17:02:30:b4:f9: + af:78:1a:8c:b4:36:10:10:07:05:70:d0:f4:31:90: + 8a:51:c5:86:26:79:b2:11:88:5e:c5:f0:0a:54:cd: + 49:a6:bf:02:9c:d2:44:a7:ed:e3:78:ef:46:5e:6d: + 71:d1:79:70:1c:46:5f:51:e9:c9:37:dc:5f:7e:69: + 7b:41:df:34:45:e0:3b:84:f4:a1:8a:0a:36:9e:37: + cc:62:52:e1:89:0d:28:f9:7a:23:b1:0d:3d:3d:9a: + fd:9d:81:ef:2c:90:c0:7b:44:4e:bb:49:e0:0e:4a: + 56:92:bc:cb:b5:dd:79:17:89:91:de:61:89:74:92: + a8:e3:32:85:be:4e:85:a4:4b:59:cb:2b:c5:78:8e: + 71:54:d0:02:37:99:8c:e5:49:ea:e0:54:72:a4:11: + 06:2f:0b:8c:c1:5b:be:b5:a1:b0:53:6e:9c:b8:60: + 91:1f:59:6b:f9:2d:f4:94:0a:97:b5:ec:c5:76:03: + 54:1b:65:52:ba:4c:92:56:51:35:a0:40:d8:29:db: + ae:52:76:3b:2d:30:40:9b:8a:d0:42:56:b4:b7:88: + 01:a4:87:3b:53:96:cd:a3:16:8f:f3:66:aa:17:b1: + c7:60:e0:c1:43:05:0c:ee:9b:5b:60:6f:06:5c:87: + 5b:27:f9:40:11:9e:9c:33:c1:b7:e5:35:57:05:7f: + 27:ce:17:20:8c:1c:fc:f1:fb:da:31:29:49:ed:f5: + 0b:84:a7:4f:c1:f6:4e:c2:28:9c:fa:ee:e0:af:07: + fb:33:11:7a:21:4f:0b:21:10:b6:40:3a:ab:22:3a: + 04:9c:8b:9b:84:86:72:9a:d2:a7:a5:c4:b4:75:91: + a9:2b:23 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + E0:AA:3F:25:8D:9F:44:5C:C1:3A:E8:2E:AE:77:4C:84:3E:67:0C:F4 + Signature Algorithm: sha256WithRSAEncryption + b9:57:af:b8:12:da:57:83:8f:68:0b:33:1d:03:53:55:f4:95: + 70:e4:2b:3d:b0:39:eb:fa:89:62:fd:f7:d6:18:04:2f:21:34: + dd:f1:68:f0:d5:96:5a:de:c2:80:a3:c1:8d:c6:6a:f7:59:77: + ae:15:64:cf:5b:79:05:77:66:ea:8c:d3:6b:0d:dd:f1:59:2c: + c1:33:a5:30:80:15:45:07:45:1a:31:22:b6:92:00:ab:99:4d: + 3a:8f:77:af:a9:22:ca:2f:63:ca:15:d6:c7:c6:f0:3d:6c:fc: + 1c:0d:98:10:61:9e:11:a2:22:d7:0a:f2:91:7a:6b:39:0e:2f: + 30:c3:36:49:9f:e0:e9:0f:02:44:50:37:94:55:7d:ea:9f:f6: + 3b:ba:94:a5:4c:e9:bc:3e:51:b4:e8:ca:92:36:54:6d:5c:25: + 28:da:dd:ad:14:fd:d3:ee:e2:22:05:eb:d0:f2:b7:68:12:d7: + 5a:8a:41:1a:c6:92:a5:5a:3b:63:45:4f:bf:e1:3a:77:22:2f: + 5c:bf:46:f9:5a:03:85:13:42:5f:ca:de:53:d7:62:b5:a6:35: + 04:c2:47:ff:99:fd:84:df:5c:ce:e9:5e:80:28:41:f2:7d:e7: + 1e:90:d8:4f:76:3e:82:3c:0d:fc:a5:03:fa:7b:1a:d9:45:1e: + 60:da:c4:8e:f9:fc:2b:c9:7b:95:c5:2a:ff:aa:89:df:82:31: + 0f:72:ff:0c:27:d7:0a:1e:56:00:50:1e:0c:90:c1:96:b5:d8: + 14:85:bb:a7:0d:16:c1:f8:07:24:1b:ba:85:a1:1a:05:09:80: + ba:95:63:c9:3a:ec:25:9f:7f:9d:ba:a4:47:15:9b:44:70:f1: + 6a:4b:d6:38:5e:43:f3:18:7e:50:6e:e9:5a:28:e6:65:e6:77: + 1b:3a:fd:1d:be:03:26:a3:db:d4:e1:bb:7e:96:27:2b:1d:ee: + a4:fb:da:25:54:13:03:de:39:c6:c3:1f:4d:90:ec:8f:1b:4a: + d2:1c:ed:85:95:38:50:79:46:d6:c1:90:50:31:a9:5c:9a:6e: + 1d:f5:33:56:8b:a7:99:d2:f2:c8:2c:33:93:92:30:c7:4e:8c: + 65:33:10:64:17:fd:24:17:96:d1:8d:c2:3a:6a:2b:eb:13:8b: + 44:f2:21:f3:4a:1a:b7:77:5f:d7:ed:88:a4:72:e5:39:1f:95: + 9d:be:67:c1:70:11:3d:bb:f4:f8:49:b7:e3:26:97:3a:9f:d2: + 5f:7c:fb:c0:99:7c:39:29:e0:7b:1d:bf:0d:a7:8f:d2:29:34: + 6e:24:15:cb:de:90:5e:bf:1a:c4:66:ea:c2:e6:ba:39:5f:8a: + 99:a9:41:59:07:b0:2c:af +SHA1 Fingerprint=A0:50:EE:0F:28:71:F4:27:B2:12:6D:6F:50:96:25:BA:CC:86:42:AF +-----BEGIN CERTIFICATE----- +MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAw +PTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2Vy +dGFpbmx5IFJvb3QgUjEwHhcNMjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9 +MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0 +YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANA2 +1B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O5MQT +vqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbed +aFySpvXl8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b0 +1C7jcvk2xusVtyWMOvwlDbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5 +r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGIXsXwClTNSaa/ApzSRKft43jvRl5tcdF5 +cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkNKPl6I7ENPT2a/Z2B7yyQ +wHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQAjeZjOVJ +6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA +2CnbrlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyH +Wyf5QBGenDPBt+U1VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMR +eiFPCyEQtkA6qyI6BJyLm4SGcprSp6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB +/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTgqj8ljZ9EXME66C6u +d0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAszHQNTVfSVcOQr +PbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d +8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi +1wrykXprOQ4vMMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrd +rRT90+7iIgXr0PK3aBLXWopBGsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9di +taY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+gjwN/KUD+nsa2UUeYNrEjvn8K8l7 +lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgHJBu6haEaBQmAupVj +yTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7fpYn +Kx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLy +yCwzk5Iwx06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5n +wXARPbv0+Em34yaXOp/SX3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6 +OV+KmalBWQewLK8= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem new file mode 100644 index 000000000000..758d61032898 --- /dev/null +++ b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem @@ -0,0 +1,79 @@ +## +## D-TRUST BR Root CA 1 2020 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 7c:c9:8f:2b:84:d7:df:ea:0f:c9:65:9a:d3:4b:4d:96 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = DE, O = D-Trust GmbH, CN = D-TRUST BR Root CA 1 2020 + Validity + Not Before: Feb 11 09:45:00 2020 GMT + Not After : Feb 11 09:44:59 2035 GMT + Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST BR Root CA 1 2020 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:c6:cb:c7:28:d1:fb:84:f5:9a:ef:42:14:20:e1: + 43:6b:6e:75:ad:fc:2b:03:84:d4:76:93:25:d7:59: + 3b:41:65:6b:1e:e6:34:2a:bb:74:f6:12:ce:e8:6d: + e7:ab:e4:3c:4e:3f:44:08:8b:cd:16:71:cb:bf:92: + 99:f4:a4:d7:3c:50:54:52:90:85:83:78:94:67:67: + a3:1c:09:19:3d:75:34:85:de:ed:60:7d:c7:0c:b4: + 41:52:b9:6e:e5:ee:42 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 73:91:10:AB:FF:55:B3:5A:7C:09:25:D5:B2:BA:08:A0:6B:AB:1F:6D + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 CRL Distribution Points: + + Full Name: + URI:http://crl.d-trust.net/crl/d-trust_br_root_ca_1_2020.crl + + Full Name: + URI:ldap://directory.d-trust.net/CN=D-TRUST%20BR%20Root%20CA%201%202020,O=D-Trust%20GmbH,C=DE?certificaterevocationlist + + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:94:90:2d:13:fa:e1:63:f8:61:63:e8:ad:85: + 78:54:91:9c:b8:93:38:3e:1a:41:da:40:16:53:42:08:ca:2f: + 8e:f1:3e:81:56:c0:aa:d8:ed:18:c4:b0:ae:f4:3e:fa:26:02: + 31:00:f3:28:e2:c6:db:2b:99:fb:b7:51:b8:24:a3:a4:94:7a: + 1a:3f:e6:36:e2:03:57:33:8a:30:cb:82:c7:d6:14:11:d5:75: + 63:5b:14:95:9c:1f:01:cf:d8:d5:72:a7:0f:3b +SHA1 Fingerprint=1F:5B:98:F0:E3:B5:F7:74:3C:ED:E6:B0:36:7D:32:CD:F4:09:41:67 +-----BEGIN CERTIFICATE----- +MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQsw +CQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRS +VVNUIEJSIFJvb3QgQ0EgMSAyMDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5 +NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEiMCAG +A1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAGByqGSM49AgEGBSuB +BAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7dPYS +zuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0 +QVK5buXuQqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/ +VbNafAkl1bK6CKBrqx9tMA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6g +PKA6hjhodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X2JyX3Jvb3Rf +Y2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5l +dC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxPPUQtVHJ1 +c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjO +PQQDAwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFW +wKrY7RjEsK70PvomAjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHV +dWNbFJWcHwHP2NVypw87 +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem new file mode 100644 index 000000000000..76991855eaa1 --- /dev/null +++ b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem @@ -0,0 +1,79 @@ +## +## D-TRUST EV Root CA 1 2020 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 5f:02:41:d7:7a:87:7c:4c:03:a3:ac:96:8d:fb:ff:d0 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = DE, O = D-Trust GmbH, CN = D-TRUST EV Root CA 1 2020 + Validity + Not Before: Feb 11 10:00:00 2020 GMT + Not After : Feb 11 09:59:59 2035 GMT + Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST EV Root CA 1 2020 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:f1:0b:dd:86:43:20:19:df:97:85:e8:22:4a:9b: + cf:9d:98:bf:b4:05:26:c9:cb:e3:a6:d2:8f:c5:9e: + 78:7b:31:89:a9:89:ad:27:3c:65:10:82:fc:df:c3: + 9d:4e:f0:33:23:c4:d2:32:f5:1c:b0:df:33:17:5d: + c5:f0:b1:8a:f9:ef:b9:b7:14:ca:29:4a:c2:0f:a9: + 7f:75:65:49:2a:30:67:f4:64:f7:d6:1a:77:da:c3: + c2:97:61:42:7b:49:ad + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 7F:10:01:16:37:3A:A4:28:E4:50:F8:A4:F7:EC:6B:32:B6:FE:E9:8B + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 CRL Distribution Points: + + Full Name: + URI:http://crl.d-trust.net/crl/d-trust_ev_root_ca_1_2020.crl + + Full Name: + URI:ldap://directory.d-trust.net/CN=D-TRUST%20EV%20Root%20CA%201%202020,O=D-Trust%20GmbH,C=DE?certificaterevocationlist + + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:ca:3c:c6:2a:75:c2:5e:75:62:39:36:00:60: + 5a:8b:c1:93:99:cc:d9:db:41:3b:3b:87:99:17:3b:d5:cc:4f: + ca:22:f7:a0:80:cb:f9:b4:b1:1b:56:f5:72:d2:fc:19:d1:02: + 31:00:91:f7:30:93:3f:10:46:2b:71:a4:d0:3b:44:9b:c0:29: + 02:05:b2:41:77:51:f3:79:5a:9e:8e:14:a0:4e:42:d2:5b:81: + f3:34:6a:03:e7:22:38:50:5b:ed:19:4f:43:16 +SHA1 Fingerprint=61:DB:8C:21:59:69:03:90:D8:7C:9C:12:86:54:CF:9D:3D:F4:DD:07 +-----BEGIN CERTIFICATE----- +MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQsw +CQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRS +VVNUIEVWIFJvb3QgQ0EgMSAyMDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5 +NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEiMCAG +A1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAGByqGSM49AgEGBSuB +BAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8ZRCC +/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rD +wpdhQntJraOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3 +OqQo5FD4pPfsazK2/umLMA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6g +PKA6hjhodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X2V2X3Jvb3Rf +Y2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5l +dC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxPPUQtVHJ1 +c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjO +PQQDAwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CA +y/m0sRtW9XLS/BnRAjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJb +gfM0agPnIjhQW+0ZT0MW +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem b/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem new file mode 100644 index 000000000000..a6f2e6a0c771 --- /dev/null +++ b/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem @@ -0,0 +1,67 @@ +## +## DigiCert TLS ECC P384 Root G5 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 09:e0:93:65:ac:f7:d9:c8:b9:3e:1c:0b:04:2a:2e:f3 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = "DigiCert, Inc.", CN = DigiCert TLS ECC P384 Root G5 + Validity + Not Before: Jan 15 00:00:00 2021 GMT + Not After : Jan 14 23:59:59 2046 GMT + Subject: C = US, O = "DigiCert, Inc.", CN = DigiCert TLS ECC P384 Root G5 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:c1:44:a1:cf:11:97:50:9a:de:23:82:35:07:cd: + d0:cb:18:9d:d2:f1:7f:77:35:4f:3b:dd:94:72:52: + ed:c2:3b:f8:ec:fa:7b:6b:58:20:ec:99:ae:c9:fc: + 68:b3:75:b9:db:09:ec:c8:13:f5:4e:c6:0a:1d:66: + 30:4c:bb:1f:47:0a:3c:61:10:42:29:7c:a5:08:0e: + e0:22:e9:d3:35:68:ce:9b:63:9f:84:b5:99:4d:58: + a0:8e:f5:54:e7:95:c9 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + C1:51:45:50:59:AB:3E:E7:2C:5A:FA:20:22:12:07:80:88:7C:11:6A + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:31:00:89:6a:8d:47:e7:ec:fc:6e:55:03:d9:67:6c: + 26:4e:83:c6:fd:c9:fb:2b:13:bc:b7:7a:8c:b4:65:d2:69:69: + 63:13:63:3b:26:50:2e:01:a1:79:06:91:9d:48:bf:c2:be:02: + 30:47:c3:15:7b:b1:a0:91:99:49:93:a8:3c:7c:e8:46:06:8b: + 2c:f2:31:00:94:9d:62:c8:89:bd:19:84:14:e9:a5:fb:01:b8: + 0d:76:43:8c:2e:53:cb:7c:df:0c:17:96:50 +SHA1 Fingerprint=17:F3:DE:5E:9F:0F:19:E9:8E:F6:1F:32:26:6E:20:C4:07:AE:30:EE +-----BEGIN CERTIFICATE----- +MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURp +Z2lDZXJ0IFRMUyBFQ0MgUDM4NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2 +MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJ +bmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQgUm9vdCBHNTB2MBAG +ByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1TzvdlHJS +7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp +0zVozptjn4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICIS +B4CIfBFqMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49 +BAMDA2gAMGUCMQCJao1H5+z8blUD2WdsJk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQ +LgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIxAJSdYsiJvRmEFOml+wG4 +DXZDjC5Ty3zfDBeWUA== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem b/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem new file mode 100644 index 000000000000..cb58c6a21418 --- /dev/null +++ b/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem @@ -0,0 +1,134 @@ +## +## DigiCert TLS RSA4096 Root G5 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 08:f9:b4:78:a8:fa:7e:da:6a:33:37:89:de:7c:cf:8a + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = US, O = "DigiCert, Inc.", CN = DigiCert TLS RSA4096 Root G5 + Validity + Not Before: Jan 15 00:00:00 2021 GMT + Not After : Jan 14 23:59:59 2046 GMT + Subject: C = US, O = "DigiCert, Inc.", CN = DigiCert TLS RSA4096 Root G5 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:b3:d0:f4:c9:79:11:9d:fd:fc:66:81:e7:cc:d5: + e4:bc:ec:81:3e:6a:35:8e:2e:b7:e7:de:af:f9:07: + 4d:cf:30:9d:ea:09:0b:99:bd:6c:57:da:18:4a:b8: + 78:ac:3a:39:a8:a6:48:ac:2e:72:e5:bd:eb:f1:1a: + cd:e7:a4:03:a9:3f:11:b4:d8:2f:89:16:fb:94:01: + 3d:bb:2f:f8:13:05:a1:78:1c:8e:28:e0:45:e0:83: + f4:59:1b:95:b3:ae:7e:03:45:e5:be:c2:42:fe:ee: + f2:3c:b6:85:13:98:32:9d:16:a8:29:c2:0b:1c:38: + dc:9f:31:77:5c:bf:27:a3:fc:27:ac:b7:2b:bd:74: + 9b:17:2d:f2:81:da:5d:b0:e1:23:17:3e:88:4a:12: + 23:d0:ea:cf:9d:de:03:17:b1:42:4a:a0:16:4c:a4: + 6d:93:e9:3f:3a:ee:3a:7c:9d:58:9d:f4:4e:8f:fc: + 3b:23:c8:6d:b8:e2:05:da:cc:eb:ec:c3:31:f4:d7: + a7:29:54:80:cf:44:5b:4c:6f:30:9e:f3:cc:dd:1f: + 94:43:9d:4d:7f:70:70:0d:d4:3a:d1:37:f0:6c:9d: + 9b:c0:14:93:58:ef:cd:41:38:75:bc:13:03:95:7c: + 7f:e3:5c:e9:d5:0d:d5:e2:7c:10:62:aa:6b:f0:3d: + 76:f3:3f:a3:e8:b0:c1:fd:ef:aa:57:4d:ac:86:a7: + 18:b4:29:c1:2c:0e:bf:64:be:29:8c:d8:02:2d:cd: + 5c:2f:f2:7f:ef:15:f4:0c:15:ac:0a:b0:f1:d3:0d: + 4f:6a:4d:77:97:01:a0:f1:66:b7:b7:ce:ef:ce:ec: + ec:a5:75:ca:ac:e3:e1:63:f7:b8:a1:04:c8:bc:7b: + 3f:5d:2d:16:22:56:ed:48:49:fe:a7:2f:79:30:25: + 9b:ba:6b:2d:3f:9d:3b:c4:17:e7:1d:2e:fb:f2:cf: + a6:fc:e3:14:2c:96:98:21:8c:b4:91:e9:19:60:83: + f2:30:2b:06:73:50:d5:98:3b:06:e9:c7:8a:0c:60: + 8c:28:f8:52:9b:6e:e1:f6:4d:bb:06:24:9b:d7:2b: + 26:3f:fd:2a:2f:71:f5:d6:24:be:7f:31:9e:0f:6d: + e8:8f:4f:4d:a3:3f:ff:35:ea:df:49:5e:41:8f:86: + f9:f1:77:79:4b:1b:b4:a3:5e:2f:fb:46:02:d0:66: + 13:5e:5e:85:4f:ce:d8:70:88:7b:ce:01:b5:96:97: + d7:cd:7d:fd:82:f8:c2:24:c1:ca:01:39:4f:8d:a2: + c1:14:40:1f:9c:66:d5:0c:09:46:d6:f2:d0:d1:48: + 76:56:3a:43:cb:b6:0a:11:39:ba:8c:13:6c:06:b5: + 9e:cf:eb + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 51:33:1C:ED:36:40:AF:17:D3:25:CD:69:68:F2:AF:4E:23:3E:B3:41 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + Signature Algorithm: sha384WithRSAEncryption + 60:a6:af:5b:5f:57:da:89:db:4b:50:a9:c4:23:35:21:ff:d0: + 61:30:84:91:b7:3f:10:cf:25:8e:c9:bf:46:34:d9:c1:21:26: + 1c:70:19:72:1e:a3:c9:87:fe:a9:43:64:96:3a:c8:53:04:0a: + b6:41:bb:c4:47:00:d9:9f:18:18:3b:b2:0e:f3:34:ea:24:f7: + dd:af:20:60:ae:92:28:5f:36:e7:5d:e4:de:c7:3c:db:50:39: + ad:bb:3d:28:4d:96:7c:76:c6:5b:f4:c1:db:14:a5:ab:19:62: + 07:18:40:5f:97:91:dc:9c:c7:ab:b5:51:0d:e6:69:53:55:cc: + 39:7d:da:c5:11:55:72:c5:3b:8b:89:f8:34:2d:a4:17:e5:17: + e6:99:7d:30:88:21:37:cd:30:17:3d:b8:f2:bc:a8:75:a0:43: + dc:3e:89:4b:90:ae:6d:03:e0:1c:a3:a0:96:09:bb:7d:a3:b7: + 2a:10:44:4b:46:07:34:63:ed:31:b9:04:ee:a3:9b:9a:ae:e6: + 31:78:f4:ea:24:61:3b:ab:58:64:ff:bb:87:27:62:25:81:df: + dc:a1:2f:f6:ed:a7:ff:7a:8f:51:2e:30:f8:a4:01:d2:85:39: + 5f:01:99:96:6f:5a:5b:70:19:46:fe:86:60:3e:ad:80:10:09: + dd:39:25:2f:58:7f:bb:d2:74:f0:f7:46:1f:46:39:4a:d8:53: + d0:f3:2e:3b:71:a5:d4:6f:fc:f3:67:e4:07:8f:dd:26:19:e1: + 8d:5b:fa:a3:93:11:9b:e9:c8:3a:c3:55:68:9a:92:e1:52:76: + 38:e8:e1:ba:bd:fb:4f:d5:ef:b3:e7:48:83:31:f0:82:21:e3: + b6:be:a7:ab:6f:ef:9f:df:4c:cf:01:b8:62:6a:23:3d:e7:09: + 4d:80:1b:7b:30:a4:c3:dd:07:7f:34:be:a4:26:b2:f6:41:e8: + 09:1d:e3:20:98:aa:37:4f:ff:f7:f1:e2:29:70:31:47:3f:74: + d0:14:16:fa:21:8a:02:d5:8a:09:94:77:2e:f2:59:28:8b:7c: + 50:92:0a:66:78:38:83:75:c4:b5:5a:a8:11:c6:e5:c1:9d:66: + 55:cf:53:c4:af:d7:75:85:a9:42:13:56:ec:21:77:81:93:5a: + 0c:ea:96:d9:49:ca:a1:08:f2:97:3b:6d:9b:04:18:24:44:8e: + 7c:01:f2:dc:25:d8:5e:86:9a:b1:39:db:f5:91:32:6a:d1:a6: + 70:8a:a2:f7:de:a4:45:85:26:a8:1e:8c:5d:29:5b:c8:4b:d8: + 9a:6a:03:5e:70:f2:85:4f:6c:4b:68:2f:ca:54:f6:8c:da:32: + fe:c3:6b:83:3f:38:c6:7e +SHA1 Fingerprint=A7:88:49:DC:5D:7C:75:8C:8C:DE:39:98:56:B3:AA:D0:B2:A5:71:35 +-----BEGIN CERTIFICATE----- +MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBN +MQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMT +HERpZ2lDZXJ0IFRMUyBSU0E0MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcN +NDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQs +IEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2IFJvb3QgRzUwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS87IE+ +ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG0 +2C+JFvuUAT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgp +wgscONyfMXdcvyej/Cestyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZM +pG2T6T867jp8nVid9E6P/DsjyG244gXazOvswzH016cpVIDPRFtMbzCe88zdH5RD +nU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnVDdXifBBiqmvwPXbzP6Po +sMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9qTXeXAaDx +Zre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cd +Lvvyz6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvX +KyY//SovcfXWJL5/MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNe +XoVPzthwiHvOAbWWl9fNff2C+MIkwcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPL +tgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4EFgQUUTMc7TZArxfTJc1paPKv +TiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN +AQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw +GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7H +PNtQOa27PShNlnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLF +O4uJ+DQtpBflF+aZfTCIITfNMBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQ +REtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/u4cnYiWB39yhL/btp/96j1EuMPik +AdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9GOUrYU9DzLjtxpdRv +/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh47a+ +p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilw +MUc/dNAUFvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WF +qUITVuwhd4GTWgzqltlJyqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCK +ovfepEWFJqgejF0pW8hL2JpqA15w8oVPbEtoL8pU9ozaMv7Da4M/OMZ+ +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem new file mode 100644 index 000000000000..589b4f911531 --- /dev/null +++ b/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem @@ -0,0 +1,73 @@ +## +## E-Tugra Global Root CA ECC v3 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 26:46:19:77:31:e1:4f:6f:28:36:de:39:51:86:e6:d4:97:88:22:c1 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA ECC v3 + Validity + Not Before: Mar 18 09:46:58 2020 GMT + Not After : Mar 12 09:46:58 2045 GMT + Subject: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA ECC v3 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:8e:98:29:bf:c7:10:1e:27:db:ab:03:cc:28:2c: + d8:5e:48:19:10:29:cc:cb:59:81:cc:8c:b8:92:17: + 89:83:2a:92:f6:c3:a4:1d:4c:62:d5:9f:d6:a0:46: + dc:1c:bc:76:c1:e3:47:d0:5b:13:da:e7:a5:b3:66: + 48:e7:21:9a:4a:4f:86:0a:7d:6c:ea:4d:32:80:0a: + b2:7a:09:9b:69:4b:98:81:e2:2e:ec:02:70:96:1f: + fd:f5:46:ce:ca:dc:82 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 + + X509v3 Subject Key Identifier: + FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:e6:05:58:69:61:e5:2d:ca:0d:cb:f1:19:08: + bd:d6:fd:51:92:1a:7e:63:54:04:90:91:9a:35:91:39:99:fa: + 07:a9:66:93:ba:c8:68:d4:8a:3f:fa:ed:6e:16:02:27:b7:02: + 31:00:dd:5a:17:2b:76:1d:65:42:96:a6:ac:5d:8a:79:56:d8: + 8a:1b:df:9a:de:5f:c7:50:8f:b1:5b:71:0c:26:df:6a:40:00: + ec:33:91:21:71:be:68:e4:23:a4:d9:ad:a1:37 +SHA1 Fingerprint=8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84 +-----BEGIN CERTIFICATE----- +MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMw +gYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVn +cmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYD +VQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIEVDQyB2MzAeFw0yMDAzMTgwOTQ2 +NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMGQW5r +YXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1Z3Jh +IFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBF +Q0MgdjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQ +KczLWYHMjLiSF4mDKpL2w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YK +fWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMB +Af8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQzPUwHQYDVR0OBBYEFP+C +MXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNp +ADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/6 +7W4WAie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFx +vmjkI6TZraE3 +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem new file mode 100644 index 000000000000..147ba810d1d6 --- /dev/null +++ b/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem @@ -0,0 +1,140 @@ +## +## E-Tugra Global Root CA RSA v3 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 0d:4d:c5:cd:16:22:95:96:08:7e:b8:0b:7f:15:06:34:fb:79:10:34 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA RSA v3 + Validity + Not Before: Mar 18 09:07:17 2020 GMT + Not After : Mar 12 09:07:17 2045 GMT + Subject: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA RSA v3 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:a2:66:f0:89:b7:72:7b:ee:09:c9:63:d2:d3:43: + dd:5e:c3:a6:84:38:4a:f1:8d:81:bb:14:bd:47:e8: + 40:17:f3:3d:c3:78:45:72:a6:2e:90:de:9a:3a:d4: + 20:71:ca:bc:9f:1d:4b:97:0a:c7:31:ba:3e:d7:fe: + 25:a9:2a:8e:36:f4:d1:2f:c7:b7:a9:5d:33:dc:30: + 70:f8:40:6c:4b:b2:a6:31:61:d1:34:3c:3d:31:7a: + c7:af:c4:a7:a7:84:e1:97:a4:e8:4b:f6:17:7c:ee: + 3c:07:ed:e2:8a:57:dc:b6:fb:f8:43:25:50:ea:27: + 81:a8:86:bc:8f:52:4a:96:3a:60:1a:96:bb:fd:73: + f4:85:fd:83:fd:7f:84:6d:34:6c:7f:6a:b7:4b:01: + 03:bf:ad:69:b7:d7:32:d9:f5:57:6a:e9:86:82:3e: + a5:66:31:b3:16:3d:c2:f3:26:60:32:d3:52:1e:b0: + 6c:a4:37:3e:f4:f5:af:eb:e1:df:80:06:cf:2a:41: + e7:66:09:e1:4b:97:e7:77:bd:21:6d:29:b6:67:c3: + 2d:7e:ed:d6:79:65:d1:cf:3a:b6:d1:b1:5e:56:61: + 50:7a:5a:ce:4e:50:31:80:03:98:47:e7:e4:18:7c: + 44:5a:c6:a4:b3:3b:c6:c6:c3:3a:f0:6c:c3:8b:c8: + a4:91:05:f3:f5:d9:b6:aa:06:a1:b7:ab:e4:b1:ea: + 21:14:5c:83:a4:fc:ff:b6:50:d3:8c:12:26:99:76: + 70:e9:c0:0f:a6:74:fc:bb:d0:1b:78:ce:72:92:e2: + 28:9c:bc:e6:e9:09:d8:3a:d3:89:e6:be:2e:77:df: + 01:0a:6f:96:f6:e5:8d:3c:4d:52:76:1a:56:e1:73: + 7e:17:ac:3d:ad:6c:a3:52:12:18:70:e6:80:4e:33: *** 1233 LINES SKIPPED *** From nobody Wed Jul 12 03:10:58 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 4R12nG3YQDz4h3f4; Wed, 12 Jul 2023 03:10:58 +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 4R12nG2pwrz49Ws; Wed, 12 Jul 2023 03:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131458; 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=5x/JiU2lrDv+iEv+QLuElp4yS+JB5JkoDM6ozAERatk=; b=NY2GUGdM+lgu/1hOpK4qklURxL5QnyF1Xt1ZgpYKHxOSwY/+NMwuPEFOYOE/NnJe4xm2Eg MnQhLnKyJWhj6uKOr8yK4dwCv7vstgGeim/pbiW7AtRISj+u+dTrbJFnOgPk5qgvHA2zc9 hEzJnApt27/FVY4jis8zdfE18K0vtKpr6Ye7Dt2QXb2FCAMtZSPBpjZ/G3TQKzaAJQt+wR bkFqGg7Y0+7GWjisfg4pnBD7DMwRlXd1bj5VKs5NHAHF/9rRXTA6qVhCwI8OAHcU4ePwWU YS9NRZeqtYw9TctrD0OtSPpvAHTBPf4NK2RKZKVP+CWh915GsGsAdDm7hBUrKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689131458; 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=5x/JiU2lrDv+iEv+QLuElp4yS+JB5JkoDM6ozAERatk=; b=dtXsdME+Ml4nvzoxN8BMFPnF5sYAQVY9jVkWd/UzoQLSRYY10KmkrWDu8SlW8f4LM9aeF2 LED4qeYo2H2tlvA5Y+gY0L5v+kxCwq5rlKpPTlQ5Px7lA4JWZvHdQW9DgVhLoqxurj2uDV NtmIV3o0w9OaqYLe6vY6lESrYvl6zaFZzlChtLO9hGUHOnKfhoimUn8VUtAjDIVd4YB4Pr 8BkJ2NqvSC+aSRyqVFGhmpcxM0lZoC9k5MzrD7rwPSk4ah2qPaUbMwsDWk4ge4ByjjzN3o IOBQTYmSkhK+/iAf8baiBzZqfUrl4sYVttrWyOgtObNchr4QCFsid6IpYDIBbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689131458; a=rsa-sha256; cv=none; b=AxRbjYuEydrWwf0+qiY0sydK1ClyA1b0n0G88RD2dLy8YZiQLKJzgeGgidueXrRYakWF5o xcVqvLgnNCl/oRuXbWU+5osvlR451HkJupBdaQjgUkhvUzzcFmKKs6eawM2OBWxjZdLMMX YivvAgcWMHufrC9g3SEAF/QR4F2bopeUKd0/7GoEmj4YST9FYqApeP35Kv9z/8YRYdqbpX 65eFuq/v1aEcaZ0Ohcm1f3fH2tKDobk63mNbSJVNK8b0x9XSW9k90s7ccNFdjpl7ic7AeE 2YAV+44gXxOAHbNav8e81LowGhNbPe7iDNV+z2fwha6NzFPAt6eHWqsmTxa29g== 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 4R12nG1k0xzsWm; Wed, 12 Jul 2023 03:10:58 +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 36C3AwY3011425; Wed, 12 Jul 2023 03:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C3AwNQ011424; Wed, 12 Jul 2023 03:10:58 GMT (envelope-from git) Date: Wed, 12 Jul 2023 03:10:58 GMT Message-Id: <202307120310.36C3AwNQ011424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f25a4bbf5d1f - stable/13 - libbe: bail out early if the zfs kmod isn't loaded 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f25a4bbf5d1ff31708d64f9cca644ae34e62cab0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f25a4bbf5d1ff31708d64f9cca644ae34e62cab0 commit f25a4bbf5d1ff31708d64f9cca644ae34e62cab0 Author: Kyle Evans AuthorDate: 2023-07-07 00:41:14 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 15:06:00 +0000 libbe: bail out early if the zfs kmod isn't loaded As noted in the comment, we already know the rest of libbe_init() will fail because there's no pool imported. Avoid the side effect by checking beforehand and bailing out early. With this, freebsd-update(8) should no longer trigger a load of the zfs kmod just because it runs `bectl check`. Reviewed by: jwmaag_gmail.com, rew (cherry picked from commit 2f700ca965a04c4a03b6f760da6a210b6ca4df4b) --- lib/libbe/be.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 13f7a59d5215..471a25e6304c 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -119,6 +120,16 @@ libbe_init(const char *root) lbh = NULL; poolname = pos = NULL; + /* + * If the zfs kmod's not loaded then the later libzfs_init() will load + * the module for us, but that's not desirable for a couple reasons. If + * the module's not loaded, there's no pool imported and we're going to + * fail anyways. We also don't really want libbe consumers to have that + * kind of side-effect (module loading) in the general case. + */ + if (modfind("zfs") < 0) + goto err; + if ((lbh = calloc(1, sizeof(libbe_handle_t))) == NULL) goto err; From nobody Fri Jul 14 04:13:06 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 4R2J424wfVz4mn3D; Fri, 14 Jul 2023 04:13:06 +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 4R2J4240qsz40Wx; Fri, 14 Jul 2023 04:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689307986; 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=sDE3reVU6W5ToAz/bKr+HCiURl3i9DcWsP1bHPnicBQ=; b=SxYCgKfp3ejtQB3qIONdiuqBvrMFp3W0PNwkqrIG/fXlGoiNA6j/DQAqe6RyK5ZRZqWQEk aQCuYnWhaUSVNVRIQym4WRiGYsaC0yVVKAr/WtZuYwOkukUOKUbri39HNa4Xl38NhwsEGt 4R6YhkWNr6ebYUZhJheJzaZu3C2m4Q4CcyQTXpkn9N0svbLvAOE1f4vQDgoFbS2oXn5OSP tM0dXQ30khvt8vCGHVyRIBsGaOcvQI3H2ngyjQd9MPfJ0c0bv9dUIPrhyLPBgVh5JHRfGz BQwisPKRf1onykLhxRy5Via4vAwQfZi8JWWudvYRgJDHV+f2cU+Ge6mkAJtmYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689307986; 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=sDE3reVU6W5ToAz/bKr+HCiURl3i9DcWsP1bHPnicBQ=; b=nKd1Sqmy3hkjt0Y65vyJuplv5VU0Ancslw702cXDP6+F0pmCyh8RM20XmQ8TszcaGx9Hg3 Mlh0YK/ySkg3RoMdRXJSl+DR2b1lBjVPfr/2bTbGDP112UtkwZlwc5tPdBfsI/hvyuD+J4 n0vns612ZJFRL3i6zLs3xgv2KAFJXsXwjowXwYBuEfcLOwnd+SH5xsuz5mUHmO5uyVdlR6 ZarLOEDUQTLKYDPQy495JL8rkxdeuKQySj4Oaoyb8N5Qq0TWiPOHq/IcPmTdnYWJId6QJ7 fjNy6mGvjf9j/KQIlaM1KOS+Stx97LY8sIVUQDQ95xABPP4JiHCa+9+jSVgVAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689307986; a=rsa-sha256; cv=none; b=nAM2rzbzhz6thh/cwrJUvuJESQxTaWOVe6kfetp/yxLwc9tmMF2JFpOGqcL4wfolV9cOWN 8+1JxdwAzEgZOizU90eUDOEwzX4QDXchYNvvCQUb57zyGIvn7vg4lcbIw+ZKxu/s0hfcmB I4Kfv/pECaljI7FQburki0Bn28KcQ2yqSW4O5FZG7VZGyevbVyiRsIaoGvOJ8vxs8UepkR lnmEpavpLD4U4H+sKLf9zF5U8E2VEyG+IwiGhbZboJCmvzOJ/IgfDFWgFLRPIRyZf3Bt1s oUKtejnaVjbFqa9PGzZKsPcMTn/kic+IvBGjOxgLjf4X+VeSAfaXqCfKYnJ1EQ== 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 4R2J423432z1JC6; Fri, 14 Jul 2023 04:13:06 +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 36E4D6BS085927; Fri, 14 Jul 2023 04:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E4D6dg085926; Fri, 14 Jul 2023 04:13:06 GMT (envelope-from git) Date: Fri, 14 Jul 2023 04:13:06 GMT Message-Id: <202307140413.36E4D6dg085926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f0404eb39e87 - stable/13 - libthr: Add src.conf variable WITHOUT_PTHREADS_ASSERTIONS 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0404eb39e877425d70b4ba0da530f67d9c36771 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f0404eb39e877425d70b4ba0da530f67d9c36771 commit f0404eb39e877425d70b4ba0da530f67d9c36771 Author: Greg Becker AuthorDate: 2023-07-07 00:30:02 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-13 01:29:17 +0000 libthr: Add src.conf variable WITHOUT_PTHREADS_ASSERTIONS (cherry picked from commit 642cd511028b8839db2c89a44cf7807d80664f38) --- lib/libthr/Makefile | 2 ++ lib/libthr/thread/thr_mutex.c | 2 +- share/mk/src.opts.mk | 1 + tools/build/options/WITHOUT_PTHREADS_ASSERTIONS | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 0b550d995241..dff8905a1670 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -45,8 +45,10 @@ SYMBOL_MAPS=${.CURDIR}/pthread.map MAN= libthr.3 +.if ${MK_PTHREADS_ASSERTIONS} != "no" # enable extra internal consistency checks CFLAGS+=-D_PTHREADS_INVARIANTS +.endif PRECIOUSLIB= diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 8dccdf4dfa8c..2cbfd9a459d3 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -120,7 +120,7 @@ __weak_reference(_pthread_mutex_getyieldloops_np, pthread_mutex_getyieldloops_np __weak_reference(_pthread_mutex_isowned_np, pthread_mutex_isowned_np); static void -mutex_init_link(struct pthread_mutex *m) +mutex_init_link(struct pthread_mutex *m __unused) { #if defined(_PTHREADS_INVARIANTS) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 403bbfb1a138..f7120b69fdbd 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -160,6 +160,7 @@ __DEFAULT_YES_OPTIONS = \ PMC \ PORTSNAP \ PPP \ + PTHREADS_ASSERTIONS \ QUOTAS \ RADIUS_SUPPORT \ RBOOTD \ diff --git a/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS b/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS new file mode 100644 index 000000000000..b0961fa43cb6 --- /dev/null +++ b/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS @@ -0,0 +1 @@ +Disable debugging assertions in pthreads library. From nobody Fri Jul 14 04:13:07 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 4R2J435cX3z4mmsM; Fri, 14 Jul 2023 04:13:07 +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 4R2J43561Dz40Fk; Fri, 14 Jul 2023 04:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689307987; 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=jaPOs+xKp/7xr8GSLJll2PuH5M274liyUdG3++TS6pY=; b=J/9Le5Obk3wqBjfVyRSJ1yzredRa3FR05aqQhtZSXlAsXEURIvvZ/GFdUp6bSXbGP35t3l xvZ3q1hVnlaFhUCbiDnlGiwXVnd3I8O8bhpqO7QbE3bxsrdRVroNKx4yQEZSk4e/I0GP22 yHsalHb/pO7KFQy767F5ubMhA1wk9MUCP8nZsc46ymn4V775nHuv8W/Hz7sknCsmk9v9tt 4SZEpjAVRZfzAhd+PiKmInFlKJzzxw/PgLQUsvkJPD1owAMEGBzNLzOK9h06253MIhgTSX xFyVuef7EOVZBxVaorkuZUf0TKC7mlY19SrODyV21xLGliFwgrpc2VabU9m0eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689307987; 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=jaPOs+xKp/7xr8GSLJll2PuH5M274liyUdG3++TS6pY=; b=SlT+T3DiAOtvb7r7X8kFfykSJ3NOxUJNoj4CNufgbyP4Q2+thuNO1kHktIpUujGyrvNVrW 3/9ZWZ7R2v/xu2Mt2x0PGJns4+WzIlFq5LtDDrRDXT3yJz9+T49BrNbCuvY2h2Rpm8sygS wfWCR8fuk33XRuowd6A8ji10apEcEdBetpYeFYEns52tzWUuYvWykaHauwtPUCs+75N3aO pvlOYBukEqQQErewgdVpfkiQBIbnN3+B1AQPo3Gr6E97Hsnutovr2UAWEwakqq4Pg28CDQ ZmBrulgrlDRekOW3HQnJb3O0mNXmyPFQ2f9IGxc4jFI09u3+fmgo9jBC8hLujQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689307987; a=rsa-sha256; cv=none; b=yqaWS1SBfFCzcFvjpPuqJpp+8z/KFFWG1OYcia5Wtu03xehrCEWEMVCS3rGVj9pSKUIEPr n/5SdMZxXHRlkb5pS7j6mIwsofrnlhHU47kpTph8tzucXSgg08HnHOPt/XpKus3SJaKZHB IGuv4k3o0n4v83KEVHXE+65Od/P6in/I4XVHswsMbn01uwbWCzgo4zJMgNfgOKYSz52n6m m3mxNFfa9SjjTQ5mvViLoyjaRV4Jz3rHiJVgHf+QiNuWLTEaJ4RS9UyjI1U3IL9/B57u+Q HApa4ddU+fjQ5vBCVE/60HnedFAkbiqkPq+gg9AWuXwk7bt6w8MTKo6pqUU49w== 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 4R2J433yWfz1Hxk; Fri, 14 Jul 2023 04:13:07 +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 36E4D7FH085946; Fri, 14 Jul 2023 04:13:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E4D7NK085945; Fri, 14 Jul 2023 04:13:07 GMT (envelope-from git) Date: Fri, 14 Jul 2023 04:13:07 GMT Message-Id: <202307140413.36E4D7NK085945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6a4f3962335c - stable/13 - src.conf.5: regen 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a4f3962335c34154e16c6a83cb25f3f91c2692c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a4f3962335c34154e16c6a83cb25f3f91c2692c commit 6a4f3962335c34154e16c6a83cb25f3f91c2692c Author: Konstantin Belousov AuthorDate: 2023-07-07 01:51:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-13 01:29:17 +0000 src.conf.5: regen --- share/man/man5/src.conf.5 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 7609a6fbbe56..93e2082cb655 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd March 6, 2023 +.Dd July 7, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1406,6 +1406,8 @@ This option is deprecated and may not be present in a future version of .Pp This is a default setting on amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mips, powerpc/powerpc, powerpc/powerpc64, riscv/riscv64 and riscv/riscv64sf. +.It Va WITHOUT_PTHREADS_ASSERTIONS +Disable debugging assertions in pthreads library. .It Va WITHOUT_QUOTAS Do not build .Xr quota 1 From nobody Fri Jul 14 04:13:08 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 4R2J446FzLz4mn5d; Fri, 14 Jul 2023 04:13:08 +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 4R2J445XtSz40lY; Fri, 14 Jul 2023 04:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689307988; 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=eOD4RRmyFqd5owaPKbzucP3ylnF8KBxqR/Pq3uzRnBY=; b=Y93VNIINzBNPNCf34MfF7YgsavM+2v4TUfrXZKNueYEvl7DRKgCd7LEY16zbkvnb6Hdbrt fLJeb3+xWCyD1+ipagPOJQ5IwMn1PYU8oy2wldZQp2DvQoque7NTxEBHXH6wGyX/mol03n 5xXRf7IHDroYTzieMqF+X0bYDZiZUKkC/U0txyOC6mNpGhZYBQWpuNNCvDFtl/8kSAwJ9O AWOUwHlK2rLB7AIZ4UcZZuEFjesd3kmgnWfWlcLiZknzbNd2qA+sDpE/8iuZAuPPYRZx74 JFdu7c3cYVzxYb/KE+P4p3OQKWW5EhONHSmN7IV0PmRVq/AFsbchngKC98YzlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689307988; 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=eOD4RRmyFqd5owaPKbzucP3ylnF8KBxqR/Pq3uzRnBY=; b=jKkDVnRxcQ0bDBGDIpW/A8Inch81jjHw2SodSZZmes5jV6gXrzqhECSwUNFArp1EiAGFoy 5JlRPxcE++sniHWlmgh4MDDeWB/uLOLumOU83I1mNXsmMkWRVvwEetEtSh09yEmhm0KSys 6fPaQn1vg04Frkz+ft9fvtugZ3V+v+DcCSmqUusDUhkZQpgzkipck33af/lUF3WWGw7Lsr N0eb69+WG0owDDrwBJuV6KTYJ2ZFVePy09t07hvZC0tTojGUAcTMSSRRmyH/OqEtVJtY5k 3QKUah/+JqFM9P8t1WHxiPHnln5wbVdqjvbVUS6TbSImBazn7Nt7i3SciAZF1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689307988; a=rsa-sha256; cv=none; b=WXpbKiZlq8nclwFbIiAp74MtPCLvBlX2Zvih4X8D4A+Zfvq71to6ngRW9T6at2kkhyIpr8 kkcm802hte0Gib20ZjO6Zr0kUl8J89ztTYFGZnIXgU8PCnVE/Kv8kcPkBLDEtMdxjXL95L hY9HwcDsBBxXubo+y+PE6ac5AK9DOqmrQkDY/LCCfYWhI9q+D4HJ8fdtKVJQiqg59PT/Ki X8KVtMheO2mlDsgYGOfgc7kxaP7ER9u3lTgvbQF/QqMds97bUW2/JJGmjE2sr/jXIf160L WqYSJuwPgjnEXlOpcZOf9ek26q6khQsKhgQPwTJ6mFQYHuJrGz6sAeZCPS7F/A== 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 4R2J444f9jz1Hp8; Fri, 14 Jul 2023 04:13:08 +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 36E4D8Uw085965; Fri, 14 Jul 2023 04:13:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E4D8xY085964; Fri, 14 Jul 2023 04:13:08 GMT (envelope-from git) Date: Fri, 14 Jul 2023 04:13:08 GMT Message-Id: <202307140413.36E4D8xY085964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 36a037f1501e - stable/13 - libthr: Patch to reduce latency to acquire+release a pthread mutex. 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36a037f1501e0969b56f643c5e9782334bd540e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=36a037f1501e0969b56f643c5e9782334bd540e3 commit 36a037f1501e0969b56f643c5e9782334bd540e3 Author: Greg Becker AuthorDate: 2023-07-07 22:03:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-13 01:29:17 +0000 libthr: Patch to reduce latency to acquire+release a pthread mutex. (cherry picked from commit b370ef156ab9d88450e9bc0440df522aec88cc44) --- lib/libthr/thread/thr_mutex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 2cbfd9a459d3..40e0b7382f95 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -596,7 +596,7 @@ check_and_init_mutex(pthread_mutex_t *mutex, struct pthread_mutex **m) *m = *mutex; ret = 0; - if (*m == THR_PSHARED_PTR) { + if (__predict_false(*m == THR_PSHARED_PTR)) { *m = __thr_pshared_offpage(mutex, 0); if (*m == NULL) ret = EINVAL; @@ -714,7 +714,7 @@ done: return (ret); } -static inline int +static __always_inline int mutex_lock_common(struct pthread_mutex *m, const struct timespec *abstime, bool cvattach, bool rb_onlist) { @@ -728,7 +728,7 @@ mutex_lock_common(struct pthread_mutex *m, const struct timespec *abstime, if (!rb_onlist) robust = _mutex_enter_robust(curthread, m); ret = _thr_umutex_trylock2(&m->m_lock, TID(curthread)); - if (ret == 0 || ret == EOWNERDEAD) { + if (__predict_true(ret == 0) || ret == EOWNERDEAD) { enqueue_mutex(curthread, m, ret); if (ret == EOWNERDEAD) m->m_lock.m_flags |= UMUTEX_NONCONSISTENT; @@ -951,7 +951,7 @@ mutex_self_lock(struct pthread_mutex *m, const struct timespec *abstime) return (ret); } -static int +static __always_inline int mutex_unlock_common(struct pthread_mutex *m, bool cv, int *mtx_defer) { struct pthread *curthread;