sha3 1.0.5 → 2.1.0

data/ext/sha3/lib/high/Keccak/KeccakDuplex.c

@@ -0,0 +1,81 @@
+/*
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
+
+Keccak, designed by Guido Bertoni, Joan Daemen, Michaël Peeters and Gilles Van Assche.
+
+Implementation by the designers, hereby denoted as "the implementer".
+
+For more information, feedback or questions, please refer to the Keccak Team website:
+https://keccak.team/
+
+To the extent possible under law, the implementer has waived all copyright
+and related or neighboring rights to the source code in this file.
+http://creativecommons.org/publicdomain/zero/1.0/
+*/
+
+#include "KeccakDuplex.h"
+
+#ifdef KeccakReference
+    #include "displayIntermediateValues.h"
+#endif
+
+#ifdef XKCP_has_KeccakP200
+    #include "KeccakP-200-SnP.h"
+
+    #define prefix KeccakWidth200
+    #define SnP KeccakP200
+    #define SnP_width 200
+    #define SnP_Permute KeccakP200_Permute_18rounds
+        #include "KeccakDuplex.inc"
+    #undef prefix
+    #undef SnP
+    #undef SnP_width
+    #undef SnP_Permute
+    #undef SnP_FastLoop_Absorb
+#endif
+
+#ifdef XKCP_has_KeccakP400
+    #include "KeccakP-400-SnP.h"
+
+    #define prefix KeccakWidth400
+    #define SnP KeccakP400
+    #define SnP_width 400
+    #define SnP_Permute KeccakP400_Permute_20rounds
+        #include "KeccakDuplex.inc"
+    #undef prefix
+    #undef SnP
+    #undef SnP_width
+    #undef SnP_Permute
+    #undef SnP_FastLoop_Absorb
+#endif
+
+#ifdef XKCP_has_KeccakP800
+    #include "KeccakP-800-SnP.h"
+
+    #define prefix KeccakWidth800
+    #define SnP KeccakP800
+    #define SnP_width 800
+    #define SnP_Permute KeccakP800_Permute_22rounds
+        #include "KeccakDuplex.inc"
+    #undef prefix
+    #undef SnP
+    #undef SnP_width
+    #undef SnP_Permute
+    #undef SnP_FastLoop_Absorb
+#endif
+
+#ifdef XKCP_has_KeccakP1600
+    #include "KeccakP-1600-SnP.h"
+
+    #define prefix KeccakWidth1600
+    #define SnP KeccakP1600
+    #define SnP_width 1600
+    #define SnP_Permute KeccakP1600_Permute_24rounds
+        #include "KeccakDuplex.inc"
+    #undef prefix
+    #undef SnP
+    #undef SnP_width
+    #undef SnP_Permute
+    #undef SnP_FastLoop_Absorb
+#endif

data/ext/sha3/lib/high/Keccak/KeccakDuplex.h

