From 55d88587a92474a8948c1fb98597f88ea2f82656 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 30 Jan 2024 01:43:09 +0800 Subject: [PATCH] upgrade all the subordinate Cargo.toml files to match the patch looks like about 9 crates will be affected by this. Point them all to the latest version of the API, and specify the "precursor" feature (which activates our patch) --- apps/vault/Cargo.toml | 2 +- apps/vault/libraries/crypto/Cargo.toml | 18 +++++++++++------- libs/tls/Cargo.toml | 2 +- services/gam/Cargo.toml | 2 +- services/pddb/Cargo.toml | 2 +- services/root-keys/Cargo.toml | 4 ++-- services/shellchat/Cargo.toml | 5 ++--- services/status/Cargo.toml | 2 +- tools/Cargo.toml | 2 +- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/apps/vault/Cargo.toml b/apps/vault/Cargo.toml index 4e550c6f4..0c02fe983 100644 --- a/apps/vault/Cargo.toml +++ b/apps/vault/Cargo.toml @@ -53,7 +53,7 @@ sha-1 = "0.9.8" hmac = "0.11.0" digest = "0.9.0" base32 = "0.4.0" -sha2 = { path = "../../services/engine-sha512" } +sha2 = { version = "0.10.8", features = ["precursor"] } sntpc = { version = "0.3.1" } net = { path = "../../services/net" } com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" } diff --git a/apps/vault/libraries/crypto/Cargo.toml b/apps/vault/libraries/crypto/Cargo.toml index cad547584..2807aa3aa 100644 --- a/apps/vault/libraries/crypto/Cargo.toml +++ b/apps/vault/libraries/crypto/Cargo.toml @@ -12,14 +12,18 @@ edition = "2018" [dependencies] cbor = { path = "../cbor" } arrayref = "0.3.6" -subtle = { version = "2.2.3", default-features = false} -trng = {path = "../../../../services/trng"} -xous-names = {package = "xous-api-names", version = "0.9.55"} +subtle = { version = "2.2.3", default-features = false } +trng = { path = "../../../../services/trng" } +xous-names = { package = "xous-api-names", version = "0.9.55" } rand_core = "0.6.3" -p256 = {version = "0.10.1", default-features = false, features = ["ecdsa", "ecdh", "std"]} +p256 = { version = "0.10.1", default-features = false, features = [ + "ecdsa", + "ecdh", + "std", +] } cbc = "0.1.2" -aes = {path="../../../../services/aes"} -sha2 = {path="../../../../services/engine-sha512"} +aes = { path = "../../../../services/aes" } +sha2 = { version = "0.10.8", features = ["precursor"] } log = "0.4.14" # xous debugging @@ -37,4 +41,4 @@ byteorder = { version = "1", default-features = false } rfc6979 = "0.2.0" [features] -with_ctap1 = [] \ No newline at end of file +with_ctap1 = [] diff --git a/libs/tls/Cargo.toml b/libs/tls/Cargo.toml index 2330146f2..967f14586 100644 --- a/libs/tls/Cargo.toml +++ b/libs/tls/Cargo.toml @@ -22,7 +22,7 @@ pddb = { path = "../../services/pddb" } der = { version = "0.7.6", features = ["derive"] } locales = { path = "../../locales" } rkyv = "0.4.3" -sha2 = "0.9.8" +sha2 = { version = "0.10.8", features = ["precursor"] } # note requirement for patch to xous-ring in workspace Cargo.toml rustls = { version = "0.21.7", features = ["dangerous_configuration"] } diff --git a/services/gam/Cargo.toml b/services/gam/Cargo.toml index f7de84f78..eda45f14a 100644 --- a/services/gam/Cargo.toml +++ b/services/gam/Cargo.toml @@ -40,7 +40,7 @@ miniz_oxide = "0.4.4" # used in bip39 dialogue hex = { version = "0.4.3", default-features = false, features = ["alloc"] } -sha2 = { path = "../engine-sha512" } +sha2 = { version = "0.10.8", features = ["precursor"] } digest = "0.9.0" utralib = { version = "0.1.24", optional = true, default-features = false } diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index 4349e3a7e..6a75db3f6 100644 --- a/services/pddb/Cargo.toml +++ b/services/pddb/Cargo.toml @@ -35,7 +35,7 @@ tts-frontend = { path = "../tts" } rand_core = "0.5.1" # passwords -sha2 = { path = "../engine-sha512" } +sha2 = { version = "0.10.8", features = ["precursor"] } digest = "0.9.0" hkdf = "0.11.0" zeroize = "1.3.0" diff --git a/services/root-keys/Cargo.toml b/services/root-keys/Cargo.toml index 9c82290da..f69c8c1e5 100644 --- a/services/root-keys/Cargo.toml +++ b/services/root-keys/Cargo.toml @@ -62,11 +62,11 @@ keyboard = { path = "../keyboard" } # private keys #sha2 = {version = "0.9.5", default-features = false, features = []} -sha2 = { path = "../engine-sha512" } +sha2 = { version = "0.10.8", features = ["precursor"] } digest = "0.9.0" aes = { path = "../aes" } engine-25519 = { path = "../engine-25519" } -byteorder = "1.4.3" # used by keywrap +byteorder = "1.4.3" # used by keywrap # hardware acceleration adaptations are inserted into a fork of the main branch. hex = { version = "0.4.3", default-features = false, features = [] } diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index 4be0b9ad5..b0dd95795 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -8,7 +8,7 @@ version = "0.1.0" # Dependency versions enforced by Cargo.lock. [dependencies] com = { path = "../com" } -content-plugin-api = { path = "../content-plugin-api" } # all content canvas providers must provide this API +content-plugin-api = { path = "../content-plugin-api" } # all content canvas providers must provide this API gam = { path = "../gam" } graphics-server = { path = "../graphics-server" } ime-plugin-api = { path = "../ime-plugin-api" } @@ -24,8 +24,7 @@ xous-names = { package = "xous-api-names", version = "0.9.55" } keyboard = { path = "../keyboard" } susres = { package = "xous-api-susres", version = "0.9.53" } codec = { path = "../codec" } -#engine-sha512 = {path="../engine-sha512"} -sha2 = { path = "../engine-sha512" } +sha2 = { version = "0.10.8", features = ["precursor"] } digest = "0.9.0" aes = { path = "../aes" } cipher = "0.3.0" diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index 88bebc900..b36c005b6 100644 --- a/services/status/Cargo.toml +++ b/services/status/Cargo.toml @@ -42,7 +42,7 @@ rkyv = { version = "0.4.3", default-features = false, features = [ chrono = { version = "0.4.19", default-features = false, features = ["std"] } crossbeam = "0.8.2" -sha2 = { path = "../engine-sha512" } +sha2 = { version = "0.10.8", features = ["precursor"] } digest = "0.9.0" xous-semver = "0.1.2" com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" } diff --git a/tools/Cargo.toml b/tools/Cargo.toml index ace56a35d..f8e216254 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -21,7 +21,7 @@ svd2utra = "0.1.22" xmas-elf = "0.9.0" xous-semver = "0.1.2" ed25519-dalek = "1.0.1" -sha2 = "0.9.5" +sha2 = { version = "0.10.8", features = ["precursor"] } pkcs8 = { version = "0.8.0", features = ["pem"] } base64 = "0.20.0"