changes functions to static

This commit is contained in:
SUZUKI Tetsuya 2012-10-07 16:52:36 +09:00
parent 9bd9083370
commit 6f28f39e3b
2 changed files with 12 additions and 12 deletions

View File

@ -174,7 +174,7 @@ ALIGN const UINT64 rot_39_41[2] = {39, 41};
#include "KeccakF-1600-unrolling.macros" #include "KeccakF-1600-unrolling.macros"
void KeccakPermutationOnWords(UINT64 *state) static void KeccakPermutationOnWords(UINT64 *state)
{ {
declareABCDE declareABCDE
#if (Unrolling != 24) #if (Unrolling != 24)
@ -188,7 +188,7 @@ void KeccakPermutationOnWords(UINT64 *state)
#endif #endif
} }
void KeccakPermutationOnWordsAfterXoring(UINT64 *state, const UINT64 *input, unsigned int laneCount) static void KeccakPermutationOnWordsAfterXoring(UINT64 *state, const UINT64 *input, unsigned int laneCount)
{ {
declareABCDE declareABCDE
#if (Unrolling != 24) #if (Unrolling != 24)
@ -206,7 +206,7 @@ void KeccakPermutationOnWordsAfterXoring(UINT64 *state, const UINT64 *input, uns
} }
#ifdef ProvideFast576 #ifdef ProvideFast576
void KeccakPermutationOnWordsAfterXoring576bits(UINT64 *state, const UINT64 *input) static void KeccakPermutationOnWordsAfterXoring576bits(UINT64 *state, const UINT64 *input)
{ {
declareABCDE declareABCDE
#if (Unrolling != 24) #if (Unrolling != 24)
@ -222,7 +222,7 @@ void KeccakPermutationOnWordsAfterXoring576bits(UINT64 *state, const UINT64 *inp
#endif #endif
#ifdef ProvideFast832 #ifdef ProvideFast832
void KeccakPermutationOnWordsAfterXoring832bits(UINT64 *state, const UINT64 *input) static void KeccakPermutationOnWordsAfterXoring832bits(UINT64 *state, const UINT64 *input)
{ {
declareABCDE declareABCDE
#if (Unrolling != 24) #if (Unrolling != 24)
@ -238,7 +238,7 @@ void KeccakPermutationOnWordsAfterXoring832bits(UINT64 *state, const UINT64 *inp
#endif #endif
#ifdef ProvideFast1024 #ifdef ProvideFast1024
void KeccakPermutationOnWordsAfterXoring1024bits(UINT64 *state, const UINT64 *input) static void KeccakPermutationOnWordsAfterXoring1024bits(UINT64 *state, const UINT64 *input)
{ {
declareABCDE declareABCDE
#if (Unrolling != 24) #if (Unrolling != 24)
@ -254,7 +254,7 @@ void KeccakPermutationOnWordsAfterXoring1024bits(UINT64 *state, const UINT64 *in
#endif #endif
#ifdef ProvideFast1088 #ifdef ProvideFast1088
void KeccakPermutationOnWordsAfterXoring1088bits(UINT64 *state, const UINT64 *input) static void KeccakPermutationOnWordsAfterXoring1088bits(UINT64 *state, const UINT64 *input)
{ {
declareABCDE declareABCDE
#if (Unrolling != 24) #if (Unrolling != 24)
@ -270,7 +270,7 @@ void KeccakPermutationOnWordsAfterXoring1088bits(UINT64 *state, const UINT64 *in
#endif #endif
#ifdef ProvideFast1152 #ifdef ProvideFast1152
void KeccakPermutationOnWordsAfterXoring1152bits(UINT64 *state, const UINT64 *input) static void KeccakPermutationOnWordsAfterXoring1152bits(UINT64 *state, const UINT64 *input)
{ {
declareABCDE declareABCDE
#if (Unrolling != 24) #if (Unrolling != 24)
@ -286,7 +286,7 @@ void KeccakPermutationOnWordsAfterXoring1152bits(UINT64 *state, const UINT64 *in
#endif #endif
#ifdef ProvideFast1344 #ifdef ProvideFast1344
void KeccakPermutationOnWordsAfterXoring1344bits(UINT64 *state, const UINT64 *input) static void KeccakPermutationOnWordsAfterXoring1344bits(UINT64 *state, const UINT64 *input)
{ {
declareABCDE declareABCDE
#if (Unrolling != 24) #if (Unrolling != 24)
@ -324,7 +324,7 @@ void KeccakPermutation(unsigned char *state)
KeccakPermutationOnWords((UINT64*)state); KeccakPermutationOnWords((UINT64*)state);
} }
void fromBytesToWord(UINT64 *word, const UINT8 *bytes) static void fromBytesToWord(UINT64 *word, const UINT8 *bytes)
{ {
unsigned int i; unsigned int i;
@ -443,7 +443,7 @@ void KeccakAbsorb(unsigned char *state, const unsigned char *data, unsigned int
#endif #endif
} }
void fromWordToBytes(UINT8 *bytes, const UINT64 word) static void fromWordToBytes(UINT8 *bytes, const UINT64 word)
{ {
unsigned int i; unsigned int i;

View File

@ -37,7 +37,7 @@ int InitSponge(spongeState *state, unsigned int rate, unsigned int capacity)
return 0; return 0;
} }
void AbsorbQueue(spongeState *state) static void AbsorbQueue(spongeState *state)
{ {
// state->bitsInQueue is assumed to be equal to state->rate // state->bitsInQueue is assumed to be equal to state->rate
#ifdef KeccakReference #ifdef KeccakReference
@ -191,7 +191,7 @@ int Absorb(spongeState *state, const unsigned char *data, unsigned long long dat
return 0; return 0;
} }
void PadAndSwitchToSqueezingPhase(spongeState *state) static void PadAndSwitchToSqueezingPhase(spongeState *state)
{ {
// Note: the bits are numbered from 0=LSB to 7=MSB // Note: the bits are numbered from 0=LSB to 7=MSB
if (state->bitsInQueue + 1 == state->rate) { if (state->bitsInQueue + 1 == state->rate) {