From cd299c01bb6bbd95981f0941ffdb94f93e49f779 Mon Sep 17 00:00:00 2001 From: Kai Jan Kriegel Date: Sun, 26 Dec 2021 05:19:27 +0100 Subject: [PATCH] bump dependencies --- Cargo.toml | 14 +++++++------- src/crypto/cipher/aes.rs | 4 ++-- src/crypto/cipher/tdes.rs | 4 ++-- src/crypto/cipher/tdes_2k.rs | 4 ++-- src/crypto/cipher/tdes_3k.rs | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1a7cf8b..22a34a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,16 +8,16 @@ license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -des = "0.6.0" -aes = "0.6.0" -block-modes = "0.7.0" +des = "0.7.0" +aes = "0.7.5" +block-modes = "0.8.1" simple-error = "0.2.3" -hex = "0.4.2" +hex = "0.4.3" num-traits = "0.2.14" num-derive = "0.3.3" -rand = "0.8.3" +rand = "0.8.4" [dev-dependencies] -hex-literal = "0.3.1" -mockall = "0.10.2" +hex-literal = "0.3.4" +mockall = "0.11.0" pcsc = "2.6.0" diff --git a/src/crypto/cipher/aes.rs b/src/crypto/cipher/aes.rs index 97b2b20..ae3bcf3 100644 --- a/src/crypto/cipher/aes.rs +++ b/src/crypto/cipher/aes.rs @@ -13,13 +13,13 @@ impl Cipher for AES { const KEY_SIZE: usize = 16; fn encrypt(data: &[u8], key: &[u8], iv: &[u8]) -> Result> { - let cipher = Aes128Cbc::new_var(&key, &iv)?; + let cipher = Aes128Cbc::new_from_slices(&key, &iv)?; return Ok(cipher.encrypt_vec(data)); } fn decrypt(data: &[u8], key: &[u8], iv: &[u8]) -> Result> { - let cipher = Aes128Cbc::new_var(&key, &iv)?; + let cipher = Aes128Cbc::new_from_slices(&key, &iv)?; let result = cipher.decrypt_vec(data); return match result { diff --git a/src/crypto/cipher/tdes.rs b/src/crypto/cipher/tdes.rs index 5a441a1..e876bb6 100644 --- a/src/crypto/cipher/tdes.rs +++ b/src/crypto/cipher/tdes.rs @@ -14,13 +14,13 @@ impl Cipher for Tdes { const KEY_SIZE: usize = 16; fn encrypt(data: &[u8], key: &[u8], iv: &[u8]) -> Result> { - let cipher = TDesEde2Cbc::new_var(&key, &iv)?; + let cipher = TDesEde2Cbc::new_from_slices(&key, &iv)?; return Ok(cipher.encrypt_vec(data)); } fn decrypt(data: &[u8], key: &[u8], iv: &[u8]) -> Result> { - let cipher = TDesEde2Cbc::new_var(&key, &iv)?; + let cipher = TDesEde2Cbc::new_from_slices(&key, &iv)?; let result = cipher.decrypt_vec(data); return match result { diff --git a/src/crypto/cipher/tdes_2k.rs b/src/crypto/cipher/tdes_2k.rs index 0a76cd7..8f57b00 100644 --- a/src/crypto/cipher/tdes_2k.rs +++ b/src/crypto/cipher/tdes_2k.rs @@ -14,13 +14,13 @@ impl Cipher for Tdes2k { const KEY_SIZE: usize = 16; fn encrypt(data: &[u8], key: &[u8], iv: &[u8]) -> Result> { - let cipher = TDesEde2Cbc::new_var(&key, &iv)?; + let cipher = TDesEde2Cbc::new_from_slices(&key, &iv)?; return Ok(cipher.encrypt_vec(data)); } fn decrypt(data: &[u8], key: &[u8], iv: &[u8]) -> Result> { - let cipher = TDesEde2Cbc::new_var(&key, &iv)?; + let cipher = TDesEde2Cbc::new_from_slices(&key, &iv)?; let result = cipher.decrypt_vec(data); return match result { diff --git a/src/crypto/cipher/tdes_3k.rs b/src/crypto/cipher/tdes_3k.rs index 81d35ee..3ba5626 100644 --- a/src/crypto/cipher/tdes_3k.rs +++ b/src/crypto/cipher/tdes_3k.rs @@ -14,13 +14,13 @@ impl Cipher for Tdes3k { const KEY_SIZE: usize = 24; fn encrypt(data: &[u8], key: &[u8], iv: &[u8]) -> Result> { - let cipher = TDesEde3Cbc::new_var(&key, &iv)?; + let cipher = TDesEde3Cbc::new_from_slices(&key, &iv)?; return Ok(cipher.encrypt_vec(data)); } fn decrypt(data: &[u8], key: &[u8], iv: &[u8]) -> Result> { - let cipher = TDesEde3Cbc::new_var(&key, &iv)?; + let cipher = TDesEde3Cbc::new_from_slices(&key, &iv)?; let result = cipher.decrypt_vec(data); return match result {