@@ -0,0 +1,73 @@
+/*
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
+
+Keccak, designed by Guido Bertoni, Joan Daemen, Michaël Peeters and Gilles Van Assche.
+
+Implementation by the designers, hereby denoted as "the implementer".
+
+For more information, feedback or questions, please refer to the Keccak Team website:
+https://keccak.team/
+
+To the extent possible under law, the implementer has waived all copyright
+and related or neighboring rights to the source code in this file.
+http://creativecommons.org/publicdomain/zero/1.0/
+*/
+
+#ifndef _KeccakDuplex_h_
+#define _KeccakDuplex_h_
+
+/* For the documentation, please follow the link: */
+/* #include "KeccakDuplex-documentation.h" */
+
+#include <string.h>
+#include "align.h"
+#include "config.h"
+
+#define XKCP_DeclareDuplexStructure(prefix, state_t) \
+    typedef struct prefix##_DuplexInstanceStruct { \
+        state_t state; \
+        unsigned int rate; \
+        unsigned int byteInputIndex; \
+        unsigned int byteOutputIndex; \
+    } prefix##_DuplexInstance;
+
+#define XKCP_DeclareDuplexFunctions(prefix) \
+    int prefix##_DuplexInitialize(prefix##_DuplexInstance *duplexInstance, unsigned int rate, unsigned int capacity); \
+    int prefix##_Duplexing(prefix##_DuplexInstance *duplexInstance, const unsigned char *sigmaBegin, unsigned int sigmaBeginByteLen, unsigned char *Z, unsigned int ZByteLen, unsigned char delimitedSigmaEnd); \
+    int prefix##_DuplexingFeedPartialInput(prefix##_DuplexInstance *duplexInstance, const unsigned char *input, unsigned int inputByteLen); \
+    int prefix##_DuplexingFeedZeroes(prefix##_DuplexInstance *duplexInstance, unsigned int inputByteLen); \
+    int prefix##_DuplexingOverwritePartialInput(prefix##_DuplexInstance *duplexInstance, const unsigned char *input, unsigned int inputByteLen); \
+    int prefix##_DuplexingOverwriteWithZeroes(prefix##_DuplexInstance *duplexInstance, unsigned int inputByteLen); \
+    int prefix##_DuplexingGetFurtherOutput(prefix##_DuplexInstance *duplexInstance, unsigned char *out, unsigned int outByteLen); \
+    int prefix##_DuplexingGetFurtherOutputAndAdd(prefix##_DuplexInstance *duplexInstance, const unsigned char *input, unsigned char *output, unsigned int outputByteLen);
+
+#ifdef XKCP_has_KeccakP200
+    #include "KeccakP-200-SnP.h"
+    XKCP_DeclareDuplexStructure(KeccakWidth200, KeccakP200_stateSizeInBytes, KeccakP200_stateAlignment)
+    XKCP_DeclareDuplexFunctions(KeccakWidth200)
+    #define XKCP_has_Duplex_Keccak_width200
+#endif
+
+#ifdef XKCP_has_KeccakP400
+    #include "KeccakP-400-SnP.h"
+    XKCP_DeclareDuplexStructure(KeccakWidth400, KeccakP400_stateSizeInBytes, KeccakP400_stateAlignment)
+    XKCP_DeclareDuplexFunctions(KeccakWidth400)
+    #define XKCP_has_Duplex_Keccak_width400
+#endif
+
+#ifdef XKCP_has_KeccakP800
+    #include "KeccakP-800-SnP.h"
+    XKCP_DeclareDuplexStructure(KeccakWidth800, KeccakP800_stateSizeInBytes, KeccakP800_stateAlignment)
+    XKCP_DeclareDuplexFunctions(KeccakWidth800)
+    #define XKCP_has_Duplex_Keccak_width800
+#endif
+
+#ifdef XKCP_has_KeccakP1600
+    #include "KeccakP-1600-SnP.h"
+    XKCP_DeclareDuplexStructure(KeccakWidth1600, KeccakP1600_state)
+    XKCP_DeclareDuplexFunctions(KeccakWidth1600)
+    #define XKCP_has_Duplex_Keccak_width1600
+#endif
+
+#endif

data/ext/sha3/lib/high/Keccak/KeccakDuplex.inc

