fix whirlpool, remove TryInto imports

RustCrypto · Jan 10, 2024 · f32bee5 · f32bee5
1 parent 5a274e1
commit f32bee5
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 25 deletions.
diff --git a/blake2/src/lib.rs b/blake2/src/lib.rs
@@ -13,7 +13,7 @@ extern crate std;
 
 pub use digest::{self, Digest};
 
-use core::{convert::TryInto, fmt, marker::PhantomData, ops::Div};
+use core::{fmt, marker::PhantomData, ops::Div};
 use digest::{
     array::{Array, ArraySize},
     block_buffer::{Lazy, LazyBuffer},

diff --git a/gost94/src/gost94_core.rs b/gost94/src/gost94_core.rs
@@ -1,5 +1,5 @@
 #![allow(clippy::many_single_char_names)]
-use core::{convert::TryInto, fmt};
+use core::fmt;
 use digest::{
     block_buffer::Eager,
     core_api::{

diff --git a/groestl/src/compress1024.rs b/groestl/src/compress1024.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::needless_range_loop)]
 use crate::table::TABLE;
-use core::{convert::TryInto, u64};
 
 pub(crate) const COLS: usize = 16;
 const ROUNDS: u64 = 14;

diff --git a/groestl/src/compress512.rs b/groestl/src/compress512.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::needless_range_loop)]
 use crate::table::TABLE;
-use core::{convert::TryInto, u64};
 
 pub(crate) const COLS: usize = 8;
 const ROUNDS: u64 = 10;

diff --git a/md4/src/lib.rs b/md4/src/lib.rs
@@ -9,7 +9,7 @@
 
 pub use digest::{self, Digest};
 
-use core::{convert::TryInto, fmt, num::Wrapping as W};
+use core::{fmt, num::Wrapping as W};
 #[cfg(feature = "oid")]
 use digest::const_oid::{AssociatedOid, ObjectIdentifier};
 use digest::{

diff --git a/md5/src/compress/soft.rs b/md5/src/compress/soft.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::many_single_char_names, clippy::unreadable_literal)]
 use crate::consts::RC;
-use core::convert::TryInto;
 
 #[inline(always)]
 fn op_f(w: u32, x: u32, y: u32, z: u32, m: u32, c: u32, s: u32) -> u32 {

diff --git a/ripemd/src/c128.rs b/ripemd/src/c128.rs
@@ -1,5 +1,3 @@
-use core::convert::TryInto;
-
 pub const DIGEST_BUF_LEN: usize = 4;
 pub const WORK_BUF_LEN: usize = 16;
 

diff --git a/ripemd/src/c160.rs b/ripemd/src/c160.rs
@@ -1,5 +1,3 @@
-use core::convert::TryInto;
-
 pub const DIGEST_BUF_LEN: usize = 5;
 pub const WORK_BUF_LEN: usize = 16;
 

diff --git a/ripemd/src/c256.rs b/ripemd/src/c256.rs
@@ -1,4 +1,4 @@
-use core::{convert::TryInto, mem::swap};
+use core::mem::swap;
 
 pub const DIGEST_BUF_LEN: usize = 8;
 pub const HALF_DIGEST_BUF_LEN: usize = DIGEST_BUF_LEN / 2;

diff --git a/ripemd/src/c320.rs b/ripemd/src/c320.rs
@@ -1,4 +1,4 @@
-use core::{convert::TryInto, mem::swap};
+use core::mem::swap;
 
 pub const HALF_DIGEST_BUF_LEN: usize = 5;
 pub const DIGEST_BUF_LEN: usize = 10;

diff --git a/sha1/src/compress/soft.rs b/sha1/src/compress/soft.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::many_single_char_names)]
 use super::BLOCK_SIZE;
-use core::convert::TryInto;
 
 const K: [u32; 4] = [0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xCA62C1D6];
 

diff --git a/sha2/src/sha256/soft.rs b/sha2/src/sha256/soft.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::many_single_char_names)]
 use crate::consts::BLOCK_LEN;
-use core::convert::TryInto;
 
 #[inline(always)]
 fn shr(v: [u32; 4], o: u32) -> [u32; 4] {

diff --git a/sha2/src/sha512/soft.rs b/sha2/src/sha512/soft.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::many_single_char_names)]
 use crate::consts::{BLOCK_LEN, K64X2};
-use core::convert::TryInto;
 
 fn add(a: [u64; 2], b: [u64; 2]) -> [u64; 2] {
     [a[0].wrapping_add(b[0]), a[1].wrapping_add(b[1])]

diff --git a/sha3/src/state.rs b/sha3/src/state.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
 #[cfg(feature = "zeroize")]
 use zeroize::{Zeroize, ZeroizeOnDrop};
 

diff --git a/sha3/tests/turboshake.rs b/sha3/tests/turboshake.rs
@@ -1,4 +1,4 @@
-use core::{convert::TryInto, fmt::Debug};
+use core::fmt::Debug;
 use digest::ExtendableOutput;
 
 pub(crate) fn turbo_shake_test<D, F>(

diff --git a/shabal/src/core_api.rs b/shabal/src/core_api.rs
@@ -1,5 +1,5 @@
 use crate::consts;
-use core::{convert::TryInto, fmt, mem, num::Wrapping};
+use core::{fmt, mem, num::Wrapping};
 use digest::{
     array::Array,
     block_buffer::Eager,

diff --git a/sm3/src/compress.rs b/sm3/src/compress.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::many_single_char_names, clippy::too_many_arguments)]
 use crate::{consts::T32, Block, Sm3Core};
-use core::convert::TryInto;
 
 #[inline(always)]
 fn ff1(x: u32, y: u32, z: u32) -> u32 {

diff --git a/streebog/src/core_api.rs b/streebog/src/core_api.rs
@@ -1,4 +1,4 @@
-use core::{convert::TryInto, fmt};
+use core::fmt;
 use digest::{
     block_buffer::Eager,
     consts::U64,

diff --git a/tiger/src/compress.rs b/tiger/src/compress.rs
@@ -1,6 +1,5 @@
 use super::tables::{T1, T2, T3, T4};
 use super::State;
-use core::convert::TryInto;
 
 #[inline(always)]
 fn round(a: &mut u64, b: &mut u64, c: &mut u64, x: &u64, mul: u8) {

diff --git a/whirlpool/src/compress.rs b/whirlpool/src/compress.rs
@@ -1,11 +1,8 @@
-use crate::BLOCK_SIZE;
-use core::convert::TryInto;
-
 #[path = "consts.rs"]
 mod consts;
 use consts::*;
 
-fn compress_block(state: &mut [u64; 8], b: &[u8; BLOCK_SIZE]) {
+fn compress_block(state: &mut [u64; 8], b: &[u8; 64]) {
     let mut k = [0u64; 8];
     let mut block = [0u64; 8];
     let mut s = [0u64; 8];