|
Lines 1-6
Link Here
|
| 1 |
--- MokManager.c.orig 2015-06-30 18:20:12 UTC |
1 |
--- MokManager.c.orig 2015-06-30 18:20:12 UTC |
| 2 |
+++ MokManager.c |
2 |
+++ MokManager.c |
| 3 |
@@ -588,11 +588,11 @@ static void show_mok_info (EFI_GUID Type |
3 |
@@ -588,11 +588,11 @@ static void show_mok_info (EFI_GUID Type, void *Mok, U |
| 4 |
|
4 |
|
| 5 |
static EFI_STATUS list_keys (void *KeyList, UINTN KeyListSize, CHAR16 *title) |
5 |
static EFI_STATUS list_keys (void *KeyList, UINTN KeyListSize, CHAR16 *title) |
| 6 |
{ |
6 |
{ |
|
Lines 14-16
Link Here
|
| 14 |
|
14 |
|
| 15 |
if (KeyListSize < (sizeof(EFI_SIGNATURE_LIST) + |
15 |
if (KeyListSize < (sizeof(EFI_SIGNATURE_LIST) + |
| 16 |
sizeof(EFI_SIGNATURE_DATA))) { |
16 |
sizeof(EFI_SIGNATURE_DATA))) { |
|
|
17 |
@@ -1037,7 +1037,8 @@ static EFI_STATUS write_back_mok_list (MokListNode *li |
| 18 |
continue; |
| 19 |
|
| 20 |
DataSize += sizeof(EFI_SIGNATURE_LIST); |
| 21 |
- if (CompareGuid(&(list[i].Type), &CertType) == 0) |
| 22 |
+ if (CompareMem(&(list[i].Type), &CertType, |
| 23 |
+ sizeof(EFI_GUID)) == 0) |
| 24 |
DataSize += sizeof(EFI_GUID); |
| 25 |
DataSize += list[i].MokSize; |
| 26 |
} |
| 27 |
@@ -1059,7 +1060,8 @@ static EFI_STATUS write_back_mok_list (MokListNode *li |
| 28 |
CertList->SignatureType = list[i].Type; |
| 29 |
CertList->SignatureHeaderSize = 0; |
| 30 |
|
| 31 |
- if (CompareGuid(&(list[i].Type), &CertType) == 0) { |
| 32 |
+ if (CompareMem(&(list[i].Type), &CertType, |
| 33 |
+ sizeof(EFI_GUID)) == 0) { |
| 34 |
CertList->SignatureListSize = list[i].MokSize + |
| 35 |
sizeof(EFI_SIGNATURE_LIST) + |
| 36 |
sizeof(EFI_GUID); |
| 37 |
@@ -1100,7 +1102,8 @@ static void delete_cert (void *key, UINT32 key_size, |
| 38 |
int i; |
| 39 |
|
| 40 |
for (i = 0; i < mok_num; i++) { |
| 41 |
- if (CompareGuid(&(mok[i].Type), &CertType) != 0) |
| 42 |
+ if (CompareMem(&(mok[i].Type), &CertType, |
| 43 |
+ sizeof(EFI_GUID)) != 0) |
| 44 |
continue; |
| 45 |
|
| 46 |
if (mok[i].MokSize == key_size && |
| 47 |
@@ -1151,7 +1154,7 @@ static void delete_hash_in_list (EFI_GUID Type, UINT8 |
| 48 |
sig_size = hash_size + sizeof(EFI_GUID); |
| 49 |
|
| 50 |
for (i = 0; i < mok_num; i++) { |
| 51 |
- if ((CompareGuid(&(mok[i].Type), &Type) != 0) || |
| 52 |
+ if ((CompareMem(&(mok[i].Type), &Type, sizeof(EFI_GUID)) != 0) || |
| 53 |
(mok[i].MokSize < sig_size)) |
| 54 |
continue; |
| 55 |
|
| 56 |
@@ -1322,7 +1325,8 @@ static EFI_STATUS delete_keys (void *MokDel, UINTN Mok |
| 57 |
|
| 58 |
/* Search and destroy */ |
| 59 |
for (i = 0; i < del_num; i++) { |
| 60 |
- if (CompareGuid(&(del_key[i].Type), &CertType) == 0) { |
| 61 |
+ if (CompareMem(&(del_key[i].Type), &CertType, |
| 62 |
+ sizeof(EFI_GUID)) == 0) { |
| 63 |
delete_cert(del_key[i].Mok, del_key[i].MokSize, |
| 64 |
mok, mok_num); |
| 65 |
} else if (is_sha2_hash(del_key[i].Type)) { |