@@ -0,0 +1,201 @@
+/*
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
+
+Keccak, designed by Guido Bertoni, Joan Daemen, Michaël Peeters and Gilles Van Assche.
+
+Implementation by the designers, hereby denoted as "the implementer".
+
+For more information, feedback or questions, please refer to the Keccak Team website:
+https://keccak.team/
+
+To the extent possible under law, the implementer has waived all copyright
+and related or neighboring rights to the source code in this file.
+http://creativecommons.org/publicdomain/zero/1.0/
+*/
+
+#define JOIN0(a, b)                     a ## b
+#define JOIN(a, b)                      JOIN0(a, b)
+
+#define DuplexInstance                  JOIN(prefix, _DuplexInstance)
+#define DuplexInitialize                JOIN(prefix, _DuplexInitialize)
+#define Duplexing                       JOIN(prefix, _Duplexing)
+#define DuplexingFeedPartialInput       JOIN(prefix, _DuplexingFeedPartialInput)
+#define DuplexingFeedZeroes             JOIN(prefix, _DuplexingFeedZeroes)
+#define DuplexingOverwritePartialInput  JOIN(prefix, _DuplexingOverwritePartialInput)
+#define DuplexingOverwriteWithZeroes    JOIN(prefix, _DuplexingOverwriteWithZeroes)
+#define DuplexingGetFurtherOutput       JOIN(prefix, _DuplexingGetFurtherOutput)
+#define DuplexingGetFurtherOutputAndAdd JOIN(prefix, _DuplexingGetFurtherOutputAndAdd)
+
+#define SnP_StaticInitialize            JOIN(SnP, _StaticInitialize)
+#define SnP_Initialize                  JOIN(SnP, _Initialize)
+#define SnP_AddByte                     JOIN(SnP, _AddByte)
+#define SnP_AddBytes                    JOIN(SnP, _AddBytes)
+#define SnP_OverwriteBytes              JOIN(SnP, _OverwriteBytes)
+#define SnP_OverwriteWithZeroes         JOIN(SnP, _OverwriteWithZeroes)
+#define SnP_ExtractBytes                JOIN(SnP, _ExtractBytes)
+#define SnP_ExtractAndAddBytes          JOIN(SnP, _ExtractAndAddBytes)
+
+int DuplexInitialize(DuplexInstance *instance, unsigned int rate, unsigned int capacity)
+{
+    if (rate+capacity != SnP_width)
+        return 1;
+    if ((rate <= 2) || (rate > SnP_width))
+        return 1;
+    SnP_StaticInitialize();
+    instance->rate = rate;
+    SnP_Initialize(&instance->state);
+    instance->byteInputIndex = 0;
+    instance->byteOutputIndex = (instance->rate+7)/8;
+    return 0;
+}
+
+int Duplexing(DuplexInstance *instance, const unsigned char *sigmaBegin, unsigned int sigmaBeginByteLen, unsigned char *Z, unsigned int ZByteLen, unsigned char delimitedSigmaEnd)
+{
+    const unsigned int rho_max = instance->rate - 2;
+
+    if (delimitedSigmaEnd == 0)
+        return 1;
+    if (sigmaBeginByteLen > rho_max/8)
+        return 1;
+    if ((instance->byteInputIndex+sigmaBeginByteLen)*8 > rho_max)
+        return 1;
+    if (rho_max - sigmaBeginByteLen*8 < 7) {
+        unsigned int maxBitsInDelimitedSigmaEnd = rho_max - sigmaBeginByteLen*8;
+        if (delimitedSigmaEnd >= (1 << (maxBitsInDelimitedSigmaEnd+1)))
+            return 1;
+    }
+    if (ZByteLen > (instance->rate+7)/8)
+        return 1; /* The output length must not be greater than the rate (rounded up to a byte) */
+
+    SnP_AddBytes(&instance->state, sigmaBegin, instance->byteInputIndex, sigmaBeginByteLen);
+    #ifdef KeccakReference
+    {
+        unsigned char block[SnP_width/8];
+        memcpy(block, sigmaBegin, sigmaBeginByteLen);
+        block[sigmaBeginByteLen] = delimitedSigmaEnd;
+        memset(block+sigmaBeginByteLen+1, 0, sizeof(block)-sigmaBeginByteLen-1);
+        block[(instance->rate-1)/8] |= 1 << ((instance->rate-1) % 8);
+        displayBytes(1, "Block to be absorbed (after padding)", block, (instance->rate+7)/8);
+    }
+    #endif
+
+    /* Last few bits, whose delimiter coincides with first bit of padding */
+    SnP_AddByte(&instance->state, delimitedSigmaEnd, instance->byteInputIndex+sigmaBeginByteLen);
+    /* Second bit of padding */
+    SnP_AddByte(&instance->state, (unsigned char)1 << ((instance->rate - 1)%8), (instance->rate - 1)/8);
+    SnP_Permute(&instance->state);
+    SnP_ExtractBytes(&instance->state, Z, 0, ZByteLen);
+
+    if (ZByteLen*8 > instance->rate) {
+        unsigned char mask = (unsigned char)(1 << (instance->rate % 8)) - 1;
+        Z[ZByteLen-1] &= mask;
+    }
+
+    instance->byteInputIndex = 0;
+    instance->byteOutputIndex = ZByteLen;
+
+    return 0;
+}
+
+int DuplexingFeedPartialInput(DuplexInstance *instance, const unsigned char *input, unsigned int inputByteLen)
+{
+    const unsigned int rho_max = instance->rate - 2;
+
+    if (inputByteLen > rho_max/8)
+        return 1;
+    if ((instance->byteInputIndex+inputByteLen)*8 > rho_max)
+        return 1;
+
+    SnP_AddBytes(&instance->state, input, instance->byteInputIndex, inputByteLen);
+    instance->byteInputIndex += inputByteLen;
+    return 0;
+}
+
+int DuplexingFeedZeroes(DuplexInstance *instance, unsigned int inputByteLen)
+{
+    const unsigned int rho_max = instance->rate - 2;
+
+    if (inputByteLen > rho_max/8)
+        return 1;
+    if ((instance->byteInputIndex+inputByteLen)*8 > rho_max)
+        return 1;
+
+    instance->byteInputIndex += inputByteLen;
+    return 0;
+}
+
+int DuplexingOverwritePartialInput(DuplexInstance *instance, const unsigned char *input, unsigned int inputByteLen)
+{
+    const unsigned int rho_max = instance->rate - 2;
+
+    if (inputByteLen > rho_max/8)
+        return 1;
+    if ((instance->byteInputIndex+inputByteLen)*8 > rho_max)
+        return 1;
+
+    SnP_OverwriteBytes(&instance->state, input, instance->byteInputIndex, inputByteLen);
+    instance->byteInputIndex += inputByteLen;
+    return 0;
+}
+
+int DuplexingOverwriteWithZeroes(DuplexInstance *instance, unsigned int inputByteLen)
+{
+    const unsigned int rho_max = instance->rate - 2;
+
+    if (inputByteLen > rho_max/8)
+        return 1;
+    if ((instance->byteInputIndex != 0) || (inputByteLen*8 > rho_max))
+        return 1;
+
+    SnP_OverwriteWithZeroes(&instance->state, inputByteLen);
+    instance->byteInputIndex = inputByteLen;
+
+    return 0;
+}
+
+int DuplexingGetFurtherOutput(DuplexInstance *instance, unsigned char *output, unsigned int outputByteLen)
+{
+    if (outputByteLen > (instance->rate+7)/8 - instance->byteOutputIndex)
+        return 1; /* The output length must not be greater than the rate (rounded up to a byte) */
+
+    SnP_ExtractBytes(&instance->state, output, instance->byteOutputIndex, outputByteLen);
+    instance->byteOutputIndex += outputByteLen;
+    if (instance->byteOutputIndex*8 > instance->rate) {
+        unsigned char mask = (1 << (instance->rate % 8)) - 1;
+        output[outputByteLen-1] &= mask;
+    }
+    return 0;
+}
+
+int DuplexingGetFurtherOutputAndAdd(DuplexInstance *instance, const unsigned char *input, unsigned char *output, unsigned int outputByteLen)
+{
+    if (outputByteLen > (instance->rate+7)/8 - instance->byteOutputIndex)
+        return 1; /* The output length must not be greater than the rate (rounded up to a byte) */
+
+    SnP_ExtractAndAddBytes(&instance->state, input, output, instance->byteOutputIndex, outputByteLen);
+    instance->byteOutputIndex += outputByteLen;
+    if (instance->byteOutputIndex*8 > instance->rate) {
+        unsigned char mask = (1 << (instance->rate % 8)) - 1;
+        output[outputByteLen-1] &= mask;
+    }
+    return 0;
+}
+
+#undef DuplexInstance
+#undef DuplexInitialize
+#undef Duplexing
+#undef DuplexingFeedPartialInput
+#undef DuplexingFeedZeroes
+#undef DuplexingOverwritePartialInput
+#undef DuplexingOverwriteWithZeroes
+#undef DuplexingGetFurtherOutput
+#undef DuplexingGetFurtherOutputAndAdd
+#undef SnP_StaticInitialize
+#undef SnP_Initialize
+#undef SnP_AddByte
+#undef SnP_AddBytes
+#undef SnP_OverwriteBytes
+#undef SnP_OverwriteWithZeroes
+#undef SnP_ExtractBytes
+#undef SnP_ExtractAndAddBytes

