aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/hash/skein
diff options
context:
space:
mode:
authorRenĂ© Korthaus <[email protected]>2016-02-18 15:54:37 +0100
committerRenĂ© Korthaus <[email protected]>2016-02-18 16:13:55 +0100
commit3a8dcbed75892ee63d73e9f9310f811e6267e504 (patch)
tree7553c5eb2936898d65b89b2407d016306d257dd1 /src/lib/hash/skein
parent0c76098cbaa8002fb89756d6fa2b02359f3f5f88 (diff)
Fix remaining Wshadow warnings and enable on gcc and clang
Diffstat (limited to 'src/lib/hash/skein')
-rw-r--r--src/lib/hash/skein/skein_512.cpp4
-rw-r--r--src/lib/hash/skein/skein_512.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/hash/skein/skein_512.cpp b/src/lib/hash/skein/skein_512.cpp
index ad0817da7..86ea9e75a 100644
--- a/src/lib/hash/skein/skein_512.cpp
+++ b/src/lib/hash/skein/skein_512.cpp
@@ -51,13 +51,13 @@ void Skein_512::clear()
initial_block();
}
-void Skein_512::reset_tweak(type_code type, bool final)
+void Skein_512::reset_tweak(type_code type, bool is_final)
{
m_T[0] = 0;
m_T[1] = (static_cast<u64bit>(type) << 56) |
(static_cast<u64bit>(1) << 62) |
- (static_cast<u64bit>(final) << 63);
+ (static_cast<u64bit>(is_final) << 63);
}
void Skein_512::initial_block()
diff --git a/src/lib/hash/skein/skein_512.h b/src/lib/hash/skein/skein_512.h
index b9d0deb2e..001d9a991 100644
--- a/src/lib/hash/skein/skein_512.h
+++ b/src/lib/hash/skein/skein_512.h
@@ -55,7 +55,7 @@ class BOTAN_DLL Skein_512 final : public HashFunction
void ubi_512(const byte msg[], size_t msg_len);
void initial_block();
- void reset_tweak(type_code type, bool final);
+ void reset_tweak(type_code type, bool is_final);
std::string m_personalization;
size_t m_output_bits;