cleanup from fixing aes transitive deps

This commit is contained in:
bunnie 2025-09-07 11:52:16 +08:00
parent 75a9373fea
commit 1efb49bc97
2 changed files with 17 additions and 23 deletions

38
Cargo.lock generated
View file

@ -20,23 +20,12 @@ dependencies = [
[[package]] [[package]]
name = "aes" name = "aes"
version = "0.8.3" version = "0.8.4"
dependencies = [ dependencies = [
"cipher", "cipher",
"zeroize", "zeroize",
] ]
[[package]]
name = "aes"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
dependencies = [
"cfg-if",
"cipher",
"cpufeatures",
]
[[package]] [[package]]
name = "aes-gcm-siv" name = "aes-gcm-siv"
version = "0.11.1" version = "0.11.1"
@ -44,7 +33,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d"
dependencies = [ dependencies = [
"aead", "aead",
"aes 0.8.4", "aes",
"cipher", "cipher",
"ctr", "ctr",
"polyval", "polyval",
@ -58,14 +47,14 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c"
dependencies = [ dependencies = [
"aes 0.8.4", "aes",
] ]
[[package]] [[package]]
name = "aes-test" name = "aes-test"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes 0.8.3", "aes",
"hex-literal", "hex-literal",
"log", "log",
"xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)",
@ -334,7 +323,7 @@ dependencies = [
name = "bao-console" name = "bao-console"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes 0.8.3", "aes",
"cram-hal-service", "cram-hal-service",
"cramium-api", "cramium-api",
"cramium-emu", "cramium-emu",
@ -1026,7 +1015,7 @@ dependencies = [
name = "cram-mbox1" name = "cram-mbox1"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes 0.8.3", "aes",
"log", "log",
"num-derive 0.4.2", "num-derive 0.4.2",
"num-traits", "num-traits",
@ -1288,7 +1277,7 @@ dependencies = [
name = "ctap-crypto" name = "ctap-crypto"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes 0.8.3", "aes",
"arrayref", "arrayref",
"byteorder", "byteorder",
"cbc", "cbc",
@ -2948,7 +2937,7 @@ dependencies = [
name = "keystore" name = "keystore"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes 0.8.3", "aes",
"aes-gcm-siv", "aes-gcm-siv",
"aes-kw", "aes-kw",
"blowfish", "blowfish",
@ -3145,6 +3134,7 @@ dependencies = [
name = "loader" name = "loader"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes",
"aes-gcm-siv", "aes-gcm-siv",
"armv7", "armv7",
"atsama5d27", "atsama5d27",
@ -3907,7 +3897,7 @@ dependencies = [
name = "pddb" name = "pddb"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes 0.8.3", "aes",
"aes-gcm-siv", "aes-gcm-siv",
"bitfield", "bitfield",
"bitflags 1.3.2", "bitflags 1.3.2",
@ -4735,7 +4725,7 @@ dependencies = [
name = "root-keys" name = "root-keys"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes 0.8.3", "aes",
"aes-gcm-siv", "aes-gcm-siv",
"aes-kw", "aes-kw",
"blitstr2", "blitstr2",
@ -5112,7 +5102,7 @@ dependencies = [
name = "shellchat" name = "shellchat"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes 0.8.3", "aes",
"base64 0.20.0", "base64 0.20.0",
"blitstr2", "blitstr2",
"chrono", "chrono",
@ -6984,6 +6974,7 @@ dependencies = [
name = "xous-kernel" name = "xous-kernel"
version = "0.9.38" version = "0.9.38"
dependencies = [ dependencies = [
"aes",
"armv7", "armv7",
"bitflags 1.3.2", "bitflags 1.3.2",
"cramium-hal", "cramium-hal",
@ -7083,6 +7074,7 @@ dependencies = [
name = "xous-swapper" name = "xous-swapper"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes",
"aes-gcm-siv", "aes-gcm-siv",
"cramium-api", "cramium-api",
"cramium-hal", "cramium-hal",
@ -7195,7 +7187,7 @@ version = "2.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e"
dependencies = [ dependencies = [
"aes 0.8.4", "aes",
"arbitrary", "arbitrary",
"bzip2", "bzip2",
"constant_time_eq", "constant_time_eq",

View file

@ -155,6 +155,8 @@ opt-level = "s" # z,s: Optimize for size instead of performance; 1 for easier de
sha2 = { git = "https://github.com/betrusted-io/hashes.git", branch = "sha2-v0.10.8-xous" } sha2 = { git = "https://github.com/betrusted-io/hashes.git", branch = "sha2-v0.10.8-xous" }
# sha2 = { path = "../hashes/sha2" } # sha2 = { path = "../hashes/sha2" }
# Debugging the cramium-soc feature on aes ("--features swap" only needed for loader):
# cargo tree -e features --features cramium-soc --features swap -f "{p} {f}"
[patch.crates-io.aes] [patch.crates-io.aes]
path = "services/aes" path = "services/aes"