proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-08-10 09:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated version 13~git1505328971.0780644a from 'upstream/13_git1505328971.0780644a'

Browse Source 
with Debian dir 8d0dcc2dc4
This commit is contained in:
Mathieu Trudel-Lapierre 2017-09-14 17:48:49 -07:00
commit 695f919503
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,4 +1,4 @@
VERSION = 13 VERSION = 12
ifneq ($(origin RELEASE),undefined) ifneq ($(origin RELEASE),undefined)
DASHRELEASE ?= -$(RELEASE) DASHRELEASE ?= -$(RELEASE)
else else
@ -167,6 +167,7 @@ shim.crt:
shim.cer: shim.crt shim.cer: shim.crt
$(OPENSSL) x509 -outform der -in $< -out $@ $(OPENSSL) x509 -outform der -in $< -out $@
.NOTPARALLEL: shim_cert.h
shim_cert.h: shim.cer shim_cert.h: shim.cer
echo "static UINT8 shim_cert[] = {" > $@ echo "static UINT8 shim_cert[] = {" > $@
$(HEXDUMP) -v -e '1/1 "0x%02x, "' $< >> $@ $(HEXDUMP) -v -e '1/1 "0x%02x, "' $< >> $@
@ -332,7 +333,7 @@ clean:
$(MAKE) -C Cryptlib -f $(TOPDIR)/Cryptlib/Makefile clean $(MAKE) -C Cryptlib -f $(TOPDIR)/Cryptlib/Makefile clean
$(MAKE) -C Cryptlib/OpenSSL -f $(TOPDIR)/Cryptlib/OpenSSL/Makefile clean $(MAKE) -C Cryptlib/OpenSSL -f $(TOPDIR)/Cryptlib/OpenSSL/Makefile clean
$(MAKE) -C lib -f $(TOPDIR)/lib/Makefile clean $(MAKE) -C lib -f $(TOPDIR)/lib/Makefile clean
rm -rf $(TARGET) $(OBJS) $(MOK_OBJS) $(FALLBACK_OBJS) $(KEYS) certdb rm -rf $(TARGET) $(OBJS) $(MOK_OBJS) $(FALLBACK_OBJS) $(KEYS) certdb $(BOOTCSVNAME)
rm -f *.debug *.so *.efi *.tar.* version.c rm -f *.debug *.so *.efi *.tar.* version.c
GITTAG = $(VERSION) GITTAG = $(VERSION)

2
commit
View File

@ -1 +1 @@
9c1c35c588d5d2aaba60aa33287d4dfae5d0f4c1 35fd2c170cadfd50670d55fbcbf9cb2f4d4f1868

3
errlog.c
View File

@ -68,6 +68,9 @@ PrintErrors(VOID)
{ {
UINTN i; UINTN i;
if (!verbose)
return;
for (i = 0; i < nerrs; i++) for (i = 0; i < nerrs; i++)
Print(L"%s", errs[i]); Print(L"%s", errs[i]);
} }

9
lib/console.c
View File

@ -312,8 +312,7 @@ console_errorbox(CHAR16 *err)
err_arr[2] = err; err_arr[2] = err;
//console_alertbox(err_arr); console_alertbox(err_arr);
Print(L"%s\n", err_arr[2]);
} }
void void
@ -326,8 +325,7 @@ console_notify(CHAR16 *string)
str_arr[0] = string; str_arr[0] = string;
//console_alertbox(str_arr); console_alertbox(str_arr);
Print(L"%s\n", str_arr[0]);
} }
#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
@ -406,8 +404,7 @@ console_error(CHAR16 *err, EFI_STATUS status)
err_arr[2] = str; err_arr[2] = str;
//console_alertbox(err_arr); console_alertbox(err_arr);
Print(L"%s\n", err_arr[2]);
} }
void void

2
shim.c
View File

@ -950,7 +950,7 @@ static EFI_STATUS generate_hash (char *data, unsigned int datasize_in,
SumOfBytesHashed += hashsize; SumOfBytesHashed += hashsize;
} }
#if 0 #if 0 // we have to migrate to doing this later :/
/* Hash all remaining data */ /* Hash all remaining data */
if (datasize > SumOfBytesHashed) { if (datasize > SumOfBytesHashed) {
hashbase = data + SumOfBytesHashed; hashbase = data + SumOfBytesHashed;