fix(udp-tracker-core): align cipher with blowfish update

Author: josecelano

Cargo.lock

@@ -20,10 +20,9 @@ bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core"
 bittorrent-udp-tracker-protocol = { version = "3.0.0-develop", path = "../udp-protocol" }
 bloom = "0.3.2"
 blowfish = "0"
-cipher = "0.4"
+cipher = "0.5"
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 futures = "0"
-generic-array = "0"
 lazy_static = "1"
 rand = "0"
 serde = "1.0.219"

packages/udp-tracker-core/Cargo.toml

@@ -84,7 +84,6 @@ use tracing::instrument;
 use zerocopy::AsBytes;
 
 use crate::crypto::keys::CipherArrayBlowfish;
-
 /// Error returned when there was an error with the connection cookie.
 #[derive(Error, Debug, Clone, PartialEq)]
 pub enum ConnectionCookieError {
@@ -140,8 +139,8 @@ use std::ops::Range;
 pub fn check(cookie: &Cookie, fingerprint: u64, valid_range: Range<f64>) -> Result<f64, ConnectionCookieError> {
     assert!(valid_range.start <= valid_range.end, "range start is larger than range end");
 
-    let cookie_bytes = CipherArrayBlowfish::from_slice(cookie.0.as_bytes());
-    let cookie_bytes = decode(*cookie_bytes);
+    let cookie_bytes = CipherArrayBlowfish::try_from(cookie.0.as_bytes()).expect("it should be the same size");
+    let cookie_bytes = decode(cookie_bytes);
 
     let issue_time = disassemble(fingerprint, cookie_bytes);
 
@@ -176,7 +175,7 @@ pub fn gen_remote_fingerprint(remote_addr: &SocketAddr) -> u64 {
 }
 
 mod cookie_builder {
-    use cipher::{BlockDecrypt, BlockEncrypt};
+    use cipher::{BlockCipherDecrypt, BlockCipherEncrypt};
     use tracing::instrument;
     use zerocopy::{byteorder, AsBytes as _, NativeEndian};
 
@@ -196,7 +195,7 @@ mod cookie_builder {
         let cookie: byteorder::I64<NativeEndian> =
             *zerocopy::FromBytes::ref_from(&cookie.to_ne_bytes()).expect("it should be aligned");
 
-        *CipherArrayBlowfish::from_slice(cookie.as_bytes())
+        CipherArrayBlowfish::try_from(cookie.as_bytes()).expect("it should be the same size")
     }
 
     #[instrument()]

packages/udp-tracker-core/src/connection_cookie.rs

@@ -4,14 +4,13 @@
 //! application starts and are not persisted anywhere.
 
 use blowfish::BlowfishLE;
-use cipher::{BlockSizeUser, KeyInit};
-use generic_array::GenericArray;
+use cipher::{Block, KeyInit};
 use rand::rngs::ThreadRng;
 use rand::RngExt;
 
 pub type Seed = [u8; 32];
 pub type CipherBlowfish = BlowfishLE;
-pub type CipherArrayBlowfish = GenericArray<u8, <CipherBlowfish as BlockSizeUser>::BlockSize>;
+pub type CipherArrayBlowfish = Block<CipherBlowfish>;
 
 lazy_static! {
     /// The random static seed.

packages/udp-tracker-core/src/crypto/ephemeral_instance_keys.rs

@@ -5,7 +5,7 @@
 //!
 //! It also provides the logic for the cipher for encryption and decryption.
 
-use cipher::{BlockDecrypt, BlockEncrypt};
+use cipher::{BlockCipherDecrypt, BlockCipherEncrypt};
 
 use self::detail_cipher::CURRENT_CIPHER;
 use self::detail_seed::CURRENT_SEED;
@@ -15,7 +15,7 @@ use crate::crypto::ephemeral_instance_keys::{CipherBlowfish, Seed, RANDOM_CIPHER
 /// This trait is for structures that can keep and provide a seed.
 pub trait Keeper {
     type Seed: Sized + Default + AsMut<[u8]>;
-    type Cipher: BlockEncrypt + BlockDecrypt;
+    type Cipher: BlockCipherEncrypt + BlockCipherDecrypt;
 
     /// It returns a reference to the seed that is keeping.
     fn get_seed() -> &'static Self::Seed;
@@ -137,14 +137,14 @@ mod detail_cipher {
 
     #[cfg(test)]
     mod tests {
-        use cipher::BlockEncrypt;
+        use cipher::BlockCipherEncrypt;
 
         use crate::crypto::ephemeral_instance_keys::{CipherArrayBlowfish, ZEROED_TEST_CIPHER_BLOWFISH};
         use crate::crypto::keys::detail_cipher::CURRENT_CIPHER;
 
         #[test]
         fn it_should_default_to_zeroed_seed_when_testing() {
-            let mut data: cipher::generic_array::GenericArray<u8, _> = CipherArrayBlowfish::from([0u8; 8]);
+            let mut data = CipherArrayBlowfish::from([0u8; 8]);
             let mut data_2 = CipherArrayBlowfish::from([0u8; 8]);
 
             CURRENT_CIPHER.encrypt_block(&mut data);