repo: Update our open source dependencies

Cargo.toml

@@ -381,9 +381,9 @@ async-channel = "2.3"
 async-task = "4.4"
 async-trait = "0.1"
 awaitgroup = "0.7"
-base64 = "0.21.7"
-base64-serde = "0.7"
-bitfield-struct = "0.7"
+base64 = "0.22.1"
+base64-serde = "0.8"
+bitfield-struct = "0.10.1"
 bitvec = { version = "1.1", default-features = false }
 blocking = "1.2"
 caps = "0.5"
@@ -393,18 +393,18 @@ cfg-if = "1"
 clap = "4.2"
 crc32fast = { version = "1.3.2", default-features = false }
 criterion = { version = "0.5", default-features = false }
-crossterm = "0.27"
+crossterm = "0.28.1"
 ctrlc = "3.4.0"
 der = "0.7"
-dirs = "5.0"
+dirs = "6.0"
 elfcore = "1.1.5"
-embed-resource = "2.4.2"
-env_logger = "0.10"
+embed-resource = "3.0.2"
+env_logger = "0.11.7"
 event-listener = "5.3"
 expect-test = "1.5"
 fatfs = { version = "0.3.6", default-features = false }
 filepath = "0.1"
-fs-err = "2.9"
+fs-err = "3.1"
 fscommon = "0.1.1"
 futures = "0.3.31"
 futures-concurrency = "7.6.3"
@@ -420,7 +420,7 @@ gptman = "1.0"
 grep-regex = "0.1"
 grep-searcher = "0.1"
 h2 = "0.4"
-heck = "0.4"
+heck = "0.5"
 hex = "0.4"
 http = "1"
 http-body-util = "0.1"
