From nobody Fri Nov 06 00:28:39 2026 X-Original-To: dev-commits-src-all@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 4jLKmF63Hyz6xVvn for ; Fri, 06 Nov 2026 00:28:45 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jLKmF1JhPz4sKW for ; Fri, 06 Nov 2026 00:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793924925; 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=NgVuS/C0ZDeOHXT03Q6BSMRjaZKU6Cc4qCPuXUP2JkU=; b=OaxaK9KbCyH0Mn1XAAGeWooHwm53XRZcc2YzkDxKpjXAfEzbjYuDZbh3XvUCtnOxUVoOdM jOVYznZa0NSP9T9mVUIdAjEQMHq/KWjv+PLwr54UqTKlFXRVeXJahQuXYIpaD9f0Axtpq4 KQ7zbgGlPk4GzFFu0s92TBVU9CxUQ/YmRYWtimUM6tfzxmkOwFpL/Y7Oz6h76A2ccmq26P 0oi0T7R+YPg3rRbkXfaIcshoUAM2BrkYD+zY3fXXjuZbgIDyXjiWp1AmMWZnvwM8C9SKAr Cfsw4LK4QQZMnYQkLiXM+4MPZd7lLSkCnkl17l2BzcW/+vN7Jnh/T3zqaYAtTw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793924925; b=qdRzNBkcn8h2I4qWU8fmqV6AFYhtmb/p0MXMFUgCKzFhxBYkZ4J+IeidxSk08IoIMElyDJ /PxrDxheqSthAdAlK9+2gnokXEFJXencUqYXwTyin4NrtLCmS4e++1peyXuH5MbmU7gPFQ vYinpcpR4UFzQqUKMwh8dmfUUNZbh1drJ7F9VkuqL3KirOJv1zaCxj4NmJnudyXN6vPg3k bDfCFf+5sruAkxMfBR/w/FmYA0Evn81NAzOYg4ssSY03T/4tgThlpaMWv+ACaZNCAUgAVI 9thAajPMOjEIqNUxWAvWvbINqFJa4IfNPM2to5I6FBliJvgbAUZzmJ5QIFvzOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793924925; 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=NgVuS/C0ZDeOHXT03Q6BSMRjaZKU6Cc4qCPuXUP2JkU=; b=pHZNbIZm6RjqTDnL04Va+c7mzJZ2CXeiROa06sqgw9IFPXniF1qKhvvTvH+ui/DGy01KQ3 luP+4KuEcUhhqOjcSHyn/FDK1UERcl86B+S7cFXqi0hlVT5qtkFUa/LA8g1GnHw6hr4q3o xiOnowJ3VWiNF8QNWOv4pqir26+YGaIVNx/f1nnNQAGP5f2ByYDjoitT/51ybet3FlVRxm 8R3n4KfB36pe6w3l1KvMItN5yh/pdD24AGNj8pln+L/iUYM4LjBYF4s9Zjw0sFA+afYBZI 13eEZtyvNzrQlsHksea7qypvi1+yGFfD6cDpJmBxuo0hBERbWKWGg364LAsg+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jLKmF0r4Zz1CG5 for ; Fri, 06 Nov 2026 00:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f529 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Nov 2026 00:28:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: b22b999afc2d - main - libsecureboot restore default trust anchors List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b22b999afc2d1ecb320928c03f2d8e0f6ae1c1fe Auto-Submitted: auto-generated Date: Fri, 06 Nov 2026 00:28:39 +0000 Message-Id: <6aed1f37.3f529.260e0468@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b22b999afc2d1ecb320928c03f2d8e0f6ae1c1fe commit b22b999afc2d1ecb320928c03f2d8e0f6ae1c1fe Author: Simon J. Gerraty AuthorDate: 2026-11-06 00:27:00 +0000 Commit: Simon J. Gerraty CommitDate: 2026-11-06 00:27:00 +0000 libsecureboot restore default trust anchors If site.trust.mk does not set VE_SIGNATURE_LIST initialize it based on content of VE_SIGNATURE_EXT_LIST which is in turn initialized from TRUST_ANCHORS. Sponsored by: Hewlett Packard Enterprise Development LP Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D61245 --- lib/libsecureboot/local.trust.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/libsecureboot/local.trust.mk b/lib/libsecureboot/local.trust.mk index 01874c0604e6..e1f8cab3c718 100644 --- a/lib/libsecureboot/local.trust.mk +++ b/lib/libsecureboot/local.trust.mk @@ -102,9 +102,18 @@ VE_SIGNATURE_EXT_LIST?= ${TRUST_ANCHORS:T:Mt*.pem:R:S/ta_//} .endif .if ${TRUST_ANCHORS:T:Mt*.asc} != "" -VE_SIGNATURE_LIST+= asc/OPENPGP/sha256/0 +VE_SIGNATURE_EXT_LIST+= asc ta_asc.h: ${TRUST_ANCHORS:M*.asc} .endif + +.if empty(VE_SIGNATURE_LIST) +method.asc?= OPENPGP/sha256/0 +method.esig?= ECDSA/sha256/0 +.for ext in ${VE_SIGNATURE_EXT_LIST} +VE_SIGNATURE_LIST+= ${ext}/${method.${ext}:URSA/sha256/0} +.endfor +.endif + # we take the mtime of this as our baseline time BUILD_UTC_FILE?= ${TRUST_ANCHORS:[1]} .endif