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)
This commit is contained in:
bunnie 2024-01-30 01:43:09 +08:00
parent 42897e4fa0
commit 55d88587a9
9 changed files with 21 additions and 18 deletions

View file

@ -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" }

View file

@ -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 = []
with_ctap1 = []

View file

@ -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"] }

View file

@ -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 }

View file

@ -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"

View file

@ -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 = [] }

View file

@ -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"

View file

@ -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" }

View file

@ -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"