diff --git a/Cargo.lock b/Cargo.lock index 6692f3abc..1ac1e99f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,15 +29,24 @@ dependencies = [ [[package]] name = "aes" version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cipher", - "ctr 0.7.0", + "cfg-if 1.0.0", + "cipher 0.3.0", + "cpufeatures", + "opaque-debug", +] + +[[package]] +name = "aes" +version = "0.8.1" +dependencies = [ + "cipher 0.4.3", "hex-literal", "log", "log-server", - "opaque-debug", "xous", - "zeroize", ] [[package]] @@ -47,9 +56,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" dependencies = [ "aead", - "aes", - "cipher", - "ctr 0.8.0", + "aes 0.7.5", + "cipher 0.3.0", + "ctr", "polyval", "subtle", "zeroize", @@ -231,7 +240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab" dependencies = [ "byteorder", - "cipher", + "cipher 0.3.0", "opaque-debug", ] @@ -347,6 +356,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "cipher" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clap" version = "2.34.0" @@ -596,6 +615,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.11.1" @@ -628,22 +657,13 @@ dependencies = [ "memchr", ] -[[package]] -name = "ctr" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481" -dependencies = [ - "cipher", -] - [[package]] name = "ctr" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", ] [[package]] @@ -1468,6 +1488,15 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -2087,12 +2116,12 @@ checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" name = "pddb" version = "0.1.0" dependencies = [ - "aes", + "aes 0.8.1", "aes-gcm-siv", "bitfield", "bitflags", "blowfish", - "cipher", + "cipher 0.3.0", "digest", "gam", "hkdf", @@ -2530,10 +2559,10 @@ dependencies = [ name = "root-keys" version = "0.1.0" dependencies = [ - "aes", + "aes 0.8.1", "blowfish", "byteorder", - "cipher", + "cipher 0.3.0", "com", "curve25519-dalek", "digest", @@ -2810,9 +2839,9 @@ dependencies = [ name = "shellchat" version = "0.1.0" dependencies = [ - "aes", + "aes 0.8.1", "chrono", - "cipher", + "cipher 0.3.0", "codec", "com", "com_rs-ref",