diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2026-11-20 20:25:46 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2026-11-20 20:25:46 +0000 |
| commit | 537dca4c0bc3218fba624bf60fbd4a92b2df805d (patch) | |
| tree | fd37f178e2605c7f437322b5769643c8d3d1a135 | |
| parent | 83c94a80bcaee2a355ab55a9cadbd51aa2c19933 (diff) | |
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<tab>" 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
| -rw-r--r-- | ObsoleteFiles.inc | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 4 | ||||
| -rw-r--r-- | share/examples/Makefile | 8 | ||||
| -rwxr-xr-x | share/examples/efisign/uefikeys (renamed from share/examples/uefisign/uefikeys) | 2 | ||||
| -rw-r--r-- | share/man/man8/uefi.8 | 6 | ||||
| -rw-r--r-- | targets/pseudo/userland/Makefile.depend | 2 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 4 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/efisign/Makefile | 11 | ||||
| -rw-r--r-- | usr.sbin/efisign/Makefile.depend (renamed from usr.sbin/uefisign/Makefile.depend) | 0 | ||||
| -rw-r--r-- | usr.sbin/efisign/child.c (renamed from usr.sbin/uefisign/child.c) | 2 | ||||
| -rw-r--r-- | usr.sbin/efisign/efisign.8 (renamed from usr.sbin/uefisign/uefisign.8) | 12 | ||||
| -rw-r--r-- | usr.sbin/efisign/efisign.c (renamed from usr.sbin/uefisign/uefisign.c) | 6 | ||||
| -rw-r--r-- | usr.sbin/efisign/efisign.h (renamed from usr.sbin/uefisign/uefisign.h) | 0 | ||||
| -rw-r--r-- | usr.sbin/efisign/magic.h (renamed from usr.sbin/uefisign/magic.h) | 0 | ||||
| -rw-r--r-- | usr.sbin/efisign/pe.c (renamed from usr.sbin/uefisign/pe.c) | 2 | ||||
| -rw-r--r-- | 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 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 <bsd.prog.mk> diff --git a/usr.sbin/uefisign/Makefile.depend b/usr.sbin/efisign/Makefile.depend index 30ac5d62651c..30ac5d62651c 100644 --- a/usr.sbin/uefisign/Makefile.depend +++ b/usr.sbin/efisign/Makefile.depend diff --git a/usr.sbin/uefisign/child.c b/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 <openssl/err.h> #include <openssl/pem.h> -#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 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 index 942bf1851f45..6545d5cc747e 100644 --- a/usr.sbin/uefisign/uefisign.c +++ b/usr.sbin/efisign/efisign.c @@ -44,15 +44,15 @@ #include <openssl/pem.h> #include <openssl/pkcs7.h> -#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 index 9ec41184aa11..9ec41184aa11 100644 --- a/usr.sbin/uefisign/uefisign.h +++ b/usr.sbin/efisign/efisign.h diff --git a/usr.sbin/uefisign/magic.h b/usr.sbin/efisign/magic.h index 1533d0ad347c..1533d0ad347c 100644 --- a/usr.sbin/uefisign/magic.h +++ b/usr.sbin/efisign/magic.h diff --git a/usr.sbin/uefisign/pe.c b/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 <string.h> #include <unistd.h> -#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 <bsd.prog.mk> |
