diff options
author | James Bottomley <JBottomley@Parallels.com> | 2012-12-12 00:08:15 +0000 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-12-12 00:08:15 +0000 |
commit | 4f431262cb5a84934dee1158624378d840c421e8 (patch) | |
tree | d0000c6bbd3a3b334d2263ffe341c01858f04d0c | |
parent | 456d3e5656d853115101cd3f0c26519cf2124c75 (diff) | |
parent | 1ab89208fca8bb431a7681e87b63ceedca5cfec9 (diff) | |
download | efitools-4f431262cb5a84934dee1158624378d840c421e8.tar.gz |
Merge tag 'v1.2.3'
version: 1.2.3
Merge fixes from 1.2.3 into main trunk
-rw-r--r-- | HashTool.c | 2 | ||||
-rw-r--r-- | KeyTool.c | 2 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | SetNull.c | 11 | ||||
-rw-r--r-- | include/version.h | 2 | ||||
-rw-r--r-- | lib/simple_file.c | 2 |
6 files changed, 17 insertions, 4 deletions
@@ -70,7 +70,7 @@ enroll_hash(void) L"This means it will Subsequently Boot with no prompting", L"Remember to make sure it is a genuine binary before Enroling its hash", NULL - }, L"\\", NULL, &file_name); + }, L"\\", L"", &file_name); if (!file_name) /* user pressed ESC */ @@ -97,7 +97,7 @@ select_and_apply(CHAR16 **title, CHAR16 *ext, int key, UINTN options) EFI_HANDLE h = NULL; int use_setsecurevariable = 0; - simple_file_selector(&h, title, NULL, ext, &file_name); + simple_file_selector(&h, title, L"\\", ext, &file_name); if (file_name == NULL) return; @@ -1,5 +1,5 @@ EFIFILES = HelloWorld.efi LockDown.efi Loader.efi ReadVars.efi UpdateVars.efi \ - KeyTool.efi HashTool.efi PreLoader.efi + KeyTool.efi HashTool.efi PreLoader.efi SetNull.efi BINARIES = cert-to-efi-sig-list sig-list-to-certs sign-efi-sig-list \ hash-to-efi-sig-list diff --git a/SetNull.c b/SetNull.c new file mode 100644 index 0000000..566fac0 --- /dev/null +++ b/SetNull.c @@ -0,0 +1,11 @@ +#include <efi.h> + +EFI_STATUS +efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab) +{ + int *test = NULL; + + *test = 0x123; + + return EFI_SUCCESS; +} diff --git a/include/version.h b/include/version.h index b3db040..2145d42 100644 --- a/include/version.h +++ b/include/version.h @@ -1,4 +1,4 @@ -#define VERSION "1.2.1" +#define VERSION "1.2.3" static void version(const char *progname) diff --git a/lib/simple_file.c b/lib/simple_file.c index 53530e6..40ebf27 100644 --- a/lib/simple_file.c +++ b/lib/simple_file.c @@ -405,6 +405,8 @@ simple_file_selector(EFI_HANDLE *im, CHAR16 **title, CHAR16 *name, *result = NULL; if (!name) name = L"\\"; + if (!filter) + filter = L""; if (!*im) { EFI_HANDLE h; CHAR16 *volname; |