digest-kangarootwelve 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffce05a13297d1397e3fa033be301d33d248b104099103ed42e902b464407068
-  data.tar.gz: fb12f02a91f041ac83f467fe9d0d75db8bc898629aa533fb7386233be711f67f
+  metadata.gz: 88387c3d71dddd53f518435cda9fe7ef93873c78aee3524fa379316ede192b67
+  data.tar.gz: 51dbf805b8f5f358626f461e5bd0fbc4a32e5608e467d2686a36805ad2c035fc
 SHA512:
-  metadata.gz: 955f7967d601bdd35be2ac94c83348fab2fd12a1494f2f725dcba14726618da1d67505dc5008fd5512b55ee99c8d8eecf9a165ddd6a89e247d44ab1307ca230a
-  data.tar.gz: ae1c8fa1b95804f6a4bd32b827bc6bf4d1a82c441a0dc277a870953d0e31c2872b9c6f3fcde66e059f0e8162b1f04f4bad3f94e00b4552f291b104cd962d17bc
+  metadata.gz: 43d2fefcbc944133c1a16d658591f5e5ab631fa869e51351aa16aac750e2365880f2f8f7db0e5a0ccc18dcd355f22ec233bd8b4021632f98d7cdc5f26bc3b76e
+  data.tar.gz: 2034731d336c5fb34270abc4becd1be7e8182a2f87c4508cfbca5633ff25ed2b3db1f66245833d7aef3ccd6225b8328af30d43bda4559cc64fadd65c1bfc086c

data/README.md

@@ -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.6
+    git checkout v0.4.7
 
     # Run bundle
     bundle

data/digest-kangarootwelve.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake-compiler", "~> 1.0"
+  spec.add_development_dependency "rake-compiler", "~> 1.2", ">= 1.2.3"
   spec.add_development_dependency "minitest", "~> 5.8"
   spec.add_development_dependency "nori"
   spec.add_development_dependency "nokogiri"

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

@@ -4,7 +4,7 @@ https://github.com/XKCP/XKCP
 
 KangarooTwelve, designed by Guido Bertoni, Joan Daemen, Michaël Peeters, Gilles Van Assche, Ronny Van Keer and Benoît Viguier.
 
-Implementation by Ronny Van Keer, hereby denoted as "the implementer".
+Implementation by Gilles Van Assche and Ronny Van Keer, hereby denoted as "the implementer".
 
 For more information, feedback or questions, please refer to the Keccak Team website:
 https://keccak.team/
@@ -66,8 +66,8 @@ http://creativecommons.org/publicdomain/zero/1.0/
         inLen -= Parallellism * chunkSize; \
         ktInstance->blockNumber += Parallellism; \
         KeccakP1600times##Parallellism##_ExtractLanesAll(states, intermediate, capacityInLanes, capacityInLanes ); \