@@ -438,12 +438,12 @@ iced-x86 = { version = "1.17", default-features = false, features = [
 ignore = "0.4"
 igvm = {git = "https://github.com/microsoft/igvm", rev = "365065d7e31da0a0116e7934de3ecd85f00bab70"}
 igvm_defs = {git = "https://github.com/microsoft/igvm", rev = "365065d7e31da0a0116e7934de3ecd85f00bab70", default-features = false, features = [ "unstable" ]}
-image = { version = "0.24", default-features = false }
-io-uring = "0.6"
+image = { version = "0.25.1", default-features = false }
+io-uring = "0.7.4"
 jiff = "0.2"
-kvm-bindings = "0.7"
+kvm-bindings = "0.11.1"
 # Use of these specific REPO will go away when changes are taken upstream.
-landlock = "0.3.1"
+landlock = "0.4.1"
 libc = "0.2"
 libfuzzer-sys = "0.4"
 libtest-mimic = "0.8"
@@ -455,9 +455,9 @@ mimalloc = { version = "0.1.39", default-features = false }
 ms-tpm-20-ref = { version = "0.1", git = "https://github.com/microsoft/ms-tpm-20-ref-rs.git", branch = "main" }
 mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main" }
 mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main" }
-nix = { version = "0.26", default-features = false }
+nix = { version = "0.27", default-features = false }
 ntapi = "0.4"
-object = { version = "0.32", default-features = false }
+object = { version = "0.36.7", default-features = false }
 once_cell = "1.7"
 openssl = "0.10.66"
 openssl-sys = "0.9"
@@ -477,10 +477,10 @@ range_map_vec = "0.2.0"
 rayon = "1.5"
 resolv-conf = "0.7"
 rlimit = "0.10.1"
-rusqlite = "0.32"
-rustc-hash = "1.1"
+rusqlite = "0.34"
+rustc-hash = "2.1.1"
 rustyline = "13"
-seccompiler = "0.4"
+seccompiler = "0.5"
 serde = "1.0.185"
 serde_json = "1.0"
 serde_yaml = "0.9"
@@ -495,30 +495,30 @@ socket2 = "0.5"
 stackfuture = "0.3"
 static_assertions = "1.1"
 syn = "2"
-target-lexicon = "0.12.13"
+target-lexicon = "0.13.2"
 tempfile = "3.2"
 thiserror = { version = "2", default-features = false }
 time = "0.3"
 toml_edit = "0.22"
 tracing = "0.1"
 tracing-core = "=0.1.30" # Pin to avoid binary size increase https://github.com/tokio-rs/tracing/issues/3182
 tracing-subscriber = "0.3.16"
-typed-path = "0.7"
-uefi = "0.32"
-unicycle = "0.9"
+typed-path = "0.10"
+uefi = "0.34.1"
+unicycle = "0.10.2"
 urlencoding = "2.1.3"
 vergen = "8.2"
 vfio-bindings = "0.3.1"
 vmm-sys-util = "*"
 walkdir = "2.3"
 wchar = "0.11"
-which = "6"
+which = "7"
 widestring = "1.0"
 win_etw_tracing = "0.1"
 winapi = "0.3"
 windows = "0.59"
-windows-service = "0.7"
-windows-sys = "0.52"
+windows-service = "0.8"
+windows-sys = "0.59"
 xshell = "=0.2.2" # pin to 0.2.2 to work around https://github.com/matklad/xshell/issues/63
 xshell-macros = "0.2"
 # We add the derive feature here since the vast majority of our crates use it.

flowey/flowey_lib_hvlite/src/_jobs/check_clippy.rs

@@ -115,7 +115,7 @@ impl SimpleFlowNode for Node {
         // with no additional dependencies
         if !matches!(
             target.operating_system,
-            target_lexicon::OperatingSystem::Darwin
+            target_lexicon::OperatingSystem::Darwin(_)
         ) {
             pre_build_deps.push(
                 ctx.reqv(|v| crate::init_cross_build::Request {
@@ -185,7 +185,7 @@ impl SimpleFlowNode for Node {
                 // packages requiring openssl-sys won't cross compile for macos
                 if matches!(
                     target.operating_system,
-                    target_lexicon::OperatingSystem::Darwin
+                    target_lexicon::OperatingSystem::Darwin(_)
                 ) {
                     exclude.extend(
                         ["openssl_kdf", "vmgs_lib", "block_crypto", "disk_crypt"].map(|x| x.into()),
@@ -198,7 +198,7 @@ impl SimpleFlowNode for Node {
 
         let extra_env = if matches!(
             target.operating_system,
-            target_lexicon::OperatingSystem::Darwin
+            target_lexicon::OperatingSystem::Darwin(_)
         ) {
             Some(vec![("SPARSE_MMAP_NO_BUILD".into(), "1".into())])
         } else {

flowey/flowey_lib_hvlite/src/init_cross_build.rs

@@ -32,7 +32,7 @@ impl FlowNode for Node {
                 target_lexicon::OperatingSystem::Linux => {
                     FlowPlatform::Linux(FlowPlatformLinuxDistro::Ubuntu)
                 }
-                target_lexicon::OperatingSystem::Darwin => FlowPlatform::MacOs,
+                target_lexicon::OperatingSystem::Darwin(_) => FlowPlatform::MacOs,
                 _ => return false,
             };
             let arch = match target.architecture {

flowey/flowey_lib_hvlite/src/run_cargo_build.rs

@@ -245,7 +245,7 @@ pub mod common {
                     CommonPlatform::MacOs => target_lexicon::Triple {
                         architecture: arch.as_arch(),
                         vendor: target_lexicon::Vendor::Apple,
-                        operating_system: target_lexicon::OperatingSystem::Darwin,
+                        operating_system: target_lexicon::OperatingSystem::Darwin(None),
                         environment: target_lexicon::Environment::Unknown,
                         binary_format: target_lexicon::BinaryFormat::Macho,
                     },

guest_test_uefi/src/uefi/rt.rs

@@ -15,7 +15,7 @@ fn panic_handler(panic: &core::panic::PanicInfo<'_>) -> ! {
 
     // If the system table is available, use UEFI's standard shutdown mechanism
     if uefi::table::system_table_raw().is_none() {
-        use uefi::table::runtime::ResetType;
+        use uefi::runtime::ResetType;
         uefi::runtime::reset(ResetType::SHUTDOWN, uefi::Status::ABORTED, None);
     }
 

guest_test_uefi/src/uefi/tests/mod.rs

@@ -8,7 +8,7 @@ use uefi::boot;
 use uefi::cstr16;
 use uefi::println;
 use uefi::runtime;
-use uefi::table::runtime::VariableVendor;
+use uefi::runtime::VariableVendor;
 
 // TODO: add runtime config for which tests to run (e.g: skipping watchdog)
 pub fn run_tests() {

openhcl/minimal_rt/src/enlightened_panic.rs

@@ -66,7 +66,7 @@ pub fn report(
         let _ = write!(panic_buffer, "{}", panic);
     }
     report_raw(
-        panic_buffer.as_ref().as_bytes(),
+        panic_buffer.as_bytes(),
         stack_va_to_pa(panic_buffer.as_bytes().as_ptr().cast()),
     );
 }

openhcl/openhcl_boot/src/host_params/dt.rs

@@ -350,7 +350,7 @@ impl PartitionInfo {
 
         // Depending on policy, write what the host specified in the chosen node.
         if can_trust_host && command_line.policy == CommandLinePolicy::APPEND_CHOSEN {
-            write!(storage.cmdline, " {}", parsed.command_line.as_ref())
+            write!(storage.cmdline, " {}", &parsed.command_line)
                 .map_err(|_| DtError::CommandLineSize)?;
         }
 

openhcl/openhcl_boot/src/main.rs

@@ -240,7 +240,7 @@ fn build_kernel_command_line(
 
     // If we're isolated we can't trust the host-provided cmdline
     if can_trust_host {
-        let old_cmdline = partition_info.cmdline.as_ref();
+        let old_cmdline = &partition_info.cmdline;
 
         // HACK: See if we should set the vmbus connection id via kernel
         // commandline. It may already be set, and we don't want to set it again.

openhcl/underhill_attestation/Cargo.toml

@@ -27,11 +27,13 @@ base64.workspace = true
 base64-serde.workspace = true
 getrandom.workspace = true
 openssl.workspace = true
+serde.workspace = true
 serde_json.workspace = true
 static_assertions.workspace = true
 thiserror.workspace = true
 time = { workspace = true, features = ["macros"] }
 zerocopy.workspace = true
+
 [target.'cfg(target_os = "linux")'.dev-dependencies]
 disklayer_ram.workspace = true
 disk_backend.workspace = true
@@ -40,3 +42,7 @@ vmgs_format.workspace = true
 
 [lints]
 workspace = true
+
+[package.metadata.xtask.unused-deps]
+# Needed for the base64-serde macros.
+ignored = ["serde"]

openhcl/vmfirmwareigvm_dll/build.rs

@@ -124,6 +124,8 @@ fn main() {
         println!("cargo:rustc-link-arg=/NOENTRY"); // resource DLL
         println!("cargo:rerun-if-changed=build.rs");
         println!("cargo:rerun-if-changed=resources.rc");
-        embed_resource::compile("resources.rc", macros.map(|(k, v)| format!("{k}={v}")));
+        embed_resource::compile("resources.rc", macros.map(|(k, v)| format!("{k}={v}")))
+            .manifest_required()
+            .unwrap();
     }
 }

petri/make_imc_hive/src/windows/offreg.rs

@@ -15,6 +15,7 @@ use windows_sys::Wdk::System::OfflineRegistry::ORCloseHive;
 use windows_sys::Wdk::System::OfflineRegistry::ORCloseKey;
 use windows_sys::Wdk::System::OfflineRegistry::ORCreateHive;
 use windows_sys::Wdk::System::OfflineRegistry::ORCreateKey;
+use windows_sys::Wdk::System::OfflineRegistry::ORHKEY;
 use windows_sys::Wdk::System::OfflineRegistry::ORSaveHive;
 use windows_sys::Wdk::System::OfflineRegistry::ORSetValue;
 use windows_sys::Win32::System::Registry::REG_DWORD;
@@ -25,7 +26,7 @@ pub struct Hive(Key);
 
 impl Hive {
     pub fn create() -> std::io::Result<Self> {
-        let mut key = 0;
+        let mut key = null_mut();
         // SAFETY: calling as documented
         unsafe {
             chk(ORCreateHive(&mut key))?;
@@ -97,11 +98,11 @@ impl Drop for OwnedKey {
     }
 }
 
-pub struct Key(isize);
+pub struct Key(ORHKEY);
 
 impl Key {
     pub fn create_key(&self, name: &str) -> anyhow::Result<OwnedKey> {
-        let mut new_key = 0;
+        let mut new_key = null_mut();
         let name16 = name.encode_utf16().chain([0]).collect::<Vec<_>>();
         // SAFETY: calling as documented with owned key and null-terminated
         // path.

petri/pipette/src/shutdown.rs

@@ -65,13 +65,13 @@ pub fn handle_shutdown(request: pipette_protocol::ShutdownRequest) -> anyhow::Re
 
     // SAFETY: calling as documented
     let token = unsafe {
-        let mut token = 0;
+        let mut token = null_mut();
         OpenProcessToken(
             GetCurrentProcess(),
             TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
             &mut token,
         );
-        OwnedHandle::from_raw_handle(token as _)
+        OwnedHandle::from_raw_handle(token)
     };
 
     let tkp = TOKEN_PRIVILEGES {
@@ -86,16 +86,8 @@ pub fn handle_shutdown(request: pipette_protocol::ShutdownRequest) -> anyhow::Re
     };
 
     // SAFETY: calling as documented with an appropriate initialized struct.
-    let r = unsafe {
-        AdjustTokenPrivileges(
-            token.as_raw_handle() as isize,
-            0,
-            &tkp,
-            0,
-            null_mut(),
-            null_mut(),
-        )
-    };
+    let r =
+        unsafe { AdjustTokenPrivileges(token.as_raw_handle(), 0, &tkp, 0, null_mut(), null_mut()) };
     if r == 0 {
         return Err(std::io::Error::last_os_error()).context("failed to adjust token privileges");
     }

support/ci_logger/src/lib.rs

@@ -3,21 +3,21 @@
 
 //! A [`log::Log`] implementation translates log-levels to ADO logging commands.
 
-use env_logger::filter::Filter;
+use env_logger::Logger;
 use log::Level;
 use log::Metadata;
 use log::Record;
 
 struct AdoLogger {
-    filter: Filter,
+    filter: Logger,
     in_ci: bool,
 }
 
 impl AdoLogger {
     fn new(log_level: Option<&str>) -> AdoLogger {
-        let mut builder = env_logger::filter::Builder::new();
+        let mut builder = env_logger::Builder::new();
         if let Some(log_level) = log_level {
-            builder.parse(log_level);
+            builder.parse_filters(log_level);
         } else {
             builder.filter_level(log::LevelFilter::Info);
         }

support/pal/pal_event/src/windows.rs

@@ -40,7 +40,7 @@ impl Event {
 
     pub(crate) fn signal_inner(&self) {
         // SAFETY: passing a valid handle.
-        let r = unsafe { Threading::SetEvent(self.0.as_raw_handle() as isize) };
+        let r = unsafe { Threading::SetEvent(self.0.as_raw_handle()) };
         if r == 0 {
             // This can only fail due to an invalid handle, which can only
             // happen due to some bug in unsafe code.
@@ -50,9 +50,8 @@ impl Event {
 
     pub(crate) fn wait_inner(&self) {
         // SAFETY: passing a valid handle.
-        let r = unsafe {
-            Threading::WaitForSingleObject(self.0.as_raw_handle() as isize, Threading::INFINITE)
-        };
+        let r =
+            unsafe { Threading::WaitForSingleObject(self.0.as_raw_handle(), Threading::INFINITE) };
         if r != Foundation::WAIT_OBJECT_0 {
             // This can only fail due to an invalid handle, which can only
             // happen due to some bug in unsafe code.
@@ -62,7 +61,7 @@ impl Event {
 
     pub(crate) fn try_wait_inner(&self) -> bool {
         // SAFETY: passing a valid handle.
-        let r = unsafe { Threading::WaitForSingleObject(self.0.as_raw_handle() as isize, 0) };
+        let r = unsafe { Threading::WaitForSingleObject(self.0.as_raw_handle(), 0) };
         match r {
             Foundation::WAIT_OBJECT_0 => true,
             Foundation::WAIT_TIMEOUT => false,