Use LibDeleteVariable in gnu-efi

diff --git a/MokManager.c b/MokManager.c
index 89c0967e43da9041144f3153f4a7cb66a9aa2bdf..8a2ec2156aff2f8684ba8cea8c8ded15beec72c1 100644 (file)
--- a/MokManager.c
+++ b/MokManager.c
@@ -39,16 +39,6 @@ static EFI_STATUS get_variable (CHAR16 *name, EFI_GUID guid, UINT32 *attributes,
        return efi_status;
 }
 
-static EFI_STATUS delete_variable (CHAR16 *name, EFI_GUID guid)
-{
-       EFI_STATUS efi_status;
-
-       efi_status = uefi_call_wrapper(RT->SetVariable, 5, name, &guid,
-                                      0, 0, (UINT8 *)NULL);
-
-       return efi_status;
-}
-
 static EFI_INPUT_KEY get_keystroke (void)
 {
        EFI_INPUT_KEY key;
@@ -671,12 +661,12 @@ static EFI_STATUS check_mok_request(EFI_HANDLE image_handle)
        }
 error:
        if (MokNew) {
-               if (delete_variable(L"MokNew", shim_lock_guid) != EFI_SUCCESS) {
+               if (LibDeleteVariable(L"MokNew", &shim_lock_guid) != EFI_SUCCESS) {
                        Print(L"Failed to delete MokNew\n");
                }
                FreePool (MokNew);
        }
-       delete_variable(L"MokAuth", shim_lock_guid);
+       LibDeleteVariable(L"MokAuth", &shim_lock_guid);
 
        return EFI_SUCCESS;
 }

diff --git a/shim.c b/shim.c
index 95c3e5441fb29ec18c50f56da7a8fc5a9ed9db06..479007b21ebd8922c4a7820d5f639fe8efbd10d7 100644 (file)
--- a/shim.c
+++ b/shim.c
@@ -92,16 +92,6 @@ static EFI_STATUS get_variable (CHAR16 *name, EFI_GUID guid, UINT32 *attributes,
        return efi_status;
 }
 
-static EFI_STATUS delete_variable (CHAR16 *name, EFI_GUID guid)
-{
-       EFI_STATUS efi_status;
-
-       efi_status = uefi_call_wrapper(RT->SetVariable, 5, name, &guid,
-                                      0, 0, (UINT8 *)NULL);
-
-       return efi_status;
-}
-
 static MokListNode *build_mok_list(UINT32 num, void *Data, UINTN DataSize) {
        MokListNode *list;
        int i, remain = DataSize;
@@ -612,7 +602,7 @@ static EFI_STATUS verify_buffer (char *data, int datasize,
 
        if (attributes & EFI_VARIABLE_RUNTIME_ACCESS) {
                Print(L"MokList is compromised!\nErase all keys in MokList!\n");
-               if (delete_variable(L"MokList", shim_lock_guid) != EFI_SUCCESS) {
+               if (LibDeleteVariable(L"MokList", &shim_lock_guid) != EFI_SUCCESS) {
                        Print(L"Failed to erase MokList\n");
                }
                status = EFI_ACCESS_DENIED;