From 12891d6af1304c031a17f48c5e28cc83d19e9ff5 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 10 May 2024 00:08:04 +0800 Subject: [PATCH 1/7] cleanup dangling server reference i think this actually didn't break hosted mode because sha2 emulation doesn't use hardware, but this cleans up a warning at least --- xtask/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 6c7d25ab9..1a6d9ee7b 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -98,7 +98,7 @@ fn main() -> Result<(), Box> { // security "root-keys", "trng", - "sha2@0.10.8", + "sha2", // "engine-25519", "jtag", // GUI front end From 52e5d21e6ff686352c0a45fe7c98cc6a3e067b9a Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 10 May 2024 00:33:59 +0800 Subject: [PATCH 2/7] work around white screen issue on Windows 11 (#538) This is the work-around suggested at https://github.com/emoon/rust_minifb/issues/351 until a new release is tagged. --- services/graphics-server/Cargo.toml | 2 +- services/graphics-server/src/backend/minifb.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index eeeacad23..25fc23e83 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -33,7 +33,7 @@ cramium-hal = { path = "../../libs/cramium-hal", optional = true, features = [ ] } [target.'cfg(any(windows,unix))'.dependencies] -minifb = "0.23.0" +minifb = { git = "https://github.com/emoon/rust_minifb.git", rev = "633e6cd4f8f55fd9cbedc461976dde0f408bea35" } [features] cramium-soc = [ diff --git a/services/graphics-server/src/backend/minifb.rs b/services/graphics-server/src/backend/minifb.rs index e30f7e07f..a472eca1d 100644 --- a/services/graphics-server/src/backend/minifb.rs +++ b/services/graphics-server/src/backend/minifb.rs @@ -16,7 +16,7 @@ pub const FB_WIDTH_PIXELS: usize = WIDTH as usize; pub const FB_LINES: usize = HEIGHT as usize; pub const FB_SIZE: usize = WIDTH_WORDS * HEIGHT as usize; // 44 bytes by 536 lines -const MAX_FPS: u64 = 60; +const MAX_FPS: usize = 60; const DARK_COLOUR: u32 = 0xB5B5AD; const LIGHT_COLOUR: u32 = 0x1B1B19; @@ -166,7 +166,7 @@ impl MinifbThread { }); // Limit the maximum update rate - window.limit_update_rate(Some(std::time::Duration::from_micros(1000 * 1000 / MAX_FPS))); + window.set_target_fps(MAX_FPS); let xns = xous_names::XousNames::new().unwrap(); let kbd = keyboard::Keyboard::new(&xns).expect("GFX|hosted can't connect to KBD for emulation"); From d4a306172f43601805160e68617bdf73755c42dc Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 10 May 2024 00:35:16 +0800 Subject: [PATCH 3/7] reflect minifb version change in lockfile --- Cargo.lock | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dd3d216a2..2341db235 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1143,12 +1143,6 @@ dependencies = [ "cipher", ] -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "curve25519-dalek" version = "4.1.2" @@ -2884,9 +2878,8 @@ checksum = "c3c8dda44ff03a2f238717214da50f65d5a53b45cd213a7370424ffdb6fae815" [[package]] name = "minifb" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e21c5f89bb820c7878c300c5b944e65de0f1b2a75e0be92ce670b95943740e" +version = "0.25.0" +source = "git+https://github.com/emoon/rust_minifb.git?rev=633e6cd4f8f55fd9cbedc461976dde0f408bea35#633e6cd4f8f55fd9cbedc461976dde0f408bea35" dependencies = [ "cc", "dlib", @@ -4010,12 +4003,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.4.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] +checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" [[package]] name = "rayon" From f1ee38cf6a3177ea6a9a4ab7fd71a34f4bb54e3d Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 10 May 2024 00:38:29 +0800 Subject: [PATCH 4/7] remove unused feature flag that is triggering a warning --- xtask/src/main.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 1a6d9ee7b..929ec9685 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -305,7 +305,6 @@ fn main() -> Result<(), Box> { .add_services(&user_pkgs) .add_feature("pddbtest") .add_feature("ditherpunk") - .add_feature("tracking-alloc") .add_feature("tls") // .add_feature("test-rekey") .add_apps(&get_cratespecs()); From 90108f266e96c9b3ed513db60601fe18f7b48871 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 10 May 2024 00:38:41 +0800 Subject: [PATCH 5/7] allow this trait to be unused it's not used in all configs but it's not a bad thing to have it around. --- kernel/src/io.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/src/io.rs b/kernel/src/io.rs index 9caa56b9e..53e653a2b 100644 --- a/kernel/src/io.rs +++ b/kernel/src/io.rs @@ -2,12 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 /// A trait for serial like drivers which are byte-oriented sinks. +#[allow(dead_code)] pub trait SerialWrite { /// Write a single byte. fn putc(&mut self, b: u8); } /// A trait for serial like drivers which allows reading from a source. +#[allow(dead_code)] pub trait SerialRead { /// Read a single byte. fn getc(&mut self) -> Option; From 65caa55407f8bf5c8d081e4510a4378bb0433eb4 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 12 May 2024 12:32:45 +0800 Subject: [PATCH 6/7] bump to minifb 0.26.0 solves #538 --- Cargo.lock | 5 +++-- services/graphics-server/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2341db235..bb400b1f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2878,8 +2878,9 @@ checksum = "c3c8dda44ff03a2f238717214da50f65d5a53b45cd213a7370424ffdb6fae815" [[package]] name = "minifb" -version = "0.25.0" -source = "git+https://github.com/emoon/rust_minifb.git?rev=633e6cd4f8f55fd9cbedc461976dde0f408bea35#633e6cd4f8f55fd9cbedc461976dde0f408bea35" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36eac3001258de903d8e8f79b91b6c03cb19214f823c01db1505ef250cb980f9" dependencies = [ "cc", "dlib", diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index 25fc23e83..59291a9ac 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -33,7 +33,7 @@ cramium-hal = { path = "../../libs/cramium-hal", optional = true, features = [ ] } [target.'cfg(any(windows,unix))'.dependencies] -minifb = { git = "https://github.com/emoon/rust_minifb.git", rev = "633e6cd4f8f55fd9cbedc461976dde0f408bea35" } +minifb = "0.26.0" [features] cramium-soc = [ From ceb89c64e617bfb1ecadbc455eb35dc4b4d1039f Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 12 May 2024 14:12:28 +0800 Subject: [PATCH 7/7] attempt to remove the last hold-out legacy sha2 dependency --- Cargo.lock | 173 +++++++++++------------- Cargo.toml | 2 - apps/vault/libraries/crypto/Cargo.toml | 2 +- apps/vault/libraries/crypto/src/ecdh.rs | 4 +- 4 files changed, 84 insertions(+), 97 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb400b1f7..dbfe5adf8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1033,18 +1033,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.4.9" @@ -1052,6 +1040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1067,16 +1056,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "csv" version = "1.3.0" @@ -1117,7 +1096,7 @@ dependencies = [ "rfc6979 0.2.0", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "subtle", "trng", "untrusted 0.7.1", @@ -1312,6 +1291,16 @@ dependencies = [ "pem-rfc7468", ] +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid 0.9.6", + "zeroize", +] + [[package]] name = "der" version = "0.7.8" @@ -1478,14 +1467,14 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.13.4" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der 0.5.1", + "der 0.6.1", "elliptic-curve", - "rfc6979 0.1.0", - "signature 1.4.0", + "rfc6979 0.3.1", + "signature 1.6.4", ] [[package]] @@ -1495,7 +1484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "serde", - "signature 1.4.0", + "signature 1.6.4", ] [[package]] @@ -1524,7 +1513,7 @@ dependencies = [ "ed25519 2.2.3", "rand_core 0.6.4", "serde", - "sha2 0.10.8", + "sha2", "signature 2.2.0", "subtle", "zeroize", @@ -1558,16 +1547,18 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", - "crypto-bigint 0.3.2", - "der 0.5.1", + "crypto-bigint", + "der 0.6.1", + "digest 0.10.7", "ff", "generic-array", "group", + "hkdf", "rand_core 0.6.4", "sec1", "subtle", @@ -1757,9 +1748,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "rand_core 0.6.4", "subtle", @@ -2016,7 +2007,7 @@ dependencies = [ "num-traits", "qrcode", "rkyv", - "sha2 0.10.8", + "sha2", "trng", "tts-frontend", "utralib 0.1.24", @@ -2139,9 +2130,9 @@ dependencies = [ [[package]] name = "group" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", "rand_core 0.6.4", @@ -2299,17 +2290,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "hmac 0.12.1", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", + "hmac", ] [[package]] @@ -3310,14 +3291,13 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p256" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19736d80675fbe9fe33426268150b951a3fb8f5cfca2a23a17c85ef3adb24e3b" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa", "elliptic-curve", - "sec1", - "sha2 0.9.9", + "sha2", ] [[package]] @@ -3455,9 +3435,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.7", - "hmac 0.12.1", + "hmac", "password-hash", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -3486,7 +3466,7 @@ dependencies = [ "rand_core 0.6.4", "rkyv", "root-keys", - "sha2 0.10.8", + "sha2", "spinor", "subtle", "trng", @@ -3628,6 +3608,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der 0.6.1", + "spki 0.6.0", +] + [[package]] name = "pkcs8" version = "0.10.2" @@ -4110,23 +4100,23 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +checksum = "6c0788437d5ee113c49af91d3594ebc4fcdcc962f8b6df5aa1c3eeafd8ad95de" dependencies = [ - "crypto-bigint 0.3.2", - "hmac 0.11.0", + "crypto-bigint", + "hmac", "zeroize", ] [[package]] name = "rfc6979" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0788437d5ee113c49af91d3594ebc4fcdcc962f8b6df5aa1c3eeafd8ad95de" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint 0.4.9", - "hmac 0.12.1", + "crypto-bigint", + "hmac", "zeroize", ] @@ -4199,7 +4189,7 @@ dependencies = [ "num-traits", "rand_core 0.6.4", "rkyv", - "sha2 0.10.8", + "sha2", "spinor", "subtle", "trng", @@ -4373,13 +4363,14 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "sec1" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "der 0.5.1", + "base16ct", + "der 0.6.1", "generic-array", - "pkcs8 0.8.0", + "pkcs8 0.9.0", "subtle", "zeroize", ] @@ -4500,18 +4491,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "git+https://github.com/RustCrypto/hashes.git?tag=sha2-v0.9.9#e942f6f13a820a58716587f508fa50b6582cf34f" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.8" @@ -4596,7 +4575,7 @@ dependencies = [ "rkyv", "root-keys", "rustls", - "sha2 0.10.8", + "sha2", "spinor", "threadpool", "tls", @@ -4621,11 +4600,11 @@ dependencies = [ [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.9.0", + "digest 0.10.7", "rand_core 0.6.4", ] @@ -4741,6 +4720,16 @@ dependencies = [ "der 0.5.1", ] +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der 0.6.1", +] + [[package]] name = "spki" version = "0.7.3" @@ -4789,7 +4778,7 @@ dependencies = [ "pddb", "rkyv", "root-keys", - "sha2 0.10.8", + "sha2", "trng", "usb-device-xous", "userprefs", @@ -5100,7 +5089,7 @@ dependencies = [ "rustls", "rustls-webpki", "sct", - "sha2 0.10.8", + "sha2", "ureq", "webpki-roots", "x509-parser", @@ -5143,7 +5132,7 @@ dependencies = [ "pkcs8 0.8.0", "rand 0.8.5", "ring", - "sha2 0.10.8", + "sha2", "svd2utra 0.1.22", "xmas-elf", "xous-semver", @@ -5616,7 +5605,7 @@ dependencies = [ "gam", "graphics-server", "hex 0.4.3", - "hmac 0.12.1", + "hmac", "ime-plugin-api", "locales", "log", @@ -5633,7 +5622,7 @@ dependencies = [ "random-pick", "rkyv", "sha1", - "sha2 0.10.8", + "sha2", "sntpc", "subtle", "trng", @@ -6513,7 +6502,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "flate2", - "hmac 0.12.1", + "hmac", "pbkdf2", "sha1", "time", diff --git a/Cargo.toml b/Cargo.toml index 1f60a1e16..dc12e8ac0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -137,8 +137,6 @@ opt-level = "s" # z,s: Optimize for size instead of performance; 1 for easier de [patch.crates-io] sha2 = { git = "https://github.com/betrusted-io/hashes.git", branch = "sha2-v0.10.8-xous" } # sha2 = { path = "../hashes/sha2" } -# This is needed by `p256`, currently the last holdout (a `vault` depenedncy) -sha2_legacy = { git = "https://github.com/RustCrypto/hashes.git", tag = "sha2-v0.9.9", package = "sha2" } [patch.crates-io.aes] path = "services/aes" diff --git a/apps/vault/libraries/crypto/Cargo.toml b/apps/vault/libraries/crypto/Cargo.toml index 6273f65a0..f6ff145bf 100644 --- a/apps/vault/libraries/crypto/Cargo.toml +++ b/apps/vault/libraries/crypto/Cargo.toml @@ -16,7 +16,7 @@ subtle = { version = "2.2.3", default-features = false } trng = { path = "../../../../services/trng" } xous-names = { package = "xous-api-names", version = "0.9.58" } rand_core = "0.6.3" -p256 = { version = "0.10.1", default-features = false, features = [ +p256 = { version = "0.11.1", default-features = false, features = [ "ecdsa", "ecdh", "std", diff --git a/apps/vault/libraries/crypto/src/ecdh.rs b/apps/vault/libraries/crypto/src/ecdh.rs index d0e1c8f22..e47395c3c 100644 --- a/apps/vault/libraries/crypto/src/ecdh.rs +++ b/apps/vault/libraries/crypto/src/ecdh.rs @@ -105,14 +105,14 @@ impl SecKey { pub fn exchange_x_sha256(&self, other: &PubKey) -> [u8; 32] { let shared = self.a.diffie_hellman(&other.p); let mut hasher = Sha256::new(); - hasher.update(shared.as_bytes().as_slice().try_into().unwrap()); + hasher.update(shared.raw_secret_bytes().as_slice().try_into().unwrap()); hasher.finalize() } pub fn exchange_x(&self, other: &PubKey) -> [u8; 32] { let shared = self.a.diffie_hellman(&other.p); let mut ret = [0u8; 32]; - ret.copy_from_slice(shared.as_bytes().as_slice()); + ret.copy_from_slice(shared.raw_secret_bytes().as_slice()); ret } }