From f50c14f91b9d7488caa45b1ab9faeaa6d6028f41 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 25 Nov 2012 21:07:38 +0000 Subject: CryptoPP patches from xcb567 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1067 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- CryptoPP/misc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CryptoPP/misc.h') diff --git a/CryptoPP/misc.h b/CryptoPP/misc.h index 8425c5362..7f32b860b 100644 --- a/CryptoPP/misc.h +++ b/CryptoPP/misc.h @@ -580,13 +580,13 @@ CRYPTOPP_DLL void CRYPTOPP_API UnalignedDeallocate(void *p); template inline T rotlFixed(T x, unsigned int y) { assert(y < sizeof(T)*8); - return T((x<>(sizeof(T)*8-y))); + return y ? T((x<>(sizeof(T)*8-y))) : x; } template inline T rotrFixed(T x, unsigned int y) { assert(y < sizeof(T)*8); - return T((x>>y) | (x<<(sizeof(T)*8-y))); + return y ? T((x>>y) | (x<<(sizeof(T)*8-y))) : x; } template inline T rotlVariable(T x, unsigned int y) -- cgit v1.2.3