From b33af49ce83840cc37de4ccc6664585deac573df Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sat, 30 Dec 2023 10:11:47 -0700 Subject: [PATCH] Fix broken tests --- cast5/tests/mod.rs | 32 ++++++++++++++++---------------- speck/tests/mod.rs | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cast5/tests/mod.rs b/cast5/tests/mod.rs index 9c972a1e..41b55a92 100644 --- a/cast5/tests/mod.rs +++ b/cast5/tests/mod.rs @@ -39,36 +39,36 @@ fn rfc2144_b1() { /// https://tools.ietf.org/html/rfc2144#appendix-B.1 #[test] fn full_maintance_test() { - let mut a = hex!("0123456712345678234567893456789A"); - let mut b = hex!("0123456712345678234567893456789A"); + let a = hex!("0123456712345678234567893456789A"); + let b = hex!("0123456712345678234567893456789A"); let verify_a = hex!("EEA9D0A249FD3BA6B3436FB89D6DCA92"); let verify_b = hex!("B2C95EB00C31AD7180AC05B8E83D696E"); let count = 1_000_000; - let (al, ar) = a.split_at_mut(8); - let (bl, br) = b.split_at_mut(8); + let (al, ar) = a.split_at(8); + let (bl, br) = b.split_at(8); - let al = Array::from_mut_slice(al); - let ar = Array::from_mut_slice(ar); + let mut al = Array::try_from(al).unwrap(); + let mut ar = Array::try_from(ar).unwrap(); - let bl = Array::from_mut_slice(bl); - let br = Array::from_mut_slice(br); + let mut bl = Array::try_from(bl).unwrap(); + let mut br = Array::try_from(br).unwrap(); for _ in 0..count { let mut k = Array::from([0u8; 16]); - k[..8].copy_from_slice(bl); - k[8..].copy_from_slice(br); + k[..8].copy_from_slice(&bl); + k[8..].copy_from_slice(&br); let c = Cast5::new(&k); - c.encrypt_block(al); - c.encrypt_block(ar); + c.encrypt_block(&mut al); + c.encrypt_block(&mut ar); - k[..8].copy_from_slice(al); - k[8..].copy_from_slice(ar); + k[..8].copy_from_slice(&al); + k[8..].copy_from_slice(&ar); let c = Cast5::new(&k); - c.encrypt_block(bl); - c.encrypt_block(br); + c.encrypt_block(&mut bl); + c.encrypt_block(&mut br); } assert_eq!(&al[..], &verify_a[..8]); diff --git a/speck/tests/mod.rs b/speck/tests/mod.rs index eb30eeae..c05a5ff8 100644 --- a/speck/tests/mod.rs +++ b/speck/tests/mod.rs @@ -2,7 +2,7 @@ use cipher::{BlockDecrypt, BlockEncrypt, KeyInit}; use hex_literal::hex; -use speck::{ +use speck_cipher::{ Speck128_128, Speck128_192, Speck128_256, Speck32_64, Speck48_72, Speck48_96, Speck64_128, Speck64_96, Speck96_144, Speck96_96, };