data/ext/sha3/lib/high/Keccak/KeccakSponge.c

@@ -79,6 +79,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
 
     #define prefix KeccakWidth1600
     #define SnP KeccakP1600
+    #define SnP_state KeccakP1600_state
     #define SnP_width 1600
     #define SnP_Permute KeccakP1600_Permute_24rounds
     #if defined(KeccakF1600_FastLoop_supported)
@@ -87,24 +88,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
         #include "KeccakSponge.inc"
     #undef prefix
     #undef SnP
-    #undef SnP_width
-    #undef SnP_Permute
-    #undef SnP_FastLoop_Absorb
-#endif
-
-#ifdef XKCP_has_KeccakP1600
-    #include "KeccakP-1600-SnP.h"
-
-    #define prefix KeccakWidth1600_12rounds
-    #define SnP KeccakP1600
-    #define SnP_width 1600
-    #define SnP_Permute KeccakP1600_Permute_12rounds
-    #if defined(KeccakP1600_12rounds_FastLoop_supported)
-        #define SnP_FastLoop_Absorb KeccakP1600_12rounds_FastLoop_Absorb
-    #endif
-        #include "KeccakSponge.inc"
-    #undef prefix
-    #undef SnP
+    #undef SnP_state
     #undef SnP_width
     #undef SnP_Permute
     #undef SnP_FastLoop_Absorb

