diff options
Diffstat (limited to 'src/lib/libcrypto/camellia/camellia.c')
-rw-r--r-- | src/lib/libcrypto/camellia/camellia.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/camellia/camellia.c b/src/lib/libcrypto/camellia/camellia.c index f400bc9ff7..fa925b72a9 100644 --- a/src/lib/libcrypto/camellia/camellia.c +++ b/src/lib/libcrypto/camellia/camellia.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: camellia.c,v 1.7 2014/07/10 22:45:56 jsing Exp $ */ | 1 | /* $OpenBSD: camellia.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . | 3 | * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . |
4 | * ALL RIGHTS RESERVED. | 4 | * ALL RIGHTS RESERVED. |
@@ -314,7 +314,7 @@ static const u32 SIGMA[] = { | |||
314 | * specific] assembler version should be/is provided anyway... | 314 | * specific] assembler version should be/is provided anyway... |
315 | */ | 315 | */ |
316 | #define Camellia_Feistel(_s0,_s1,_s2,_s3,_key) do {\ | 316 | #define Camellia_Feistel(_s0,_s1,_s2,_s3,_key) do {\ |
317 | register u32 _t0,_t1,_t2,_t3;\ | 317 | u32 _t0,_t1,_t2,_t3;\ |
318 | \ | 318 | \ |
319 | _t0 = _s0 ^ (_key)[0];\ | 319 | _t0 = _s0 ^ (_key)[0];\ |
320 | _t3 = SBOX4_4404[_t0&0xff];\ | 320 | _t3 = SBOX4_4404[_t0&0xff];\ |
@@ -348,7 +348,7 @@ static const u32 SIGMA[] = { | |||
348 | 348 | ||
349 | int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k) | 349 | int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k) |
350 | { | 350 | { |
351 | register u32 s0,s1,s2,s3; | 351 | u32 s0,s1,s2,s3; |
352 | 352 | ||
353 | k[0] = s0 = GETU32(rawKey); | 353 | k[0] = s0 = GETU32(rawKey); |
354 | k[1] = s1 = GETU32(rawKey+4); | 354 | k[1] = s1 = GETU32(rawKey+4); |
@@ -473,7 +473,7 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k) | |||
473 | void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[], | 473 | void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[], |
474 | const KEY_TABLE_TYPE keyTable, u8 ciphertext[]) | 474 | const KEY_TABLE_TYPE keyTable, u8 ciphertext[]) |
475 | { | 475 | { |
476 | register u32 s0,s1,s2,s3; | 476 | u32 s0,s1,s2,s3; |
477 | const u32 *k = keyTable,*kend = keyTable+grandRounds*16; | 477 | const u32 *k = keyTable,*kend = keyTable+grandRounds*16; |
478 | 478 | ||
479 | s0 = GETU32(plaintext) ^ k[0]; | 479 | s0 = GETU32(plaintext) ^ k[0]; |