Fixed bug that prevented launching Windows in Secure Boot mode;

[refind] / refind / mok.c

diff --git a/refind/mok.c b/refind/mok.c
index 6c4ef38e20f021b845ada1fb6b4438e84a742884..e9a2ad1213099db94cba8a79e389305382f96172 100644 (file)
--- a/refind/mok.c
+++ b/refind/mok.c
@@ -130,6 +130,15 @@ BOOLEAN secure_mode (VOID)
    return TRUE;
 } // secure_mode()
 
+// Returns TRUE if the shim program is available to verify binaries,
+// FALSE if not
+BOOLEAN ShimLoaded(void) {
+   SHIM_LOCK   *shim_lock;
+   EFI_GUID    ShimLockGuid = SHIM_LOCK_GUID;
+
+   return (BS->LocateProtocol(&ShimLockGuid, NULL, (VOID**) &shim_lock) == EFI_SUCCESS);
+} // ShimLoaded()
+
 /*
  * Currently, shim/MOK only works on x86-64 (X64) systems, and some of this code
  * generates warnings on x86 (IA32) builds, so don't bother compiling it at all
@@ -330,8 +339,8 @@ static EFI_STATUS read_header(void *data, unsigned int datasize,
 // Returns TRUE if the specified data is validated by Shim's MOK, FALSE otherwise
 static BOOLEAN ShimValidate (VOID *data, UINT32 size)
 {
-   EFI_GUID    ShimLockGuid = SHIM_LOCK_GUID;
    SHIM_LOCK   *shim_lock;
+   EFI_GUID    ShimLockGuid = SHIM_LOCK_GUID;
 
    if (BS->LocateProtocol(&ShimLockGuid, NULL, (VOID**) &shim_lock) == EFI_SUCCESS) {
       if (!shim_lock)