vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

pgp: Fix emu build and tests after pgp module renaming

Browse source 
Commit b07feb8746 (verifiers: Rename
verify module to pgp module) renamed the "verify" module to "pgp", but
the GRUB_MOD_INIT and GRUB_MOD_FINI macros were left as "verify", which
broke the emu target build; and file_filter_test still referred to the
now non-existent "verify" module. Fix both of these.

Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Colin Watson 2019-01-09 14:54:39 +00:00 • committed by Vincent Batts
parent eb392eefde
commit 140526af7d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grub-core/commands/pgp.c
View file

@ -1006,7 +1006,7 @@ struct grub_file_verifier grub_pubkey_verifier =
static grub_extcmd_t cmd, cmd_trust; static grub_extcmd_t cmd, cmd_trust;
static grub_command_t cmd_trust_var, cmd_distrust, cmd_list; static grub_command_t cmd_trust_var, cmd_distrust, cmd_list;
GRUB_MOD_INIT(verify) GRUB_MOD_INIT(pgp)
{ {
const char *val; const char *val;
struct grub_module_header *header; struct grub_module_header *header;
@ -1068,7 +1068,7 @@ GRUB_MOD_INIT(verify)
grub_verifier_register (&grub_pubkey_verifier); grub_verifier_register (&grub_pubkey_verifier);
} }
GRUB_MOD_FINI(verify) GRUB_MOD_FINI(pgp)
{ {
grub_verifier_unregister (&grub_pubkey_verifier); grub_verifier_unregister (&grub_pubkey_verifier);
grub_unregister_extcmd (cmd); grub_unregister_extcmd (cmd);

2
tests/file_filter_test.in
View file

@ -19,7 +19,7 @@ grubshell=@builddir@/grub-shell
. "@builddir@/grub-core/modinfo.sh" . "@builddir@/grub-core/modinfo.sh"
filters="gzio xzio lzopio verify" filters="gzio xzio lzopio pgp"
modules="cat mpi" modules="cat mpi"
for mod in $(cut -d ' ' -f 2 "@builddir@/grub-core/crypto.lst" | sort -u); do for mod in $(cut -d ' ' -f 2 "@builddir@/grub-core/crypto.lst" | sort -u); do