pgp: Fix emu build and tests after pgp module renaming

Commit b07feb8746c3bb845e3f0d33d37c0bded704d14d (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>

diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
index 0487479af56c64ba7cce5d9c56f14267fbef3edd..d39846d8cfea505ce4af4f1cd3164723c935c4e1 100644 (file)
--- a/grub-core/commands/pgp.c
+++ b/grub-core/commands/pgp.c
@@ -949,7 +949,7 @@ struct grub_file_verifier grub_pubkey_verifier =
 static grub_extcmd_t cmd, cmd_trust;
 static grub_command_t cmd_distrust, cmd_list;
 
-GRUB_MOD_INIT(verify)
+GRUB_MOD_INIT(pgp)
 {
   const char *val;
   struct grub_module_header *header;
@@ -1008,7 +1008,7 @@ GRUB_MOD_INIT(verify)
   grub_verifier_register (&grub_pubkey_verifier);
 }
 
-GRUB_MOD_FINI(verify)
+GRUB_MOD_FINI(pgp)
 {
   grub_verifier_unregister (&grub_pubkey_verifier);
   grub_unregister_extcmd (cmd);

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