TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'miko-const-int-fix' into develop

Browse Source 
This closes #92 and closes #96
This commit is contained in:
Steffen Jaeckel 2016-01-19 00:04:27 +01:00
commit de15a6fad9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ciphers/camellia.c
View File

@ -190,7 +190,7 @@ static ulong64 F(ulong64 x)
U = SP1110[(x >> loc(1)) & 0xFF] ^ SP0222[(x >> loc(2)) & 0xFF] ^ SP3033[(x >> loc(3)) & 0xFF] ^ SP4404[(x >> loc(4)) & 0xFF]; U = SP1110[(x >> loc(1)) & 0xFF] ^ SP0222[(x >> loc(2)) & 0xFF] ^ SP3033[(x >> loc(3)) & 0xFF] ^ SP4404[(x >> loc(4)) & 0xFF];
D ^= U; D ^= U;
U = D ^ ROR(U, (const int)8); U = D ^ RORc(U, 8);
return ((ulong64)U) | (((ulong64)D) << CONST64(32)); return ((ulong64)U) | (((ulong64)D) << CONST64(32));
} }