# HG changeset patch # User jbe # Date 1502822875 -7200 # Node ID cf948f21905676beb150dc61a5787e4692ca70e3 # Parent 218219b7a15e78a05d49825dffc8bdbc1ad00410 Re-added unused parameter c from Keccak function (Backed out changeset 218219b7a15e) diff -r 218219b7a15e -r cf948f219056 libraries/moonhash/moonhash_sha3.c --- a/libraries/moonhash/moonhash_sha3.c Tue Aug 15 20:46:13 2017 +0200 +++ b/libraries/moonhash/moonhash_sha3.c Tue Aug 15 20:47:55 2017 +0200 @@ -8,13 +8,13 @@ typedef uint64_t u64; typedef unsigned int ui; -static void Keccak(ui r, const u8 *in, u64 inLen, u8 sfx, u8 *out, u64 outLen); -void FIPS202_SHAKE128(const u8 *in, u64 inLen, u8 *out, u64 outLen) { Keccak(1344, /*256,*/ in, inLen, 0x1F, out, outLen); } -void FIPS202_SHAKE256(const u8 *in, u64 inLen, u8 *out, u64 outLen) { Keccak(1088, /*512,*/ in, inLen, 0x1F, out, outLen); } -void FIPS202_SHA3_224(const u8 *in, u64 inLen, u8 *out) { Keccak(1152, /*448,*/ in, inLen, 0x06, out, 28); } -void FIPS202_SHA3_256(const u8 *in, u64 inLen, u8 *out) { Keccak(1088, /*512,*/ in, inLen, 0x06, out, 32); } -void FIPS202_SHA3_384(const u8 *in, u64 inLen, u8 *out) { Keccak(832, /*768,*/ in, inLen, 0x06, out, 48); } -void FIPS202_SHA3_512(const u8 *in, u64 inLen, u8 *out) { Keccak(576, /*1024,*/ in, inLen, 0x06, out, 64); } +static void Keccak(ui r, ui c, const u8 *in, u64 inLen, u8 sfx, u8 *out, u64 outLen); +void FIPS202_SHAKE128(const u8 *in, u64 inLen, u8 *out, u64 outLen) { Keccak(1344, 256, in, inLen, 0x1F, out, outLen); } +void FIPS202_SHAKE256(const u8 *in, u64 inLen, u8 *out, u64 outLen) { Keccak(1088, 512, in, inLen, 0x1F, out, outLen); } +void FIPS202_SHA3_224(const u8 *in, u64 inLen, u8 *out) { Keccak(1152, 448, in, inLen, 0x06, out, 28); } +void FIPS202_SHA3_256(const u8 *in, u64 inLen, u8 *out) { Keccak(1088, 512, in, inLen, 0x06, out, 32); } +void FIPS202_SHA3_384(const u8 *in, u64 inLen, u8 *out) { Keccak(832, 768, in, inLen, 0x06, out, 48); } +void FIPS202_SHA3_512(const u8 *in, u64 inLen, u8 *out) { Keccak(576, 1024, in, inLen, 0x06, out, 64); } static int LFSR86540(u8 *R) { (*R)=((*R)<<1)^(((*R)&0x80)?0x71:0); return ((*R)&2)>>1; } #define ROL(a,o) ((((u64)a)<>(64-o))) @@ -40,7 +40,7 @@ /*ι*/ FOR(j,7) if (LFSR86540(&R)) XL(0,0,(u64)1<<((1<0) { b=(inLen