wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sha/keccak1600.c: internalize KeccakF1600 and simplify SHA3_absorb.

Browse source 
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
This commit is contained in:
Andy Polyakov 2017-06-30 13:35:59 +02:00
parent edbc681d22
commit b4f2a462b7
1 changed files with 17 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
crypto/sha/keccak1600.c
View file

@ -212,7 +212,7 @@ static void Iota(uint64_t A[5][5], size_t i)
A[0][0] ^= iotas[i];
}
void KeccakF1600(uint64_t A[5][5])
static void KeccakF1600(uint64_t A[5][5])
{
size_t i;
@ -347,7 +347,7 @@ static void Round(uint64_t A[5][5], size_t i)
A[4][4] = C[4] ^ (~C[0] & C[1]);
}
void KeccakF1600(uint64_t A[5][5])
static void KeccakF1600(uint64_t A[5][5])
{
size_t i;
@ -490,7 +490,7 @@ static void Round(uint64_t A[5][5], size_t i)
A[0][0] ^= iotas[i];
}
void KeccakF1600(uint64_t A[5][5])
static void KeccakF1600(uint64_t A[5][5])
{
size_t i;
@ -628,7 +628,7 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
#endif
}
void KeccakF1600(uint64_t A[5][5])
static void KeccakF1600(uint64_t A[5][5])
{
uint64_t T[5][5];
size_t i;
@ -946,7 +946,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
/* C[4] ^= */ A[4][4] = B[4] ^ (~B[0] & B[1]);
}
void KeccakF1600(uint64_t A[5][5])
static void KeccakF1600(uint64_t A[5][5])
{
size_t i;
@ -1071,14 +1071,22 @@ size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r)
{
uint64_t *A_flat = (uint64_t *)A;
size_t i, rem, w = r / 8;
size_t i, w = r / 8;
assert(r < (25 * sizeof(A[0][0])) && (r % 8) == 0);
while (len >= r) {
for (i = 0; i < w; i++) {
while (len != 0) {
for (i = 0; i < w && len != 0; i++) {
uint64_t Ai = BitDeinterleave(A_flat[i]);
if (len < 8) {
for (i = 0; i < len; i++) {
*out++ = (unsigned char)Ai;
Ai >>= 8;
}
return;
}
out[0] = (unsigned char)(Ai);
out[1] = (unsigned char)(Ai >> 8);
out[2] = (unsigned char)(Ai >> 16);
@ -1088,37 +1096,11 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r)
out[6] = (unsigned char)(Ai >> 48);
out[7] = (unsigned char)(Ai >> 56);
out += 8;
len -= 8;
}
len -= r;
if (len)
KeccakF1600(A);
}
rem = len % 8;
len /= 8;
for (i = 0; i < len; i++) {
uint64_t Ai = BitDeinterleave(A_flat[i]);
out[0] = (unsigned char)(Ai);
out[1] = (unsigned char)(Ai >> 8);
out[2] = (unsigned char)(Ai >> 16);
out[3] = (unsigned char)(Ai >> 24);
out[4] = (unsigned char)(Ai >> 32);
out[5] = (unsigned char)(Ai >> 40);
out[6] = (unsigned char)(Ai >> 48);
out[7] = (unsigned char)(Ai >> 56);
out += 8;
}
if (rem) {
uint64_t Ai = BitDeinterleave(A_flat[i]);
for (i = 0; i < rem; i++) {
*out++ = (unsigned char)Ai;
Ai >>= 8;
}
}
}
#else
size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,