diff --git a/Cargo.lock b/Cargo.lock index 305ac3e..7d53049 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,15 +94,6 @@ dependencies = [ "generic-array 0.14.4", ] -[[package]] -name = "block-cipher" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80" -dependencies = [ - "generic-array 0.14.4", -] - [[package]] name = "block-padding" version = "0.1.5" @@ -155,6 +146,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "cipher" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f7954ae5588102b35257639b1c36a2e7425cc6540fcdb4de19dcb91055d659" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "const-oid" version = "0.1.0" @@ -175,9 +175,9 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" [[package]] name = "crypto-mac" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ "generic-array 0.14.4", "subtle", @@ -228,12 +228,12 @@ dependencies = [ [[package]] name = "des" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e084b5048dec677e6c9f27d7abc551dde7d127cf4127fea82323c98a30d7fa0d" +checksum = "b24e7c748888aa2fa8bce21d8c64a52efc810663285315ac7476f7197a982fae" dependencies = [ - "block-cipher", "byteorder", + "cipher", "opaque-debug 0.3.0", ] @@ -378,9 +378,9 @@ dependencies = [ [[package]] name = "hmac" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" dependencies = [ "crypto-mac", "digest 0.9.0", @@ -573,11 +573,11 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170d73bf11f39b4ce1809aabc95bf5c33564cdc16fc3200ddda17a5f6e5e48b" +checksum = "b3b8c0d71734018084da0c0354193a5edfb81b20d2d57a92c5b154aefc554a4a" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "crypto-mac", "hmac", "rand", diff --git a/Cargo.toml b/Cargo.toml index fb26637..105126f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,20 +25,20 @@ maintenance = { status = "experimental" } chrono = "0.4" cookie-factory = "0.3" der-parser = "4" -des = "0.5" +des = "0.6" elliptic-curve = "0.6" getrandom = "0.1" -hmac = "0.9" +hmac = "0.10" log = "0.4" nom = "5" num-bigint = { version = "0.6", features = ["rand"], package = "num-bigint-dig" } num-traits = "0.2" num-integer = "0.1" -pbkdf2 = "0.5" +pbkdf2 = "0.6" p256 = "0.5" p384 = "0.4" pcsc = "2" -rsa = "0.3.0" +rsa = "0.3" secrecy = "0.7" sha-1 = "0.9" sha2 = "0.9" diff --git a/src/mgm.rs b/src/mgm.rs index 5883d8b..c1cac81 100644 --- a/src/mgm.rs +++ b/src/mgm.rs @@ -42,7 +42,7 @@ use crate::{ TAG_ADMIN_SALT, TAG_PROTECTED, TAG_PROTECTED_MGM, }; use des::{ - block_cipher::{generic_array::GenericArray, BlockCipher, NewBlockCipher}, + cipher::{generic_array::GenericArray, BlockCipher, NewBlockCipher}, TdesEde3, }; #[cfg(feature = "untested")]