Skip to content

Commit 4ccdb85

Browse files
fmt pass
1 parent 9959d43 commit 4ccdb85

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

kupyna/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ impl KupynaH {
2626
let state_matrix_cols = 8;
2727
let state_matrix_rows = 16;
2828

29-
30-
3129
KupynaH {
3230
state_size,
3331
state_matrix_cols,

kupyna/src/sub_units/mod.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mod t_xor_plus;
22

3-
use t_xor_plus::{t_plus_l, t_xor_l};
43
use crate::KupynaH;
4+
use t_xor_plus::{t_plus_l, t_xor_l};
55

66
const ROUNDS: usize = 14;
77

@@ -19,7 +19,11 @@ fn silo(message_block: &[u8], prev_vector: &[u8], hash_params: &KupynaH) -> Vec<
1919
xor_bytes(&(xor_bytes(&t_xor_mp, &t_plus_m)), prev_vector)
2020
}
2121

22-
pub(crate) fn plant(message_blocks: Vec<&[u8]>, init_vector: &[u8], hash_params: &KupynaH) -> Vec<u8> {
22+
pub(crate) fn plant(
23+
message_blocks: Vec<&[u8]>,
24+
init_vector: &[u8],
25+
hash_params: &KupynaH,
26+
) -> Vec<u8> {
2327
let mut last_vector = init_vector.to_vec();
2428

2529
for block in message_blocks {

kupyna/src/sub_units/t_xor_plus/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const REDUCTION_POLYNOMIAL: u16 = 0x011d;
1111

1212
type Matrix = Vec<Vec<u8>>;
1313

14-
use tables::{MDS_MATRIX, SBOXES};
1514
use crate::KupynaH;
15+
use tables::{MDS_MATRIX, SBOXES};
1616

1717
pub(crate) fn block_to_matrix(block: &[u8], hash_params: &KupynaH) -> Matrix {
1818
let rows = hash_params.state_matrix_rows;
@@ -28,11 +28,10 @@ pub(crate) fn block_to_matrix(block: &[u8], hash_params: &KupynaH) -> Matrix {
2828
}
2929

3030
fn matrix_to_block(matrix: Matrix) -> Vec<u8> {
31-
3231
let rows = matrix.len();
3332
let cols = matrix[0].len();
3433

35-
let mut block = vec![0u8; rows*cols];
34+
let mut block = vec![0u8; rows * cols];
3635
for i in 0..rows {
3736
for j in 0..cols {
3837
block[i * cols + j] = matrix[i][j];
@@ -73,7 +72,6 @@ pub(crate) fn s_box_layer(mut state: Matrix, hash_params: &KupynaH) -> Matrix {
7372
}
7473

7574
pub(crate) fn rotate_rows(mut state: Matrix, hash_params: &KupynaH) -> Matrix {
76-
7775
let rows = hash_params.state_matrix_rows;
7876
let cols = hash_params.state_matrix_cols;
7977

@@ -114,7 +112,6 @@ fn multiply_gf(mut x: u8, mut y: u8) -> u8 {
114112
}
115113

116114
pub(crate) fn mix_columns(state: Matrix, hash_params: &KupynaH) -> Matrix {
117-
118115
let rows = hash_params.state_matrix_rows;
119116
let cols = hash_params.state_matrix_cols;
120117

kupyna/src/sub_units/t_xor_plus/tests/test_individual_layers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::KupynaH;
21
use crate::sub_units::t_xor_plus::*;
2+
use crate::KupynaH;
33

44
fn setup_hash_params() -> KupynaH {
55
KupynaH::default()

kupyna/src/sub_units/t_xor_plus/tests/test_xor_plus.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::KupynaH;
21
use crate::sub_units::t_xor_plus::{t_plus_l, t_xor_l};
2+
use crate::KupynaH;
33

44
fn setup_hash_params() -> KupynaH {
55
KupynaH::default()

0 commit comments

Comments
 (0)