data/ext/sha3/lib/high/Keccak/KeccakSponge.h

@@ -24,9 +24,9 @@ http://creativecommons.org/publicdomain/zero/1.0/
 #include "align.h"
 #include "config.h"
 
-#define XKCP_DeclareSpongeStructure(prefix, size, alignment) \
-    ALIGN(alignment) typedef struct prefix##_SpongeInstanceStruct { \
-        unsigned char state[size]; \
+#define XKCP_DeclareSpongeStructure(prefix, state_t) \
+    typedef struct prefix##_SpongeInstanceStruct { \
+        state_t state; \
         unsigned int rate; \
         unsigned int byteIOIndex; \
         int squeezing; \
@@ -62,15 +62,9 @@ http://creativecommons.org/publicdomain/zero/1.0/
 
 #ifdef XKCP_has_KeccakP1600
     #include "KeccakP-1600-SnP.h"
-    XKCP_DeclareSpongeStructure(KeccakWidth1600, KeccakP1600_stateSizeInBytes, KeccakP1600_stateAlignment)
+    XKCP_DeclareSpongeStructure(KeccakWidth1600, KeccakP1600_state)
     XKCP_DeclareSpongeFunctions(KeccakWidth1600)
     #define XKCP_has_Sponge_Keccak_width1600
 #endif
 
-#ifdef XKCP_has_KeccakP1600
-    #include "KeccakP-1600-SnP.h"
-    XKCP_DeclareSpongeStructure(KeccakWidth1600_12rounds, KeccakP1600_stateSizeInBytes, KeccakP1600_stateAlignment)
-    XKCP_DeclareSpongeFunctions(KeccakWidth1600_12rounds)
-#endif
-
 #endif

