Page MenuHomeFreeBSD
Files F162687836

D58187.diff
No OneTemporary
Actions

D58187.diff
View Options

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20260712: uefisign(8) -> efisign(8) collateral damage
+OLD_FILES+=usr/share/examples/uefisign/uefikeys
+OLD_DIRS+=usr/share/examples/uefisign
+
# 20260707: Move sendfile_helper to tests/sys/common
OLD_FILES+=usr/tests/sys/kern/sendfile_helper
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -290,6 +290,8 @@
..
dwatch
..
+ efisign
+ ..
etc
defaults
..
@@ -384,8 +386,6 @@
..
tcsh
..
- uefisign
- ..
ypldap
..
..
diff --git a/share/examples/Makefile b/share/examples/Makefile
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -349,10 +349,10 @@
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
rename from share/examples/uefisign/uefikeys
rename to share/examples/efisign/uefikeys
--- 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
--- 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 @@
.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
--- a/targets/pseudo/userland/Makefile.depend
+++ b/targets/pseudo/userland/Makefile.depend
@@ -526,6 +526,7 @@
usr.sbin/dumpcis \
usr.sbin/editmap \
usr.sbin/edquota \
+ usr.sbin/efisign \
usr.sbin/etcupdate \
usr.sbin/extattr \
usr.sbin/extattrctl \
@@ -692,7 +693,6 @@
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
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1693,9 +1693,11 @@
.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
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -134,7 +134,7 @@
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
--- /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
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
rename from usr.sbin/uefisign/child.c
rename to usr.sbin/efisign/child.c
--- 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.h b/usr.sbin/efisign/efisign.h
rename from usr.sbin/uefisign/uefisign.h
rename to usr.sbin/efisign/efisign.h
diff --git a/usr.sbin/uefisign/uefisign.8 b/usr.sbin/efisign/efisign.8
rename from usr.sbin/uefisign/uefisign.8
rename to usr.sbin/efisign/efisign.8
--- 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 @@
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
rename from usr.sbin/uefisign/uefisign.c
rename to usr.sbin/efisign/efisign.c
--- 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/magic.h b/usr.sbin/efisign/magic.h
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
rename from usr.sbin/uefisign/pe.c
rename to usr.sbin/efisign/pe.c
--- 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
--- 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>

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 16, 6:56 PM (7 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35116457
Default Alt Text
D58187.diff (6 KB)

Event Timeline