Commit 4768c9de authored by bernd's avatar bernd
Browse files

Fix keccak problem

parent 39232615

keccak/KeccakF-1600-opt32.c

+4 −4
Original line number Diff line number Diff line
@@ -282,23 +282,23 @@ void KeccakInitializeState(keccak_state state) 
    memset(state, 0, 200);

}



void KeccakExtract(keccak_state state, UINT64 *data, unsigned int byteCount)

void KeccakExtract(keccak_state state, UINT64 *data, int byteCount)

{

    extractLanes(byteCount, state, (char*)data)

}



void KeccakAbsorb(keccak_state state, UINT64 *data, unsigned int byteCount)

void KeccakAbsorb(keccak_state state, UINT64 *data, int byteCount)

{

    xorLanesIntoState(byteCount, state, (char*)data)

}



void KeccakEncrypt(keccak_state state, UINT64 *data, unsigned int byteCount)

void KeccakEncrypt(keccak_state state, UINT64 *data, int byteCount)

{

  xorLanesIntoState(byteCount, state, (char*)data);

  extractLanes(byteCount, state, (char*)data);

}



void KeccakDecrypt(keccak_state state, UINT64 *data, unsigned int byteCount)

void KeccakDecrypt(keccak_state state, UINT64 *data, int byteCount)

{

  UINT64 tmp[(byteCount>>3)+1];

  int i;

keccak/KeccakF-1600-opt64.c

+8 −8
Original line number Diff line number Diff line
@@ -220,13 +220,13 @@ void KeccakInitialize() 
{

}



void KeccakExtract(keccak_state state, UINT64 *data, unsigned int byteCount)

void KeccakExtract(keccak_state state, UINT64 *data, int byteCount)

{

  UINT64 m = 0xffffffffffffffffull;

#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)

  memcpy(data, state, byteCount);

#else

  unsigned int i;

  int i;

  

  for(i=0; i<byteCount-7; i+=8)

    fromWordToBytes(data+(i>>3), ((const UINT64*)state)[i>>3]);
@@ -255,9 +255,9 @@ void KeccakExtract(keccak_state state, UINT64 *data, unsigned int byteCount) 
#endif

}



void KeccakAbsorb(keccak_state state, UINT64 *data, unsigned int byteCount)

void KeccakAbsorb(keccak_state state, UINT64 *data, int byteCount)

{

  unsigned int i;

  int i;

  UINT64 m = 0xffffffffffffffffull;

  for(i=0; i<byteCount-7; i+=8) {

#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
@@ -281,9 +281,9 @@ void KeccakAbsorb(keccak_state state, UINT64 *data, unsigned int byteCount) 
#endif

}



void KeccakEncrypt(keccak_state state, UINT64 *data, unsigned int byteCount)

void KeccakEncrypt(keccak_state state, UINT64 *data, int byteCount)

{

  unsigned int i;

  int i;

  UINT64 m = 0xffffffffffffffffull;

  for(i=0; i<byteCount-7; i+=8) {

#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
@@ -330,9 +330,9 @@ void KeccakEncrypt(keccak_state state, UINT64 *data, unsigned int byteCount) 
#endif

}



void KeccakDecrypt(keccak_state state, UINT64 *data, unsigned int byteCount)

void KeccakDecrypt(keccak_state state, UINT64 *data, int byteCount)

{

  unsigned int i;

  int i;

  UINT64 m = 0xffffffffffffffffull;

  UINT64 tmp;

  for(i=0; i<byteCount-7; i+=8) {

keccak/KeccakF-1600.h

+4 −4
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ typedef STATEI keccak_state[25*sizeof(UINT64)/sizeof(STATEI)]; 
void KeccakInitialize();

void KeccakF(keccak_state state);

void KeccakInitializeState(keccak_state state);

void KeccakExtract(keccak_state state, UINT64 *data, unsigned int laneCount);

void KeccakAbsorb(keccak_state state, UINT64 *data, unsigned int laneCount);

void KeccakEncrypt(keccak_state state, UINT64 *data, unsigned int laneCount);

void KeccakDecrypt(keccak_state state, UINT64 *data, unsigned int laneCount);

void KeccakExtract(keccak_state state, UINT64 *data, int laneCount);

void KeccakAbsorb (keccak_state state, UINT64 *data, int laneCount);

void KeccakEncrypt(keccak_state state, UINT64 *data, int laneCount);

void KeccakDecrypt(keccak_state state, UINT64 *data, int laneCount);



#endif