fixed warnings

randombit · Aug 2, 2023 · aab1793 · aab1793
1 parent 22a202e
commit aab1793
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/lib/permutations/keccak_fips/keccak_fips.cpp b/src/lib/permutations/keccak_fips/keccak_fips.cpp
@@ -45,7 +45,7 @@ void Keccak_FIPS::permute() { Keccak_FIPS::permute(m_S.data()); }
 
 uint32_t Keccak_FIPS::absorb(size_t bitrate,
  secure_vector<uint64_t>& S,
- uint32_t S_pos,
+ size_t S_pos,
  std::span<const uint8_t> input_span) {
  const uint8_t* input = input_span.data();
  size_t length = input_span.size();
@@ -84,7 +84,7 @@ uint32_t Keccak_FIPS::absorb(size_t bitrate,
  }
  }
 
- return S_pos;
+ return static_cast<uint32_t>(S_pos);
 }
 
 //static
@@ -125,10 +125,10 @@ void Keccak_FIPS::expand(size_t bitrate, secure_vector<uint64_t>& S, std::span<u
 
 void Keccak_FIPS::expand(std::span<uint8_t> output_span) { expand(m_bitrate, m_S, output_span); }
 
-Keccak_FIPS::Keccak_FIPS(size_t output_bits, uint32_t capacity, uint64_t custom_padd, uint8_t custom_padd_bit_len) :
+Keccak_FIPS::Keccak_FIPS(size_t output_bits, size_t capacity, uint64_t custom_padd, uint8_t custom_padd_bit_len) :
  m_output_bits(output_bits),
- m_capacity(capacity),
- m_bitrate(1600 - capacity),
+ m_capacity(static_cast<uint32_t>(capacity)),
+ m_bitrate(static_cast<uint32_t>(1600 - capacity)),
  m_custom_padd(custom_padd),
  m_custom_padd_bit_len(custom_padd_bit_len),
  m_S(25), // 1600 bit

diff --git a/src/lib/permutations/keccak_fips/keccak_fips.h b/src/lib/permutations/keccak_fips/keccak_fips.h
@@ -42,7 +42,7 @@ class Keccak_FIPS final {
  * 224, 256, 384, or 512
  */
  explicit Keccak_FIPS(size_t output_bits,
- uint32_t capacity_bits,
+ size_t capacity_bits,
  uint64_t custom_padd,
  uint8_t custom_padd_bit_len);
 
@@ -78,7 +78,7 @@ class Keccak_FIPS final {
  */
  static uint32_t absorb(size_t bitrate,
  secure_vector<uint64_t>& S,
- uint32_t S_pos,
+ size_t S_pos,
  std::span<const uint8_t> input);
 
  void absorb(std::span<const uint8_t> input);