RubyGems - digest-kangarootwelve - Versions diffs - 0.4.8 → 0.5.0 - Mend

digest-kangarootwelve 0.4.8 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (473) hide show

data/ext/digest/kangarootwelve/XKCP/lib/low/KeccakP-1600/compact/KeccakP-1600-SnP.h CHANGED Viewed

@@ -21,20 +21,26 @@ Please refer to SnP-documentation.h for more details.
 #ifndef _KeccakP_1600_SnP_h_
 #define _KeccakP_1600_SnP_h_
+#include <stdint.h>
 #define KeccakP1600_implementation      "64-bit compact implementation"
-#define KeccakP1600_stateSizeInBytes    200
-#define KeccakP1600_stateAlignment      8
+typedef struct {
+    uint64_t A[25];
+} KeccakP1600_plain64_state;
+typedef KeccakP1600_plain64_state KeccakP1600_state;
 #define KeccakP1600_StaticInitialize()
-void KeccakP1600_Initialize(void *state);
-void KeccakP1600_AddByte(void *state, unsigned char data, unsigned int offset);
-void KeccakP1600_AddBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_OverwriteBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_OverwriteWithZeroes(void *state, unsigned int byteCount);
-void KeccakP1600_Permute_Nrounds(void *state, unsigned int nrounds);
-void KeccakP1600_Permute_12rounds(void *state);
-void KeccakP1600_Permute_24rounds(void *state);
-void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length);
+void KeccakP1600_Initialize(KeccakP1600_plain64_state *state);
+void KeccakP1600_AddByte(KeccakP1600_plain64_state *state, unsigned char data, unsigned int offset);
+void KeccakP1600_AddBytes(KeccakP1600_plain64_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteBytes(KeccakP1600_plain64_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteWithZeroes(KeccakP1600_plain64_state *state, unsigned int byteCount);
+void KeccakP1600_Permute_Nrounds(KeccakP1600_plain64_state *state, unsigned int nrounds);
+void KeccakP1600_Permute_12rounds(KeccakP1600_plain64_state *state);
+void KeccakP1600_Permute_24rounds(KeccakP1600_plain64_state *state);
+void KeccakP1600_ExtractBytes(const KeccakP1600_plain64_state *state, unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_ExtractAndAddBytes(const KeccakP1600_plain64_state *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length);
 #endif

data/ext/digest/kangarootwelve/XKCP/lib/low/KeccakP-1600/compact/KeccakP-1600-compact64.c CHANGED Viewed

@@ -101,7 +101,7 @@ static tKeccakLane KeccakF1600_GetNextRoundConstant( uint8_t *LFSR )
 /* ---------------------------------------------------------------- */
-void KeccakP1600_Initialize(void *argState)
+void KeccakP1600_Initialize(KeccakP1600_plain64_state *argState)
 {
     #if defined(USE_MEMSET)
     memset( argState, 0, 25 * 8 );
@@ -121,7 +121,7 @@ void KeccakP1600_Initialize(void *argState)
 /* ---------------------------------------------------------------- */
-void KeccakP1600_AddBytesInLane(void *argState, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_AddBytesInLane(KeccakP1600_plain64_state *argState, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length)
 {
     unsigned int i;
     #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
@@ -138,7 +138,7 @@ void KeccakP1600_AddBytesInLane(void *argState, unsigned int lanePosition, const
 /* ---------------------------------------------------------------- */
-void KeccakP1600_AddLanes(void *state, const unsigned char *data, unsigned int laneCount)
+void KeccakP1600_AddLanes(KeccakP1600_plain64_state *state, const unsigned char *data, unsigned int laneCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     tSmallUInt i;
@@ -165,7 +165,7 @@ void KeccakP1600_AddLanes(void *state, const unsigned char *data, unsigned int l
 /* ---------------------------------------------------------------- */
-void KeccakP1600_AddByte(void *state, unsigned char byte, unsigned int offset)
+void KeccakP1600_AddByte(KeccakP1600_plain64_state *state, unsigned char byte, unsigned int offset)
 {
     uint64_t lane = byte;
     lane <<= (offset%8)*8;
@@ -174,14 +174,14 @@ void KeccakP1600_AddByte(void *state, unsigned char byte, unsigned int offset)
 /* ---------------------------------------------------------------- */
-void KeccakP1600_AddBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_AddBytes(KeccakP1600_plain64_state *state, const unsigned char *data, unsigned int offset, unsigned int length)
 {
     SnP_AddBytes(state, data, offset, length, KeccakP1600_AddLanes, KeccakP1600_AddBytesInLane, 8);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_OverwriteBytesInLane(void *argState, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_OverwriteBytesInLane(KeccakP1600_plain64_state *argState, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     memcpy((unsigned char*)argState+lanePosition*8+offset, data, length);
@@ -199,7 +199,7 @@ void KeccakP1600_OverwriteBytesInLane(void *argState, unsigned int lanePosition,
 /* ---------------------------------------------------------------- */
-void KeccakP1600_OverwriteLanes(void *state, const unsigned char *data, unsigned int laneCount)
+void KeccakP1600_OverwriteLanes(KeccakP1600_plain64_state *state, const unsigned char *data, unsigned int laneCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     memcpy((unsigned char*)state, data, laneCount*8);
@@ -222,14 +222,14 @@ void KeccakP1600_OverwriteLanes(void *state, const unsigned char *data, unsigned
 /* ---------------------------------------------------------------- */
-void KeccakP1600_OverwriteBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_OverwriteBytes(KeccakP1600_plain64_state *state, const unsigned char *data, unsigned int offset, unsigned int length)
 {
     SnP_OverwriteBytes(state, data, offset, length, KeccakP1600_OverwriteLanes, KeccakP1600_OverwriteBytesInLane, 8);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_OverwriteWithZeroes(void *argState, unsigned int byteCount)
+void KeccakP1600_OverwriteWithZeroes(KeccakP1600_plain64_state *argState, unsigned int byteCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     memset((unsigned char*)argState, 0, byteCount);
@@ -245,7 +245,7 @@ void KeccakP1600_OverwriteWithZeroes(void *argState, unsigned int byteCount)
 /* ---------------------------------------------------------------- */
-static void KeccakP1600_Permute_NroundsLFSR(void *argState, uint8_t rounds, uint8_t LFSRinitialState)
+static void KeccakP1600_Permute_NroundsLFSR(KeccakP1600_plain64_state *argState, uint8_t rounds, uint8_t LFSRinitialState)
 {
     tSmallUInt x, y, round;
     tKeccakLane        temp;
@@ -310,7 +310,7 @@ static void KeccakP1600_Permute_NroundsLFSR(void *argState, uint8_t rounds, uint
 /* ---------------------------------------------------------------- */
-void KeccakP1600_Permute_Nrounds(void *state, unsigned int nrounds)
+void KeccakP1600_Permute_Nrounds(KeccakP1600_plain64_state *state, unsigned int nrounds)
 {
 	uint8_t LFSRstate;
 	uint8_t nr;
@@ -323,21 +323,21 @@ void KeccakP1600_Permute_Nrounds(void *state, unsigned int nrounds)
 /* ---------------------------------------------------------------- */
-void KeccakP1600_Permute_12rounds(void *state)
+void KeccakP1600_Permute_12rounds(KeccakP1600_plain64_state *state)
 {
     KeccakP1600_Permute_NroundsLFSR(state, 12, 0xD5);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_Permute_24rounds(void *state)
+void KeccakP1600_Permute_24rounds(KeccakP1600_plain64_state *state)
 {
     KeccakP1600_Permute_NroundsLFSR(state, 24, 0x01);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractBytesInLane(const void *state, unsigned int lanePosition, unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_ExtractBytesInLane(const KeccakP1600_plain64_state *state, unsigned int lanePosition, unsigned char *data, unsigned int offset, unsigned int length)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     memcpy(data, ((uint8_t*)&((tKeccakLane*)state)[lanePosition])+offset, length);
@@ -354,7 +354,7 @@ void KeccakP1600_ExtractBytesInLane(const void *state, unsigned int lanePosition
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractLanes(const void *state, unsigned char *data, unsigned int laneCount)
+void KeccakP1600_ExtractLanes(const KeccakP1600_plain64_state *state, unsigned char *data, unsigned int laneCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     memcpy(data, state, laneCount*8);
@@ -372,14 +372,14 @@ void KeccakP1600_ExtractLanes(const void *state, unsigned char *data, unsigned i
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_ExtractBytes(const KeccakP1600_plain64_state *state, unsigned char *data, unsigned int offset, unsigned int length)
 {
     SnP_ExtractBytes(state, data, offset, length, KeccakP1600_ExtractLanes, KeccakP1600_ExtractBytesInLane, 8);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractAndAddBytesInLane(const void *state, unsigned int lanePosition, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
+void KeccakP1600_ExtractAndAddBytesInLane(const KeccakP1600_plain64_state *state, unsigned int lanePosition, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
 {
     tSmallUInt i;
     tKeccakLane lane = ((tKeccakLane*)state)[lanePosition];
@@ -392,7 +392,7 @@ void KeccakP1600_ExtractAndAddBytesInLane(const void *state, unsigned int lanePo
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractAndAddLanes(const void *state, const unsigned char *input, unsigned char *output, unsigned int laneCount)
+void KeccakP1600_ExtractAndAddLanes(const KeccakP1600_plain64_state *state, const unsigned char *input, unsigned char *output, unsigned int laneCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     tSmallUInt i;
@@ -412,7 +412,7 @@ void KeccakP1600_ExtractAndAddLanes(const void *state, const unsigned char *inpu
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
+void KeccakP1600_ExtractAndAddBytes(const KeccakP1600_plain64_state *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
 {
     SnP_ExtractAndAddBytes(state, input, output, offset, length, KeccakP1600_ExtractAndAddLanes, KeccakP1600_ExtractAndAddBytesInLane, 8);
 }

data/ext/digest/kangarootwelve/XKCP/lib/low/KeccakP-1600/plain-32bits-inplace/KeccakP-1600-SnP.h CHANGED Viewed

@@ -21,23 +21,29 @@ Please refer to SnP-documentation.h for more details.
 #ifndef _KeccakP_1600_SnP_h_
 #define _KeccakP_1600_SnP_h_
+#include <stdint.h>
 /** For the documentation, see SnP-documentation.h.
  */
+typedef struct {
+    uint32_t A[50];
+} KeccakP1600_plain32_state;
+typedef KeccakP1600_plain32_state KeccakP1600_state;
 #define KeccakP1600_implementation      "in-place 32-bit optimized implementation"
-#define KeccakP1600_stateSizeInBytes    200
-#define KeccakP1600_stateAlignment      8
 #define KeccakP1600_StaticInitialize()
-void KeccakP1600_Initialize(void *state);
-void KeccakP1600_AddByte(void *state, unsigned char data, unsigned int offset);
-void KeccakP1600_AddBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_OverwriteBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_OverwriteWithZeroes(void *state, unsigned int byteCount);
-void KeccakP1600_Permute_Nrounds(void *state, unsigned int nrounds);
-void KeccakP1600_Permute_12rounds(void *state);
-void KeccakP1600_Permute_24rounds(void *state);
-void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length);
+void KeccakP1600_Initialize(KeccakP1600_plain32_state *state);
+void KeccakP1600_AddByte(KeccakP1600_plain32_state *state, unsigned char data, unsigned int offset);
+void KeccakP1600_AddBytes(KeccakP1600_plain32_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteBytes(KeccakP1600_plain32_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteWithZeroes(KeccakP1600_plain32_state *state, unsigned int byteCount);
+void KeccakP1600_Permute_Nrounds(KeccakP1600_plain32_state *state, unsigned int nrounds);
+void KeccakP1600_Permute_12rounds(KeccakP1600_plain32_state *state);
+void KeccakP1600_Permute_24rounds(KeccakP1600_plain32_state *state);
+void KeccakP1600_ExtractBytes(const KeccakP1600_plain32_state *state, unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_ExtractAndAddBytes(const KeccakP1600_plain32_state *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length);
 #endif

data/ext/digest/kangarootwelve/XKCP/lib/low/KeccakP-1600/plain-32bits-inplace/KeccakP-1600-inplace32BI.c CHANGED Viewed

@@ -84,12 +84,12 @@ Please refer to LowLevel.build for the exact list of other files it must be comb
         lowOut = lowIn ^ temp0; \
         highOut = highIn ^ temp1;
-void KeccakP1600_SetBytesInLaneToZero(void *state, unsigned int lanePosition, unsigned int offset, unsigned int length)
+void KeccakP1600_SetBytesInLaneToZero(KeccakP1600_plain32_state *state, unsigned int lanePosition, unsigned int offset, unsigned int length)
 {
     uint8_t laneAsBytes[8];
     uint32_t low, high;
     uint32_t temp, temp0, temp1;
-    uint32_t *stateAsHalfLanes = (uint32_t*)state;
+    uint32_t *stateAsHalfLanes = state->A;
     memset(laneAsBytes, 0xFF, offset);
     memset(laneAsBytes+offset, 0x00, length);
@@ -112,20 +112,20 @@ void KeccakP1600_SetBytesInLaneToZero(void *state, unsigned int lanePosition, un
 /* ---------------------------------------------------------------- */
-void KeccakP1600_Initialize(void *state)
+void KeccakP1600_Initialize(KeccakP1600_plain32_state *state)
 {
     memset(state, 0, 200);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_AddByte(void *state, unsigned char byte, unsigned int offset)
+void KeccakP1600_AddByte(KeccakP1600_plain32_state *state, unsigned char byte, unsigned int offset)
 {
     unsigned int lanePosition = offset/8;
     unsigned int offsetInLane = offset%8;
     uint32_t low, high;
     uint32_t temp, temp0, temp1;
-    uint32_t *stateAsHalfLanes = (uint32_t*)state;
+    uint32_t *stateAsHalfLanes = state->A;
     if (offsetInLane < 4) {
         low = (uint32_t)byte << (offsetInLane*8);
@@ -140,12 +140,12 @@ void KeccakP1600_AddByte(void *state, unsigned char byte, unsigned int offset)
 /* ---------------------------------------------------------------- */
-void KeccakP1600_AddBytesInLane(void *state, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_AddBytesInLane(KeccakP1600_plain32_state *state, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length)
 {
     uint8_t laneAsBytes[8];
     uint32_t low, high;
     uint32_t temp, temp0, temp1;
-    uint32_t *stateAsHalfLanes = (uint32_t*)state;
+    uint32_t *stateAsHalfLanes = state->A;
     memset(laneAsBytes, 0, 8);
     memcpy(laneAsBytes+offset, data, length);
@@ -167,11 +167,11 @@ void KeccakP1600_AddBytesInLane(void *state, unsigned int lanePosition, const un
 /* ---------------------------------------------------------------- */
-void KeccakP1600_AddLanes(void *state, const unsigned char *data, unsigned int laneCount)
+void KeccakP1600_AddLanes(KeccakP1600_plain32_state *state, const unsigned char *data, unsigned int laneCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     const uint32_t * pI = (const uint32_t *)data;
-    uint32_t * pS = (uint32_t*)state;
+    uint32_t * pS = state->A;
     uint32_t t, x0, x1;
     int i;
     for (i = laneCount-1; i >= 0; --i) {
@@ -199,7 +199,7 @@ void KeccakP1600_AddLanes(void *state, const unsigned char *data, unsigned int l
             | ((uint32_t)(laneAsBytes[6]) << 16)
             | ((uint32_t)(laneAsBytes[7]) << 24);
         uint32_t even, odd, temp, temp0, temp1;
-        uint32_t *stateAsHalfLanes = (uint32_t*)state;
+        uint32_t *stateAsHalfLanes = state->A;
         toBitInterleavingAndXOR(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1);
     }
 #endif
@@ -207,14 +207,14 @@ void KeccakP1600_AddLanes(void *state, const unsigned char *data, unsigned int l
 /* ---------------------------------------------------------------- */
-void KeccakP1600_AddBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_AddBytes(KeccakP1600_plain32_state *state, const unsigned char *data, unsigned int offset, unsigned int length)
 {
     SnP_AddBytes(state, data, offset, length, KeccakP1600_AddLanes, KeccakP1600_AddBytesInLane, 8);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_OverwriteBytesInLane(void *state, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_OverwriteBytesInLane(KeccakP1600_plain32_state *state, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length)
 {
     KeccakP1600_SetBytesInLaneToZero(state, lanePosition, offset, length);
     KeccakP1600_AddBytesInLane(state, lanePosition, data, offset, length);
@@ -222,7 +222,7 @@ void KeccakP1600_OverwriteBytesInLane(void *state, unsigned int lanePosition, co
 /* ---------------------------------------------------------------- */
-void KeccakP1600_OverwriteLanes(void *state, const unsigned char *data, unsigned int laneCount)
+void KeccakP1600_OverwriteLanes(KeccakP1600_plain32_state *state, const unsigned char *data, unsigned int laneCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     const uint32_t * pI = (const uint32_t *)data;
@@ -254,7 +254,7 @@ void KeccakP1600_OverwriteLanes(void *state, const unsigned char *data, unsigned
             | ((uint32_t)(laneAsBytes[6]) << 16)
             | ((uint32_t)(laneAsBytes[7]) << 24);
         uint32_t even, odd, temp, temp0, temp1;
-        uint32_t *stateAsHalfLanes = (uint32_t*)state;
+        uint32_t *stateAsHalfLanes = state->A;
         toBitInterleavingAndSet(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1);
     }
 #endif
@@ -262,16 +262,16 @@ void KeccakP1600_OverwriteLanes(void *state, const unsigned char *data, unsigned
 /* ---------------------------------------------------------------- */
-void KeccakP1600_OverwriteBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_OverwriteBytes(KeccakP1600_plain32_state *state, const unsigned char *data, unsigned int offset, unsigned int length)
 {
     SnP_OverwriteBytes(state, data, offset, length, KeccakP1600_OverwriteLanes, KeccakP1600_OverwriteBytesInLane, 8);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_OverwriteWithZeroes(void *state, unsigned int byteCount)
+void KeccakP1600_OverwriteWithZeroes(KeccakP1600_plain32_state *state, unsigned int byteCount)
 {
-    uint32_t *stateAsHalfLanes = (uint32_t*)state;
+    uint32_t *stateAsHalfLanes = state->A;
     unsigned int i;
     for(i=0; i<byteCount/8; i++) {
@@ -284,9 +284,9 @@ void KeccakP1600_OverwriteWithZeroes(void *state, unsigned int byteCount)
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractBytesInLane(const void *state, unsigned int lanePosition, unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_ExtractBytesInLane(const KeccakP1600_plain32_state *state, unsigned int lanePosition, unsigned char *data, unsigned int offset, unsigned int length)
 {
-    uint32_t *stateAsHalfLanes = (uint32_t*)state;
+    const uint32_t *stateAsHalfLanes = state->A;
     uint32_t low, high, temp, temp0, temp1;
     uint8_t laneAsBytes[8];
@@ -309,7 +309,7 @@ void KeccakP1600_ExtractBytesInLane(const void *state, unsigned int lanePosition
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractLanes(const void *state, unsigned char *data, unsigned int laneCount)
+void KeccakP1600_ExtractLanes(const KeccakP1600_plain32_state *state, unsigned char *data, unsigned int laneCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     uint32_t * pI = (uint32_t *)data;
@@ -330,7 +330,7 @@ void KeccakP1600_ExtractLanes(const void *state, unsigned char *data, unsigned i
 #else
     unsigned int lanePosition;
     for(lanePosition=0; lanePosition<laneCount; lanePosition++) {
-        uint32_t *stateAsHalfLanes = (uint32_t*)state;
+        uint32_t *stateAsHalfLanes = state->A;
         uint32_t low, high, temp, temp0, temp1;
         fromBitInterleaving(stateAsHalfLanes[lanePosition*2], stateAsHalfLanes[lanePosition*2+1], low, high, temp, temp0, temp1);
         uint8_t laneAsBytes[8];
@@ -349,16 +349,16 @@ void KeccakP1600_ExtractLanes(const void *state, unsigned char *data, unsigned i
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length)
+void KeccakP1600_ExtractBytes(const KeccakP1600_plain32_state *state, unsigned char *data, unsigned int offset, unsigned int length)
 {
     SnP_ExtractBytes(state, data, offset, length, KeccakP1600_ExtractLanes, KeccakP1600_ExtractBytesInLane, 8);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractAndAddBytesInLane(const void *state, unsigned int lanePosition, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
+void KeccakP1600_ExtractAndAddBytesInLane(const KeccakP1600_plain32_state *state, unsigned int lanePosition, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
 {
-    uint32_t *stateAsHalfLanes = (uint32_t*)state;
+    const uint32_t *stateAsHalfLanes = state->A;
     uint32_t low, high, temp, temp0, temp1;
     uint8_t laneAsBytes[8];
     unsigned int i;
@@ -383,7 +383,7 @@ void KeccakP1600_ExtractAndAddBytesInLane(const void *state, unsigned int lanePo
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractAndAddLanes(const void *state, const unsigned char *input, unsigned char *output, unsigned int laneCount)
+void KeccakP1600_ExtractAndAddLanes(const KeccakP1600_plain32_state *state, const unsigned char *input, unsigned char *output, unsigned int laneCount)
 {
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
     const uint32_t * pI = (const uint32_t *)input;
@@ -405,7 +405,7 @@ void KeccakP1600_ExtractAndAddLanes(const void *state, const unsigned char *inpu
 #else
     unsigned int lanePosition;
     for(lanePosition=0; lanePosition<laneCount; lanePosition++) {
-        uint32_t *stateAsHalfLanes = (uint32_t*)state;
+        uint32_t *stateAsHalfLanes = state->A;
         uint32_t low, high, temp, temp0, temp1;
         fromBitInterleaving(stateAsHalfLanes[lanePosition*2], stateAsHalfLanes[lanePosition*2+1], low, high, temp, temp0, temp1);
         uint8_t laneAsBytes[8];
@@ -424,7 +424,7 @@ void KeccakP1600_ExtractAndAddLanes(const void *state, const unsigned char *inpu
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
+void KeccakP1600_ExtractAndAddBytes(const KeccakP1600_plain32_state *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
 {
     SnP_ExtractAndAddBytes(state, input, output, offset, length, KeccakP1600_ExtractAndAddLanes, KeccakP1600_ExtractAndAddBytesInLane, 8);
 }
@@ -960,14 +960,14 @@ static const uint32_t KeccakF1600RoundConstants_int2[2*24+1] =
         Aso1 =   Bo ^((~Bu)&  Ba ); \
         Asu1 =   Bu ^((~Ba)&  Be );
-void KeccakP1600_Permute_Nrounds(void *state, unsigned int nRounds)
+void KeccakP1600_Permute_Nrounds(KeccakP1600_plain32_state *state, unsigned int nRounds)
 {
     uint32_t Da0, De0, Di0, Do0, Du0;
     uint32_t Da1, De1, Di1, Do1, Du1;
     uint32_t Ba, Be, Bi, Bo, Bu;
     uint32_t Cx, Cy, Cz, Cw;
     const uint32_t *pRoundConstants = KeccakF1600RoundConstants_int2+(24-nRounds)*2;
-    uint32_t *stateAsHalfLanes = (uint32_t*)state;
+    uint32_t *stateAsHalfLanes = state->A;
     #define Aba0 stateAsHalfLanes[ 0]
     #define Aba1 stateAsHalfLanes[ 1]
     #define Abe0 stateAsHalfLanes[ 2]
@@ -1150,14 +1150,14 @@ void KeccakP1600_Permute_Nrounds(void *state, unsigned int nRounds)
 /* ---------------------------------------------------------------- */
-void KeccakP1600_Permute_12rounds(void *state)
+void KeccakP1600_Permute_12rounds(KeccakP1600_plain32_state *state)
 {
      KeccakP1600_Permute_Nrounds(state, 12);
 }
 /* ---------------------------------------------------------------- */
-void KeccakP1600_Permute_24rounds(void *state)
+void KeccakP1600_Permute_24rounds(KeccakP1600_plain32_state *state)
 {
      KeccakP1600_Permute_Nrounds(state, 24);
 }

data/ext/digest/kangarootwelve/XKCP/lib/low/KeccakP-1600/plain-64bits/KeccakP-1600-SnP.h CHANGED Viewed

@@ -21,34 +21,39 @@ Please refer to SnP-documentation.h for more details.
 #ifndef _KeccakP_1600_SnP_h_
 #define _KeccakP_1600_SnP_h_
+#include <stddef.h>
+#include <stdint.h>
 #include "brg_endian.h"
 #include "KeccakP-1600-opt64-config.h"
+typedef struct {
+    uint64_t A[25];
+} KeccakP1600_plain64_state;
+typedef KeccakP1600_plain64_state KeccakP1600_state;
 #define KeccakP1600_implementation      "generic 64-bit optimized implementation (" KeccakP1600_implementation_config ")"
-#define KeccakP1600_stateSizeInBytes    200
-#define KeccakP1600_stateAlignment      8
 #define KeccakF1600_FastLoop_supported
 #define KeccakP1600_12rounds_FastLoop_supported
-#include <stddef.h>
 #define KeccakP1600_StaticInitialize()
-void KeccakP1600_Initialize(void *state);
+void KeccakP1600_Initialize(KeccakP1600_plain64_state *state);
 #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
 #define KeccakP1600_AddByte(state, byte, offset) \
     ((unsigned char*)(state))[(offset)] ^= (byte)
 #else
-void KeccakP1600_AddByte(void *state, unsigned char data, unsigned int offset);
+void KeccakP1600_AddByte(KeccakP1600_plain64_state *state, unsigned char data, unsigned int offset);
 #endif
-void KeccakP1600_AddBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_OverwriteBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_OverwriteWithZeroes(void *state, unsigned int byteCount);
-void KeccakP1600_Permute_Nrounds(void *state, unsigned int nrounds);
-void KeccakP1600_Permute_12rounds(void *state);
-void KeccakP1600_Permute_24rounds(void *state);
-void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length);
-void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length);
-size_t KeccakF1600_FastLoop_Absorb(void *state, unsigned int laneCount, const unsigned char *data, size_t dataByteLen);
-size_t KeccakP1600_12rounds_FastLoop_Absorb(void *state, unsigned int laneCount, const unsigned char *data, size_t dataByteLen);
+void KeccakP1600_AddBytes(KeccakP1600_plain64_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteBytes(KeccakP1600_plain64_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteWithZeroes(KeccakP1600_plain64_state *state, unsigned int byteCount);
+void KeccakP1600_Permute_Nrounds(KeccakP1600_plain64_state *state, unsigned int nrounds);
+void KeccakP1600_Permute_12rounds(KeccakP1600_plain64_state *state);
+void KeccakP1600_Permute_24rounds(KeccakP1600_plain64_state *state);
+void KeccakP1600_ExtractBytes(const KeccakP1600_plain64_state *state, unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_ExtractAndAddBytes(const KeccakP1600_plain64_state *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length);
+size_t KeccakF1600_FastLoop_Absorb(KeccakP1600_plain64_state *state, unsigned int laneCount, const unsigned char *data, size_t dataByteLen);
+size_t KeccakP1600_12rounds_FastLoop_Absorb(KeccakP1600_plain64_state *state, unsigned int laneCount, const unsigned char *data, size_t dataByteLen);
 #endif