From 88aeb61d853953a3a5e4232c06db8777315630d3 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Fri, 2 Jun 2023 13:16:44 +0200
Subject: [PATCH] stub: upgrade to uefi-rs 0.22.0

This upgrade is necessary to avoid borking boot on bad UEFI implementations.
---
 rust/stub/Cargo.lock | 65 ++++++++++----------------------------------
 rust/stub/Cargo.toml |  4 +--
 2 files changed, 17 insertions(+), 52 deletions(-)

diff --git a/rust/stub/Cargo.lock b/rust/stub/Cargo.lock
index 9f8b918..a75e577 100644
--- a/rust/stub/Cargo.lock
+++ b/rust/stub/Cargo.lock
@@ -29,12 +29,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.7"
@@ -54,19 +48,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -131,9 +112,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
  "unicode-ident",
 ]
@@ -160,22 +141,13 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "scroll"
 version = "0.11.0"
@@ -196,12 +168,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
-
 [[package]]
 name = "sha1_smol"
 version = "1.0.0"
@@ -232,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.16"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -258,12 +224,11 @@ dependencies = [
 
 [[package]]
 name = "uefi"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b568c22d9ed54fb8695eff4252975063a3fa20281049df911d0237b44b86b6a"
+checksum = "4b5a986a0a287cb6d48ed113002d9f807d371513f30db7fbd7fbf87ec5c3f5b8"
 dependencies = [
  "bitflags",
- "derive_more",
  "log",
  "ptr_meta",
  "ucs2",
@@ -280,14 +245,14 @@ checksum = "023d94ef8e135d068b9a3bd94614ef2610b2b0419ade0a9d8f3501fa9cd08e95"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "uefi-raw"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d5b1c8cd8a8a201bcc0d132f8367f5cb7c38c99a5debe304392d379963776d5"
+checksum = "d73e08d8e944b7c7e90a7c8a53213bdd71ceb7b414ee664f522c1cc579888c25"
 dependencies = [
  "bitflags",
  "ptr_meta",
@@ -296,9 +261,9 @@ dependencies = [
 
 [[package]]
 name = "uefi-services"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de55164b5fc3eddb8619add9fa14d91321bb337507e1f0d065a992060f1ccafc"
+checksum = "033fe0196c749908abc54642a8a04e5d2b5bfe4d3d0a58c7777aea75636e8027"
 dependencies = [
  "cfg-if",
  "log",
@@ -313,9 +278,9 @@ checksum = "594cc87e268a7b43d625d46c63cf1605d0e61bf66e4b1cd58c058ec0191e1f81"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
 [[package]]
 name = "version_check"
diff --git a/rust/stub/Cargo.toml b/rust/stub/Cargo.toml
index af2ff14..13e9537 100644
--- a/rust/stub/Cargo.toml
+++ b/rust/stub/Cargo.toml
@@ -7,8 +7,8 @@ publish = false
 rust-version = "1.68"
 
 [dependencies]
-uefi = { version = "0.21.0", default-features = false, features = [ "alloc", "global_allocator" ] }
-uefi-services = { version = "0.18.0", default-features = false, features = [ "panic_handler", "logger" ] }
+uefi = { version = "0.22.0", default-features = false, features = [ "alloc", "global_allocator" ] }
+uefi-services = { version = "0.19.0", default-features = false, features = [ "panic_handler", "logger" ] }
 goblin = { version = "0.6.1", default-features = false, features = [ "pe64", "alloc" ]}
 bitflags = "2.3.1"