proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-06-05 13:15:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use LibGetVariable(), since it doesn't give us real error codes.

Browse Source
This commit is contained in:
Peter Jones 2013-09-26 13:44:05 -04:00
parent 59dcd9d1b8
commit 8317a1f0ad
1 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
MokManager.c
View File

@ -1685,45 +1685,62 @@ static EFI_STATUS check_mok_request(EFI_HANDLE image_handle)
void *MokDel = NULL; void *MokDel = NULL;
void *MokSB = NULL; void *MokSB = NULL;
void *MokPW = NULL; void *MokPW = NULL;
EFI_STATUS status;
MokNew = LibGetVariableAndSize(L"MokNew", &shim_lock_guid, &MokNewSize); status = get_variable(L"MokNew", (UINT8 **)&MokNew, &MokNewSize,
shim_lock_guid);
if (status == EFI_SUCCESS) {
if (LibDeleteVariable(L"MokNew", &shim_lock_guid) != EFI_SUCCESS) {
console_notify(L"Failed to delete MokNew");
}
} else if (EFI_ERROR(status) && status != EFI_NOT_FOUND) {
console_error(L"Could not retrieve MokNew", status);
}
MokDel = LibGetVariableAndSize(L"MokDel", &shim_lock_guid, &MokDelSize); status = get_variable(L"MokDel", (UINT8 **)&MokDel, &MokDelSize,
shim_lock_guid);
if (status == EFI_SUCCESS) {
if (LibDeleteVariable(L"MokDel", &shim_lock_guid) != EFI_SUCCESS) {
console_notify(L"Failed to delete MokDel");
}
} else if (EFI_ERROR(status) && status != EFI_NOT_FOUND) {
console_error(L"Could not retrieve MokDel", status);
}
MokSB = LibGetVariableAndSize(L"MokSB", &shim_lock_guid, &MokSBSize); status = get_variable(L"MokSB", (UINT8 **)&MokSB, &MokSBSize,
shim_lock_guid);
if (status == EFI_SUCCESS) {
if (LibDeleteVariable(L"MokSB", &shim_lock_guid) != EFI_SUCCESS) {
console_notify(L"Failed to delete MokSB");
}
} else if (EFI_ERROR(status) && status != EFI_NOT_FOUND) {
console_error(L"Could not retrieve MokSB", status);
}
MokPW = LibGetVariableAndSize(L"MokPW", &shim_lock_guid, &MokPWSize); status = get_variable(L"MokPW", (UINT8 **)&MokPW, &MokPWSize,
shim_lock_guid);
if (status == EFI_SUCCESS) {
if (LibDeleteVariable(L"MokPW", &shim_lock_guid) != EFI_SUCCESS) {
console_notify(L"Failed to delete MokPW");
}
} else if (EFI_ERROR(status) && status != EFI_NOT_FOUND) {
console_error(L"Could not retrieve MokPW", status);
}
enter_mok_menu(image_handle, MokNew, MokNewSize, MokDel, MokDelSize, enter_mok_menu(image_handle, MokNew, MokNewSize, MokDel, MokDelSize,
MokSB, MokSBSize, MokPW, MokPWSize); MokSB, MokSBSize, MokPW, MokPWSize);
if (MokNew) { if (MokNew)
if (LibDeleteVariable(L"MokNew", &shim_lock_guid) != EFI_SUCCESS) {
console_notify(L"Failed to delete MokNew");
}
FreePool (MokNew); FreePool (MokNew);
}
if (MokDel) { if (MokDel)
if (LibDeleteVariable(L"MokDel", &shim_lock_guid) != EFI_SUCCESS) {
console_notify(L"Failed to delete MokDel");
}
FreePool (MokDel); FreePool (MokDel);
}
if (MokSB) { if (MokSB)
if (LibDeleteVariable(L"MokSB", &shim_lock_guid) != EFI_SUCCESS) { FreePool (MokSB);
console_notify(L"Failed to delete MokSB");
}
FreePool (MokNew);
}
if (MokPW) { if (MokPW)
if (LibDeleteVariable(L"MokPW", &shim_lock_guid) != EFI_SUCCESS) { FreePool (MokPW);
console_notify(L"Failed to delete MokPW");
}
FreePool (MokNew);
}
LibDeleteVariable(L"MokAuth", &shim_lock_guid); LibDeleteVariable(L"MokAuth", &shim_lock_guid);
LibDeleteVariable(L"MokDelAuth", &shim_lock_guid); LibDeleteVariable(L"MokDelAuth", &shim_lock_guid);