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

Merge branch 'fix/anubis' into develop

Browse Source
This commit is contained in:
Steffen Jaeckel 2014-05-01 23:02:40 +02:00
commit be5418368c
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ciphers/anubis.c
View File

@ -931,10 +931,10 @@ int anubis_setup(const unsigned char *key, int keylen, int num_rounds, symmetri
*/ */
for (i = 0, pos = 0; i < N; i++, pos += 4) { for (i = 0, pos = 0; i < N; i++, pos += 4) {
kappa[i] = kappa[i] =
(key[pos ] << 24) ^ (((ulong32)key[pos ]) << 24) ^
(key[pos + 1] << 16) ^ (((ulong32)key[pos + 1]) << 16) ^
(key[pos + 2] << 8) ^ (((ulong32)key[pos + 2]) << 8) ^
(key[pos + 3] ); (((ulong32)key[pos + 3]) );
} }
/* /*
@ -1048,10 +1048,10 @@ static void anubis_crypt(const unsigned char *plaintext, unsigned char *cipherte
*/ */
for (i = 0, pos = 0; i < 4; i++, pos += 4) { for (i = 0, pos = 0; i < 4; i++, pos += 4) {
state[i] = state[i] =
(plaintext[pos ] << 24) ^ (((ulong32)plaintext[pos ]) << 24) ^
(plaintext[pos + 1] << 16) ^ (((ulong32)plaintext[pos + 1]) << 16) ^
(plaintext[pos + 2] << 8) ^ (((ulong32)plaintext[pos + 2]) << 8) ^
(plaintext[pos + 3] ) ^ (((ulong32)plaintext[pos + 3]) ) ^
roundKey[0][i]; roundKey[0][i];
} }