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

fixing warnings when compiling camellia.c with 64bit MS compiler

Browse Source
This commit is contained in:
karel-m 2013-06-14 21:10:14 +02:00 committed by Steffen Jaeckel
parent 3da9adc366
commit f3789b31b6
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/ciphers/camellia.c
View File

@ -192,7 +192,7 @@ static ulong64 F(ulong64 x)
D ^= U; D ^= U;
U = D ^ ROR(U, (const int)8); U = D ^ ROR(U, (const int)8);
return ((ulong64)U) | (((ulong64)D) << 32ULL); return ((ulong64)U) | (((ulong64)D) << CONST64(32));
} }
static void rot_128(unsigned char *in, unsigned count, unsigned char *out) static void rot_128(unsigned char *in, unsigned count, unsigned char *out)
@ -456,17 +456,17 @@ int camellia_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_k
L ^= F(R ^ skey->camellia.k[5]); L ^= F(R ^ skey->camellia.k[5]);
/* FL */ /* FL */
a = L >> 32; a = (ulong32)(L >> 32);
b = L & 0xFFFFFFFFUL; b = (ulong32)(L & 0xFFFFFFFFUL);
b ^= ROL((a & (skey->camellia.kl[0] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[0] >> 32)), 1);
a ^= b | (skey->camellia.kl[0] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[0] & 0xFFFFFFFFU);
L = (((ulong64)a) << 32) | b; L = (((ulong64)a) << 32) | b;
/* FL^-1 */ /* FL^-1 */
a = R >> 32; a = (ulong32)(R >> 32);
b = R & 0xFFFFFFFFUL; b = (ulong32)(R & 0xFFFFFFFFUL);
a ^= b | (skey->camellia.kl[1] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[1] & 0xFFFFFFFFU);
b ^= ROL((a & (skey->camellia.kl[1] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[1] >> 32)), 1);
R = (((ulong64)a) << 32) | b; R = (((ulong64)a) << 32) | b;
/* second 6 rounds */ /* second 6 rounds */
@ -478,17 +478,17 @@ int camellia_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_k
L ^= F(R ^ skey->camellia.k[11]); L ^= F(R ^ skey->camellia.k[11]);
/* FL */ /* FL */
a = L >> 32; a = (ulong32)(L >> 32);
b = L & 0xFFFFFFFFUL; b = (ulong32)(L & 0xFFFFFFFFUL);
b ^= ROL((a & (skey->camellia.kl[2] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[2] >> 32)), 1);
a ^= b | (skey->camellia.kl[2] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[2] & 0xFFFFFFFFU);
L = (((ulong64)a) << 32) | b; L = (((ulong64)a) << 32) | b;
/* FL^-1 */ /* FL^-1 */
a = R >> 32; a = (ulong32)(R >> 32);
b = R & 0xFFFFFFFFUL; b = (ulong32)(R & 0xFFFFFFFFUL);
a ^= b | (skey->camellia.kl[3] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[3] & 0xFFFFFFFFU);
b ^= ROL((a & (skey->camellia.kl[3] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[3] >> 32)), 1);
R = (((ulong64)a) << 32) | b; R = (((ulong64)a) << 32) | b;
/* third 6 rounds */ /* third 6 rounds */
@ -502,17 +502,17 @@ int camellia_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_k
/* next FL */ /* next FL */
if (skey->camellia.R == 24) { if (skey->camellia.R == 24) {
/* FL */ /* FL */
a = L >> 32; a = (ulong32)(L >> 32);
b = L & 0xFFFFFFFFUL; b = (ulong32)(L & 0xFFFFFFFFUL);
b ^= ROL((a & (skey->camellia.kl[4] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[4] >> 32)), 1);
a ^= b | (skey->camellia.kl[4] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[4] & 0xFFFFFFFFU);
L = (((ulong64)a) << 32) | b; L = (((ulong64)a) << 32) | b;
/* FL^-1 */ /* FL^-1 */
a = R >> 32; a = (ulong32)(R >> 32);
b = R & 0xFFFFFFFFUL; b = (ulong32)(R & 0xFFFFFFFFUL);
a ^= b | (skey->camellia.kl[5] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[5] & 0xFFFFFFFFU);
b ^= ROL((a & (skey->camellia.kl[5] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[5] >> 32)), 1);
R = (((ulong64)a) << 32) | b; R = (((ulong64)a) << 32) | b;
/* fourth 6 rounds */ /* fourth 6 rounds */
@ -552,16 +552,16 @@ int camellia_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_k
R ^= F(L ^ skey->camellia.k[18]); R ^= F(L ^ skey->camellia.k[18]);
/* FL */ /* FL */
a = L >> 32; a = (ulong32)(L >> 32);
b = L & 0xFFFFFFFFUL; b = (ulong32)(L & 0xFFFFFFFFUL);
a ^= b | (skey->camellia.kl[4] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[4] & 0xFFFFFFFFU);
b ^= ROL((a & (skey->camellia.kl[4] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[4] >> 32)), 1);
L = (((ulong64)a) << 32) | b; L = (((ulong64)a) << 32) | b;
/* FL^-1 */ /* FL^-1 */
a = R >> 32; a = (ulong32)(R >> 32);
b = R & 0xFFFFFFFFUL; b = (ulong32)(R & 0xFFFFFFFFUL);
b ^= ROL((a & (skey->camellia.kl[5] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[5] >> 32)), 1);
a ^= b | (skey->camellia.kl[5] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[5] & 0xFFFFFFFFU);
R = (((ulong64)a) << 32) | b; R = (((ulong64)a) << 32) | b;
@ -576,16 +576,16 @@ int camellia_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_k
R ^= F(L ^ skey->camellia.k[12]); R ^= F(L ^ skey->camellia.k[12]);
/* FL */ /* FL */
a = L >> 32; a = (ulong32)(L >> 32);
b = L & 0xFFFFFFFFUL; b = (ulong32)(L & 0xFFFFFFFFUL);
a ^= b | (skey->camellia.kl[2] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[2] & 0xFFFFFFFFU);
b ^= ROL((a & (skey->camellia.kl[2] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[2] >> 32)), 1);
L = (((ulong64)a) << 32) | b; L = (((ulong64)a) << 32) | b;
/* FL^-1 */ /* FL^-1 */
a = R >> 32; a = (ulong32)(R >> 32);
b = R & 0xFFFFFFFFUL; b = (ulong32)(R & 0xFFFFFFFFUL);
b ^= ROL((a & (skey->camellia.kl[3] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[3] >> 32)), 1);
a ^= b | (skey->camellia.kl[3] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[3] & 0xFFFFFFFFU);
R = (((ulong64)a) << 32) | b; R = (((ulong64)a) << 32) | b;
@ -598,16 +598,16 @@ int camellia_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_k
R ^= F(L ^ skey->camellia.k[6]); R ^= F(L ^ skey->camellia.k[6]);
/* FL */ /* FL */
a = L >> 32; a = (ulong32)(L >> 32);
b = L & 0xFFFFFFFFUL; b = (ulong32)(L & 0xFFFFFFFFUL);
a ^= b | (skey->camellia.kl[0] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[0] & 0xFFFFFFFFU);
b ^= ROL((a & (skey->camellia.kl[0] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[0] >> 32)), 1);
L = (((ulong64)a) << 32) | b; L = (((ulong64)a) << 32) | b;
/* FL^-1 */ /* FL^-1 */
a = R >> 32; a = (ulong32)(R >> 32);
b = R & 0xFFFFFFFFUL; b = (ulong32)(R & 0xFFFFFFFFUL);
b ^= ROL((a & (skey->camellia.kl[1] >> 32)), 1); b ^= ROL((a & (ulong32)(skey->camellia.kl[1] >> 32)), 1);
a ^= b | (skey->camellia.kl[1] & 0xFFFFFFFFU); a ^= b | (skey->camellia.kl[1] & 0xFFFFFFFFU);
R = (((ulong64)a) << 32) | b; R = (((ulong64)a) << 32) | b;