From nobody Fri Nov 20 20:26:48 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 4jWRh937Xsz6w0bb for ; Fri, 20 Nov 2026 20:26:49 +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 4jWRh909LCz4Gmh for ; Fri, 20 Nov 2026 20:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795206409; 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=dLaROc4EyW5BzBpKujSSV7stiySzfOUgPyFGeUmokcY=; b=OqzumgRkEP2+LNXfjgrRTOTOrlOKx9WDYcnwuPz1zFR97+iSEhr3R4ja29yvRGjzQidKWQ xllapOvmiVTAOGbUhVpc5wuzUFaoCz1WBAfc71SToa7ygX71+PMP3gKcb9gcAxQWF7sDwu JlJr7i2FkOCNvJLpu4Y7msHwVoNbgkPSx1UMoIxueKbexmRCoOSEXU9QUYr4QOgCBxpVcU 7TFUHecXfuh1aXXEuz1s4tyUIabvMHYuvMPQ3do5s7xQwdskg68uIaTuUNITcgRvqgS1mX dc7Voj5NglHes55ksYrZnUDZFFD3wryl0LpizsIQeqYDXyOWt9Eq+rKFmw3RBw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795206409; b=abhGRMyWkne8Fom8+47u05Yr0vXmYl2x65GxZBrrI2LbY06p/ecQsE4ylAUsGOXLVlCma6 /YsLOU/3Cy/PA0ENgCtLYWuMNG4Y9oiQYPMYw1FVKHJQ+OgKcOU6Jj/6Y1elYkdeeIljKw iGbjfU5tZIs/+VaYLk5cluNZSwXmZCJFiZdliS0i7wa37lZaqUlauD/RZhV6YOv58r9igO G8ObFXO09Dyo2/bgrV+MQgmfSS4rFNfMPtJVJHeSEsUr4lQC/Ecl5hjSSasx7SJPIrqw1A zZN8xy7jHQr+P9iQKwMlh37sm+sl/IQjUfm3j9Dij7fhMScyb3n0Xt3x6Tt9IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795206409; 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=dLaROc4EyW5BzBpKujSSV7stiySzfOUgPyFGeUmokcY=; b=XSOk/3ITWB4s0NStBHbhABeG7BR1Jk7VlkRHlWhGNbUHTpK4oCIh8n4208tWN5dKNr970x p3UIGTIfrgan84JghBAjv7l8hZlJp2kl6XuRlRzOm86GIeEMDz3MXJ0oq1dSDu5PLiMlhb XAL2lIEHAYZjmSt/QB/67uGKDzdYqqIrL8IPYBFszhS8Eh3Dd9No8vuD8kXEYlYl5AVSt9 ZQJJVKJUFR+FyaMxAit0ZWfNAzpXKuZN4KovNN/LOiD93FrMONfeFpAPHgdD302WzYrPaK RikYkvmort5NSyclmckblp/aslfV1+4P9LQwF9w3JEkw/XKmnPLB4Ie+hHZPbA== 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 4jWRh86hkPz13Yy for ; Fri, 20 Nov 2026 20:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 10aee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 20:26:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 537dca4c0bc3 - main - uefisign: rename to efisign List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 537dca4c0bc3218fba624bf60fbd4a92b2df805d Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 20:26:48 +0000 Message-Id: <6b00ad08.10aee.20200d8@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=537dca4c0bc3218fba624bf60fbd4a92b2df805d commit 537dca4c0bc3218fba624bf60fbd4a92b2df805d Author: Kyle Evans AuthorDate: 2026-11-20 20:25:46 +0000 Commit: Kyle Evans CommitDate: 2026-11-20 20:25:46 +0000 uefisign: rename to efisign uefisign seems to have come first, but the efi* naming has won out in our UEFI tooling and consistency is good. This fixes it so that "efi" gives a reasonable view of what efitools we have in base. uefi* links are added for compatibility, at least for now. Maybe it's a reasonable idea to add such links for all of the efi tools, but I'm punting on that for a moment. Reviewed by: emaste, imp (both previous version), ziaee Relnotes: maybe Differential Revision: https://reviews.freebsd.org/D58187 --- ObsoleteFiles.inc | 4 ++++ etc/mtree/BSD.usr.dist | 4 ++-- share/examples/Makefile | 8 ++++---- share/examples/{uefisign => efisign}/uefikeys | 2 +- share/man/man8/uefi.8 | 6 +++--- targets/pseudo/userland/Makefile.depend | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 4 +++- usr.sbin/Makefile | 2 +- usr.sbin/efisign/Makefile | 11 +++++++++++ usr.sbin/{uefisign => efisign}/Makefile.depend | 0 usr.sbin/{uefisign => efisign}/child.c | 2 +- usr.sbin/{uefisign/uefisign.8 => efisign/efisign.8} | 12 ++++++------ usr.sbin/{uefisign/uefisign.c => efisign/efisign.c} | 6 +++--- usr.sbin/{uefisign/uefisign.h => efisign/efisign.h} | 0 usr.sbin/{uefisign => efisign}/magic.h | 0 usr.sbin/{uefisign => efisign}/pe.c | 2 +- usr.sbin/uefisign/Makefile | 7 ------- 17 files changed, 41 insertions(+), 31 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a65e9aa296b5..1b143d64250b 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20261120: uefisign(8) -> efisign(8) collateral damage +OLD_FILES+=usr/share/examples/uefisign/uefikeys +OLD_DIRS+=usr/share/examples/uefisign + # 20261020: Regenerate trust store OLD_FILES+=usr/share/certs/trusted/Atos_TrustedRoot_2011.pem OLD_FILES+=usr/share/certs/trusted/SecureSign_Root_CA12.pem diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 5bbfba4bc5b5..5c7111b7098d 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -296,6 +296,8 @@ .. dwatch .. + efisign + .. etc defaults .. @@ -390,8 +392,6 @@ .. tcsh .. - uefisign - .. ypldap .. .. diff --git a/share/examples/Makefile b/share/examples/Makefile index dae84f27d9dc..c806fc02ba69 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -349,10 +349,10 @@ SE_SUNRPC_SORT= \ sort_proc.c .if ${MK_EFI} != "no" -LDIRS+= uefisign -SE_DIRS+= uefisign -SE_UEFISIGN= uefikeys -SE_UEFISIGNPACKAGE=efi-tools +LDIRS+= efisign +SE_DIRS+= efisign +SE_EFISIGN= uefikeys +SE_EFISIGNPACKAGE=efi-tools .endif SE_DIRS+= ypldap diff --git a/share/examples/uefisign/uefikeys b/share/examples/efisign/uefikeys similarity index 95% rename from share/examples/uefisign/uefikeys rename to share/examples/efisign/uefikeys index ac97f2cfb3fa..d7737c06181a 100755 --- a/share/examples/uefisign/uefikeys +++ b/share/examples/efisign/uefikeys @@ -1,6 +1,6 @@ #!/bin/sh # -# See uefisign(8) manual page for usage instructions. +# See efisign(8) manual page for usage instructions. # # diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index e29bed134850..2f41222adb72 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 31, 2023 +.Dd July 12, 2026 .Dt UEFI 8 .Os .Sh NAME @@ -114,10 +114,10 @@ Typical non-default kernel (optional) .Xr boot 8 , .Xr efibootmgr 8 , .Xr efidp 8 , +.Xr efisign 8 , .Xr efivar 8 , .Xr gpart 8 , -.Xr loader.efi 8 , -.Xr uefisign 8 +.Xr loader.efi 8 .Sh HISTORY EFI boot support for the ia64 architecture first appeared in .Fx 5.0 . diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend index a50cb7561c36..161fcf64380d 100644 --- a/targets/pseudo/userland/Makefile.depend +++ b/targets/pseudo/userland/Makefile.depend @@ -525,6 +525,7 @@ DIRDEPS+= \ usr.sbin/dumpcis \ usr.sbin/editmap \ usr.sbin/edquota \ + usr.sbin/efisign \ usr.sbin/etcupdate \ usr.sbin/extattr \ usr.sbin/extattrctl \ @@ -691,7 +692,6 @@ DIRDEPS+= \ usr.sbin/traceroute6 \ usr.sbin/tzsetup \ usr.sbin/uathload \ - usr.sbin/uefisign \ usr.sbin/ugidfw \ usr.sbin/uhsoctl \ usr.sbin/unbound/anchor \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 0ba0dfe1e1dc..a55b28e986fc 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1729,9 +1729,11 @@ OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat .if ${MK_EFI} == no OLD_FILES+=usr/sbin/efibootmgr OLD_FILES+=usr/sbin/efidp +OLD_FILES+=usr/sbin/efisign OLD_FILES+=usr/sbin/efivar OLD_FILES+=usr/sbin/uefisign -OLD_FILES+=usr/share/examples/uefisign/uefikeys +OLD_FILES+=usr/share/examples/efisign/uefikeys +OLD_DIRS+=usr/share/examples/efisign .endif .if ${MK_EXAMPLES} == no diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index abd2967584fc..da24da8865a3 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -135,7 +135,7 @@ SUBDIR.${MK_OPENSSL}+= certctl SUBDIR.${MK_CXGBETOOL}+= cxgbetool SUBDIR.${MK_EFI}+= efivar efidp efibootmgr efitable efiwake .if ${MK_OPENSSL} != "no" -SUBDIR.${MK_EFI}+= uefisign +SUBDIR.${MK_EFI}+= efisign .endif SUBDIR.${MK_FDT}+= ofwdump SUBDIR.${MK_FLOPPY}+= fdcontrol diff --git a/usr.sbin/efisign/Makefile b/usr.sbin/efisign/Makefile new file mode 100644 index 000000000000..5cd8f1b6cd0a --- /dev/null +++ b/usr.sbin/efisign/Makefile @@ -0,0 +1,11 @@ +PROG= efisign +SRCS= efisign.c child.c pe.c +MAN= efisign.8 + +# Compatibility links +LINKS= $(BINDIR)/efisign $(BINDIR)/uefisign +MLINKS= efisign.8 uefisign.8 + +LIBADD= crypto + +.include diff --git a/usr.sbin/uefisign/Makefile.depend b/usr.sbin/efisign/Makefile.depend similarity index 100% rename from usr.sbin/uefisign/Makefile.depend rename to usr.sbin/efisign/Makefile.depend diff --git a/usr.sbin/uefisign/child.c b/usr.sbin/efisign/child.c similarity index 99% rename from usr.sbin/uefisign/child.c rename to usr.sbin/efisign/child.c index 7d2349aec7d7..6225268b07f1 100644 --- a/usr.sbin/uefisign/child.c +++ b/usr.sbin/efisign/child.c @@ -46,7 +46,7 @@ #include #include -#include "uefisign.h" +#include "efisign.h" static void load(struct executable *x) diff --git a/usr.sbin/uefisign/uefisign.8 b/usr.sbin/efisign/efisign.8 similarity index 93% rename from usr.sbin/uefisign/uefisign.8 rename to usr.sbin/efisign/efisign.8 index e80fa8737d48..c58dba14e166 100644 --- a/usr.sbin/uefisign/uefisign.8 +++ b/usr.sbin/efisign/efisign.8 @@ -24,11 +24,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 11, 2015 -.Dt UEFISIGN 8 +.Dd July 11, 2026 +.Dt EFISIGN 8 .Os .Sh NAME -.Nm uefisign +.Nm efisign .Nd UEFI Secure Boot signing utility .Sh SYNOPSIS .Nm @@ -68,11 +68,11 @@ The utility exits 0 on success, and >0 if an error occurs. .Sh EXAMPLES Generate self-signed certificate and use it to sign a binary: -.Dl /usr/share/examples/uefisign/uefikeys testcert -.Dl uefisign -c testcert.pem -k testcert.key -o signed-binary binary +.Dl /usr/share/examples/efisign/uefikeys testcert +.Dl efisign -c testcert.pem -k testcert.key -o signed-binary binary .Pp View signature: -.Dl uefisign -Vv binary +.Dl efisign -Vv binary .Sh SEE ALSO .Xr openssl 1 , .Xr loader 8 , diff --git a/usr.sbin/uefisign/uefisign.c b/usr.sbin/efisign/efisign.c similarity index 98% rename from usr.sbin/uefisign/uefisign.c rename to usr.sbin/efisign/efisign.c index 942bf1851f45..6545d5cc747e 100644 --- a/usr.sbin/uefisign/uefisign.c +++ b/usr.sbin/efisign/efisign.c @@ -44,15 +44,15 @@ #include #include -#include "uefisign.h" +#include "efisign.h" #include "magic.h" static void usage(void) { - fprintf(stderr, "usage: uefisign -c cert -k key -o outfile [-v] file\n" - " uefisign -V [-c cert] [-v] file\n"); + fprintf(stderr, "usage: efisign -c cert -k key -o outfile [-v] file\n" + " efisign -V [-c cert] [-v] file\n"); exit(1); } diff --git a/usr.sbin/uefisign/uefisign.h b/usr.sbin/efisign/efisign.h similarity index 100% rename from usr.sbin/uefisign/uefisign.h rename to usr.sbin/efisign/efisign.h diff --git a/usr.sbin/uefisign/magic.h b/usr.sbin/efisign/magic.h similarity index 100% rename from usr.sbin/uefisign/magic.h rename to usr.sbin/efisign/magic.h diff --git a/usr.sbin/uefisign/pe.c b/usr.sbin/efisign/pe.c similarity index 99% rename from usr.sbin/uefisign/pe.c rename to usr.sbin/efisign/pe.c index 7c194cc134a7..a9c93f9bc9d2 100644 --- a/usr.sbin/uefisign/pe.c +++ b/usr.sbin/efisign/pe.c @@ -45,7 +45,7 @@ #include #include -#include "uefisign.h" +#include "efisign.h" #ifndef CTASSERT #define CTASSERT(x) _CTASSERT(x, __LINE__) diff --git a/usr.sbin/uefisign/Makefile b/usr.sbin/uefisign/Makefile deleted file mode 100644 index b389af5cac43..000000000000 --- a/usr.sbin/uefisign/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -PROG= uefisign -SRCS= uefisign.c child.c pe.c -MAN= uefisign.8 - -LIBADD= crypto - -.include