b8cbae7e99
- updated shim to new version (OpenSSL 0.9.8za) and requested a new certificate from Microsoft. Removed * shim-allow-fallback-use-system-loadimage.patch * shim-bnc872503-check-key-encoding.patch * shim-bnc877003-fetch-from-the-same-device.patch * shim-correct-user_insecure-usage.patch * shim-fallback-avoid-duplicate-bootorder.patch * shim-fallback-improve-entries-creation.patch * shim-fix-dhcpv4-path-generation.patch * shim-fix-uninitialized-variable.patch * shim-fix-verify-mok.patch * shim-get-variable-check.patch * shim-improve-error-messages.patch * shim-mokmanager-delete-bs-var-right.patch * shim-mokmanager-handle-keystroke-error.patch * shim-remove-unused-variables.patch since they're included in upstream and rebased the remaining onces. Added shim-signed-unsigned-compares.patch to fix some compiler warnings OBS-URL: https://build.opensuse.org/request/show/244530 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=81
52 lines
1.2 KiB
Diff
52 lines
1.2 KiB
Diff
Index: shim-0.7/MokManager.c
|
|
===================================================================
|
|
--- shim-0.7.orig/MokManager.c
|
|
+++ shim-0.7/MokManager.c
|
|
@@ -483,8 +483,8 @@ static void show_efi_hash (EFI_GUID Type
|
|
UINTN hash_num;
|
|
UINT8 *hash;
|
|
CHAR16 **menu_strings;
|
|
- int key_num = 0;
|
|
- int i;
|
|
+ UINTN key_num = 0;
|
|
+ UINTN i;
|
|
|
|
sig_size = sha_size(Type) + sizeof(EFI_GUID);
|
|
if ((MokSize % sig_size) != 0) {
|
|
@@ -562,7 +562,7 @@ static EFI_STATUS list_keys (void *KeyLi
|
|
{
|
|
UINT32 MokNum = 0;
|
|
MokListNode *keys = NULL;
|
|
- int key_num = 0;
|
|
+ UINT32 key_num = 0;
|
|
CHAR16 **menu_strings;
|
|
unsigned int i;
|
|
|
|
@@ -1088,7 +1088,7 @@ static int match_hash (UINT8 *hash, UINT
|
|
void *hash_list, UINT32 list_num)
|
|
{
|
|
UINT8 *ptr;
|
|
- int i;
|
|
+ UINTN i;
|
|
|
|
ptr = hash_list + sizeof(EFI_GUID);
|
|
for (i = start; i < list_num; i++) {
|
|
@@ -1103,7 +1103,7 @@ static int match_hash (UINT8 *hash, UINT
|
|
static void mem_move (void *dest, void *src, UINTN size)
|
|
{
|
|
UINT8 *d, *s;
|
|
- int i;
|
|
+ UINTN i;
|
|
|
|
d = (UINT8 *)dest;
|
|
s = (UINT8 *)src;
|
|
@@ -1160,7 +1160,7 @@ static void delete_hash_list (EFI_GUID T
|
|
UINT32 hash_num;
|
|
UINT32 sig_size;
|
|
UINT8 *hash;
|
|
- int i;
|
|
+ UINT32 i;
|
|
|
|
hash_size = sha_size (Type);
|
|
sig_size = hash_size + sizeof(EFI_GUID);
|