From 512b088278712c02965e79ddaf5a627692048093 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 19:32:05 +0000 Subject: [PATCH] Update Rust crate borsh to v1 --- src/Cargo.lock | 86 ++++---------------------------------- src/integration/Cargo.toml | 4 +- src/qos_client/Cargo.toml | 2 +- src/qos_core/Cargo.toml | 2 +- src/qos_host/Cargo.toml | 2 +- src/qos_nsm/Cargo.toml | 2 +- src/qos_p256/Cargo.toml | 2 +- 7 files changed, 16 insertions(+), 84 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index cbb316ca..1f30ce90 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -52,17 +52,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", -] - [[package]] name = "android_system_properties" version = "0.1.5" @@ -251,47 +240,11 @@ dependencies = [ [[package]] name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive", - "hashbrown", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +checksum = "5e3f7359eeed8d454c38bbb25eb89d98b888b1060bbfeed2cda71cb013ff2dc2" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "cfg_aliases", ] [[package]] @@ -324,6 +277,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" version = "0.4.24" @@ -702,15 +661,6 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hermit-abi" version = "0.2.6" @@ -1271,15 +1221,6 @@ dependencies = [ "elliptic-curve", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -1895,15 +1836,6 @@ dependencies = [ "syn 2.0.15", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "tower" version = "0.4.13" diff --git a/src/integration/Cargo.toml b/src/integration/Cargo.toml index 8cb66c1e..faa491d2 100644 --- a/src/integration/Cargo.toml +++ b/src/integration/Cargo.toml @@ -15,11 +15,11 @@ qos_p256 = { path = "../qos_p256", features = ["mock"] } qos_test_primitives = { path = "../qos_test_primitives" } tokio = { version = "1.33", features = ["macros", "rt-multi-thread"], default-features = false } -borsh = { version = "0.10" } +borsh = { version = "1.1" } nix = { version = "0.26", features = ["socket"], default-features = false } [dev-dependencies] qos_core = { path = "../qos_core", features = ["mock"], default-features = false } -borsh = { version = "0.10" } +borsh = { version = "1.1" } aws-nitro-enclaves-nsm-api = { version = "0.3", default-features = false } rand = "0.8" diff --git a/src/qos_client/Cargo.toml b/src/qos_client/Cargo.toml index 1ded91ec..b96c4dae 100644 --- a/src/qos_client/Cargo.toml +++ b/src/qos_client/Cargo.toml @@ -13,7 +13,7 @@ qos_nsm = { path = "../qos_nsm", default-features = false } # Third party ureq = { version = "2.6", default-features = false } aws-nitro-enclaves-nsm-api = { version = "0.3", default-features = false } -borsh = { version = "0.10", default-features = false } +borsh = { version = "1.1", default-features = false } p256 = { version = "0.12.0", default-features = false } rand_core = { version = "0.6", default-features = false } zeroize = { version = "1.6", default-features = false } diff --git a/src/qos_core/Cargo.toml b/src/qos_core/Cargo.toml index 992fac24..090c2560 100644 --- a/src/qos_core/Cargo.toml +++ b/src/qos_core/Cargo.toml @@ -11,7 +11,7 @@ qos_nsm = { path = "../qos_nsm", default-features = false } nix = { version = "0.26", features = ["socket"], default-features = false } libc = "=0.2.148" -borsh = { version = "0.10" } +borsh = { version = "1.1" } # For AWS Nitro aws-nitro-enclaves-nsm-api = { version = "0.3", default-features = false } diff --git a/src/qos_host/Cargo.toml b/src/qos_host/Cargo.toml index d89a00e8..e14a8ea5 100644 --- a/src/qos_host/Cargo.toml +++ b/src/qos_host/Cargo.toml @@ -9,7 +9,7 @@ qos_core = { path = "../qos_core", default-features = false } # Third party axum = { version = "0.6.20", features = ["http1", "tokio"], default-features = false } tokio = { version = "1.33", features = ["macros", "rt-multi-thread"], default-features = false } -borsh = { version = "0.10" } +borsh = { version = "1.1" } [features] vm = ["qos_core/vm"] diff --git a/src/qos_nsm/Cargo.toml b/src/qos_nsm/Cargo.toml index 2ffb3ca5..14e3c9ee 100644 --- a/src/qos_nsm/Cargo.toml +++ b/src/qos_nsm/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] qos_hex = { path = "../qos_hex" } -borsh = { version = "0.10" } +borsh = { version = "1.1" } aws-nitro-enclaves-nsm-api = { version = "0.3", features = ["nix"], default-features = false } aws-nitro-enclaves-cose = { version = "0.5", default-features = false } sha2 = { version = "0.10", default-features = false } diff --git a/src/qos_p256/Cargo.toml b/src/qos_p256/Cargo.toml index f9ac2a36..af7aea90 100644 --- a/src/qos_p256/Cargo.toml +++ b/src/qos_p256/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] qos_hex = { path = "../qos_hex" } -borsh = { version = "0.10", default-features = false } +borsh = { version = "1.1", default-features = false } rand_core = { version = "0.6.4", default-features = false } sha2 = { version = "0.10", default-features = false }