fix(deps): update rust crate uefi to 0.32.0

rust/uefi/linux-bootloader/Cargo.toml

@@ -12,7 +12,7 @@ repository = "/~https://github.com/nix-community/lanzaboote/"
 rust-version = "1.68"
 
 [dependencies]
-uefi = { version = "0.31.0", default-features = false, features = [ "alloc", "global_allocator" ] }
+uefi = { version = "0.32.0", default-features = false, features = [ "alloc", "global_allocator" ] }
 # Update blocked by #237
 goblin = { version = "=0.6.1", default-features = false, features = [ "pe64", "alloc" ]}
 bitflags = "2.5.0"

rust/uefi/linux-bootloader/src/companions.rs

@@ -7,7 +7,7 @@ use uefi::{
         text::{AllowShortcuts, DisplayOnly},
         DevicePath,
     },
-    table, CString16,
+    CString16,
 };
 
 /// Locate files with ASCII filenames and matching the suffix passed as a parameter.
@@ -47,11 +47,7 @@ pub fn get_default_dropin_directory(
     // But this is as much tedious as performing a conversion to string
     // then opening the root directory and finding the new directory.
     let mut target_directory = loaded_image_file_path
-        .to_string(
-            table::system_table_boot().unwrap().boot_services(),
-            DisplayOnly(false),
-            AllowShortcuts(false),
-        )
+        .to_string(DisplayOnly(false), AllowShortcuts(false))
         .map_err(|_dpp_error| {
             log::warn!("Failed to obtain string representation of the loaded image file path");
             uefi::Error::new(uefi::Status::NOT_FOUND, ())

rust/uefi/linux-bootloader/src/efivars.rs

@@ -11,7 +11,7 @@ use uefi::{
         loaded_image::LoadedImage,
     },
     runtime::{self, VariableAttributes, VariableVendor},
-    system, table, CStr16, Guid, Handle, Result, Status,
+    system, CStr16, Guid, Handle, Result, Status,
 };
 
 use bitflags::bitflags;
@@ -196,7 +196,6 @@ pub fn export_efi_variables(stub_info_name: &str) -> Result<()> {
                 )?;
                 dp_protocol
                     .convert_device_path_to_text(
-                        table::system_table_boot().unwrap().boot_services(),
                         dp,
                         uefi::proto::device_path::text::DisplayOnly(false),
                         uefi::proto::device_path::text::AllowShortcuts(false),

rust/uefi/stub/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-uefi = { version = "0.31.0", default-features = false, features = [ "alloc", "global_allocator", "panic_handler", "logger" ] }
+uefi = { version = "0.32.0", default-features = false, features = [ "alloc", "global_allocator", "panic_handler", "logger" ] }
 # Even in debug builds, we don't enable the debug logs, because they generate a lot of spam from goblin.
 log = { version = "0.4.21", default-features = false, features = [ "max_level_info", "release_max_level_warn" ]}
 # Use software implementation because the UEFI target seems to need it.

rust/uefi/stub/src/main.rs

@@ -85,9 +85,7 @@ fn main() -> Status {
         // files, nothing can open the LoadedImage protocol here.
         // Everything must use `filesystem`.
         let mut companions = Vec::new();
-        let image_fs = system_table
-            .boot_services()
-            .get_image_file_system(boot::image_handle());
+        let image_fs = uefi::boot::get_image_file_system(boot::image_handle());
 
         if let Ok(image_fs) = image_fs {
             let mut filesystem = uefi::fs::FileSystem::new(image_fs);

rust/uefi/stub/src/thin.rs

@@ -2,7 +2,7 @@ use alloc::vec;
 use alloc::vec::Vec;
 use log::{error, warn};
 use sha2::{Digest, Sha256};
-use uefi::{fs::FileSystem, prelude::*, table, CString16, Result};
+use uefi::{fs::FileSystem, prelude::*, CString16, Result};
 
 use crate::common::{boot_linux_unchecked, extract_string, get_cmdline, get_secure_boot_status};
 use linux_bootloader::pe_section::pe_section;
@@ -93,11 +93,8 @@ pub fn boot_linux(handle: Handle, dynamic_initrds: Vec<Vec<u8>>) -> uefi::Result
     let mut initrd_data;
 
     {
-        let system_table = table::system_table_boot().unwrap();
-        let file_system = system_table
-            .boot_services()
-            .get_image_file_system(handle)
-            .expect("Failed to get file system handle");
+        let file_system =
+            uefi::boot::get_image_file_system(handle).expect("Failed to get file system handle");
         let mut file_system = FileSystem::new(file_system);
 
         kernel_data = file_system