-        if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
-    }
+        if (TurboSHAKE_Absorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
+            }
 
 #define ParallelSpongeLoop( Parallellism ) \
     while ( inLen >= Parallellism * chunkSize ) { \
@@ -95,8 +95,8 @@ http://creativecommons.org/publicdomain/zero/1.0/
         inLen -= Parallellism * chunkSize; \
         ktInstance->blockNumber += Parallellism; \
         KeccakP1600times##Parallellism##_ExtractLanesAll(states, intermediate, capacityInLanes, capacityInLanes ); \
-        if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
-    }
+        if (TurboSHAKE_Absorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
+}
 
 #define ProcessLeaves( Parallellism ) \
     while ( inLen >= Parallellism * chunkSize ) { \
@@ -106,15 +106,15 @@ http://creativecommons.org/publicdomain/zero/1.0/
         input += Parallellism * chunkSize; \
         inLen -= Parallellism * chunkSize; \
         ktInstance->blockNumber += Parallellism; \
-        if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
+        if (TurboSHAKE_Absorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
     }
 
-static unsigned int right_encode( unsigned char * encbuf, size_t value )
+static unsigned int right_encode(unsigned char * encbuf, size_t value)
 {
     unsigned int n, i;
     size_t v;
 
-    for ( v = value, n = 0; v && (n < sizeof(size_t)); ++n, v >>= 8 )
+    for (v = value, n = 0; v && (n < sizeof(size_t)); ++n, v >>= 8)
         ; /* empty */
     for ( i = 1; i <= n; ++i )
         encbuf[i-1] = (unsigned char)(value >> (8 * (n-i)));
@@ -128,7 +128,7 @@ int KangarooTwelve_Initialize(KangarooTwelve_Instance *ktInstance, size_t output
     ktInstance->queueAbsorbedLen = 0;
     ktInstance->blockNumber = 0;
     ktInstance->phase = ABSORBING;
-    return KeccakWidth1600_12rounds_SpongeInitialize(&ktInstance->finalNode, rate, capacity);
+    return TurboSHAKE128_Initialize(&ktInstance->finalNode);
 }
 
 int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned char *input, size_t inLen)
@@ -136,10 +136,10 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
     if (ktInstance->phase != ABSORBING)
         return 1;
 
-    if ( ktInstance->blockNumber == 0 ) {
+    if (ktInstance->blockNumber == 0) {
         /* First block, absorb in final node */
         unsigned int len = (inLen < (chunkSize - ktInstance->queueAbsorbedLen)) ? (unsigned int)inLen : (chunkSize - ktInstance->queueAbsorbedLen);
-        if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, input, len) != 0)
+        if (TurboSHAKE_Absorb(&ktInstance->finalNode, input, len) != 0)
             return 1;
         input += len;
         inLen -= len;
@@ -149,7 +149,7 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
             const unsigned char padding = 0x03; /* '110^6': message hop, simple padding */
             ktInstance->queueAbsorbedLen = 0;
             ktInstance->blockNumber = 1;
-            if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, &padding, 1) != 0)
+            if (TurboSHAKE_Absorb(&ktInstance->finalNode, &padding, 1) != 0)
                 return 1;
             ktInstance->finalNode.byteIOIndex = (ktInstance->finalNode.byteIOIndex + 7) & ~7; /* Zero padding up to 64 bits */
         }
@@ -157,7 +157,7 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
     else if ( ktInstance->queueAbsorbedLen != 0 ) {
         /* There is data in the queue, absorb further in queue until block complete */
         unsigned int len = (inLen < (chunkSize - ktInstance->queueAbsorbedLen)) ? (unsigned int)inLen : (chunkSize - ktInstance->queueAbsorbedLen);
-        if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->queueNode, input, len) != 0)
+        if (TurboSHAKE_Absorb(&ktInstance->queueNode, input, len) != 0)
             return 1;
         input += len;
         inLen -= len;
@@ -166,11 +166,11 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
             unsigned char intermediate[capacityInBytes];
             ktInstance->queueAbsorbedLen = 0;
             ++ktInstance->blockNumber;
-            if (KeccakWidth1600_12rounds_SpongeAbsorbLastFewBits(&ktInstance->queueNode, suffixLeaf) != 0)
+            if (TurboSHAKE_AbsorbDomainSeparationByte(&ktInstance->queueNode, suffixLeaf) != 0)
                 return 1;
-            if (KeccakWidth1600_12rounds_SpongeSqueeze(&ktInstance->queueNode, intermediate, capacityInBytes) != 0)
+            if (TurboSHAKE_Squeeze(&ktInstance->queueNode, intermediate, capacityInBytes) != 0)
                 return 1;
-            if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, intermediate, capacityInBytes) != 0)
+            if (TurboSHAKE_Absorb(&ktInstance->finalNode, intermediate, capacityInBytes) != 0)
                 return 1;
         }
     }
@@ -203,24 +203,24 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
     #else
     ParallelSpongeLoop( 2 )
     #endif
