proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-26 23:41:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

verifiers: Move verifiers API to kernel image

Browse Source 
Move verifiers API from a module to the kernel image, so it can be
used there as well. There are no functional changes in this patch.

Signed-off-by: Marco A Benatto <mbenatto@redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Marco A Benatto 2020-09-23 11:33:33 -04:00 committed by Daniel Kiper
parent 635ef55ed1
commit 9e95f45cee
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
grub-core/Makefile.am
View File

@ -91,6 +91,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/verify.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h

6
grub-core/Makefile.core.def
View File

@ -140,6 +140,7 @@ kernel = {
common = kern/rescue_parser.c; common = kern/rescue_parser.c;
common = kern/rescue_reader.c; common = kern/rescue_reader.c;
common = kern/term.c; common = kern/term.c;
common = kern/verifiers.c;
noemu = kern/compiler-rt.c; noemu = kern/compiler-rt.c;
noemu = kern/mm.c; noemu = kern/mm.c;
@ -943,11 +944,6 @@ module = {
cppflags = '-I$(srcdir)/lib/posix_wrap'; cppflags = '-I$(srcdir)/lib/posix_wrap';
}; };
module = {
name = verifiers;
common = commands/verifiers.c;
};
module = { module = {
name = shim_lock; name = shim_lock;
common = commands/efi/shim_lock.c; common = commands/efi/shim_lock.c;

4
grub-core/kern/main.c
View File

@ -29,6 +29,7 @@
#include <grub/command.h> #include <grub/command.h>
#include <grub/reader.h> #include <grub/reader.h>
#include <grub/parser.h> #include <grub/parser.h>
#include <grub/verify.h>
#ifdef GRUB_MACHINE_PCBIOS #ifdef GRUB_MACHINE_PCBIOS
#include <grub/machine/memory.h> #include <grub/machine/memory.h>
@ -274,6 +275,9 @@ grub_main (void)
grub_printf ("Welcome to GRUB!\n\n"); grub_printf ("Welcome to GRUB!\n\n");
grub_setcolorstate (GRUB_TERM_COLOR_STANDARD); grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
/* Init verifiers API. */
grub_verifiers_init ();
grub_load_config (); grub_load_config ();
grub_boot_time ("Before loading embedded modules."); grub_boot_time ("Before loading embedded modules.");

8
grub-core/commands/verifiers.c → grub-core/kern/verifiers.c
View File

@ -221,12 +221,8 @@ grub_verify_string (char *str, enum grub_verify_string_type type)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
GRUB_MOD_INIT(verifiers) void
grub_verifiers_init (void)
{ {
grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open); grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open);
} }
GRUB_MOD_FINI(verifiers)
{
grub_file_filter_unregister (GRUB_FILE_FILTER_VERIFY);
}

9
include/grub/verify.h
View File

@ -64,7 +64,10 @@ struct grub_file_verifier
grub_err_t (*verify_string) (char *str, enum grub_verify_string_type type); grub_err_t (*verify_string) (char *str, enum grub_verify_string_type type);
}; };
extern struct grub_file_verifier *grub_file_verifiers; extern struct grub_file_verifier *EXPORT_VAR (grub_file_verifiers);
extern void
grub_verifiers_init (void);
static inline void static inline void
grub_verifier_register (struct grub_file_verifier *ver) grub_verifier_register (struct grub_file_verifier *ver)
@ -78,7 +81,7 @@ grub_verifier_unregister (struct grub_file_verifier *ver)
grub_list_remove (GRUB_AS_LIST (ver)); grub_list_remove (GRUB_AS_LIST (ver));
} }
grub_err_t extern grub_err_t
grub_verify_string (char *str, enum grub_verify_string_type type); EXPORT_FUNC (grub_verify_string) (char *str, enum grub_verify_string_type type);
#endif /* ! GRUB_VERIFY_HEADER */ #endif /* ! GRUB_VERIFY_HEADER */