Remove unused and flawed keccak_absorb

Closes Argyle-Software#75
bwesterb · Apr 11, 2023 · 5acfd2d · 5acfd2d
1 parent 1b1637c
commit 5acfd2d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 108 deletions.
diff --git a/src/avx2/fips202.rs b/src/avx2/fips202.rs
@@ -323,41 +323,6 @@ pub(crate) fn keccakf1600_statepermute(state: &mut[u64])
   state[24] = asu;
 }
 
-// Name:        keccak_absorb
-//
-// Description: Absorb step of Keccak;
-//              non-incremental, starts by zeroing the state.
-//
-// Arguments:   - u64 s:             Keccak state
-//                usize pos: position in current block to be absorbed
-//              - usize r:          rate in bytes (e.g., 168 for SHAKE128)
-//              - const [u8] input: pointer to input to be absorbed into s
-//              - u64 inlen: length of input in bytes
-pub(crate) fn keccak_absorb(
-  s: &mut[u64], 
-  mut pos: usize, 
-  r: usize, 
-  input: &[u8], 
-  mut inlen: usize
-) -> usize
-{
-  let mut idx = 0usize;
-  while pos+inlen >= r {
-    for i in pos..r {
-      s[i/8] ^= (input[idx] as u64) << 8 * (i%8);
-      idx += 1;
-    }
-    inlen -= r-pos;
-    keccakf1600_statepermute(s);
-    pos = 0;
-  }
-  let new_pos = pos+inlen;
-  for i in pos..new_pos {
-    s[i/8] ^= (input[idx] as u64) << 8 * (i%8);
-  }
-  new_pos
-}
-
 // Name:        keccak_squeezeblocks
 //
 // Description: Squeeze step of Keccak. Squeezes full blocks of r bytes each.
@@ -381,20 +346,6 @@ pub(crate) fn keccak_squeezeblocks(h: &mut[u8], mut nblocks: usize, s: &mut [u64
   }
 }
 
-// Name:        shake128_absorb
-//
-// Description: Absorb step of the SHAKE128 XOF.
-//              non-incremental, starts by zeroing the state.
-//
-// Arguments:   - u64 *s:                     (uninitialized) output Keccak state
-//              - const [u8] input:      input to be absorbed into s
-//              - u64 inputByteLen: length of input in bytes
-pub(crate) fn shake128_absorb(state: &mut KeccakState, input: &[u8], inlen: usize)
-{
-  let pos = state.pos;
-  state.pos =keccak_absorb(&mut state.s, pos, SHAKE128_RATE, input, inlen);
-}
-
 // Name:        shake128_squeezeblocks
 //
 // Description: Squeeze step of SHAKE128 XOF. Squeezes full blocks of
@@ -610,11 +561,6 @@ fn shake256_init(state: &mut KeccakState) {
   state.reset();
 }
 
-fn shake256_absorb(state: &mut KeccakState,  input: &[u8], inlen: usize)
-{
-  state.pos = keccak_absorb(&mut state.s, state.pos, SHAKE256_RATE, input, inlen);
-}
-
 fn shake256_finalize(state: &mut KeccakState)
 {
   keccak_finalize(&mut state.s, state.pos, SHAKE256_RATE, 0x1F);

diff --git a/src/reference/fips202.rs b/src/reference/fips202.rs
@@ -324,41 +324,6 @@ pub fn keccakf1600_statepermute(state: &mut[u64])
   state[24] = asu;
 }
 
-// Name:        keccak_absorb
-//
-// Description: Absorb step of Keccak;
-//              non-incremental, starts by zeroeing the state.
-//
-// Arguments:   - u64 s:             Keccak state
-//                usize pos: position in current block to be absorbed
-//              - usize r:          rate in bytes (e.g., 168 for SHAKE128)
-//              - const [u8] input: pointer to input to be absorbed into s
-//              - u64 inlen: length of input in bytes
-pub(crate) fn keccak_absorb(
-  s: &mut[u64], 
-  mut pos: usize, 
-  r: usize, 
-  input: &[u8], 
-  mut inlen: usize
-) -> usize
-{
-  let mut idx = 0usize;
-  while pos+inlen >= r {
-    for i in pos..r {
-      s[i/8] ^= (input[idx] as u64) << 8 * (i%8);
-      idx += 1;
-    }
-    inlen -= r-pos;
-    keccakf1600_statepermute(s);
-    pos = 0;
-  }
-  let new_pos = pos+inlen;
-  for i in pos..new_pos {
-    s[i/8] ^= (input[idx] as u64) << 8 * (i%8);
-  }
-  new_pos
-}
-
 // Name:        keccak_squeezeblocks
 //
 // Description: Squeeze step of Keccak. Squeezes full blocks of r bytes each.
@@ -382,20 +347,6 @@ pub(crate) fn keccak_squeezeblocks(h: &mut[u8], mut nblocks: usize, s: &mut [u64
   }
 }
 
-// Name:        shake128_absorb
-//
-// Description: Absorb step of the SHAKE128 XOF.
-//              non-incremental, starts by zeroeing the state.
-//
-// Arguments:   - u64 *s:                     (uninitialized) output Keccak state
-//              - const [u8] input:      input to be absorbed into s
-//              - u64 inputByteLen: length of input in bytes
-pub(crate) fn shake128_absorb(state: &mut KeccakState, input: &[u8], inlen: usize)
-{
-  let pos = state.pos;
-  state.pos =keccak_absorb(&mut state.s, pos, SHAKE128_RATE, input, inlen);
-}
-
 // Name:        shake128_squeezeblocks
 //
 // Description: Squeeze step of SHAKE128 XOF. Squeezes full blocks of
@@ -611,11 +562,6 @@ fn shake256_init(state: &mut KeccakState) {
   state.reset();
 }
 
-fn shake256_absorb(state: &mut KeccakState,  input: &[u8], inlen: usize)
-{
-  state.pos = keccak_absorb(&mut state.s, state.pos, SHAKE256_RATE, input, inlen);
-}
-
 fn shake256_finalize(state: &mut KeccakState)
 {
   keccak_finalize(&mut state.s, state.pos, SHAKE256_RATE, 0x1F);