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

Allow the new keys to be listed again

Browse Source
This commit is contained in:
Gary Ching-Pang Lin 2012-09-21 15:36:57 +08:00
parent 6577945fba
commit 6306b495c5
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MokManager.c
View File

@ -376,12 +376,11 @@ static UINT8 list_keys (void *MokNew, UINTN MokNewSize)
MokListNode *keys = NULL; MokListNode *keys = NULL;
INTN key_num = 0; INTN key_num = 0;
UINT8 initial = 1; UINT8 initial = 1;
int ret = 0;
CopyMem(&MokNum, MokNew, sizeof(UINT32)); CopyMem(&MokNum, MokNew, sizeof(UINT32));
if (MokNum == 0) { if (MokNum == 0) {
Print(L"No key exists\n"); Print(L"No key exists\n");
goto error; return 0;
} }
keys = build_mok_list(MokNum, keys = build_mok_list(MokNum,
@ -390,7 +389,7 @@ static UINT8 list_keys (void *MokNew, UINTN MokNewSize)
if (!keys) { if (!keys) {
Print(L"Failed to construct key list in MokNew\n"); Print(L"Failed to construct key list in MokNew\n");
goto error; return 0;
} }
do { do {
@ -418,23 +417,21 @@ static UINT8 list_keys (void *MokNew, UINTN MokNewSize)
initial = 0; initial = 0;
} while (key_num != 0); } while (key_num != 0);
ret = 1;
error:
if (keys)
FreePool(keys); FreePool(keys);
return ret; return 1;
} }
static UINT8 mok_enrollment_prompt (void *MokNew, UINTN MokNewSize) static UINT8 mok_enrollment_prompt (void *MokNew, UINTN MokNewSize)
{ {
EFI_INPUT_KEY key; EFI_INPUT_KEY key;
do {
if (!list_keys(MokNew, MokNewSize)) { if (!list_keys(MokNew, MokNewSize)) {
return 0; return 0;
} }
Print(L"Enroll the key(s)? (y/N): "); Print(L"Enroll the key(s) or list the key(s) again? (y/n/l): ");
key = get_keystroke(); key = get_keystroke();
Print(L"%c\n", key.UnicodeChar); Print(L"%c\n", key.UnicodeChar);
@ -442,6 +439,7 @@ static UINT8 mok_enrollment_prompt (void *MokNew, UINTN MokNewSize)
if (key.UnicodeChar == 'Y' || key.UnicodeChar == 'y') { if (key.UnicodeChar == 'Y' || key.UnicodeChar == 'y') {
return 1; return 1;
} }
} while (key.UnicodeChar == 'L' || key.UnicodeChar == 'l');
Print(L"Abort\n"); Print(L"Abort\n");