From bd057ae5137a0536f1e9f1d21011851824cf5415 Mon Sep 17 00:00:00 2001 From: NikitaShyrei Date: Tue, 13 Aug 2024 13:00:59 +0200 Subject: [PATCH 1/3] - pin version --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9e63fc9..22b1c545 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,8 +43,8 @@ jobs: - name: Setup Rust toolchain run: | rustup target add x86_64-fortanix-unknown-sgx x86_64-unknown-linux-musl - rustup toolchain add nightly - rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly + rustup toolchain add nightly-2024-05-14 + rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly-2024-05-14 rustup update - name: Cargo test --all --exclude sgxs-loaders From 954ed5073cb84e49bbea8ee9de60a1ae9c437d09 Mon Sep 17 00:00:00 2001 From: NikitaShyrei Date: Tue, 13 Aug 2024 13:11:04 +0200 Subject: [PATCH 2/3] - updated time --- Cargo.lock | 110 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e33c816c..0c59ec02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,7 +108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced66cf8fabb128c1f9aa335bdacf3009fbc4b6ad66bd42fa447f6a219736bfc" dependencies = [ "openssl", - "serde", + "serde 1.0.132", "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.132", "serde_bytes", "serde_cbor", "serde_repr", @@ -136,7 +136,7 @@ dependencies = [ "libc", "log 0.4.21", "nix 0.20.2", - "serde", + "serde 1.0.132", "serde_bytes", "serde_cbor", ] @@ -337,7 +337,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "363c7cfaa15f101415c4ac9e68706ca4a2277773932828b33f96e59d28c68e62" dependencies = [ - "serde", + "serde 1.0.132", "serde_derive 1.0.132", "toml 0.5.8", ] @@ -378,7 +378,7 @@ dependencies = [ "libc", "num-integer", "num-traits", - "serde", + "serde 1.0.132", "time 0.1.44", "winapi", ] @@ -648,7 +648,7 @@ dependencies = [ "num-derive 0.2.5", "num-traits", "report-test", - "serde", + "serde 1.0.132", "serde_json", "sgx-isa", "sgxs", @@ -729,7 +729,7 @@ dependencies = [ "log 0.4.21", "nitro-cli", "once_cell", - "serde", + "serde 1.0.132", "sha2 0.9.8", "tempdir", "thiserror", @@ -743,7 +743,7 @@ dependencies = [ "byteorder 1.3.4", "num-derive 0.3.3", "num-traits", - "serde", + "serde 1.0.132", "serde_json", "sha2 0.9.8", ] @@ -771,7 +771,7 @@ dependencies = [ "hex 0.3.2", "log 0.4.21", "openssl", - "serde", + "serde 1.0.132", "serde_cbor", "sha2 0.9.8", ] @@ -798,7 +798,7 @@ dependencies = [ "pkix", "rustc-serialize", "sdkms", - "serde", + "serde 1.0.132", "serde_bytes", "serde_derive 1.0.132", "serde_json", @@ -825,7 +825,7 @@ dependencies = [ "lazy_static", "log 0.3.9", "mime 0.2.6", - "serde", + "serde 1.0.132", "serde_derive 1.0.132", "serde_ignored", "serde_json", @@ -846,7 +846,7 @@ dependencies = [ "lazy_static", "log 0.3.9", "mime 0.2.6", - "serde", + "serde 1.0.132", "serde_derive 1.0.132", "serde_ignored", "serde_json", @@ -886,7 +886,7 @@ dependencies = [ "eif_utils", "futures 0.3.17", "log 0.4.21", - "serde", + "serde 1.0.132", "serde_json", "serde_yaml", "sha2 0.9.8", @@ -1052,7 +1052,7 @@ dependencies = [ "libc", "nix 0.13.1", "num_cpus", - "serde", + "serde 1.0.132", "serde_derive 1.0.132", "sgx-isa", "sgxs", @@ -1069,7 +1069,7 @@ dependencies = [ "compiler_builtins", "rustc-std-workspace-alloc", "rustc-std-workspace-core", - "serde", + "serde 1.0.204", "vsock 0.2.4", ] @@ -1082,7 +1082,7 @@ dependencies = [ "fortanix-vme-abi", "log 0.4.21", "nix 0.22.2", - "serde", + "serde 1.0.132", "serde_cbor", "vsock 0.2.4", ] @@ -1500,7 +1500,7 @@ dependencies = [ "pkix", "report-test", "reqwest", - "serde", + "serde 1.0.132", "serde-bytes-repr", "serde_bytes", "serde_json", @@ -1769,7 +1769,7 @@ dependencies = [ "mbedtls-platform-support", "mbedtls-sys-auto", "rs-libc 0.2.3", - "serde", + "serde 1.0.132", "serde_derive 1.0.132", "yasna 0.2.2", ] @@ -1941,7 +1941,7 @@ dependencies = [ "mbedtls", "num-bigint 0.4.3", "pkix", - "serde", + "serde 1.0.132", "serde_bytes", "serde_cbor", "yasna 0.4.0", @@ -1970,7 +1970,7 @@ dependencies = [ "once_cell", "openssl", "page_size", - "serde", + "serde 1.0.132", "serde_cbor", "serde_json", "sha2 0.9.8", @@ -2069,7 +2069,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.132", "serde_bytes", "serde_cbor", ] @@ -2892,7 +2892,7 @@ dependencies = [ "native-tls", "percent-encoding 2.1.0", "pin-project-lite", - "serde", + "serde 1.0.132", "serde_json", "serde_urlencoded", "tokio", @@ -3000,7 +3000,7 @@ dependencies = [ "hyper 0.10.16", "log 0.4.21", "rustc-serialize", - "serde", + "serde 1.0.132", "serde_derive 1.0.132", "serde_json", "url 1.7.2", @@ -3032,13 +3032,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.130" -source = "git+https://github.com/fortanix/serde.git?branch=master#80449547025fc4a016a333e96c0cdaf7e4a96f67" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008" +dependencies = [ + "serde_derive 1.0.132", +] + +[[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 +3058,7 @@ checksum = "9eb83481bce328081ced4404f986de002bf2e08865bec386734595ebf3b2c425" dependencies = [ "base64 0.13.0", "hex 0.4.3", - "serde", + "serde 1.0.132", ] [[package]] @@ -3058,7 +3067,7 @@ version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" dependencies = [ - "serde", + "serde 1.0.132", ] [[package]] @@ -3068,13 +3077,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ "half", - "serde", + "serde 1.0.132", ] [[package]] name = "serde_derive" -version = "1.0.130" -source = "git+https://github.com/fortanix/serde.git?branch=master#80449547025fc4a016a333e96c0cdaf7e4a96f67" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", @@ -3083,13 +3093,12 @@ dependencies = [ [[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 +3107,7 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" dependencies = [ - "serde", + "serde 1.0.132", ] [[package]] @@ -3109,7 +3118,7 @@ checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "itoa 1.0.1", "ryu", - "serde", + "serde 1.0.132", ] [[package]] @@ -3132,7 +3141,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.1", "ryu", - "serde", + "serde 1.0.132", ] [[package]] @@ -3142,7 +3151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edeeaecd5445109b937a3a335dc52780ca7779c4b4b7374cc6340dedfe44cfca" dependencies = [ "rustversion", - "serde", + "serde 1.0.132", "serde_with_macros", ] @@ -3166,7 +3175,7 @@ checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" dependencies = [ "dtoa", "linked-hash-map", - "serde", + "serde 1.0.132", "yaml-rust", ] @@ -3176,7 +3185,7 @@ version = "0.4.1" dependencies = [ "bitflags 1.2.1", "mbedtls", - "serde", + "serde 1.0.132", ] [[package]] @@ -3248,7 +3257,7 @@ dependencies = [ "regex", "report-test", "reqwest", - "serde", + "serde 1.0.132", "serde_derive 1.0.132", "serde_yaml", "sgx-isa", @@ -3316,7 +3325,7 @@ dependencies = [ "mime 0.3.16", "openssl", "pin-project 1.0.8", - "serde", + "serde 1.0.132", "serde_json", "tar", "tokio", @@ -3540,7 +3549,7 @@ dependencies = [ "itoa 1.0.1", "libc", "num_threads", - "serde", + "serde 1.0.132", "time-core", "time-macros", ] @@ -3649,7 +3658,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" dependencies = [ - "serde", + "serde 1.0.132", ] [[package]] @@ -3658,7 +3667,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde", + "serde 1.0.132", ] [[package]] @@ -3838,7 +3847,7 @@ checksum = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" dependencies = [ "cfg-if 0.1.10", "rand 0.4.6", - "serde", + "serde 1.0.132", ] [[package]] @@ -3848,7 +3857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" dependencies = [ "rand 0.6.5", - "serde", + "serde 1.0.132", ] [[package]] @@ -4221,3 +4230,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" From 8408adac6e9eacc16acdb83dee445b00f59b077b Mon Sep 17 00:00:00 2001 From: NikitaShyrei Date: Tue, 13 Aug 2024 13:16:25 +0200 Subject: [PATCH 3/3] - lock file update --- Cargo.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c59ec02..9ec51229 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4230,8 +4230,3 @@ 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"