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