Lines Matching +full:- +full:c
3 Date: Wed, 23 Sep 2020 11:33:33 -0400
9 Signed-off-by: Marco A Benatto <mbenatto@redhat.com>
10 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
11 Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
13 Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
14 ---
15 grub-core/Makefile.am | 1 +
16 grub-core/Makefile.core.am | 66 +++-----
17 grub-core/Makefile.core.def | 6 +-
18 grub-core/Makefile.in | 355 +++++++++++++++++++++--------------------
19 grub-core/commands/verifiers.c | 228 --------------------------
20 grub-core/kern/main.c | 4 +
21 grub-core/kern/verifiers.c | 224 ++++++++++++++++++++++++++
22 include/grub/verify.h | 9 +-
23 po/POTFILES.in | 2 +-
24 9 files changed, 446 insertions(+), 449 deletions(-)
25 delete mode 100644 grub-core/commands/verifiers.c
26 create mode 100644 grub-core/kern/verifiers.c
28 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
30 --- a/grub-core/Makefile.am
31 +++ b/grub-core/Makefile.am
32 @@ -91,6 +91,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
40 diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am
42 --- a/grub-core/Makefile.core.am
43 +++ b/grub-core/Makefile.core.am
44 @@ -6953,26 +6953,6 @@ CLEANFILES += pgp.marker
46 …GET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_mod…
47 grep 'MARKER' $@.new > $@; rm -f $@.new
48 -platform_PROGRAMS += verifiers.module
49 -MODULE_FILES += verifiers.module$(EXEEXT)
50 -verifiers_module_SOURCES = commands/verifiers.c ## platform sources
51 -nodist_verifiers_module_SOURCES = ## platform nodist sources
52 -verifiers_module_LDADD =
53 -verifiers_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
54 -verifiers_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE)
55 -verifiers_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE)
56 -verifiers_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE)
57 -verifiers_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
58 -dist_noinst_DATA +=
59 -BUILT_SOURCES += $(nodist_verifiers_module_SOURCES)
60 -CLEANFILES += $(nodist_verifiers_module_SOURCES)
61 -MOD_FILES += verifiers.mod
62 -MARKER_FILES += verifiers.marker
63 -CLEANFILES += verifiers.marker
64 -
65 -verifiers.marker: $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES)
66 - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(v…
67 - grep 'MARKER' $@.new > $@; rm -f $@.new
71 @@ -22377,7 +22357,7 @@ gcry_whirlpool.marker: $(gcry_whirlpool_module_SOURCES) $(nodist_gcry_whirl…
75 -kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c os…
76 …c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdi…
80 @@ -22399,7 +22379,7 @@ endif
84 -kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl…
85 …c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c ke…
86 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
89 @@ -22421,7 +22401,7 @@ endif
93 -kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c …
94 …c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/…
95 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
98 @@ -22443,7 +22423,7 @@ endif
102 -kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/…
103 …c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386…
104 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
107 @@ -22465,7 +22445,7 @@ endif
111 -kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmt…
112 …c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreb…
113 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
116 @@ -22487,7 +22467,7 @@ endif
120 -kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multibo…
121 …c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.…
122 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
125 @@ -22509,7 +22489,7 @@ endif
129 -kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/…
130 …c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/…
131 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
134 @@ -22531,7 +22511,7 @@ endif
138 -kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern…
139 …c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl…
140 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
143 @@ -22553,7 +22533,7 @@ endif
147 -kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.…
148 …c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c…
149 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
152 @@ -22575,7 +22555,7 @@ endif
156 -kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/…
157 …c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console…
158 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
161 @@ -22597,7 +22577,7 @@ endif
165 -kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386…
166 …c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/…
167 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
170 @@ -22619,7 +22599,7 @@ endif
174 -kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c…
175 …c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c comm…
176 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
179 @@ -22641,7 +22621,7 @@ endif
183 -kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c dis…
184 …c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cma…
185 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
188 @@ -22663,7 +22643,7 @@ endif
192 -kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee…
193 …c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c…
194 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
197 @@ -22685,7 +22665,7 @@ endif
201 -kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc…
202 …c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips…
203 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
206 @@ -22707,7 +22687,7 @@ endif
210 -kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_he…
211 …c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/ef…
212 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
214 …kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-thr…
215 @@ -22729,7 +22709,7 @@ endif
219 -kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c t…
220 …c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c …
221 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
224 @@ -22751,7 +22731,7 @@ endif
228 -kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/ub…
229 …c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw…
230 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
233 @@ -22773,7 +22753,7 @@ endif
237 -kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/…
238 …c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S …
239 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
242 @@ -22795,7 +22775,7 @@ endif
246 -kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_fl…
247 …c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.…
248 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
251 @@ -22817,7 +22797,7 @@ endif
255 -kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/corebo…
256 …c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/p…
257 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
260 @@ -22839,7 +22819,7 @@ endif
264 -kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_fl…
265 …c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/e…
266 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
269 @@ -22861,7 +22841,7 @@ endif
273 -kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_fl…
274 …c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c ke…
275 nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
278 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
280 --- a/grub-core/Makefile.core.def
281 +++ b/grub-core/Makefile.core.def
282 @@ -140,6 +140,7 @@ kernel = {
283 common = kern/rescue_parser.c;
284 common = kern/rescue_reader.c;
285 common = kern/term.c;
286 + common = kern/verifiers.c;
288 noemu = kern/compiler-rt.c;
289 noemu = kern/mm.c;
290 @@ -943,11 +944,6 @@ module = {
291 cppflags = '-I$(srcdir)/lib/posix_wrap';
294 -module = {
295 - name = verifiers;
296 - common = commands/verifiers.c;
297 -};
298 -
301 common = commands/efi/shim_lock.c;
302 diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in
304 --- a/grub-core/Makefile.in
305 +++ b/grub-core/Makefile.in
306 @@ -202,39 +202,39 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \
310 - verifiers.module$(EXEEXT) $(am__EXEEXT_293) $(am__EXEEXT_294) \
311 - $(am__EXEEXT_295) $(am__EXEEXT_296) $(am__EXEEXT_297) \
312 - $(am__EXEEXT_298) $(am__EXEEXT_299) $(am__EXEEXT_300) \
313 - $(am__EXEEXT_301) $(am__EXEEXT_302) help.module$(EXEEXT) \
314 - hexdump.module$(EXEEXT) keystatus.module$(EXEEXT) \
315 - $(am__EXEEXT_303) $(am__EXEEXT_304) loadenv.module$(EXEEXT) \
316 - ls.module$(EXEEXT) lsmmap.module$(EXEEXT) $(am__EXEEXT_305) \
317 - $(am__EXEEXT_306) $(am__EXEEXT_307) $(am__EXEEXT_308) \
318 - $(am__EXEEXT_309) $(am__EXEEXT_310) $(am__EXEEXT_311) \
319 - $(am__EXEEXT_312) memrw.module$(EXEEXT) \
320 - minicmd.module$(EXEEXT) parttool.module$(EXEEXT) \
321 - password.module$(EXEEXT) password_pbkdf2.module$(EXEEXT) \
322 - $(am__EXEEXT_313) $(am__EXEEXT_314) $(am__EXEEXT_315) \
323 - $(am__EXEEXT_316) $(am__EXEEXT_317) $(am__EXEEXT_318) \
324 - $(am__EXEEXT_319) $(am__EXEEXT_320) $(am__EXEEXT_321) \
325 - $(am__EXEEXT_322) $(am__EXEEXT_323) $(am__EXEEXT_324) \
326 - $(am__EXEEXT_325) $(am__EXEEXT_326) $(am__EXEEXT_327) \
327 - $(am__EXEEXT_328) $(am__EXEEXT_329) $(am__EXEEXT_330) \
328 - $(am__EXEEXT_331) $(am__EXEEXT_332) $(am__EXEEXT_333) \
329 - probe.module$(EXEEXT) read.module$(EXEEXT) \
330 - search.module$(EXEEXT) search_fs_file.module$(EXEEXT) \
331 - search_fs_uuid.module$(EXEEXT) search_label.module$(EXEEXT) \
332 - $(am__EXEEXT_334) $(am__EXEEXT_335) $(am__EXEEXT_336) \
333 - $(am__EXEEXT_337) $(am__EXEEXT_338) $(am__EXEEXT_339) \
334 - $(am__EXEEXT_340) $(am__EXEEXT_341) $(am__EXEEXT_342) \
335 - $(am__EXEEXT_343) $(am__EXEEXT_344) $(am__EXEEXT_345) \
336 - $(am__EXEEXT_346) $(am__EXEEXT_347) $(am__EXEEXT_348) \
337 - $(am__EXEEXT_349) sleep.module$(EXEEXT) $(am__EXEEXT_350) \
338 - $(am__EXEEXT_351) terminal.module$(EXEEXT) \
339 - test.module$(EXEEXT) true.module$(EXEEXT) $(am__EXEEXT_352) \
340 - $(am__EXEEXT_353) $(am__EXEEXT_354) $(am__EXEEXT_355) \
341 - $(am__EXEEXT_356) $(am__EXEEXT_357) $(am__EXEEXT_358) \
342 - $(am__EXEEXT_359) $(am__EXEEXT_360) videoinfo.module$(EXEEXT) \
379 @@ -10474,7 +10474,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
380 kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \
381 kern/misc.c kern/parser.c kern/partition.c \
382 kern/rescue_parser.c kern/rescue_reader.c kern/term.c \
383 - kern/arm/startup.S kern/arm/coreboot/init.c \
384 + kern/verifiers.c kern/arm/startup.S kern/arm/coreboot/init.c \
385 kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \
386 lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \
387 term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \
388 @@ -10564,7 +10564,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
389 …ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
390 …eee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
391 …eee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
392 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
393 …rc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
394 …4_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
395 …ALSE@@COND_x86_64_efi_TRUE@am_kernel_exec_OBJECTS = kern/x86_64/efi/kernel_exec-startup.$(OBJEXT) \
396 …FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/i386/efi/kernel_exec-tsc.$(OBJEXT) \
397 …SE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/i386/kernel_exec-tsc_pmtimer.$(OBJEXT)…
398 @@ -10602,7 +10603,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
399 …fi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
400 …i_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
401 …i_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
402 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
403 …v64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
404 …_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
405 …D_sparc64_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/sparc64/ieee1275/kernel_exec-crt0.$(OBJEXT) \
406 …LSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/sparc64/kernel_exec-cache.$(OBJEXT) \
407 …_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/sparc64/kernel_exec-dl.$(OBJEXT) \
408 @@ -10639,7 +10641,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
409 …i_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
410 …_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
411 …_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
412 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
413 …32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
414 …efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
415 …ALSE@@COND_riscv64_efi_TRUE@am_kernel_exec_OBJECTS = kern/riscv/efi/kernel_exec-startup.$(OBJEXT) \
416 …5_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/riscv/efi/kernel_exec-init.$(OBJEXT) \
417 …ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \
418 @@ -10674,7 +10677,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
419 …ee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
420 …e1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
421 …e1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
422 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
423 …pc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
424 …ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
425 …ALSE@@COND_riscv32_efi_TRUE@am_kernel_exec_OBJECTS = kern/riscv/efi/kernel_exec-startup.$(OBJEXT) \
426 …SE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/riscv/efi/kernel_exec-init.$(OBJEXT) \
427 …ips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \
428 @@ -10710,7 +10714,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
429 …s_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
430 …_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
431 …_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
432 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
433 …u_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
434 …ips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
435 …owerpc_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/powerpc/ieee1275/kernel_exec-startup.$(OBJEXT) \
436 …@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/powerpc/kernel_exec-cache.$(OBJEXT) \
437 …LSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/powerpc/kernel_exec-dl.$(OBJEXT) \
438 @@ -10746,7 +10751,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
439 …ALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
440 …LSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
441 …LSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
442 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
443 …son_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
444 …_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
445 …_FALSE@@COND_mips_qemu_mips_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \
446 …OND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/mips/qemu_mips/kernel_exec-init.$(OBJEXT) \
447 …_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ term/kernel_exec-ns8250.$(OBJEXT) \
448 @@ -10785,7 +10791,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
449 …c_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
450 …_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
451 …_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
452 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
453 …ps_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
454 …arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
455 …c_FALSE@@COND_mips_loongson_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \
456 …D_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ term/kernel_exec-ns8250.$(OBJEXT) \
457 …ND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ bus/kernel_exec-bonito.$(OBJEXT) \
458 @@ -10838,7 +10845,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
459 …a64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
460 …64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
461 …64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
462 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
463 …OND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
464 …_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
465 …64_efi_FALSE@@COND_mips_arc_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \
466 …_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/mips/arc/kernel_exec-init.$(OBJEXT) \
467 …86_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ term/arc/kernel_exec-console.$(OBJEXT) \
468 @@ -10871,7 +10879,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
469 …i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
470 …386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
471 …386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
472 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
473 …COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
474 …D_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
475 …vh_FALSE@@COND_ia64_efi_TRUE@am_kernel_exec_OBJECTS = kern/ia64/efi/kernel_exec-startup.$(OBJEXT) \
476 …_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/ia64/efi/kernel_exec-init.$(OBJEXT) \
477 …D_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/ia64/kernel_exec-dl.$(OBJEXT) \
478 @@ -10906,7 +10915,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
479 …i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
480 …386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
481 …386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
482 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
483 …COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
484 …D_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
485 …E@@COND_i386_xen_pvh_TRUE@am_kernel_exec_OBJECTS = kern/i386/xen/kernel_exec-startup_pvh.$(OBJEXT)…
486 …_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/i386/kernel_exec-dl.$(OBJEXT) \
487 …i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ commands/kernel_exec-boot.$(OBJEXT) \
488 @@ -10940,7 +10950,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
489 …386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
490 …86_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
491 …86_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
492 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
493 …OND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
494 …_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
495 …mu_FALSE@@COND_i386_xen_TRUE@am_kernel_exec_OBJECTS = kern/i386/xen/kernel_exec-startup.$(OBJEXT) \
496 …@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/i386/kernel_exec-dl.$(OBJEXT) \
497 …pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/i386/xen/kernel_exec-hypercall.$(OBJEXT) \
498 @@ -10974,7 +10985,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
499 …OND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
500 …ND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
501 …ND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
502 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
503 …SE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
504 …@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
505 …_FALSE@@COND_i386_qemu_TRUE@am_kernel_exec_OBJECTS = kern/i386/qemu/kernel_exec-startup.$(OBJEXT) \
506 …ltiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/i386/qemu/kernel_exec-init.$(OBJEXT) \
507 …COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ bus/kernel_exec-pci.$(OBJEXT) \
508 @@ -11004,7 +11016,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
509 …86_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
510 …6_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
511 …6_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
512 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
513 …ND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
514 …i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
515 …boot_FALSE@@COND_i386_pc_TRUE@am_kernel_exec_OBJECTS = kern/i386/pc/kernel_exec-startup.$(OBJEXT) \
516 …1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/i386/pc/kernel_exec-init.$(OBJEXT) \
517 …1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/i386/pc/kernel_exec-mmap.$(OBJEXT) \
518 @@ -11032,7 +11045,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
519 …eee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
520 …ee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
521 …ee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
522 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
523 …386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
524 …_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
525 …OND_i386_multiboot_TRUE@am_kernel_exec_OBJECTS = kern/i386/coreboot/kernel_exec-startup.$(OBJEXT) \
526 …COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/i386/coreboot/kernel_exec-init.$(OBJEXT) \
527 …ALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/i386/pc/kernel_exec-acpi.$(OBJEXT) \
528 @@ -11062,7 +11076,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
529 …i_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
530 …_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
531 …_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
532 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
533 …86_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
534 …efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
535 …COND_i386_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/i386/ieee1275/kernel_exec-startup.$(OBJEXT) \
536 …t_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ disk/ieee1275/kernel_exec-ofdisk.$(OBJEXT) \
537 …ot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/ieee1275/kernel_exec-cmain.$(OBJEXT) \
538 @@ -11098,7 +11113,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
539 …oreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
540 …reboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
541 …reboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
542 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
543 …386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
544 …_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
545 …ot_FALSE@@COND_i386_efi_TRUE@am_kernel_exec_OBJECTS = kern/i386/efi/kernel_exec-startup.$(OBJEXT) \
546 …_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/i386/efi/kernel_exec-tsc.$(OBJEXT) \
547 …u_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/i386/kernel_exec-tsc_pmtimer.$(OBJEXT)…
548 @@ -11135,7 +11151,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
549 …OND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
550 …ND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
551 …ND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
552 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
553 …SE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
554 …@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
555 …COND_i386_coreboot_TRUE@am_kernel_exec_OBJECTS = kern/i386/coreboot/kernel_exec-startup.$(OBJEXT) \
556 …oot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/i386/coreboot/kernel_exec-init.$(OBJEXT) \
557 …arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/i386/pc/kernel_exec-acpi.$(OBJEXT) \
558 @@ -11178,7 +11195,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
559 …ND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
560 …D_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
561 …D_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
562 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
563 …E@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
564 …COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
565 …LSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@am_kernel_exec_OBJECTS = disk/kernel_exec-host.$(OBJEXT) \
566 …@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/emu/kernel_exec-cache_s.$(OBJEXT) \
567 …@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/emu/kernel_exec-hostdisk.$(OBJEXT) \
568 @@ -11219,7 +11237,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
569 …SE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
570 …E@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
571 …E@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
572 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu…
573 …t_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
574 …ALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
575 …rm_efi_FALSE@@COND_arm_uboot_TRUE@am_kernel_exec_OBJECTS = kern/arm/kernel_exec-startup.$(OBJEXT) \
576 …oreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/arm/uboot/kernel_exec-init.$(OBJEXT) \
577 …reboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/arm/uboot/kernel_exec-uboot.$(OBJEXT) \
578 @@ -11259,7 +11278,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
579 …arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
580 …rm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEX…
581 …rm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEX…
582 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kern…
583 …COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
584 …D_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
585 …boot_FALSE@@COND_arm_efi_TRUE@am_kernel_exec_OBJECTS = kern/arm/efi/kernel_exec-startup.$(OBJEXT) \
586 …@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/arm/efi/kernel_exec-init.$…
587 …@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJE…
588 @@ -11298,7 +11318,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
589 …@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-partition.$(OB…
590 …@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-rescue_parser.…
591 …@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-rescue_reader.…
592 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT)
593 +@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT)…
594 +@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-verifiers.$(OB…
595 …@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@am_kernel_exec_OBJECTS = kern/arm/kernel_exec-startu…
596 @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/arm/coreboot/kernel_exec-init.$(OBJEXT) \
597 @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/arm/coreboot/kernel_exec-timer.$(OBJEXT) \
598 @@ -11352,7 +11373,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
599 @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
600 @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \
601 @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \
602 -@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT)
603 +@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
604 +@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
605 @COND_arm64_efi_TRUE@am_kernel_exec_OBJECTS = kern/arm64/efi/kernel_exec-startup.$(OBJEXT) \
606 @COND_arm64_efi_TRUE@ kern/arm64/efi/kernel_exec-init.$(OBJEXT) \
607 @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \
608 @@ -11388,7 +11410,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
609 @COND_arm64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \
610 @COND_arm64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \
611 @COND_arm64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \
612 -@COND_arm64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT)
613 +@COND_arm64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \
614 +@COND_arm64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT)
615 …D_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT)
616 …c64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT)
617 …64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT)
618 @@ -13146,13 +13169,6 @@ vbe_module_OBJECTS = $(am_vbe_module_OBJECTS) \
621 $(vbe_module_LDFLAGS) $(LDFLAGS) -o $@
622 -am_verifiers_module_OBJECTS = \
623 - commands/verifiers_module-verifiers.$(OBJEXT)
624 -nodist_verifiers_module_OBJECTS =
625 -verifiers_module_OBJECTS = $(am_verifiers_module_OBJECTS) \
626 - $(nodist_verifiers_module_OBJECTS)
627 -verifiers_module_LINK = $(CCLD) $(verifiers_module_CFLAGS) $(CFLAGS) \
628 - $(verifiers_module_LDFLAGS) $(LDFLAGS) -o $@
629 am__vga_module_SOURCES_DIST = video/i386/pc/vga.c
631 @COND_i386_pc_TRUE@ video/i386/pc/vga_module-vga.$(OBJEXT)
632 @@ -13879,7 +13895,6 @@ SOURCES = $(acpi_module_SOURCES) $(nodist_acpi_module_SOURCES) \
636 - $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES) \
640 @@ -14089,8 +14104,7 @@ DIST_SOURCES = $(am__acpi_module_SOURCES_DIST) \
644 - $(am__vbe_module_SOURCES_DIST) $(verifiers_module_SOURCES) \
645 - $(am__vga_module_SOURCES_DIST) \
650 @@ -15497,38 +15511,38 @@ MOD_FILES = disk.mod trig.mod $(am__append_8) $(am__append_15) \
654 - verifiers.mod $(am__append_2045) $(am__append_2052) \
655 - $(am__append_2059) $(am__append_2066) $(am__append_2073) \
656 - $(am__append_2080) $(am__append_2087) $(am__append_2094) \
657 - $(am__append_2101) $(am__append_2108) help.mod hexdump.mod \
658 - keystatus.mod $(am__append_2115) $(am__append_2122) \
659 - loadenv.mod ls.mod lsmmap.mod $(am__append_2129) \
660 - $(am__append_2136) $(am__append_2143) $(am__append_2150) \
661 - $(am__append_2157) $(am__append_2164) $(am__append_2171) \
662 - $(am__append_2178) memrw.mod minicmd.mod parttool.mod \
663 - password.mod password_pbkdf2.mod $(am__append_2185) \
664 - $(am__append_2192) $(am__append_2199) $(am__append_2206) \
665 - $(am__append_2213) $(am__append_2220) $(am__append_2227) \
666 - $(am__append_2234) $(am__append_2241) $(am__append_2248) \
667 - $(am__append_2255) $(am__append_2262) $(am__append_2269) \
668 - $(am__append_2276) $(am__append_2283) $(am__append_2290) \
669 - $(am__append_2297) $(am__append_2304) $(am__append_2311) \
670 - $(am__append_2318) $(am__append_2325) probe.mod read.mod \
671 - search.mod search_fs_file.mod search_fs_uuid.mod \
672 - search_label.mod $(am__append_2332) $(am__append_2339) \
673 - $(am__append_2346) $(am__append_2353) $(am__append_2360) \
674 - $(am__append_2367) $(am__append_2374) $(am__append_2381) \
675 - $(am__append_2388) $(am__append_2395) $(am__append_2402) \
676 - $(am__append_2409) $(am__append_2416) $(am__append_2423) \
677 - $(am__append_2430) $(am__append_2437) sleep.mod \
678 - $(am__append_2444) $(am__append_2451) terminal.mod test.mod \
679 - true.mod $(am__append_2458) $(am__append_2465) \
680 - $(am__append_2472) $(am__append_2479) $(am__append_2486) \
681 - $(am__append_2493) $(am__append_2500) $(am__append_2507) \
682 - $(am__append_2514) videoinfo.mod videotest.mod xnu_uuid.mod \
683 - dm_nv.mod loopback.mod cryptodisk.mod luks.mod geli.mod \
684 - lvm.mod ldm.mod mdraid09.mod mdraid09_be.mod mdraid1x.mod \
685 - diskfilter.mod raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \
721 @@ -15809,8 +15823,7 @@ MODULE_FILES = disk.module$(EXEEXT) trig.module$(EXEEXT) \
725 - hashsum.module$(EXEEXT) pgp.module$(EXEEXT) \
726 - verifiers.module$(EXEEXT) $(am__append_2041) \
731 @@ -16164,7 +16177,7 @@ MARKER_FILES = disk.marker trig.marker $(am__append_9) \
735 - hashsum.marker pgp.marker verifiers.marker $(am__append_2046) \
740 @@ -16403,6 +16416,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \
748 @@ -16845,12 +16859,11 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \
752 - $(nodist_pgp_module_SOURCES) pgp.marker \
753 - $(nodist_verifiers_module_SOURCES) verifiers.marker \
754 - $(am__append_2044) $(am__append_2051) $(am__append_2058) \
755 - $(am__append_2065) $(am__append_2072) $(am__append_2079) \
756 - $(am__append_2086) $(am__append_2093) $(am__append_2100) \
757 - $(am__append_2107) $(nodist_help_module_SOURCES) help.marker \
766 @@ -17313,11 +17326,11 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \
770 - $(nodist_verifiers_module_SOURCES) $(am__append_2043) \
771 - $(am__append_2050) $(am__append_2057) $(am__append_2064) \
772 - $(am__append_2071) $(am__append_2078) $(am__append_2085) \
773 - $(am__append_2092) $(am__append_2099) $(am__append_2106) \
774 - $(nodist_help_module_SOURCES) $(nodist_hexdump_module_SOURCES) \
783 @@ -20070,14 +20083,6 @@ pgp_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE)
784 pgp_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) -I$(srcdir)/lib/posix_wrap
787 -verifiers_module_SOURCES = commands/verifiers.c ## platform sources
788 -nodist_verifiers_module_SOURCES = ## platform nodist sources
789 -verifiers_module_LDADD =
790 -verifiers_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
791 -verifiers_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE)
792 -verifiers_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE)
793 -verifiers_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE)
794 -verifiers_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
795 @COND_x86_64_efi_TRUE@shim_lock_module_SOURCES = commands/efi/shim_lock.c ## platform sources
798 @@ -25629,7 +25634,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
799 @COND_arm64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \
800 @COND_arm64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \
801 @COND_arm64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \
802 -@COND_arm64_efi_TRUE@ kern/rescue_reader.c kern/term.c
803 +@COND_arm64_efi_TRUE@ kern/rescue_reader.c kern/term.c \
804 +@COND_arm64_efi_TRUE@ kern/verifiers.c
806 @COND_arm_coreboot_TRUE@ kern/arm/coreboot/init.c \
807 @COND_arm_coreboot_TRUE@ kern/arm/coreboot/timer.c \
808 @@ -25660,7 +25666,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
809 @COND_arm_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \
810 @COND_arm_coreboot_TRUE@ kern/misc.c kern/parser.c \
811 @COND_arm_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \
812 -@COND_arm_coreboot_TRUE@ kern/rescue_reader.c kern/term.c
813 +@COND_arm_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \
814 +@COND_arm_coreboot_TRUE@ kern/verifiers.c
816 @COND_arm_efi_TRUE@ kern/arm/efi/init.c kern/efi/fdt.c \
817 @COND_arm_efi_TRUE@ kern/arm/dl.c kern/arm/dl_helper.c \
818 @@ -25678,7 +25685,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
819 @COND_arm_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \
820 @COND_arm_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \
821 @COND_arm_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \
822 -@COND_arm_efi_TRUE@ kern/term.c
823 +@COND_arm_efi_TRUE@ kern/term.c kern/verifiers.c
825 @COND_arm_uboot_TRUE@ kern/arm/uboot/init.c \
827 @@ -25698,7 +25705,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
828 @COND_arm_uboot_TRUE@ kern/file.c kern/fs.c kern/list.c \
829 @COND_arm_uboot_TRUE@ kern/main.c kern/misc.c kern/parser.c \
830 @COND_arm_uboot_TRUE@ kern/partition.c kern/rescue_parser.c \
831 -@COND_arm_uboot_TRUE@ kern/rescue_reader.c kern/term.c
832 +@COND_arm_uboot_TRUE@ kern/rescue_reader.c kern/term.c \
833 +@COND_arm_uboot_TRUE@ kern/verifiers.c
834 @COND_emu_TRUE@kernel_exec_SOURCES = disk/host.c kern/emu/cache_s.S \
835 @COND_emu_TRUE@ kern/emu/hostdisk.c osdep/unix/hostdisk.c \
836 @COND_emu_TRUE@ osdep/exec.c osdep/devmapper/hostdisk.c \
837 @@ -25714,7 +25722,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
838 @COND_emu_TRUE@ kern/fs.c kern/list.c kern/main.c kern/misc.c \
839 @COND_emu_TRUE@ kern/parser.c kern/partition.c \
840 @COND_emu_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \
841 -@COND_emu_TRUE@ kern/term.c
842 +@COND_emu_TRUE@ kern/term.c kern/verifiers.c
845 @COND_i386_coreboot_TRUE@ kern/i386/coreboot/init.c \
846 @@ -25739,7 +25747,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
847 @COND_i386_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \
848 @COND_i386_coreboot_TRUE@ kern/misc.c kern/parser.c \
849 @COND_i386_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \
850 -@COND_i386_coreboot_TRUE@ kern/rescue_reader.c kern/term.c
851 +@COND_i386_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \
852 +@COND_i386_coreboot_TRUE@ kern/verifiers.c
854 @COND_i386_efi_TRUE@ kern/i386/efi/tsc.c \
855 @COND_i386_efi_TRUE@ kern/i386/tsc_pmtimer.c \
856 @@ -25756,7 +25765,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
857 @COND_i386_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \
858 @COND_i386_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \
859 @COND_i386_efi_TRUE@ kern/partition.c kern/rescue_parser.c \
860 -@COND_i386_efi_TRUE@ kern/rescue_reader.c kern/term.c
861 +@COND_i386_efi_TRUE@ kern/rescue_reader.c kern/term.c \
862 +@COND_i386_efi_TRUE@ kern/verifiers.c
865 @COND_i386_ieee1275_TRUE@ disk/ieee1275/ofdisk.c \
866 @@ -25777,7 +25787,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
867 @COND_i386_ieee1275_TRUE@ kern/fs.c kern/list.c kern/main.c \
868 @COND_i386_ieee1275_TRUE@ kern/misc.c kern/parser.c \
869 @COND_i386_ieee1275_TRUE@ kern/partition.c kern/rescue_parser.c \
870 -@COND_i386_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c
871 +@COND_i386_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \
872 +@COND_i386_ieee1275_TRUE@ kern/verifiers.c
875 @COND_i386_multiboot_TRUE@ kern/i386/coreboot/init.c \
876 @@ -25796,7 +25807,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
877 @COND_i386_multiboot_TRUE@ kern/misc.c kern/parser.c \
878 @COND_i386_multiboot_TRUE@ kern/partition.c \
879 @COND_i386_multiboot_TRUE@ kern/rescue_parser.c \
880 -@COND_i386_multiboot_TRUE@ kern/rescue_reader.c kern/term.c
881 +@COND_i386_multiboot_TRUE@ kern/rescue_reader.c kern/term.c \
882 +@COND_i386_multiboot_TRUE@ kern/verifiers.c
884 @COND_i386_pc_TRUE@ kern/i386/pc/init.c kern/i386/pc/mmap.c \
885 @COND_i386_pc_TRUE@ term/i386/pc/console.c kern/i386/dl.c \
886 @@ -25808,7 +25820,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
887 @COND_i386_pc_TRUE@ kern/fs.c kern/list.c kern/main.c \
888 @COND_i386_pc_TRUE@ kern/misc.c kern/parser.c kern/partition.c \
889 @COND_i386_pc_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \
890 -@COND_i386_pc_TRUE@ kern/term.c
891 +@COND_i386_pc_TRUE@ kern/term.c kern/verifiers.c
893 @COND_i386_qemu_TRUE@ kern/i386/qemu/init.c bus/pci.c \
894 @COND_i386_qemu_TRUE@ kern/vga_init.c kern/i386/qemu/mmap.c \
895 @@ -25821,7 +25833,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
896 @COND_i386_qemu_TRUE@ kern/file.c kern/fs.c kern/list.c \
897 @COND_i386_qemu_TRUE@ kern/main.c kern/misc.c kern/parser.c \
898 @COND_i386_qemu_TRUE@ kern/partition.c kern/rescue_parser.c \
899 -@COND_i386_qemu_TRUE@ kern/rescue_reader.c kern/term.c
900 +@COND_i386_qemu_TRUE@ kern/rescue_reader.c kern/term.c \
901 +@COND_i386_qemu_TRUE@ kern/verifiers.c
903 @COND_i386_xen_TRUE@ kern/i386/dl.c kern/i386/xen/hypercall.S \
904 @COND_i386_xen_TRUE@ kern/i386/tsc.c kern/i386/xen/tsc.c \
905 @@ -25836,7 +25849,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
906 @COND_i386_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \
907 @COND_i386_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \
908 @COND_i386_xen_TRUE@ kern/partition.c kern/rescue_parser.c \
909 -@COND_i386_xen_TRUE@ kern/rescue_reader.c kern/term.c
910 +@COND_i386_xen_TRUE@ kern/rescue_reader.c kern/term.c \
911 +@COND_i386_xen_TRUE@ kern/verifiers.c
914 @COND_i386_xen_pvh_TRUE@ kern/i386/dl.c commands/boot.c \
915 @@ -25853,7 +25867,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
916 @COND_i386_xen_pvh_TRUE@ kern/fs.c kern/list.c kern/main.c \
917 @COND_i386_xen_pvh_TRUE@ kern/misc.c kern/parser.c \
918 @COND_i386_xen_pvh_TRUE@ kern/partition.c kern/rescue_parser.c \
919 -@COND_i386_xen_pvh_TRUE@ kern/rescue_reader.c kern/term.c
920 +@COND_i386_xen_pvh_TRUE@ kern/rescue_reader.c kern/term.c \
921 +@COND_i386_xen_pvh_TRUE@ kern/verifiers.c
923 @COND_ia64_efi_TRUE@ kern/ia64/efi/init.c kern/ia64/dl.c \
924 @COND_ia64_efi_TRUE@ kern/ia64/dl_helper.c kern/ia64/cache.c \
925 @@ -25868,7 +25883,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
926 @COND_ia64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \
927 @COND_ia64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \
928 @COND_ia64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \
929 -@COND_ia64_efi_TRUE@ kern/rescue_reader.c kern/term.c
930 +@COND_ia64_efi_TRUE@ kern/rescue_reader.c kern/term.c \
931 +@COND_ia64_efi_TRUE@ kern/verifiers.c
933 @COND_mips_arc_TRUE@ kern/mips/arc/init.c term/arc/console.c \
934 @COND_mips_arc_TRUE@ disk/arc/arcdisk.c \
935 @@ -25883,7 +25899,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
936 @COND_mips_arc_TRUE@ kern/file.c kern/fs.c kern/list.c \
937 @COND_mips_arc_TRUE@ kern/main.c kern/misc.c kern/parser.c \
938 @COND_mips_arc_TRUE@ kern/partition.c kern/rescue_parser.c \
939 -@COND_mips_arc_TRUE@ kern/rescue_reader.c kern/term.c
940 +@COND_mips_arc_TRUE@ kern/rescue_reader.c kern/term.c \
941 +@COND_mips_arc_TRUE@ kern/verifiers.c
943 @COND_mips_loongson_TRUE@ term/ns8250.c bus/bonito.c \
944 @COND_mips_loongson_TRUE@ bus/cs5536.c bus/pci.c \
945 @@ -25911,7 +25928,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
946 @COND_mips_loongson_TRUE@ kern/fs.c kern/list.c kern/main.c \
947 @COND_mips_loongson_TRUE@ kern/misc.c kern/parser.c \
948 @COND_mips_loongson_TRUE@ kern/partition.c kern/rescue_parser.c \
949 -@COND_mips_loongson_TRUE@ kern/rescue_reader.c kern/term.c
950 +@COND_mips_loongson_TRUE@ kern/rescue_reader.c kern/term.c \
951 +@COND_mips_loongson_TRUE@ kern/verifiers.c
953 @COND_mips_qemu_mips_TRUE@ kern/mips/qemu_mips/init.c \
954 @COND_mips_qemu_mips_TRUE@ term/ns8250.c term/serial.c \
955 @@ -25934,7 +25952,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
956 @COND_mips_qemu_mips_TRUE@ kern/misc.c kern/parser.c \
957 @COND_mips_qemu_mips_TRUE@ kern/partition.c \
958 @COND_mips_qemu_mips_TRUE@ kern/rescue_parser.c \
959 -@COND_mips_qemu_mips_TRUE@ kern/rescue_reader.c kern/term.c
960 +@COND_mips_qemu_mips_TRUE@ kern/rescue_reader.c kern/term.c \
961 +@COND_mips_qemu_mips_TRUE@ kern/verifiers.c
965 @@ -25959,7 +25978,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
966 @COND_powerpc_ieee1275_TRUE@ kern/main.c kern/misc.c \
967 @COND_powerpc_ieee1275_TRUE@ kern/parser.c kern/partition.c \
968 @COND_powerpc_ieee1275_TRUE@ kern/rescue_parser.c \
969 -@COND_powerpc_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c
970 +@COND_powerpc_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \
971 +@COND_powerpc_ieee1275_TRUE@ kern/verifiers.c
973 @COND_riscv32_efi_TRUE@ kern/riscv/efi/init.c kern/efi/fdt.c \
974 @COND_riscv32_efi_TRUE@ kern/riscv/cache.c \
975 @@ -25977,7 +25997,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
976 @COND_riscv32_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \
977 @COND_riscv32_efi_TRUE@ kern/misc.c kern/parser.c \
978 @COND_riscv32_efi_TRUE@ kern/partition.c kern/rescue_parser.c \
979 -@COND_riscv32_efi_TRUE@ kern/rescue_reader.c kern/term.c
980 +@COND_riscv32_efi_TRUE@ kern/rescue_reader.c kern/term.c \
981 +@COND_riscv32_efi_TRUE@ kern/verifiers.c
983 @COND_riscv64_efi_TRUE@ kern/riscv/efi/init.c kern/efi/fdt.c \
984 @COND_riscv64_efi_TRUE@ kern/riscv/cache.c \
985 @@ -25995,7 +26016,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
986 @COND_riscv64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \
987 @COND_riscv64_efi_TRUE@ kern/misc.c kern/parser.c \
988 @COND_riscv64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \
989 -@COND_riscv64_efi_TRUE@ kern/rescue_reader.c kern/term.c
990 +@COND_riscv64_efi_TRUE@ kern/rescue_reader.c kern/term.c \
991 +@COND_riscv64_efi_TRUE@ kern/verifiers.c
995 @@ -26021,7 +26043,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
996 @COND_sparc64_ieee1275_TRUE@ kern/main.c kern/misc.c \
997 @COND_sparc64_ieee1275_TRUE@ kern/parser.c kern/partition.c \
998 @COND_sparc64_ieee1275_TRUE@ kern/rescue_parser.c \
999 -@COND_sparc64_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c
1000 +@COND_sparc64_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \
1001 +@COND_sparc64_ieee1275_TRUE@ kern/verifiers.c
1003 @COND_x86_64_efi_TRUE@ kern/i386/efi/tsc.c \
1004 @COND_x86_64_efi_TRUE@ kern/i386/tsc_pmtimer.c \
1005 @@ -26040,7 +26063,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
1006 @COND_x86_64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \
1007 @COND_x86_64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \
1008 @COND_x86_64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \
1009 -@COND_x86_64_efi_TRUE@ kern/rescue_reader.c kern/term.c
1010 +@COND_x86_64_efi_TRUE@ kern/rescue_reader.c kern/term.c \
1011 +@COND_x86_64_efi_TRUE@ kern/verifiers.c
1013 @COND_x86_64_xen_TRUE@ kern/x86_64/dl.c \
1015 @@ -26056,7 +26080,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
1016 @COND_x86_64_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \
1017 @COND_x86_64_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \
1018 @COND_x86_64_xen_TRUE@ kern/partition.c kern/rescue_parser.c \
1019 -@COND_x86_64_xen_TRUE@ kern/rescue_reader.c kern/term.c
1020 +@COND_x86_64_xen_TRUE@ kern/rescue_reader.c kern/term.c \
1021 +@COND_x86_64_xen_TRUE@ kern/verifiers.c
1022 @COND_arm64_efi_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
1023 @COND_arm_coreboot_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
1024 @COND_arm_efi_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
1025 @@ -28051,6 +28076,8 @@ kern/kernel_exec-rescue_reader.$(OBJEXT): kern/$(am__dirstamp) \
1027 kern/kernel_exec-term.$(OBJEXT): kern/$(am__dirstamp) \
1029 +kern/kernel_exec-verifiers.$(OBJEXT): kern/$(am__dirstamp) \
1034 @@ -30171,12 +30198,6 @@ video/i386/pc/vbe_module-vbe.$(OBJEXT): video/i386/pc/$(am__dirstamp) \
1036 @rm -f vbe.module$(EXEEXT)
1038 -commands/verifiers_module-verifiers.$(OBJEXT): \
1039 - commands/$(am__dirstamp) commands/$(DEPDIR)/$(am__dirstamp)
1040 -
1041 -verifiers.module$(EXEEXT): $(verifiers_module_OBJECTS) $(verifiers_module_DEPENDENCIES) $(EXTRA_ve…
1042 - @rm -f verifiers.module$(EXEEXT)
1043 - $(AM_V_CCLD)$(verifiers_module_LINK) $(verifiers_module_OBJECTS) $(verifiers_module_LDADD) $(LIBS)
1044 video/i386/pc/vga_module-vga.$(OBJEXT): video/i386/pc/$(am__dirstamp) \
1047 @@ -30799,7 +30820,6 @@ distclean-compile:
1048 @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/tr_module-tr.Po@am__quote@
1049 @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/true_module-true.Po@am__quote@
1050 @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/usbtest_module-usbtest.Po@am__quote@
1051 -@AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/verifiers_module-verifiers.Po@am__quote@
1052 @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/videoinfo_module-videoinfo.Po@am__quote@
1053 @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/videotest_module-videotest.Po@am__quote@
1054 @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/xnu_uuid_module-xnu_uuid.Po@am__quote@
1055 @@ -30975,6 +30995,7 @@ distclean-compile:
1056 @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-rescue_reader.Po@am__quote@
1057 @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-term.Po@am__quote@
1058 @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-time.Po@am__quote@
1059 +@AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-verifiers.Po@am__quote@
1060 @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-vga_init.Po@am__quote@
1061 @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/xz_decompress_image-compiler-rt.Po@am__quote@
1062 @AMDEP_TRUE@@am__include@ @am__quote@kern/arm/$(DEPDIR)/kernel_exec-cache.Po@am__quote@
1063 @@ -35607,6 +35628,20 @@ kern/kernel_exec-term.obj: kern/term.c
1065 …$(CFLAGS) -c -o kern/kernel_exec-term.obj `if test -f 'kern/term.c'; then $(CYGPATH_W) 'kern/term.…
1067 +kern/kernel_exec-verifiers.o: kern/verifiers.c
1068 …-MT kern/kernel_exec-verifiers.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-verifiers.Tpo -c -o kern/k…
1069 …CC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-verifiers.Tpo kern/$(DEPDIR)/kernel_exec-v…
1070 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/verifiers.c' object='kern/kernel_exec-ver…
1072 …el_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-verifiers.o `test -f 'kern/verifiers.c' || echo '…
1074 +kern/kernel_exec-verifiers.obj: kern/verifiers.c
1075 …-MT kern/kernel_exec-verifiers.obj -MD -MP -MF kern/$(DEPDIR)/kernel_exec-verifiers.Tpo -c -o kern…
1076 …CC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-verifiers.Tpo kern/$(DEPDIR)/kernel_exec-v…
1077 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/verifiers.c' object='kern/kernel_exec-ver…
1079 …-c -o kern/kernel_exec-verifiers.obj `if test -f 'kern/verifiers.c'; then $(CYGPATH_W) 'kern/verif…
1081 kern/arm/coreboot/kernel_exec-init.o: kern/arm/coreboot/init.c
1082 …-MT kern/arm/coreboot/kernel_exec-init.o -MD -MP -MF kern/arm/coreboot/$(DEPDIR)/kernel_exec-init.…
1083 …t)$(am__mv) kern/arm/coreboot/$(DEPDIR)/kernel_exec-init.Tpo kern/arm/coreboot/$(DEPDIR)/kernel_ex…
1084 @@ -40983,20 +41018,6 @@ video/i386/pc/vbe_module-vbe.obj: video/i386/pc/vbe.c
1086 …-c -o video/i386/pc/vbe_module-vbe.obj `if test -f 'video/i386/pc/vbe.c'; then $(CYGPATH_W) 'video…
1088 -commands/verifiers_module-verifiers.o: commands/verifiers.c
1089 -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CP…
1090 -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/$(DEPDIR)/verifiers_module-verifiers.Tpo command…
1091 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/verifiers.c' object='commands/verifie…
1092 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1093 -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifie…
1094 -
1095 -commands/verifiers_module-verifiers.obj: commands/verifiers.c
1096 -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CP…
1097 -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/$(DEPDIR)/verifiers_module-verifiers.Tpo command…
1098 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/verifiers.c' object='commands/verifie…
1099 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1100 -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifie…
1101 -
1102 video/i386/pc/vga_module-vga.o: video/i386/pc/vga.c
1103 …-MT video/i386/pc/vga_module-vga.o -MD -MP -MF video/i386/pc/$(DEPDIR)/vga_module-vga.Tpo -c -o vi…
1104 …$(AM_V_at)$(am__mv) video/i386/pc/$(DEPDIR)/vga_module-vga.Tpo video/i386/pc/$(DEPDIR)/vga_module-…
1105 @@ -43717,10 +43738,6 @@ pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES)
1106 …GET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_mod…
1107 grep 'MARKER' $@.new > $@; rm -f $@.new
1109 -verifiers.marker: $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES)
1110 - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(v…
1111 - grep 'MARKER' $@.new > $@; rm -f $@.new
1112 -
1114 …_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_…
1115 @COND_x86_64_efi_TRUE@ grep 'MARKER' $@.new > $@; rm -f $@.new
1116 diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c
1119 --- a/grub-core/commands/verifiers.c
1121 @@ -1,228 +0,0 @@
1122 -/*
1123 - * GRUB -- GRand Unified Bootloader
1124 - * Copyright (C) 2017 Free Software Foundation, Inc.
1125 - *
1126 - * GRUB is free software: you can redistribute it and/or modify
1127 - * it under the terms of the GNU General Public License as published by
1128 - * the Free Software Foundation, either version 3 of the License, or
1129 - * (at your option) any later version.
1130 - *
1131 - * GRUB is distributed in the hope that it will be useful,
1132 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
1133 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1134 - * GNU General Public License for more details.
1135 - *
1136 - * You should have received a copy of the GNU General Public License
1137 - * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
1138 - *
1139 - * Verifiers helper.
1140 - */
1141 -
1142 -#include <grub/file.h>
1143 -#include <grub/verify.h>
1144 -#include <grub/dl.h>
1145 -
1146 -GRUB_MOD_LICENSE ("GPLv3+");
1147 -
1148 -struct grub_file_verifier *grub_file_verifiers;
1149 -
1150 -struct grub_verified
1151 -{
1152 - grub_file_t file;
1153 - void *buf;
1154 -};
1155 -typedef struct grub_verified *grub_verified_t;
1156 -
1157 -static void
1158 -verified_free (grub_verified_t verified)
1159 -{
1160 - if (verified)
1161 - {
1162 - grub_free (verified->buf);
1163 - grub_free (verified);
1164 - }
1165 -}
1166 -
1167 -static grub_ssize_t
1168 -verified_read (struct grub_file *file, char *buf, grub_size_t len)
1169 -{
1170 - grub_verified_t verified = file->data;
1171 -
1172 - grub_memcpy (buf, (char *) verified->buf + file->offset, len);
1173 - return len;
1174 -}
1175 -
1176 -static grub_err_t
1177 -verified_close (struct grub_file *file)
1178 -{
1179 - grub_verified_t verified = file->data;
1180 -
1181 - grub_file_close (verified->file);
1182 - verified_free (verified);
1183 - file->data = 0;
1184 -
1185 - /* Device and name are freed by parent. */
1186 - file->device = 0;
1187 - file->name = 0;
1188 -
1189 - return grub_errno;
1190 -}
1191 -
1192 -struct grub_fs verified_fs =
1193 -{
1194 - .name = "verified_read",
1195 - .fs_read = verified_read,
1196 - .fs_close = verified_close
1197 -};
1198 -
1199 -static grub_file_t
1200 -grub_verifiers_open (grub_file_t io, enum grub_file_type type)
1201 -{
1202 - grub_verified_t verified = NULL;
1203 - struct grub_file_verifier *ver;
1204 - void *context;
1205 - grub_file_t ret = 0;
1206 - grub_err_t err;
1207 - int defer = 0;
1208 -
1209 - grub_dprintf ("verify", "file: %s type: %d\n", io->name, type);
1210 -
1211 - if ((type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_SIGNATURE
1212 - || (type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_VERIFY_SIGNATURE
1213 - || (type & GRUB_FILE_TYPE_SKIP_SIGNATURE))
1214 - return io;
1215 -
1216 - if (io->device->disk &&
1217 - (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID
1218 - || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID))
1219 - return io;
1220 -
1221 - FOR_LIST_ELEMENTS(ver, grub_file_verifiers)
1222 - {
1223 - enum grub_verify_flags flags = 0;
1224 - err = ver->init (io, type, &context, &flags);
1225 - if (err)
1226 - goto fail_noclose;
1227 - if (flags & GRUB_VERIFY_FLAGS_DEFER_AUTH)
1228 - {
1229 - defer = 1;
1230 - continue;
1231 - }
1232 - if (!(flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION))
1233 - break;
1234 - }
1235 -
1236 - if (!ver)
1237 - {
1238 - if (defer)
1239 - {
1240 - grub_error (GRUB_ERR_ACCESS_DENIED,
1241 - N_("verification requested but nobody cares: %s"), io->name);
1242 - goto fail_noclose;
1243 - }
1244 -
1245 - /* No verifiers wanted to verify. Just return underlying file. */
1246 - return io;
1247 - }
1248 -
1249 - ret = grub_malloc (sizeof (*ret));
1250 - if (!ret)
1251 - {
1252 - goto fail;
1253 - }
1254 - *ret = *io;
1255 -
1256 - ret->fs = &verified_fs;
1257 - ret->not_easily_seekable = 0;
1258 - if (ret->size >> (sizeof (grub_size_t) * GRUB_CHAR_BIT - 1))
1259 - {
1260 - grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
1261 - N_("big file signature isn't implemented yet"));
1262 - goto fail;
1263 - }
1264 - verified = grub_malloc (sizeof (*verified));
1265 - if (!verified)
1266 - {
1267 - goto fail;
1268 - }
1269 - verified->buf = grub_malloc (ret->size);
1270 - if (!verified->buf)
1271 - {
1272 - goto fail;
1273 - }
1274 - if (grub_file_read (io, verified->buf, ret->size) != (grub_ssize_t) ret->size)
1275 - {
1276 - if (!grub_errno)
1277 - grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
1278 - io->name);
1279 - goto fail;
1280 - }
1281 -
1282 - err = ver->write (context, verified->buf, ret->size);
1283 - if (err)
1284 - goto fail;
1285 -
1286 - err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE;
1287 - if (err)
1288 - goto fail;
1289 -
1290 - if (ver->close)
1291 - ver->close (context);
1292 -
1293 - FOR_LIST_ELEMENTS_NEXT(ver, grub_file_verifiers)
1294 - {
1295 - enum grub_verify_flags flags = 0;
1296 - err = ver->init (io, type, &context, &flags);
1297 - if (err)
1298 - goto fail_noclose;
1299 - if (flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION ||
1300 - /* Verification done earlier. So, we are happy here. */
1301 - flags & GRUB_VERIFY_FLAGS_DEFER_AUTH)
1302 - continue;
1303 - err = ver->write (context, verified->buf, ret->size);
1304 - if (err)
1305 - goto fail;
1306 -
1307 - err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE;
1308 - if (err)
1309 - goto fail;
1310 -
1311 - if (ver->close)
1312 - ver->close (context);
1313 - }
1314 -
1315 - verified->file = io;
1316 - ret->data = verified;
1317 - return ret;
1318 -
1319 - fail:
1320 - ver->close (context);
1321 - fail_noclose:
1322 - verified_free (verified);
1323 - grub_free (ret);
1324 - return NULL;
1325 -}
1326 -
1327 -grub_err_t
1328 -grub_verify_string (char *str, enum grub_verify_string_type type)
1329 -{
1330 - struct grub_file_verifier *ver;
1331 - FOR_LIST_ELEMENTS(ver, grub_file_verifiers)
1332 - {
1333 - grub_err_t err;
1334 - err = ver->verify_string ? ver->verify_string (str, type) : GRUB_ERR_NONE;
1335 - if (err)
1336 - return err;
1337 - }
1338 - return GRUB_ERR_NONE;
1339 -}
1340 -
1341 -GRUB_MOD_INIT(verifiers)
1342 -{
1343 - grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open);
1344 -}
1345 -
1346 -GRUB_MOD_FINI(verifiers)
1347 -{
1348 - grub_file_filter_unregister (GRUB_FILE_FILTER_VERIFY);
1349 -}
1350 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
1352 --- a/grub-core/kern/main.c
1353 +++ b/grub-core/kern/main.c
1354 @@ -29,6 +29,7 @@
1362 @@ -274,6 +275,9 @@ grub_main (void)
1372 diff --git a/grub-core/kern/verifiers.c b/grub-core/kern/verifiers.c
1375 --- /dev/null
1376 +++ b/grub-core/kern/verifiers.c
1377 @@ -0,0 +1,224 @@
1379 + * GRUB -- GRand Unified Bootloader
1380 + * Copyright (C) 2017 Free Software Foundation, Inc.
1418 + grub_free (verified->buf);
1426 + grub_verified_t verified = file->data;
1428 + grub_memcpy (buf, (char *) verified->buf + file->offset, len);
1435 + grub_verified_t verified = file->data;
1437 + grub_file_close (verified->file);
1439 + file->data = 0;
1442 + file->device = 0;
1443 + file->name = 0;
1465 + grub_dprintf ("verify", "file: %s type: %d\n", io->name, type);
1472 + if (io->device->disk &&
1473 + (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID
1474 + || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID))
1480 + err = ver->init (io, type, &context, &flags);
1497 + N_("verification requested but nobody cares: %s"), io->name);
1512 + ret->fs = &verified_fs;
1513 + ret->not_easily_seekable = 0;
1514 + if (ret->size >> (sizeof (grub_size_t) * GRUB_CHAR_BIT - 1))
1525 + verified->buf = grub_malloc (ret->size);
1526 + if (!verified->buf)
1530 + if (grub_file_read (io, verified->buf, ret->size) != (grub_ssize_t) ret->size)
1534 + io->name);
1538 + err = ver->write (context, verified->buf, ret->size);
1542 + err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE;
1546 + if (ver->close)
1547 + ver->close (context);
1552 + err = ver->init (io, type, &context, &flags);
1559 + err = ver->write (context, verified->buf, ret->size);
1563 + err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE;
1567 + if (ver->close)
1568 + ver->close (context);
1571 + verified->file = io;
1572 + ret->data = verified;
1576 + ver->close (context);
1590 + err = ver->verify_string ? ver->verify_string (str, type) : GRUB_ERR_NONE;
1602 diff --git a/include/grub/verify.h b/include/grub/verify.h
1604 --- a/include/grub/verify.h
1606 @@ -64,7 +64,10 @@ struct grub_file_verifier
1610 -extern struct grub_file_verifier *grub_file_verifiers;
1618 @@ -78,7 +81,7 @@ grub_verifier_unregister (struct grub_file_verifier *ver)
1622 -grub_err_t
1623 -grub_verify_string (char *str, enum grub_verify_string_type type);
1628 diff --git a/po/POTFILES.in b/po/POTFILES.in
1630 --- a/po/POTFILES.in
1632 @@ -107,7 +107,6 @@
1633 ./grub-core/commands/tr.c
1634 ./grub-core/commands/true.c
1635 ./grub-core/commands/usbtest.c
1636 -./grub-core/commands/verifiers.c
1637 ./grub-core/commands/videoinfo.c
1638 ./grub-core/commands/videotest.c
1639 ./grub-core/commands/wildcard.c
1640 @@ -334,6 +333,7 @@
1641 ./grub-core/kern/uboot/hw.c
1642 ./grub-core/kern/uboot/init.c
1643 ./grub-core/kern/uboot/uboot.c
1644 +./grub-core/kern/verifiers.c
1645 ./grub-core/kern/vga_init.c
1646 ./grub-core/kern/x86_64/dl.c
1647 ./grub-core/kern/xen/init.c
1648 --