-    #endif
+#endif
 
     while ( inLen > 0 ) {
         unsigned int len = (inLen < chunkSize) ? (unsigned int)inLen : chunkSize;
-        if (KeccakWidth1600_12rounds_SpongeInitialize(&ktInstance->queueNode, rate, capacity) != 0)
+        if (TurboSHAKE128_Initialize(&ktInstance->queueNode) != 0)
             return 1;
-        if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->queueNode, input, len) != 0)
+        if (TurboSHAKE_Absorb(&ktInstance->queueNode, input, len) != 0)
             return 1;
         input += len;
         inLen -= len;
         if ( len == chunkSize ) {
             unsigned char intermediate[capacityInBytes];
             ++ktInstance->blockNumber;
-            if (KeccakWidth1600_12rounds_SpongeAbsorbLastFewBits(&ktInstance->queueNode, suffixLeaf) != 0)
+            if (TurboSHAKE_AbsorbDomainSeparationByte(&ktInstance->queueNode, suffixLeaf) != 0)
                 return 1;
-            if (KeccakWidth1600_12rounds_SpongeSqueeze(&ktInstance->queueNode, intermediate, capacityInBytes) != 0)
+            if (TurboSHAKE_Squeeze(&ktInstance->queueNode, intermediate, capacityInBytes) != 0)
                 return 1;
-            if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, intermediate, capacityInBytes) != 0)
+            if (TurboSHAKE_Absorb(&ktInstance->finalNode, intermediate, capacityInBytes) != 0)
                 return 1;
         }
         else
@@ -244,37 +244,37 @@ int KangarooTwelve_Final(KangarooTwelve_Instance *ktInstance, unsigned char * ou
     if (KangarooTwelve_Update(ktInstance, encbuf, right_encode(encbuf, customLen)) != 0)
         return 1;
 
-    if ( ktInstance->blockNumber == 0 ) {
+    if (ktInstance->blockNumber == 0) {
         /* Non complete first block in final node, pad it */
         padding = 0x07; /*  '11': message hop, final node */
     }
     else {
         unsigned int n;
 
-        if ( ktInstance->queueAbsorbedLen != 0 ) {
+        if (ktInstance->queueAbsorbedLen != 0) {
             /* There is data in the queue node */
             unsigned char intermediate[capacityInBytes];
             ++ktInstance->blockNumber;
-            if (KeccakWidth1600_12rounds_SpongeAbsorbLastFewBits(&ktInstance->queueNode, suffixLeaf) != 0)
+            if (TurboSHAKE_AbsorbDomainSeparationByte(&ktInstance->queueNode, suffixLeaf) != 0)
                 return 1;
-            if (KeccakWidth1600_12rounds_SpongeSqueeze(&ktInstance->queueNode, intermediate, capacityInBytes) != 0)
+            if (TurboSHAKE_Squeeze(&ktInstance->queueNode, intermediate, capacityInBytes) != 0)
                 return 1;
-            if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, intermediate, capacityInBytes) != 0)
+            if (TurboSHAKE_Absorb(&ktInstance->finalNode, intermediate, capacityInBytes) != 0)
                 return 1;
         }
         --ktInstance->blockNumber; /* Absorb right_encode(number of Chaining Values) || 0xFF || 0xFF */
         n = right_encode(encbuf, ktInstance->blockNumber);
         encbuf[n++] = 0xFF;
         encbuf[n++] = 0xFF;
-        if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, encbuf, n) != 0)
+        if (TurboSHAKE_Absorb(&ktInstance->finalNode, encbuf, n) != 0)
             return 1;
         padding = 0x06; /* '01': chaining hop, final node */
     }
-    if (KeccakWidth1600_12rounds_SpongeAbsorbLastFewBits(&ktInstance->finalNode, padding) != 0)
+    if (TurboSHAKE_AbsorbDomainSeparationByte(&ktInstance->finalNode, padding) != 0)
         return 1;
