digest-kangarootwelve 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88387c3d71dddd53f518435cda9fe7ef93873c78aee3524fa379316ede192b67
-  data.tar.gz: 51dbf805b8f5f358626f461e5bd0fbc4a32e5608e467d2686a36805ad2c035fc
+  metadata.gz: 494bade116ed3511f1182ba5e2150357053921a39e6e55a62d234746d78b5185
+  data.tar.gz: 48fcdbe91ef7ef8390eccde97841e56b1231a069f3cca87588d3488973dbe13b
 SHA512:
-  metadata.gz: 43d2fefcbc944133c1a16d658591f5e5ab631fa869e51351aa16aac750e2365880f2f8f7db0e5a0ccc18dcd355f22ec233bd8b4021632f98d7cdc5f26bc3b76e
-  data.tar.gz: 2034731d336c5fb34270abc4becd1be7e8182a2f87c4508cfbca5633ff25ed2b3db1f66245833d7aef3ccd6225b8328af30d43bda4559cc64fadd65c1bfc086c
+  metadata.gz: 35cbf325fec5072a28430acf27ce4f2e4fd59dc82f384408ab8627b0d5fd2ff438e8620abcbbd070608bd510a4e19e1dfdb5bfc7bfed6a520f52e1ee31066df7
+  data.tar.gz: e15cc91881a43fc00549dda67bc1559bcb29b7f6f56caabb88900b2c7e24e1f73dabaa06574f842148e15156899a6b9cffd2695bc575188d76731d53caa95fac

data/LICENSE.XKCP

@@ -100,26 +100,6 @@ For XKCP/Standalone/CompactFIPS202/C/genKAT.c, XKCP/tests/UnitTests/genKAT.c and
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-For XKCP/support/Kernel-PMU/enable_arm_pmu.c (*not* used in libXKCP, UnitTests, Benchmarks nor KeccakSum):
-
-    Kernel-PMU
-    Enabling user-mode access to the performance monitor unit (PMU) on ARMv8 Aarch64 and ARMv7
-    Copyright (C) 2019 Bruno Pairault
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
 For XKCP/tests/Benchmarks/timing.h (used only in Benchmarks):
 
     Copyright 2020 Google Inc.

data/README.md

@@ -18,8 +18,8 @@ This gem can be configured to compile differently based on the target specified.
 
 The current target implementations are `armv6`, `armv6m`, `armv7a`, `armv7m`,
 `armv8a`, `avr8`, `avx`, `avx2`, `avx2noasm`, `avx512`, `avx512noasm`,
