proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-08-11 16:56:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MokManager: Write the hash list properly

Browse Source 
also return to the previous entry in the list

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
This commit is contained in:
Gary Ching-Pang Lin 2015-06-16 11:41:32 -04:00 committed by Peter Jones
parent c9261eab2a
commit c9cf07a0e0
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MokManager.c
View File

@ -471,12 +471,12 @@ static void show_efi_hash (void *Mok, UINTN MokSize)
for (i=0; i<hash_num; i++) { for (i=0; i<hash_num; i++) {
menu_strings[i] = PoolPrint(L"View hash %d", i); menu_strings[i] = PoolPrint(L"View hash %d", i);
} }
menu_strings[i] = StrDuplicate(L"Continue"); menu_strings[i] = StrDuplicate(L"Back");
menu_strings[i+1] = NULL; menu_strings[i+1] = NULL;
while (key_num < hash_num) { while (key_num < hash_num) {
key_num = console_select((CHAR16 *[]){ L"[Hash List]", NULL }, key_num = console_select((CHAR16 *[]){ L"[Hash List]", NULL },
menu_strings, 0); menu_strings, key_num);
if (key_num < 0 || key_num >= hash_num) if (key_num < 0 || key_num >= hash_num)
break; break;
@ -561,7 +561,7 @@ static EFI_STATUS list_keys (void *KeyList, UINTN KeyListSize, CHAR16 *title)
while (key_num < MokNum) { while (key_num < MokNum) {
key_num = console_select((CHAR16 *[]){ title, NULL }, key_num = console_select((CHAR16 *[]){ title, NULL },
menu_strings, 0); menu_strings, key_num);
if (key_num < 0 || key_num >= MokNum) if (key_num < 0 || key_num >= MokNum)
break; break;
@ -954,6 +954,7 @@ static EFI_STATUS write_back_mok_list (MokListNode *list, INTN key_num,
BOOLEAN MokX) BOOLEAN MokX)
{ {
EFI_GUID shim_lock_guid = SHIM_LOCK_GUID; EFI_GUID shim_lock_guid = SHIM_LOCK_GUID;
EFI_GUID CertType = X509_GUID;
EFI_STATUS efi_status; EFI_STATUS efi_status;
EFI_SIGNATURE_LIST *CertList; EFI_SIGNATURE_LIST *CertList;
EFI_SIGNATURE_DATA *CertData; EFI_SIGNATURE_DATA *CertData;
@ -990,17 +991,24 @@ static EFI_STATUS write_back_mok_list (MokListNode *list, INTN key_num,
sizeof(EFI_SIGNATURE_LIST)); sizeof(EFI_SIGNATURE_LIST));
CertList->SignatureType = list[i].Type; CertList->SignatureType = list[i].Type;
CertList->SignatureHeaderSize = 0;
if (CompareGuid(&(list[i].Type), &CertType) == 0) {
CertList->SignatureListSize = list[i].MokSize + CertList->SignatureListSize = list[i].MokSize +
sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_LIST) +
sizeof(EFI_SIGNATURE_DATA) - 1; sizeof(EFI_GUID);
CertList->SignatureHeaderSize = 0;
CertList->SignatureSize = list[i].MokSize + sizeof(EFI_GUID); CertList->SignatureSize = list[i].MokSize + sizeof(EFI_GUID);
CertData->SignatureOwner = shim_lock_guid; CertData->SignatureOwner = shim_lock_guid;
CopyMem(CertData->SignatureData, list[i].Mok, list[i].MokSize); CopyMem(CertData->SignatureData, list[i].Mok, list[i].MokSize);
} else {
CertList->SignatureListSize = list[i].MokSize +
sizeof(EFI_SIGNATURE_LIST);
CertList->SignatureSize = SHA256_DIGEST_SIZE + sizeof(EFI_GUID);
ptr = (uint8_t *)ptr + sizeof(EFI_SIGNATURE_LIST) + CopyMem(CertData, list[i].Mok, list[i].MokSize);
sizeof(EFI_GUID) + list[i].MokSize; }
ptr = (uint8_t *)ptr + CertList->SignatureListSize;
} }
efi_status = uefi_call_wrapper(RT->SetVariable, 5, db_name, efi_status = uefi_call_wrapper(RT->SetVariable, 5, db_name,