data/ext/sha3/lib/high/Keccak/KeccakSponge.inc

@@ -24,8 +24,6 @@ http://creativecommons.org/publicdomain/zero/1.0/
 #define SpongeAbsorbLastFewBits         JOIN(prefix, _SpongeAbsorbLastFewBits)
 #define SpongeSqueeze                   JOIN(prefix, _SpongeSqueeze)
 
-#define SnP_stateSizeInBytes            JOIN(SnP, _stateSizeInBytes)
-#define SnP_stateAlignment              JOIN(SnP, _stateAlignment)
 #define SnP_StaticInitialize            JOIN(SnP, _StaticInitialize)
 #define SnP_Initialize                  JOIN(SnP, _Initialize)
 #define SnP_AddByte                     JOIN(SnP, _AddByte)
@@ -34,7 +32,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
 
 int Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input, size_t inputByteLen, unsigned char suffix, unsigned char *output, size_t outputByteLen)
 {
-    ALIGN(SnP_stateAlignment) unsigned char state[SnP_stateSizeInBytes];
+    SnP_state state;
     unsigned int partialBlock;
     const unsigned char *curInput = input;
     unsigned char *curOutput = output;
@@ -49,14 +47,14 @@ int Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input,
 
     /* Initialize the state */
     SnP_StaticInitialize();
-    SnP_Initialize(state);
+    SnP_Initialize(&state);
 
     /* First, absorb whole blocks */
 #ifdef SnP_FastLoop_Absorb
     if (((rateInBytes % (SnP_width/200)) == 0) && (inputByteLen >= rateInBytes)) {
         /* fast lane: whole lane rate */
         size_t j;
-        j = SnP_FastLoop_Absorb(state, rateInBytes/(SnP_width/200), curInput, inputByteLen);
+        j = SnP_FastLoop_Absorb(&state, rateInBytes/(SnP_width/200), curInput, inputByteLen);
         curInput += j;
         inputByteLen -= j;
     }
@@ -65,8 +63,8 @@ int Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input,
         #ifdef KeccakReference
         displayBytes(1, "Block to be absorbed", curInput, rateInBytes);
         #endif
-        SnP_AddBytes(state, curInput, 0, rateInBytes);
-        SnP_Permute(state);
+        SnP_AddBytes(&state, curInput, 0, rateInBytes);
+        SnP_Permute(&state);
         curInput += rateInBytes;
         inputByteLen -= rateInBytes;
     }
@@ -76,7 +74,7 @@ int Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input,
     #ifdef KeccakReference
     displayBytes(1, "Block to be absorbed (part)", curInput, partialBlock);
     #endif
-    SnP_AddBytes(state, curInput, 0, partialBlock);
+    SnP_AddBytes(&state, curInput, 0, partialBlock);
 
     /* Finally, absorb the suffix */
     #ifdef KeccakReference
@@ -87,12 +85,12 @@ int Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input,
     }
     #endif
     /* Last few bits, whose delimiter coincides with first bit of padding */
-    SnP_AddByte(state, suffix, partialBlock);
+    SnP_AddByte(&state, suffix, partialBlock);
     /* If the first bit of padding is at position rate-1, we need a whole new block for the second bit of padding */
     if ((suffix >= 0x80) && (partialBlock == (rateInBytes-1)))
-        SnP_Permute(state);
+        SnP_Permute(&state);
     /* Second bit of padding */
-    SnP_AddByte(state, 0x80, rateInBytes-1);
+    SnP_AddByte(&state, 0x80, rateInBytes-1);
     #ifdef KeccakReference
     {
         unsigned char block[SnP_width/8];
@@ -101,15 +99,15 @@ int Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input,
         displayBytes(1, "Second bit of padding", block, rateInBytes);
     }
     #endif
