aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/block
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-10-31 11:31:27 +0000
committerlloyd <[email protected]>2014-10-31 11:31:27 +0000
commit083f699c30d584ac59453139e4f2e03d1fde0545 (patch)
treed9cc192ace03a9a0ef1c0e1705d5468ff3eb3489 /src/lib/block
parentaf0cc3c7308d0f5320e82394590b0ca93f43c4d4 (diff)
Fix various warnings from VC++ 2014 and add missing include
Diffstat (limited to 'src/lib/block')
-rw-r--r--src/lib/block/blowfish/blowfish.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/block/blowfish/blowfish.cpp b/src/lib/block/blowfish/blowfish.cpp
index e93359141..b896033f4 100644
--- a/src/lib/block/blowfish/blowfish.cpp
+++ b/src/lib/block/blowfish/blowfish.cpp
@@ -139,7 +139,7 @@ void Blowfish::eks_key_schedule(const byte key[], size_t length,
key_expansion(key, length, salt);
const byte null_salt[16] = { 0 };
- const size_t rounds = 1 << workfactor;
+ const size_t rounds = static_cast<size_t>(1) << workfactor;
for(size_t r = 0; r != rounds; ++r)
{