-`compact`, `generic32`, `generic32lc`, `generic64`, `generic64lc`, `reference`,
-`reference32bits`, `ssse3`, and `xop`, with `compact` being the default target.
+`compact`, `generic32`, `generic32lc`, `generic64`, `generic64lc`,  `ssse3`, and
+`xop`, with `compact` being the default target.
 
 Details on what architectures these targets support are provided in the
 [README.markdown](https://github.com/XKCP/XKCP/blob/master/README.markdown) file
@@ -98,7 +98,7 @@ The gem can also be tested from source using the following commands:
     cd digest-kangarootwelve-ruby
 
     # Optionally checkout a tagged version.
-    git checkout v0.4.7
+    git checkout v0.4.8
 
     # Run bundle
     bundle

data/ext/digest/kangarootwelve/XKCP/lib/high/KangarooTwelve/KangarooTwelve.c

@@ -44,7 +44,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
 
 #define ParallelSpongeFastLoop( Parallellism ) \
     while ( inLen >= Parallellism * chunkSize ) { \
-        ALIGN(KeccakP1600times##Parallellism##_statesAlignment) unsigned char states[KeccakP1600times##Parallellism##_statesSizeInBytes]; \
+        KeccakP1600times##Parallellism##_states states; \
         unsigned char intermediate[Parallellism*capacityInBytes]; \
         unsigned int localBlockLen = chunkSize; \
         const unsigned char * localInput = input; \
@@ -52,49 +52,49 @@ http://creativecommons.org/publicdomain/zero/1.0/
         unsigned int fastLoopOffset; \
         \
         KeccakP1600times##Parallellism##_StaticInitialize(); \
-        KeccakP1600times##Parallellism##_InitializeAll(states); \
-        fastLoopOffset = (unsigned int)KeccakP1600times##Parallellism##_12rounds_FastLoop_Absorb(states, rateInLanes, chunkSize / laneSize, rateInLanes, localInput, Parallellism * chunkSize); \
+        KeccakP1600times##Parallellism##_InitializeAll(&states); \
+        fastLoopOffset = (unsigned int)KeccakP1600times##Parallellism##_12rounds_FastLoop_Absorb(&states, rateInLanes, chunkSize / laneSize, rateInLanes, localInput, Parallellism * chunkSize); \
         localBlockLen -= fastLoopOffset; \
         localInput += fastLoopOffset; \
         for ( i = 0; i < Parallellism; ++i, localInput += chunkSize ) { \
-            KeccakP1600times##Parallellism##_AddBytes(states, i, localInput, 0, localBlockLen); \
-            KeccakP1600times##Parallellism##_AddByte(states, i, suffixLeaf, localBlockLen); \
-            KeccakP1600times##Parallellism##_AddByte(states, i, 0x80, rateInBytes-1); \
+            KeccakP1600times##Parallellism##_AddBytes(&states, i, localInput, 0, localBlockLen); \
+            KeccakP1600times##Parallellism##_AddByte(&states, i, suffixLeaf, localBlockLen); \
+            KeccakP1600times##Parallellism##_AddByte(&states, i, 0x80, rateInBytes-1); \
         } \
-        KeccakP1600times##Parallellism##_PermuteAll_12rounds(states); \
+        KeccakP1600times##Parallellism##_PermuteAll_12rounds(&states); \
         input += Parallellism * chunkSize; \
         inLen -= Parallellism * chunkSize; \
         ktInstance->blockNumber += Parallellism; \
-        KeccakP1600times##Parallellism##_ExtractLanesAll(states, intermediate, capacityInLanes, capacityInLanes ); \
+        KeccakP1600times##Parallellism##_ExtractLanesAll(&states, intermediate, capacityInLanes, capacityInLanes ); \
         if (TurboSHAKE_Absorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
             }
 
 #define ParallelSpongeLoop( Parallellism ) \
     while ( inLen >= Parallellism * chunkSize ) { \
-        ALIGN(KeccakP1600times##Parallellism##_statesAlignment) unsigned char states[KeccakP1600times##Parallellism##_statesSizeInBytes]; \
+        KeccakP1600times##Parallellism##_states states; \
         unsigned char intermediate[Parallellism*capacityInBytes]; \
         unsigned int localBlockLen = chunkSize; \
         const unsigned char * localInput = input; \
         unsigned int i; \
         \
         KeccakP1600times##Parallellism##_StaticInitialize(); \
-        KeccakP1600times##Parallellism##_InitializeAll(states); \
+        KeccakP1600times##Parallellism##_InitializeAll(&states); \
         while(localBlockLen >= rateInBytes) { \
-            KeccakP1600times##Parallellism##_AddLanesAll(states, localInput, rateInLanes, chunkSize / laneSize); \
-            KeccakP1600times##Parallellism##_PermuteAll_12rounds(states); \
+            KeccakP1600times##Parallellism##_AddLanesAll(&states, localInput, rateInLanes, chunkSize / laneSize); \
+            KeccakP1600times##Parallellism##_PermuteAll_12rounds(&states); \
             localBlockLen -= rateInBytes; \
             localInput += rateInBytes; \
            } \
         for ( i = 0; i < Parallellism; ++i, localInput += chunkSize ) { \
-            KeccakP1600times##Parallellism##_AddBytes(states, i, localInput, 0, localBlockLen); \
-            KeccakP1600times##Parallellism##_AddByte(states, i, suffixLeaf, localBlockLen); \
-            KeccakP1600times##Parallellism##_AddByte(states, i, 0x80, rateInBytes-1); \
+            KeccakP1600times##Parallellism##_AddBytes(&states, i, localInput, 0, localBlockLen); \
+            KeccakP1600times##Parallellism##_AddByte(&states, i, suffixLeaf, localBlockLen); \
+            KeccakP1600times##Parallellism##_AddByte(&states, i, 0x80, rateInBytes-1); \
         } \
-        KeccakP1600times##Parallellism##_PermuteAll_12rounds(states); \
+        KeccakP1600times##Parallellism##_PermuteAll_12rounds(&states); \
         input += Parallellism * chunkSize; \
         inLen -= Parallellism * chunkSize; \
         ktInstance->blockNumber += Parallellism; \
-        KeccakP1600times##Parallellism##_ExtractLanesAll(states, intermediate, capacityInLanes, capacityInLanes ); \
+        KeccakP1600times##Parallellism##_ExtractLanesAll(&states, intermediate, capacityInLanes, capacityInLanes ); \
         if (TurboSHAKE_Absorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
 }
 
@@ -175,7 +175,7 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
         }
     }
 
-    #if defined(KeccakP1600times8_implementation) && !defined(KeccakP1600times8_isFallback)
+    #if defined(KeccakP1600times8_implementation)
     #if defined(KeccakP1600times8_K12ProcessLeaves_supported)
     ProcessLeaves( 8 )
     #elif defined(KeccakP1600times8_12rounds_FastLoop_supported)
@@ -185,7 +185,7 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
     #endif
     #endif
 
-    #if defined(KeccakP1600times4_implementation) && !defined(KeccakP1600times4_isFallback)
+    #if defined(KeccakP1600times4_implementation)
     #if defined(KeccakP1600times4_K12ProcessLeaves_supported)
     ProcessLeaves( 4 )
     #elif defined(KeccakP1600times4_12rounds_FastLoop_supported)
@@ -195,7 +195,7 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
     #endif
     #endif
 
-    #if defined(KeccakP1600times2_implementation) && !defined(KeccakP1600times2_isFallback)
+    #if defined(KeccakP1600times2_implementation)
     #if defined(KeccakP1600times2_K12ProcessLeaves_supported)
     ProcessLeaves( 2 )
     #elif defined(KeccakP1600times2_12rounds_FastLoop_supported)

data/ext/digest/kangarootwelve/XKCP/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,6 +88,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
         #include "KeccakSponge.inc"
     #undef prefix
     #undef SnP
+    #undef SnP_state
     #undef SnP_width
     #undef SnP_Permute
     #undef SnP_FastLoop_Absorb

data/ext/digest/kangarootwelve/XKCP/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,7 +62,7 @@ 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

data/ext/digest/kangarootwelve/XKCP/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/digest/kangarootwelve/XKCP/lib/high/TurboSHAKE/TurboSHAKE.c

@@ -21,6 +21,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
 
     #define prefix TurboSHAKE
     #define SnP KeccakP1600
+    #define SnP_state KeccakP1600_state
     #define SnP_width 1600
     #define SnP_Permute KeccakP1600_Permute_12rounds
     #if defined(KeccakP1600_12rounds_FastLoop_supported)
@@ -29,6 +30,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
         #include "KeccakSponge.inc"
     #undef prefix
     #undef SnP
+    #undef SnP_state
     #undef SnP_width
     #undef SnP_Permute
     #undef SnP_FastLoop_Absorb

data/ext/digest/kangarootwelve/XKCP/lib/high/TurboSHAKE/TurboSHAKE.h

@@ -24,7 +24,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
 
 #ifdef XKCP_has_KeccakP1600
     #include "KeccakP-1600-SnP.h"
-    XKCP_DeclareSpongeStructure(TurboSHAKE, KeccakP1600_stateSizeInBytes, KeccakP1600_stateAlignment)
+    XKCP_DeclareSpongeStructure(TurboSHAKE, KeccakP1600_state)
 
 typedef TurboSHAKE_SpongeInstance TurboSHAKE_Instance;
 

data/ext/digest/kangarootwelve/XKCP/lib/low/KeccakP-1600/ARM/KeccakP-1600-SnP.h

@@ -21,21 +21,27 @@ Please refer to SnP-documentation.h for more details.
 #ifndef _KeccakP_1600_SnP_h_
 #define _KeccakP_1600_SnP_h_
 
+#include <stdint.h>
+
+typedef struct {
+    uint32_t A[50];
+} KeccakP1600_plain32_state;
+
+typedef KeccakP1600_plain32_state KeccakP1600_state;
+
 #define KeccakP1600_implementation      "32-bit bit-interleaved optimized ARM assembler implementation"
-#define KeccakP1600_stateSizeInBytes    200
-#define KeccakP1600_stateAlignment      4
 
 /* void KeccakP1600_StaticInitialize( void ); */
 #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/ARMv7A-NEON/KeccakP-1600-SnP.h

@@ -21,22 +21,30 @@ Please refer to SnP-documentation.h for more details.
 #ifndef _KeccakP_1600_SnP_h_
 #define _KeccakP_1600_SnP_h_
 
+#include <stdint.h>
+#include "align.h"
+
+typedef struct {
+    ALIGN(32) uint64_t A[25];
+} KeccakP1600_align256plain64_state;
+
+typedef KeccakP1600_align256plain64_state KeccakP1600_state;
+
 #define KeccakP1600_implementation      "64-bit optimized ARM assembler implementation"
-#define KeccakP1600_stateSizeInBytes    200
 #define KeccakP1600_stateAlignment      32
 
 /* void KeccakP1600_StaticInitialize( void ); */
 #define KeccakP1600_StaticInitialize()
-void KeccakP1600_Initialize(void *state);
-/* void KeccakP1600_AddByte(void *state, unsigned char data, unsigned int offset); */
+void KeccakP1600_Initialize(KeccakP1600_align256plain64_state *state);
+/* void KeccakP1600_AddByte(KeccakP1600_align256plain64_state *state, unsigned char data, unsigned int offset); */
 #define KeccakP1600_AddByte(argS, argData, argOffset)   ((unsigned char*)argS)[argOffset] ^= (argData)
-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_AddBytes(KeccakP1600_align256plain64_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteBytes(KeccakP1600_align256plain64_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteWithZeroes(KeccakP1600_align256plain64_state *state, unsigned int byteCount);
+void KeccakP1600_Permute_Nrounds(KeccakP1600_align256plain64_state *state, unsigned int nrounds);
+void KeccakP1600_Permute_12rounds(KeccakP1600_align256plain64_state *state);
+void KeccakP1600_Permute_24rounds(KeccakP1600_align256plain64_state *state);
+void KeccakP1600_ExtractBytes(const KeccakP1600_align256plain64_state *state, unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_ExtractAndAddBytes(const KeccakP1600_align256plain64_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/AVR8/KeccakP-1600-SnP.h

@@ -21,22 +21,28 @@ Please refer to SnP-documentation.h for more details.
 #ifndef _KeccakP_1600_SnP_h_
 #define _KeccakP_1600_SnP_h_
 
+#include <stdint.h>
+
+typedef struct {
+    uint8_t A[200];
+} KeccakP1600_plain8_state;
+
+typedef KeccakP1600_plain8_state KeccakP1600_state;
+
 #define KeccakP1600_implementation      "8-bit optimized AVR assembler implementation"
-#define KeccakP1600_stateSizeInBytes    200
-#define KeccakP1600_stateAlignment      8
 
 void KeccakP1600_StaticInitialize( void );
 /* #define   KeccakP1600_StaticInitialize() */
-void KeccakP1600_Initialize(void *state);
-void KeccakP1600_AddByte(void *state, unsigned char data, unsigned int offset);
+void KeccakP1600_Initialize(KeccakP1600_state *state);
+void KeccakP1600_AddByte(KeccakP1600_state *state, unsigned char data, unsigned int offset);
 /* #define   KeccakP1600_AddByte(argS, argData, argOffset)   ((unsigned char*)argS)[argOffset] ^= (argData) */
-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_AddBytes(KeccakP1600_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteBytes(KeccakP1600_state *state, const unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_OverwriteWithZeroes(KeccakP1600_state *state, unsigned int byteCount);
+void KeccakP1600_Permute_Nrounds(KeccakP1600_state *state, unsigned int nrounds);
+void KeccakP1600_Permute_12rounds(KeccakP1600_state *state);
+void KeccakP1600_Permute_24rounds(KeccakP1600_state *state);
+void KeccakP1600_ExtractBytes(const KeccakP1600_state *state, unsigned char *data, unsigned int offset, unsigned int length);
+void KeccakP1600_ExtractAndAddBytes(const KeccakP1600_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/AVR8/KeccakP-1600-avr8-fast.s

@@ -40,7 +40,7 @@
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_Initialize(void *state)
+; void KeccakP1600_Initialize(KeccakP1600_state *state)
 ;
 ; argument state   is passed in r24:r25
 ;
@@ -64,7 +64,7 @@ KeccakP1600_StaticInitialize:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_AddByte(void *state, unsigned char data, unsigned int offset)
+; void KeccakP1600_AddByte(KeccakP1600_state *state, unsigned char data, unsigned int offset)
 ;
 ; argument state     is passed in r24:r25
 ; argument data      is passed in r22:r23, only LSB (r22) is used
@@ -82,7 +82,7 @@ KeccakP1600_AddByte:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_AddBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length)
+; void KeccakP1600_AddBytes(KeccakP1600_state *state, const unsigned char *data, unsigned int offset, unsigned int length)
 ;
 ; argument state     is passed in r24:r25
 ; argument data      is passed in r22:r23
@@ -150,7 +150,7 @@ KeccakP1600_AddBytes_End:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_OverwriteBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length)
+; void KeccakP1600_OverwriteBytes(KeccakP1600_state *state, const unsigned char *data, unsigned int offset, unsigned int length)
 ;
 ; argument state     is passed in r24:r25
 ; argument data      is passed in r22:r23
@@ -199,7 +199,7 @@ KeccakP1600_OverwriteBytes_End:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_OverwriteWithZeroes(void *state, unsigned int byteCount)
+; void KeccakP1600_OverwriteWithZeroes(KeccakP1600_state *state, unsigned int byteCount)
 ;
 ; argument state        is passed in r24:r25
 ; argument byteCount    is passed in r22:r23, only LSB (r22) is used
@@ -235,7 +235,7 @@ KeccakP1600_OverwriteWithZeroes_End:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_ExtractBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length)
+; void KeccakP1600_ExtractBytes(KeccakP1600_state *state, const unsigned char *data, unsigned int offset, unsigned int length)
 ;
 ; argument state     is passed in r24:r25
 ; argument data      is passed in r22:r23
@@ -284,7 +284,7 @@ KeccakP1600_ExtractBytes_End:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_ExtractAndAddBytes(void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
+; void KeccakP1600_ExtractAndAddBytes(KeccakP1600_state *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length)
 ;
 ; argument state     is passed in r24:r25
 ; argument input     is passed in r22:r23
@@ -424,7 +424,7 @@ KeccakP1600_RoundConstants_0:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_Permute_Nrounds( void *state, unsigned int nrounds )
+; void KeccakP1600_Permute_Nrounds( KeccakP1600_state *state, unsigned int nrounds )
 ;
 ; argument state     is passed in r24:r25
 ; argument nrounds   is passed in r22:r23 (only LSB (r22) is used)
@@ -443,7 +443,7 @@ KeccakP1600_Permute_Nrounds:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_Permute_24rounds( void *state )
+; void KeccakP1600_Permute_24rounds( KeccakP1600_state *state )
 ;
 .global KeccakP1600_Permute_24rounds
 KeccakP1600_Permute_24rounds:
@@ -453,7 +453,7 @@ KeccakP1600_Permute_24rounds:
 
 ;----------------------------------------------------------------------------
 ;
-; void KeccakP1600_Permute_12rounds( void *state )
+; void KeccakP1600_Permute_12rounds( KeccakP1600_state *state )
 ;
 .global KeccakP1600_Permute_12rounds
 KeccakP1600_Permute_12rounds: