diff options
Diffstat (limited to 'src/lib/hash/whirlpool/whirlpool.cpp')
| -rw-r--r-- | src/lib/hash/whirlpool/whirlpool.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/hash/whirlpool/whirlpool.cpp b/src/lib/hash/whirlpool/whirlpool.cpp index 5bf4c5246..64350fd24 100644 --- a/src/lib/hash/whirlpool/whirlpool.cpp +++ b/src/lib/hash/whirlpool/whirlpool.cpp @@ -12,9 +12,9 @@ namespace Botan { /* * Whirlpool Compression Function */ -void Whirlpool::compress_n(const byte in[], size_t blocks) +void Whirlpool::compress_n(const uint8_t in[], size_t blocks) { - static const u64bit RC[10] = { + static const uint64_t RC[10] = { 0x1823C6E887B8014F, 0x36A6D2F5796F9152, 0x60BC9B8EA30C7B35, 0x1DE0D7C22E4BFE57, 0x157737E59FF04ADA, 0x58C9290AB1A06B85, @@ -26,17 +26,17 @@ void Whirlpool::compress_n(const byte in[], size_t blocks) { load_be(m_M.data(), in, m_M.size()); - u64bit K0, K1, K2, K3, K4, K5, K6, K7; + uint64_t K0, K1, K2, K3, K4, K5, K6, K7; K0 = m_digest[0]; K1 = m_digest[1]; K2 = m_digest[2]; K3 = m_digest[3]; K4 = m_digest[4]; K5 = m_digest[5]; K6 = m_digest[6]; K7 = m_digest[7]; - u64bit B0, B1, B2, B3, B4, B5, B6, B7; + uint64_t B0, B1, B2, B3, B4, B5, B6, B7; B0 = K0 ^ m_M[0]; B1 = K1 ^ m_M[1]; B2 = K2 ^ m_M[2]; B3 = K3 ^ m_M[3]; B4 = K4 ^ m_M[4]; B5 = K5 ^ m_M[5]; B6 = K6 ^ m_M[6]; B7 = K7 ^ m_M[7]; for(size_t j = 0; j != 10; ++j) { - u64bit T0, T1, T2, T3, T4, T5, T6, T7; + uint64_t T0, T1, T2, T3, T4, T5, T6, T7; T0 = C0[get_byte(0, K0)] ^ C1[get_byte(1, K7)] ^ C2[get_byte(2, K6)] ^ C3[get_byte(3, K5)] ^ C4[get_byte(4, K4)] ^ C5[get_byte(5, K3)] ^ @@ -126,7 +126,7 @@ void Whirlpool::compress_n(const byte in[], size_t blocks) /* * Copy out the digest */ -void Whirlpool::copy_out(byte output[]) +void Whirlpool::copy_out(uint8_t output[]) { copy_out_vec_be(output, output_length(), m_digest); } |