-    if ( ktInstance->fixedOutputLength != 0 ) {
+    if (ktInstance->fixedOutputLength != 0) {
         ktInstance->phase = FINAL;
-        return KeccakWidth1600_12rounds_SpongeSqueeze(&ktInstance->finalNode, output, ktInstance->fixedOutputLength);
+        return TurboSHAKE_Squeeze(&ktInstance->finalNode, output, ktInstance->fixedOutputLength);
     }
     ktInstance->phase = SQUEEZING;
     return 0;
@@ -284,7 +284,7 @@ int KangarooTwelve_Squeeze(KangarooTwelve_Instance *ktInstance, unsigned char *
 {
     if (ktInstance->phase != SQUEEZING)
         return 1;
-    return KeccakWidth1600_12rounds_SpongeSqueeze(&ktInstance->finalNode, output, outputLen);
+    return TurboSHAKE_Squeeze(&ktInstance->finalNode, output, outputLen);
 }
 
 int KangarooTwelve( const unsigned char * input, size_t inLen, unsigned char * output, size_t outLen, const unsigned char * customization, size_t customLen )

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

@@ -4,7 +4,7 @@ https://github.com/XKCP/XKCP
 
 KangarooTwelve, designed by Guido Bertoni, Joan Daemen, Michaël Peeters, Gilles Van Assche, Ronny Van Keer and Benoît Viguier.
 
-Implementation by Ronny Van Keer, hereby denoted as "the implementer".
+Implementation by Gilles Van Assche and Ronny Van Keer, hereby denoted as "the implementer".
 
 For more information, feedback or questions, please refer to the Keccak Team website:
 https://keccak.team/
@@ -22,14 +22,14 @@ http://creativecommons.org/publicdomain/zero/1.0/
 
 #include <stddef.h>
 #include "align.h"
-#include "KeccakSponge.h"
+#include "TurboSHAKE.h"
 #include "Phases.h"
 
 typedef KCP_Phases KangarooTwelve_Phases;
 
 typedef struct {
-    KeccakWidth1600_12rounds_SpongeInstance queueNode;
-    KeccakWidth1600_12rounds_SpongeInstance finalNode;
+    TurboSHAKE_Instance queueNode;
+    TurboSHAKE_Instance finalNode;
     size_t fixedOutputLength;
     size_t blockNumber;
     unsigned int queueAbsorbedLen;
@@ -45,7 +45,7 @@ typedef struct {
   * @param  customByteLen   The length of the customization string in bytes.
   * @return 0 if successful, 1 otherwise.
   */
-int KangarooTwelve(const unsigned char *input, size_t inputByteLen, unsigned char *output, size_t outputByteLen, const unsigned char *customization, size_t customByteLen );
+int KangarooTwelve(const unsigned char *input, size_t inputByteLen, unsigned char *output, size_t outputByteLen, const unsigned char *customization, size_t customByteLen);
 
 /**
   * Function to initialize a KangarooTwelve instance.

data/ext/digest/kangarootwelve/XKCP/lib/high/Keccak/KeccakSponge.c

@@ -91,21 +91,3 @@ http://creativecommons.org/publicdomain/zero/1.0/
     #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_width
-    #undef SnP_Permute
-    #undef SnP_FastLoop_Absorb
-#endif

data/ext/digest/kangarootwelve/XKCP/lib/high/Keccak/KeccakSponge.h

@@ -67,10 +67,4 @@ http://creativecommons.org/publicdomain/zero/1.0/
     #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/digest/kangarootwelve/XKCP/lib/high/TurboSHAKE/TurboSHAKE.c

@@ -0,0 +1,71 @@
+/*
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
+
+TurboSHAKE, proposed by Guido Bertoni, Joan Daemen, Seth Hoffert, Michaël Peeters, Gilles Van Assche, Ronny Van Keer and Benoît Viguier.
+
+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 "TurboSHAKE.h"
+
+#ifdef XKCP_has_KeccakP1600
+    #include "KeccakP-1600-SnP.h"
+
+    #define prefix TurboSHAKE
+    #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_width
+    #undef SnP_Permute
+    #undef SnP_FastLoop_Absorb
+#endif
+
+XKCP_DeclareSpongeFunctions(TurboSHAKE)
+
+int TurboSHAKE(unsigned int capacity, const unsigned char *input, size_t inputByteLen, unsigned char domain, unsigned char *output, size_t outputByteLen)
+{
+    TurboSHAKE_Instance instance;
+
+    if (TurboSHAKE_Initialize(&instance, capacity)) return 1;
+    if (TurboSHAKE_Absorb(&instance, input, inputByteLen)) return 1;
+    if (TurboSHAKE_AbsorbDomainSeparationByte(&instance, domain)) return 1;
+    if (TurboSHAKE_Squeeze(&instance, output, outputByteLen)) return 1;
+    return 0;
+}
+
+int TurboSHAKE_Initialize(TurboSHAKE_Instance *instance, unsigned int capacity)
+{
+    if ((capacity > 512) || ((capacity % 8) != 0))
+        return 1;
+    else
+        return TurboSHAKE_SpongeInitialize(instance, 1600-capacity, capacity);
+}
+
+int TurboSHAKE_Absorb(TurboSHAKE_Instance *instance, const unsigned char *data, size_t dataByteLen)
+{
+    return TurboSHAKE_SpongeAbsorb(instance, data, dataByteLen);
+}
+
+int TurboSHAKE_AbsorbDomainSeparationByte(TurboSHAKE_Instance *instance, unsigned char domain)
+{
+    return TurboSHAKE_SpongeAbsorbLastFewBits(instance, domain);
+}
+
+int TurboSHAKE_Squeeze(TurboSHAKE_Instance *instance, unsigned char *data, size_t dataByteLen)
+{
+    return TurboSHAKE_SpongeSqueeze(instance, data, dataByteLen);
+}

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

@@ -0,0 +1,49 @@
+/*
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
+
+TurboSHAKE, proposed by Guido Bertoni, Joan Daemen, Seth Hoffert, Michaël Peeters, Gilles Van Assche, Ronny Van Keer and Benoît Viguier.
+
+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/
+*/
+
+#ifndef _TurboSHAKE_h_
+#define _TurboSHAKE_h_
+
+#include <string.h>
+#include "align.h"
+#include "config.h"
+#include "KeccakSponge.h"
+
+#ifdef XKCP_has_KeccakP1600
+    #include "KeccakP-1600-SnP.h"
+    XKCP_DeclareSpongeStructure(TurboSHAKE, KeccakP1600_stateSizeInBytes, KeccakP1600_stateAlignment)
+
+typedef TurboSHAKE_SpongeInstance TurboSHAKE_Instance;
+
+int TurboSHAKE(unsigned int capacity, const unsigned char *input, size_t inputByteLen, unsigned char domain, unsigned char *output, size_t outputByteLen);
+
+int TurboSHAKE_Initialize(TurboSHAKE_Instance *instance, unsigned int capacity);
+
+#define TurboSHAKE128_Initialize(instance) \
+    TurboSHAKE_Initialize((instance), 256)
+
+#define TurboSHAKE256_Initialize(instance) \
+    TurboSHAKE_Initialize((instance), 512)
+
+int TurboSHAKE_Absorb(TurboSHAKE_Instance *instance, const unsigned char *data, size_t dataByteLen);
+
+int TurboSHAKE_AbsorbDomainSeparationByte(TurboSHAKE_Instance *instance, unsigned char domain);
+
+int TurboSHAKE_Squeeze(TurboSHAKE_Instance *instance, unsigned char *data, size_t dataByteLen);
+
+#endif
+
+#endif