-    SnP_Permute(state);
+    SnP_Permute(&state);
     #ifdef KeccakReference
     displayText(1, "--- Switching to squeezing phase ---");
     #endif
 
     /* First, output whole blocks */
     while(outputByteLen > (size_t)rateInBytes) {
-        SnP_ExtractBytes(state, curOutput, 0, rateInBytes);
-        SnP_Permute(state);
+        SnP_ExtractBytes(&state, curOutput, 0, rateInBytes);
+        SnP_Permute(&state);
         #ifdef KeccakReference
         displayBytes(1, "Squeezed block", curOutput, rateInBytes);
         #endif
@@ -119,7 +117,7 @@ int Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input,
 
     /* Finally, output what remains */
     partialBlock = (unsigned int)outputByteLen;
-    SnP_ExtractBytes(state, curOutput, 0, partialBlock);
+    SnP_ExtractBytes(&state, curOutput, 0, partialBlock);
     #ifdef KeccakReference
     displayBytes(1, "Squeezed block (part)", curOutput, partialBlock);
     #endif
@@ -138,7 +136,7 @@ int SpongeInitialize(SpongeInstance *instance, unsigned int rate, unsigned int c
     if ((rate <= 0) || (rate > SnP_width) || ((rate % 8) != 0))
         return 1;
     SnP_StaticInitialize();
-    SnP_Initialize(instance->state);
+    SnP_Initialize(&instance->state);
     instance->rate = rate;
     instance->byteIOIndex = 0;
     instance->squeezing = 0;
@@ -166,7 +164,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat
             /* processing full blocks first */
             if ((rateInBytes % (SnP_width/200)) == 0) {
                 /* fast lane: whole lane rate */
-                j = SnP_FastLoop_Absorb(instance->state, rateInBytes/(SnP_width/200), curData, dataByteLen - i);
+                j = SnP_FastLoop_Absorb(&instance->state, rateInBytes/(SnP_width/200), curData, dataByteLen - i);
                 i += j;
                 curData += j;
             }
@@ -176,8 +174,8 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat
                     #ifdef KeccakReference
                     displayBytes(1, "Block to be absorbed", curData, rateInBytes);
                     #endif
-                    SnP_AddBytes(instance->state, curData, 0, rateInBytes);
-                    SnP_Permute(instance->state);
+                    SnP_AddBytes(&instance->state, curData, 0, rateInBytes);
+                    SnP_Permute(&instance->state);
                     curData+=rateInBytes;
                 }
                 i = dataByteLen - j;
@@ -196,11 +194,11 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat
             #endif
             i += partialBlock;
 
-            SnP_AddBytes(instance->state, curData, instance->byteIOIndex, partialBlock);
+            SnP_AddBytes(&instance->state, curData, instance->byteIOIndex, partialBlock);
             curData += partialBlock;
             instance->byteIOIndex += partialBlock;
             if (instance->byteIOIndex == rateInBytes) {
-                SnP_Permute(instance->state);
+                SnP_Permute(&instance->state);
                 instance->byteIOIndex = 0;
             }
         }
@@ -227,12 +225,12 @@ int SpongeAbsorbLastFewBits(SpongeInstance *instance, unsigned char delimitedDat
     }
     #endif
     /* Last few bits, whose delimiter coincides with first bit of padding */
-    SnP_AddByte(instance->state, delimitedData, instance->byteIOIndex);
+    SnP_AddByte(&instance->state, delimitedData, instance->byteIOIndex);
     /* If the first bit of padding is at position rate-1, we need a whole new block for the second bit of padding */
     if ((delimitedData >= 0x80) && (instance->byteIOIndex == (rateInBytes-1)))
-        SnP_Permute(instance->state);
+        SnP_Permute(&instance->state);
     /* Second bit of padding */
