From 8e990fe6568168ab15a9b6af68efa9e465f5353a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 17:21:36 +0000
Subject: [PATCH] Bump elf from 0.0.10 to 0.7.4

Bumps [elf](https://github.com/cole14/rust-elf) from 0.0.10 to 0.7.4.
- [Release notes](https://github.com/cole14/rust-elf/releases)
- [Changelog](https://github.com/cole14/rust-elf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cole14/rust-elf/commits/v0.7.4)

---
updated-dependencies:
- dependency-name: elf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                                    | 169 +++++++++---------
 .../aws-nitro-enclaves/eif-tools/Cargo.toml   |   2 +-
 2 files changed, 88 insertions(+), 83 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e33c816c..e7184742 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,7 +28,7 @@ name = "aesm-client"
 version = "0.6.0"
 dependencies = [
  "anyhow",
- "byteorder 1.3.4",
+ "byteorder",
  "lazy_static",
  "libloading 0.5.2",
  "protobuf",
@@ -108,7 +108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced66cf8fabb128c1f9aa335bdacf3009fbc4b6ad66bd42fa447f6a219736bfc"
 dependencies = [
  "openssl",
- "serde",
+ "serde 1.0.171",
  "serde_bytes",
  "serde_cbor",
  "serde_repr",
@@ -120,7 +120,7 @@ name = "aws-nitro-enclaves-cose"
 version = "0.5.0"
 source = "git+https://github.com/fortanix/aws-nitro-enclaves-cose.git?branch=raoul/crypto_abstraction_pinned#1021a397acc56d4d3ed935991f205754e5a2d2c5"
 dependencies = [
- "serde",
+ "serde 1.0.171",
  "serde_bytes",
  "serde_cbor",
  "serde_repr",
@@ -136,7 +136,7 @@ dependencies = [
  "libc",
  "log 0.4.21",
  "nix 0.20.2",
- "serde",
+ "serde 1.0.171",
  "serde_bytes",
  "serde_cbor",
 ]
@@ -168,7 +168,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "safemem",
 ]
 
@@ -178,7 +178,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
 ]
 
 [[package]]
@@ -248,7 +248,7 @@ checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
  "block-padding",
  "byte-tools",
- "byteorder 1.3.4",
+ "byteorder",
  "generic-array 0.12.3",
 ]
 
@@ -297,12 +297,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
-[[package]]
-name = "byteorder"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-
 [[package]]
 name = "byteorder"
 version = "1.3.4"
@@ -315,7 +309,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "iovec",
 ]
 
@@ -337,8 +331,8 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "363c7cfaa15f101415c4ac9e68706ca4a2277773932828b33f96e59d28c68e62"
 dependencies = [
- "serde",
- "serde_derive 1.0.132",
+ "serde 1.0.171",
+ "serde_derive 1.0.171",
  "toml 0.5.8",
 ]
 
@@ -378,7 +372,7 @@ dependencies = [
  "libc",
  "num-integer",
  "num-traits",
- "serde",
+ "serde 1.0.171",
  "time 0.1.44",
  "winapi",
 ]
@@ -624,7 +618,7 @@ dependencies = [
 name = "dcap-provider"
 version = "0.4.0"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "dcap-ql",
  "env_logger 0.6.2",
  "lazy_static",
@@ -639,7 +633,7 @@ name = "dcap-ql"
 version = "0.4.0"
 dependencies = [
  "anyhow",
- "byteorder 1.3.4",
+ "byteorder",
  "dcap-ql-sys",
  "lazy_static",
  "libc",
@@ -648,7 +642,7 @@ dependencies = [
  "num-derive 0.2.5",
  "num-traits",
  "report-test",
- "serde",
+ "serde 1.0.171",
  "serde_json",
  "sgx-isa",
  "sgxs",
@@ -729,7 +723,7 @@ dependencies = [
  "log 0.4.21",
  "nitro-cli",
  "once_cell",
- "serde",
+ "serde 1.0.171",
  "sha2 0.9.8",
  "tempdir",
  "thiserror",
@@ -740,10 +734,10 @@ name = "eif_defs"
 version = "0.1.0"
 source = "git+https://github.com/fortanix/aws-nitro-enclaves-cli.git?branch=main#93193b1317c544ff07dd3ddcc6e126f847449cbb"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "num-derive 0.3.3",
  "num-traits",
- "serde",
+ "serde 1.0.171",
  "serde_json",
  "sha2 0.9.8",
 ]
@@ -771,19 +765,16 @@ dependencies = [
  "hex 0.3.2",
  "log 0.4.21",
  "openssl",
- "serde",
+ "serde 1.0.171",
  "serde_cbor",
  "sha2 0.9.8",
 ]
 
 [[package]]
 name = "elf"
-version = "0.0.10"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4841de15dbe0e49b9b62a417589299e3be0d557e0900d36acb87e6dae47197f5"
-dependencies = [
- "byteorder 0.5.3",
-]
+checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b"
 
 [[package]]
 name = "em-app"
@@ -798,9 +789,9 @@ dependencies = [
  "pkix",
  "rustc-serialize",
  "sdkms",
- "serde",
+ "serde 1.0.171",
  "serde_bytes",
- "serde_derive 1.0.132",
+ "serde_derive 1.0.171",
  "serde_json",
  "sgx-isa",
  "sgx_pkix",
@@ -825,8 +816,8 @@ dependencies = [
  "lazy_static",
  "log 0.3.9",
  "mime 0.2.6",
- "serde",
- "serde_derive 1.0.132",
+ "serde 1.0.171",
+ "serde_derive 1.0.171",
  "serde_ignored",
  "serde_json",
  "url 1.7.2",
@@ -846,8 +837,8 @@ dependencies = [
  "lazy_static",
  "log 0.3.9",
  "mime 0.2.6",
- "serde",
- "serde_derive 1.0.132",
+ "serde 1.0.171",
+ "serde_derive 1.0.171",
  "serde_ignored",
  "serde_json",
  "url 1.7.2",
@@ -886,7 +877,7 @@ dependencies = [
  "eif_utils",
  "futures 0.3.17",
  "log 0.4.21",
- "serde",
+ "serde 1.0.171",
  "serde_json",
  "serde_yaml",
  "sha2 0.9.8",
@@ -1052,8 +1043,8 @@ dependencies = [
  "libc",
  "nix 0.13.1",
  "num_cpus",
- "serde",
- "serde_derive 1.0.132",
+ "serde 1.0.171",
+ "serde_derive 1.0.171",
  "sgx-isa",
  "sgxs",
  "sgxs-loaders",
@@ -1069,7 +1060,7 @@ dependencies = [
  "compiler_builtins",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
- "serde",
+ "serde 1.0.204",
  "vsock 0.2.4",
 ]
 
@@ -1082,7 +1073,7 @@ dependencies = [
  "fortanix-vme-abi",
  "log 0.4.21",
  "nix 0.22.2",
- "serde",
+ "serde 1.0.171",
  "serde_cbor",
  "vsock 0.2.4",
 ]
@@ -1490,7 +1481,7 @@ dependencies = [
  "aesm-client",
  "base64 0.13.0",
  "bitflags 1.2.1",
- "byteorder 1.3.4",
+ "byteorder",
  "clap",
  "env_logger 0.9.0",
  "lazy_static",
@@ -1500,7 +1491,7 @@ dependencies = [
  "pkix",
  "report-test",
  "reqwest",
- "serde",
+ "serde 1.0.171",
  "serde-bytes-repr",
  "serde_bytes",
  "serde_json",
@@ -1763,14 +1754,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8730cf71e8d79ba70b3b7986af7af7629c0c4ee58b59e4a2e30d855cc31552e8"
 dependencies = [
  "bitflags 1.2.1",
- "byteorder 1.3.4",
+ "byteorder",
  "cc",
  "cfg-if 1.0.0",
  "mbedtls-platform-support",
  "mbedtls-sys-auto",
  "rs-libc 0.2.3",
- "serde",
- "serde_derive 1.0.132",
+ "serde 1.0.171",
+ "serde_derive 1.0.171",
  "yasna 0.2.2",
 ]
 
@@ -1941,7 +1932,7 @@ dependencies = [
  "mbedtls",
  "num-bigint 0.4.3",
  "pkix",
- "serde",
+ "serde 1.0.171",
  "serde_bytes",
  "serde_cbor",
  "yasna 0.4.0",
@@ -1970,7 +1961,7 @@ dependencies = [
  "once_cell",
  "openssl",
  "page_size",
- "serde",
+ "serde 1.0.171",
  "serde_cbor",
  "serde_json",
  "sha2 0.9.8",
@@ -2069,7 +2060,7 @@ version = "0.1.0"
 source = "git+https://github.com/aws/aws-nitro-enclaves-nsm-api#9ddb589875baf345d085a980aa96cf3a4e480ea8"
 dependencies = [
  "log 0.4.21",
- "serde",
+ "serde 1.0.171",
  "serde_bytes",
  "serde_cbor",
 ]
@@ -2892,7 +2883,7 @@ dependencies = [
  "native-tls",
  "percent-encoding 2.1.0",
  "pin-project-lite",
- "serde",
+ "serde 1.0.171",
  "serde_json",
  "serde_urlencoded",
  "tokio",
@@ -3000,8 +2991,8 @@ dependencies = [
  "hyper 0.10.16",
  "log 0.4.21",
  "rustc-serialize",
- "serde",
- "serde_derive 1.0.132",
+ "serde 1.0.171",
+ "serde_derive 1.0.171",
  "serde_json",
  "url 1.7.2",
  "uuid 0.7.4",
@@ -3032,13 +3023,22 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.130"
-source = "git+https://github.com/fortanix/serde.git?branch=master#80449547025fc4a016a333e96c0cdaf7e4a96f67"
+version = "1.0.171"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
+dependencies = [
+ "serde_derive 1.0.171",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.204"
+source = "git+https://github.com/fortanix/serde.git?branch=master#1755f934942d36f9caf6cb73177fda1d25ca20f4"
 dependencies = [
  "compiler_builtins",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
- "serde_derive 1.0.130",
+ "serde_derive 1.0.204",
 ]
 
 [[package]]
@@ -3049,7 +3049,7 @@ checksum = "9eb83481bce328081ced4404f986de002bf2e08865bec386734595ebf3b2c425"
 dependencies = [
  "base64 0.13.0",
  "hex 0.4.3",
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -3058,7 +3058,7 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
 dependencies = [
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -3068,28 +3068,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
  "half",
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.130"
-source = "git+https://github.com/fortanix/serde.git?branch=master#80449547025fc4a016a333e96c0cdaf7e4a96f67"
+version = "1.0.171"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
 dependencies = [
  "proc-macro2 1.0.78",
  "quote 1.0.35",
- "syn 1.0.81",
+ "syn 2.0.50",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.132"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276"
+version = "1.0.204"
+source = "git+https://github.com/fortanix/serde.git?branch=master#1755f934942d36f9caf6cb73177fda1d25ca20f4"
 dependencies = [
  "proc-macro2 1.0.78",
  "quote 1.0.35",
- "syn 1.0.81",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -3098,7 +3098,7 @@ version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142"
 dependencies = [
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -3109,7 +3109,7 @@ checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
 dependencies = [
  "itoa 1.0.1",
  "ryu",
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -3132,7 +3132,7 @@ dependencies = [
  "form_urlencoded",
  "itoa 1.0.1",
  "ryu",
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -3142,7 +3142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edeeaecd5445109b937a3a335dc52780ca7779c4b4b7374cc6340dedfe44cfca"
 dependencies = [
  "rustversion",
- "serde",
+ "serde 1.0.171",
  "serde_with_macros",
 ]
 
@@ -3166,7 +3166,7 @@ checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
 dependencies = [
  "dtoa",
  "linked-hash-map",
- "serde",
+ "serde 1.0.171",
  "yaml-rust",
 ]
 
@@ -3176,14 +3176,14 @@ version = "0.4.1"
 dependencies = [
  "bitflags 1.2.1",
  "mbedtls",
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
 name = "sgx_pkix"
 version = "0.2.2"
 dependencies = [
- "byteorder 1.3.4",
+ "byteorder",
  "lazy_static",
  "pkix",
  "quick-error",
@@ -3195,7 +3195,7 @@ name = "sgxs"
 version = "0.8.0"
 dependencies = [
  "anyhow",
- "byteorder 1.3.4",
+ "byteorder",
  "crypto-hash",
  "foreign-types",
  "openssl",
@@ -3229,7 +3229,7 @@ dependencies = [
  "aesm-client",
  "anyhow",
  "atty",
- "byteorder 1.3.4",
+ "byteorder",
  "clap",
  "crypto-hash",
  "dcap-ql",
@@ -3248,8 +3248,8 @@ dependencies = [
  "regex",
  "report-test",
  "reqwest",
- "serde",
- "serde_derive 1.0.132",
+ "serde 1.0.171",
+ "serde_derive 1.0.171",
  "serde_yaml",
  "sgx-isa",
  "sgxs",
@@ -3303,7 +3303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e468265908f45299c26571dad9a2e5cb3656eceb51cd58f1441cf61aa71aad6"
 dependencies = [
  "base64 0.13.0",
- "byteorder 1.3.4",
+ "byteorder",
  "bytes 1.1.0",
  "chrono",
  "flate2",
@@ -3316,7 +3316,7 @@ dependencies = [
  "mime 0.3.16",
  "openssl",
  "pin-project 1.0.8",
- "serde",
+ "serde 1.0.171",
  "serde_json",
  "tar",
  "tokio",
@@ -3540,7 +3540,7 @@ dependencies = [
  "itoa 1.0.1",
  "libc",
  "num_threads",
- "serde",
+ "serde 1.0.171",
  "time-core",
  "time-macros",
 ]
@@ -3649,7 +3649,7 @@ version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
 dependencies = [
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -3658,7 +3658,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -3838,7 +3838,7 @@ checksum = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363"
 dependencies = [
  "cfg-if 0.1.10",
  "rand 0.4.6",
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -3848,7 +3848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
 dependencies = [
  "rand 0.6.5",
- "serde",
+ "serde 1.0.171",
 ]
 
 [[package]]
@@ -4221,3 +4221,8 @@ name = "zeroize"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+
+[[patch.unused]]
+name = "serde"
+version = "1.0.130"
+source = "git+https://github.com/fortanix/serde.git?branch=master#80449547025fc4a016a333e96c0cdaf7e4a96f67"
diff --git a/fortanix-vme/aws-nitro-enclaves/eif-tools/Cargo.toml b/fortanix-vme/aws-nitro-enclaves/eif-tools/Cargo.toml
index 9bad509c..f29f1ba3 100644
--- a/fortanix-vme/aws-nitro-enclaves/eif-tools/Cargo.toml
+++ b/fortanix-vme/aws-nitro-enclaves/eif-tools/Cargo.toml
@@ -17,7 +17,7 @@ categories = ["command-line-utilities"]
 anyhow = "1.0"
 cargo_toml = "0.10.3"
 clap = "2.34"
-elf = "0.0.10"
+elf = "0.7.4"
 env_logger = "0.9"
 log = "0.4"
 nitro-cli = { git = "https://github.com/fortanix/aws-nitro-enclaves-cli.git", branch = "main" }