diff --git a/Cargo.lock b/Cargo.lock index 7c71775ae..8b951c2e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,22 +18,11 @@ dependencies = [ "generic-array", ] -[[package]] -name = "aes" -version = "0.8.1" -dependencies = [ - "cipher 0.4.4", -] - [[package]] name = "aes" version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "cfg-if", - "cipher 0.4.4", - "cpufeatures", + "cipher", ] [[package]] @@ -43,8 +32,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", - "aes 0.8.1", - "cipher 0.4.4", + "aes", + "cipher", "ctr", "polyval", "subtle", @@ -57,14 +46,14 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" dependencies = [ - "aes 0.8.1", + "aes", ] [[package]] name = "aes-test" version = "0.1.0" dependencies = [ - "aes 0.8.1", + "aes", "hex-literal", "log", "xous 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", @@ -471,17 +460,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "blowfish" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab" -dependencies = [ - "byteorder", - "cipher 0.3.0", - "opaque-debug", -] - [[package]] name = "blowfish" version = "0.9.1" @@ -489,7 +467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" dependencies = [ "byteorder", - "cipher 0.4.4", + "cipher", ] [[package]] @@ -549,7 +527,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -656,15 +634,6 @@ dependencies = [ "windows-targets 0.52.0", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - [[package]] name = "cipher" version = "0.4.4" @@ -815,6 +784,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1125,7 +1100,7 @@ dependencies = [ name = "ctap-crypto" version = "0.1.0" dependencies = [ - "aes 0.8.1", + "aes", "arrayref", "byteorder", "cbc", @@ -1163,7 +1138,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -1172,19 +1147,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" -[[package]] -name = "curve25519-dalek" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "4.1.1" @@ -1197,6 +1159,7 @@ dependencies = [ "platforms", "rustc_version 0.4.0", "subtle", + "zeroize", ] [[package]] @@ -1344,7 +1307,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" dependencies = [ - "const-oid", + "const-oid 0.7.1", "pem-rfc7468", ] @@ -1354,7 +1317,9 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ + "const-oid 0.9.6", "der_derive", + "zeroize", ] [[package]] @@ -1538,6 +1503,7 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8 0.10.2", "signature 2.2.0", ] @@ -1547,32 +1513,20 @@ version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e18997d4604542d0736fae2c5ad6de987f0a50530cbcc14a7ce5a685328a252d" -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.1", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "ed25519-dalek" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek", "ed25519 2.2.3", "rand_core 0.6.4", + "serde", "sha2 0.10.8", "signature 2.2.0", "subtle", + "zeroize", ] [[package]] @@ -3495,12 +3449,12 @@ dependencies = [ name = "pddb" version = "0.1.0" dependencies = [ - "aes 0.8.1", + "aes", "aes-gcm-siv", "bitfield", "bitflags 1.3.2", - "blowfish 0.9.1", - "cipher 0.4.4", + "blowfish", + "cipher", "digest 0.10.7", "gam", "hex 0.4.3", @@ -3655,10 +3609,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" dependencies = [ "der 0.5.1", - "spki", + "spki 0.5.4", "zeroize", ] +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.8", + "spki 0.7.3", +] + [[package]] name = "pkg-config" version = "0.3.29" @@ -4219,16 +4183,16 @@ dependencies = [ name = "root-keys" version = "0.1.0" dependencies = [ - "aes 0.8.1", + "aes", "aes-gcm-siv", "aes-kw", - "blowfish 0.8.0", + "blowfish", "byteorder", - "cipher 0.4.4", + "cipher", "com", - "curve25519-dalek 4.1.1", + "curve25519-dalek", "digest 0.10.7", - "ed25519-dalek 2.1.0", + "ed25519-dalek", "engine-25519", "gam", "graphics-server", @@ -4414,7 +4378,7 @@ checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ "der 0.5.1", "generic-array", - "pkcs8", + "pkcs8 0.8.0", "subtle", "zeroize", ] @@ -4592,19 +4556,19 @@ dependencies = [ name = "shellchat" version = "0.1.0" dependencies = [ - "aes 0.8.1", + "aes", "base64 0.20.0", "chrono", - "cipher 0.4.4", + "cipher", "codec", "com", "com_rs 0.1.0 (git+https://github.com/betrusted-io/com_rs?rev=891bdd3ca8e41f81510d112483e178aea3e3a921)", "content-plugin-api", "cos_table", - "curve25519-dalek 4.1.1", + "curve25519-dalek", "digest 0.10.7", "dns", - "ed25519-dalek 2.1.0", + "ed25519-dalek", "engine-25519", "gam", "graphics-server", @@ -4670,6 +4634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", + "rand_core 0.6.4", ] [[package]] @@ -4780,6 +4745,16 @@ dependencies = [ "der 0.5.1", ] +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der 0.7.8", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -5148,13 +5123,13 @@ dependencies = [ "clap 2.34.0", "crc", "csv", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "env_logger 0.7.1", "log", "pem", - "pkcs8", + "pkcs8 0.8.0", "ring 0.16.20", - "sha2 0.9.9", + "sha2 0.10.8", "svd2utra 0.1.22", "xmas-elf", "xous-semver", @@ -6156,7 +6131,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek", "rand_core 0.6.4", ] @@ -6480,9 +6455,9 @@ checksum = "2fe21bcc34ca7fe6dd56cc2cb1261ea59d6b93620215aefb5ea6032265527784" [[package]] name = "zeroize" -version = "1.3.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -6504,7 +6479,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes 0.8.3", + "aes", "byteorder", "bzip2", "constant_time_eq",