-    SnP_AddByte(instance->state, 0x80, rateInBytes-1);
+    SnP_AddByte(&instance->state, 0x80, rateInBytes-1);
     #ifdef KeccakReference
     {
         unsigned char block[SnP_width/8];
@@ -241,7 +239,7 @@ int SpongeAbsorbLastFewBits(SpongeInstance *instance, unsigned char delimitedDat
         displayBytes(1, "Second bit of padding", block, rateInBytes);
     }
     #endif
-    SnP_Permute(instance->state);
+    SnP_Permute(&instance->state);
     instance->byteIOIndex = 0;
     instance->squeezing = 1;
     #ifdef KeccakReference
@@ -267,8 +265,8 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte
     while(i < dataByteLen) {
         if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= rateInBytes)) {
             for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) {
-                SnP_Permute(instance->state);
-                SnP_ExtractBytes(instance->state, curData, 0, rateInBytes);
+                SnP_Permute(&instance->state);
+                SnP_ExtractBytes(&instance->state, curData, 0, rateInBytes);
                 #ifdef KeccakReference
                 displayBytes(1, "Squeezed block", curData, rateInBytes);
                 #endif
@@ -279,7 +277,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte
         else {
             /* normal lane: using the message queue */
             if (instance->byteIOIndex == rateInBytes) {
-                SnP_Permute(instance->state);
+                SnP_Permute(&instance->state);
                 instance->byteIOIndex = 0;
             }
             if (dataByteLen-i > rateInBytes-instance->byteIOIndex)
@@ -288,7 +286,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte
                 partialBlock = (unsigned int)(dataByteLen - i);
             i += partialBlock;
 
-            SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, partialBlock);
+            SnP_ExtractBytes(&instance->state, curData, instance->byteIOIndex, partialBlock);
             #ifdef KeccakReference
             displayBytes(1, "Squeezed block (part)", curData, partialBlock);
             #endif
@@ -307,8 +305,6 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte
 #undef SpongeAbsorb
 #undef SpongeAbsorbLastFewBits
 #undef SpongeSqueeze
-#undef SnP_stateSizeInBytes
-#undef SnP_stateAlignment
 #undef SnP_StaticInitialize
 #undef SnP_Initialize
 #undef SnP_AddByte

data/ext/sha3/lib/high/Keccak/PRG/KeccakPRG.c

@@ -0,0 +1,61 @@
+/*
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
+
+Keccak, designed by Guido Bertoni, Joan Daemen, Michaël Peeters and Gilles Van Assche.
+
+Implementation by Gilles Van Assche, hereby denoted as "the implementer".
+
+For more information, feedback or questions, please refer to the Keccak Team website:
+https://keccak.team/
+
+To the extent possible under law, the implementer has waived all copyright
+and related or neighboring rights to the source code in this file.
+http://creativecommons.org/publicdomain/zero/1.0/
+*/
+
+#include "KeccakPRG.h"
+
+#ifdef KeccakReference
+    #include "displayIntermediateValues.h"
+#endif
+
+#ifdef XKCP_has_KeccakP200
+    #include "KeccakP-200-SnP.h"
+
+    #define prefix KeccakWidth200
+    #define SnP_width 200
+        #include "KeccakPRG.inc"
+    #undef prefix
+    #undef SnP_width
+#endif
+
+#ifdef XKCP_has_KeccakP400
+    #include "KeccakP-400-SnP.h"
+
+    #define prefix KeccakWidth400
+    #define SnP_width 400
+        #include "KeccakPRG.inc"
+    #undef prefix
+    #undef SnP_width
+#endif
+
+#ifdef XKCP_has_KeccakP800
+    #include "KeccakP-800-SnP.h"
+
+    #define prefix KeccakWidth800
+    #define SnP_width 800
+        #include "KeccakPRG.inc"
+    #undef prefix
+    #undef SnP_width
+#endif
+
+#ifdef XKCP_has_KeccakP1600
+    #include "KeccakP-1600-SnP.h"
+
+    #define prefix KeccakWidth1600
+    #define SnP_width 1600
+        #include "KeccakPRG.inc"
+    #undef prefix
+    #undef SnP_width
+#endif