aboutsummaryrefslogtreecommitdiffstats
path: root/src/hash
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-12-24 21:38:25 +0000
committerlloyd <[email protected]>2009-12-24 21:38:25 +0000
commit8e0c38eff91fc6c3df5cc0104704baa75149898e (patch)
treee6d79db18899068f8cfa77f2455f00c86d86b6ef /src/hash
parentc85c79ac51b5829258dae7e51bb472b740da9574 (diff)
parenta48ae8f6c1aa605acbed76e9e2f1d6c2dcdd3d1e (diff)
propagate from branch 'net.randombit.botan' (head 367d157c1221a162f5b4098492944a509ef6d019)
to branch 'net.randombit.botan.c++0x' (head 1b9e8c4e92663f30b7d57b0fd8f57eb13cfce155)
Diffstat (limited to 'src/hash')
-rw-r--r--src/hash/skein/skein_512.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hash/skein/skein_512.cpp b/src/hash/skein/skein_512.cpp
index ab74faf42..869257567 100644
--- a/src/hash/skein/skein_512.cpp
+++ b/src/hash/skein/skein_512.cpp
@@ -27,11 +27,11 @@ enum type_code {
SKEIN_OUTPUT = 63
};
-void ubi_512(u64bit H[9], u64bit T[], const byte msg[], u64bit msg_len)
+void ubi_512(u64bit H[9], u64bit T[], const byte msg[], u32bit msg_len)
{
do
{
- const u64bit to_proc = std::min<u64bit>(msg_len, 64);
+ const u32bit to_proc = std::min<u32bit>(msg_len, 64);
T[0] += to_proc;
u64bit M[8] = { 0 };