attempt to remove the last hold-out legacy sha2 dependency

This commit is contained in:
bunnie 2024-05-12 14:12:28 +08:00
parent 4f30067244
commit ceb89c64e6
4 changed files with 84 additions and 97 deletions

173
Cargo.lock generated
View file

@ -1033,18 +1033,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" 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]] [[package]]
name = "crypto-bigint" name = "crypto-bigint"
version = "0.4.9" version = "0.4.9"
@ -1052,6 +1040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
dependencies = [ dependencies = [
"generic-array", "generic-array",
"rand_core 0.6.4",
"subtle", "subtle",
"zeroize", "zeroize",
] ]
@ -1067,16 +1056,6 @@ dependencies = [
"typenum", "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]] [[package]]
name = "csv" name = "csv"
version = "1.3.0" version = "1.3.0"
@ -1117,7 +1096,7 @@ dependencies = [
"rfc6979 0.2.0", "rfc6979 0.2.0",
"serde", "serde",
"serde_json", "serde_json",
"sha2 0.10.8", "sha2",
"subtle", "subtle",
"trng", "trng",
"untrusted 0.7.1", "untrusted 0.7.1",
@ -1312,6 +1291,16 @@ dependencies = [
"pem-rfc7468", "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]] [[package]]
name = "der" name = "der"
version = "0.7.8" version = "0.7.8"
@ -1478,14 +1467,14 @@ dependencies = [
[[package]] [[package]]
name = "ecdsa" name = "ecdsa"
version = "0.13.4" version = "0.14.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
dependencies = [ dependencies = [
"der 0.5.1", "der 0.6.1",
"elliptic-curve", "elliptic-curve",
"rfc6979 0.1.0", "rfc6979 0.3.1",
"signature 1.4.0", "signature 1.6.4",
] ]
[[package]] [[package]]
@ -1495,7 +1484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
dependencies = [ dependencies = [
"serde", "serde",
"signature 1.4.0", "signature 1.6.4",
] ]
[[package]] [[package]]
@ -1524,7 +1513,7 @@ dependencies = [
"ed25519 2.2.3", "ed25519 2.2.3",
"rand_core 0.6.4", "rand_core 0.6.4",
"serde", "serde",
"sha2 0.10.8", "sha2",
"signature 2.2.0", "signature 2.2.0",
"subtle", "subtle",
"zeroize", "zeroize",
@ -1558,16 +1547,18 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]] [[package]]
name = "elliptic-curve" name = "elliptic-curve"
version = "0.11.12" version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
dependencies = [ dependencies = [
"base16ct", "base16ct",
"crypto-bigint 0.3.2", "crypto-bigint",
"der 0.5.1", "der 0.6.1",
"digest 0.10.7",
"ff", "ff",
"generic-array", "generic-array",
"group", "group",
"hkdf",
"rand_core 0.6.4", "rand_core 0.6.4",
"sec1", "sec1",
"subtle", "subtle",
@ -1757,9 +1748,9 @@ dependencies = [
[[package]] [[package]]
name = "ff" name = "ff"
version = "0.11.1" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
dependencies = [ dependencies = [
"rand_core 0.6.4", "rand_core 0.6.4",
"subtle", "subtle",
@ -2016,7 +2007,7 @@ dependencies = [
"num-traits", "num-traits",
"qrcode", "qrcode",
"rkyv", "rkyv",
"sha2 0.10.8", "sha2",
"trng", "trng",
"tts-frontend", "tts-frontend",
"utralib 0.1.24", "utralib 0.1.24",
@ -2139,9 +2130,9 @@ dependencies = [
[[package]] [[package]]
name = "group" name = "group"
version = "0.11.0" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
dependencies = [ dependencies = [
"ff", "ff",
"rand_core 0.6.4", "rand_core 0.6.4",
@ -2299,17 +2290,7 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
dependencies = [ dependencies = [
"hmac 0.12.1", "hmac",
]
[[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",
] ]
[[package]] [[package]]
@ -3310,14 +3291,13 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "p256" name = "p256"
version = "0.10.1" version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19736d80675fbe9fe33426268150b951a3fb8f5cfca2a23a17c85ef3adb24e3b" checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
dependencies = [ dependencies = [
"ecdsa", "ecdsa",
"elliptic-curve", "elliptic-curve",
"sec1", "sha2",
"sha2 0.9.9",
] ]
[[package]] [[package]]
@ -3455,9 +3435,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
dependencies = [ dependencies = [
"digest 0.10.7", "digest 0.10.7",
"hmac 0.12.1", "hmac",
"password-hash", "password-hash",
"sha2 0.10.8", "sha2",
] ]
[[package]] [[package]]
@ -3486,7 +3466,7 @@ dependencies = [
"rand_core 0.6.4", "rand_core 0.6.4",
"rkyv", "rkyv",
"root-keys", "root-keys",
"sha2 0.10.8", "sha2",
"spinor", "spinor",
"subtle", "subtle",
"trng", "trng",
@ -3628,6 +3608,16 @@ dependencies = [
"zeroize", "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]] [[package]]
name = "pkcs8" name = "pkcs8"
version = "0.10.2" version = "0.10.2"
@ -4110,23 +4100,23 @@ dependencies = [
[[package]] [[package]]
name = "rfc6979" name = "rfc6979"
version = "0.1.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" checksum = "6c0788437d5ee113c49af91d3594ebc4fcdcc962f8b6df5aa1c3eeafd8ad95de"
dependencies = [ dependencies = [
"crypto-bigint 0.3.2", "crypto-bigint",
"hmac 0.11.0", "hmac",
"zeroize", "zeroize",
] ]
[[package]] [[package]]
name = "rfc6979" name = "rfc6979"
version = "0.2.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c0788437d5ee113c49af91d3594ebc4fcdcc962f8b6df5aa1c3eeafd8ad95de" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
dependencies = [ dependencies = [
"crypto-bigint 0.4.9", "crypto-bigint",
"hmac 0.12.1", "hmac",
"zeroize", "zeroize",
] ]
@ -4199,7 +4189,7 @@ dependencies = [
"num-traits", "num-traits",
"rand_core 0.6.4", "rand_core 0.6.4",
"rkyv", "rkyv",
"sha2 0.10.8", "sha2",
"spinor", "spinor",
"subtle", "subtle",
"trng", "trng",
@ -4373,13 +4363,14 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
[[package]] [[package]]
name = "sec1" name = "sec1"
version = "0.2.1" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
dependencies = [ dependencies = [
"der 0.5.1", "base16ct",
"der 0.6.1",
"generic-array", "generic-array",
"pkcs8 0.8.0", "pkcs8 0.9.0",
"subtle", "subtle",
"zeroize", "zeroize",
] ]
@ -4500,18 +4491,6 @@ dependencies = [
"digest 0.10.7", "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]] [[package]]
name = "sha2" name = "sha2"
version = "0.10.8" version = "0.10.8"
@ -4596,7 +4575,7 @@ dependencies = [
"rkyv", "rkyv",
"root-keys", "root-keys",
"rustls", "rustls",
"sha2 0.10.8", "sha2",
"spinor", "spinor",
"threadpool", "threadpool",
"tls", "tls",
@ -4621,11 +4600,11 @@ dependencies = [
[[package]] [[package]]
name = "signature" name = "signature"
version = "1.4.0" version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
dependencies = [ dependencies = [
"digest 0.9.0", "digest 0.10.7",
"rand_core 0.6.4", "rand_core 0.6.4",
] ]
@ -4741,6 +4720,16 @@ dependencies = [
"der 0.5.1", "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]] [[package]]
name = "spki" name = "spki"
version = "0.7.3" version = "0.7.3"
@ -4789,7 +4778,7 @@ dependencies = [
"pddb", "pddb",
"rkyv", "rkyv",
"root-keys", "root-keys",
"sha2 0.10.8", "sha2",
"trng", "trng",
"usb-device-xous", "usb-device-xous",
"userprefs", "userprefs",
@ -5100,7 +5089,7 @@ dependencies = [
"rustls", "rustls",
"rustls-webpki", "rustls-webpki",
"sct", "sct",
"sha2 0.10.8", "sha2",
"ureq", "ureq",
"webpki-roots", "webpki-roots",
"x509-parser", "x509-parser",
@ -5143,7 +5132,7 @@ dependencies = [
"pkcs8 0.8.0", "pkcs8 0.8.0",
"rand 0.8.5", "rand 0.8.5",
"ring", "ring",
"sha2 0.10.8", "sha2",
"svd2utra 0.1.22", "svd2utra 0.1.22",
"xmas-elf", "xmas-elf",
"xous-semver", "xous-semver",
@ -5616,7 +5605,7 @@ dependencies = [
"gam", "gam",
"graphics-server", "graphics-server",
"hex 0.4.3", "hex 0.4.3",
"hmac 0.12.1", "hmac",
"ime-plugin-api", "ime-plugin-api",
"locales", "locales",
"log", "log",
@ -5633,7 +5622,7 @@ dependencies = [
"random-pick", "random-pick",
"rkyv", "rkyv",
"sha1", "sha1",
"sha2 0.10.8", "sha2",
"sntpc", "sntpc",
"subtle", "subtle",
"trng", "trng",
@ -6513,7 +6502,7 @@ dependencies = [
"crc32fast", "crc32fast",
"crossbeam-utils", "crossbeam-utils",
"flate2", "flate2",
"hmac 0.12.1", "hmac",
"pbkdf2", "pbkdf2",
"sha1", "sha1",
"time", "time",

View file

@ -137,8 +137,6 @@ opt-level = "s" # z,s: Optimize for size instead of performance; 1 for easier de
[patch.crates-io] [patch.crates-io]
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" }
# 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] [patch.crates-io.aes]
path = "services/aes" path = "services/aes"

View file

@ -16,7 +16,7 @@ subtle = { version = "2.2.3", default-features = false }
trng = { path = "../../../../services/trng" } trng = { path = "../../../../services/trng" }
xous-names = { package = "xous-api-names", version = "0.9.58" } xous-names = { package = "xous-api-names", version = "0.9.58" }
rand_core = "0.6.3" rand_core = "0.6.3"
p256 = { version = "0.10.1", default-features = false, features = [ p256 = { version = "0.11.1", default-features = false, features = [
"ecdsa", "ecdsa",
"ecdh", "ecdh",
"std", "std",

View file

@ -105,14 +105,14 @@ impl SecKey {
pub fn exchange_x_sha256(&self, other: &PubKey) -> [u8; 32] { pub fn exchange_x_sha256(&self, other: &PubKey) -> [u8; 32] {
let shared = self.a.diffie_hellman(&other.p); let shared = self.a.diffie_hellman(&other.p);
let mut hasher = Sha256::new(); 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() hasher.finalize()
} }
pub fn exchange_x(&self, other: &PubKey) -> [u8; 32] { pub fn exchange_x(&self, other: &PubKey) -> [u8; 32] {
let shared = self.a.diffie_hellman(&other.p); let shared = self.a.diffie_hellman(&other.p);
let mut ret = [0u8; 32]; 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 ret
} }
} }