digest-kangarootwelve 0.2.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cc16ae34a7fdce2bb7506850c7c625c4085fc73c5489118551a34e6f226c028
-  data.tar.gz: 08253906ee3841daf5e9fd4f5040a0caa4fdcc63d9cc3ec66b449992fdb6dd63
+  metadata.gz: b87cc8666ac88cef2163a09169663b72fd780f531a33315a8bc1329acdd494f2
+  data.tar.gz: f9960e47d3976cdbd2e1c1a6e344220c8a861601968997b36eb9932b21d872f5
 SHA512:
-  metadata.gz: b08df25f76db8f22044487a8bf02a19ec73ecfa278c8de047a0fe84ba7fe73668b5ee90a048887129eb518fe7454f280b17dff3d6bafdd6641391ff3238e9982
-  data.tar.gz: 58b8d97b25cb1ef5e2b80570973f55f380168a34a6bbc2bf1163e2fd72cfbb42e8b026d2fe52f1318267492a9d4d6ddbe16c5baab5fbbe30508f19595853ce9c
+  metadata.gz: 75597c93c110ff7796bc546b4f15b25541f8ae7b413ba479a7d87e756ca7fbe43731d75db1e808a8cd9ef24cff0c6a9d4e31524b29b8c32626e33e02df419d35
+  data.tar.gz: 1bdc214850cad5879f6930367e88af5350cfae1a7f6d6e2620474e1ae1f823f5c8eb7c455373741ecb5cc440e547c8e074090fd33f80b75a0f5c0e9fcdbe9be9

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017 konsolebox
+Copyright (c) 2022 konsolebox
 
 MIT License
 

data/LICENSE.XKCP

@@ -0,0 +1,9 @@
+# Under which license is the XKCP distributed?
+
+Most of the source and header files in the XKCP are released to the **public domain** and associated to the [CC0](http://creativecommons.org/publicdomain/zero/1.0/) deed. The exceptions are the following:
+
+* [`lib/common/brg_endian.h`](lib/common/brg_endian.h) is copyrighted by Brian Gladman and comes with a BSD 3-clause license;
+* [`tests/UnitTests/genKAT.c`](tests/UnitTests/genKAT.c) is based on [SHA-3 contest's code by Larry Bassham, NIST](http://csrc.nist.gov/groups/ST/hash/sha-3/documents/KAT1.zip), which he licensed under a BSD 3-clause license;
+* [`tests/UnitTests/timing.h`](tests/UnitTests/timing.h) is adapted from Google Benchmark and is licensed under the Apache License, Version 2.0;
+* [`KeccakP-1600-AVX2.s`](lib/low/KeccakP-1600/AVX2/KeccakP-1600-AVX2.s) is licensed under the [CRYPTOGAMS license](http://www.openssl.org/~appro/cryptogams/) (BSD-like);
+* [`support/Kernel-PMU/enable_arm_pmu.c`](support/Kernel-PMU/enable_arm_pmu.c) is licensed under the GNU General Public License by Bruno Pairault.

data/README.md

@@ -1,32 +1,115 @@
-# digest-kangarootwelve-ruby
+# digest-kangarootwelve
 
-The digest-kangarootwelve gem is an implementation of KangarooTwelve for Ruby
-that works on top of Digest::Base.
+This gem is an implementation of KangarooTwelve for Ruby that works on top of
+the `Digest::Base` class.
 
-It allows hashing with different digest lengths and different customization
-strings.
+It can be configured to produce outputs with different digest lengths, and can
+be initilized with different customization strings.
 
-See http://kangarootwelve.org/ to know more about the hashing algorithm.
+To know more about the KangarooTwelve algorithm, visit
+https://keccak.team/kangarootwelve.html.
 
-The core implementation was extracted/generated from the KCP
-(https://github.com/gvanas/KeccakCodePackage).  The extension currently utilizes
-the compact version, but I'll try to use a more optimized version in the future,
-and also consider adding a capability to use an external library that can be
-natively optimized (e.g. libkeccak.a), without compromisations.
+The core implementation of KangarooTwelve is part of the
+[XKCP](https://github.com/XKCP/XKCP) project.
+
+XKCP provides multiple targets for different architecture-dependent builds.
+
+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.
+
+Details on what architectures these targets support are provided in the
+[README.markdown](https://github.com/XKCP/XKCP/blob/master/README.markdown) file
+of XKCP.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+To use the gem in an application, add the following line to the application's
+Gemfile:
 
     gem 'digest-kangarootwelve'
 
 And then execute:
 
-    $ bundle
+    bundle
+
+The gem can also be installed manually using the `gem` command:
+
+    gem install digest-kangarootwelve
+
+To build and install the gem against a different platform target, use a
+`--with-target` option that follows a `--`.  Example:
+
+    gem install digest-kangarootwelve -- --with-target=avx
+
+Targets may also need `CFLAGS` specified.  Please see the
+[Build failures](#build-failures) section.
+
+It's also a good idea to test the gem before actively using it, especially when
+using a not so commonly used target.  Here's one way to test it:
+
+    cd GEM_DIR/gems/digest-kangarootwelve-VERSION
+    bundle
+    rake test
+
+To know the right value of GEM_DIR, try running `gem info digest-kangarootwelve`.
+
+## Installing in Gentoo
+
+The library can also be globally installed in Gentoo using `layman`:
+
+    # Fetch remote list of overlays, and add 'konsolebox' overlay.
+    layman -f && layman -a konsolebox
+
+    # Unmask unstable keyword.
+    echo 'dev-ruby/digest-kangarootwelve' > /etc/portage/package.accept_keywords/dev-ruby.digest-kangarootwelve
+
+    # Merge package.
+    emerge dev-ruby/digest-kangarootwelve
+
+## Testing from source
 
-Or install it yourself as:
+The gem can also be tested from source using the following commands:
 
-    $ gem install digest-kangarootwelve
+    # Clone this repo.
+    git clone https://github.com/konsolebox/digest-kangarootwelve-ruby.git -b master
+
+    # Change to directory.
+    cd digest-kangarootwelve-ruby
+
+    # Optionally checkout a tagged version.
+    git checkout v0.4.0
+
+    # Run bundle
+    bundle
+
+    # Finally run `rake` to compile the extension and test the gem.
+    rake
+
+    # A different target can also be specified.  Example:
+    rake clean clobber && rake -- --with-target=avx
+
+## Build failures
+
+Targets like AVX2 may fail to build unless an explicit `CFLAGS` with proper
+architecture-related options is specified.
+
+Specifying a `CFLAGS` can be done by using the `--with-cflags` option.  For example:
+
+    rake -- --with-target=avx2 --with-cflags="-march=native"
+
+    gem install digest-kangarootwelve -- --with-target=avx2 --with-cflags="-march=native"
+
+    bundle config build.digest-kangarootwelve --with-target=avx2 --with-cflags="-march=native"
+
+Compact (the default target) and AVX targets have been tested to not need a
+`CFLAGS` to compile and work.
+
+Please note that this gem has not been tested to work with cross-compilations,
+so please test the resulting runtime thoroughly.
 
 ## Example Usage
 
@@ -62,16 +145,26 @@ For details on how to use these methods, please examine the comments in
 `ext/digest/kangarootwelve/ext.c`, or run `ri` with
 `ri 'Digest::KangarooTwelve'`, or `ri 'Digest::KangarooTwelve::<method_name>'`.
 
-You can also visit the automatically generated API documentation pages provided
-by RubyDoc.info in http://www.rubydoc.info/gems/digest-kangarootwelve/.
+## API Documentation
+
+RubyGems.org also provides autogenerated API documentation of the library in
+https://www.rubydoc.info/gems/digest-kangarootwelve/.
+
+## Github Page
+
+https://github.com/konsolebox/digest-kangarootwelve-ruby
+
+## RubyGems.org Page
+
+https://rubygems.org/gems/digest-kangarootwelve
 
 ## Contributing
 
 1. Fork it ( https://github.com/konsolebox/digest-kangarootwelve-ruby/fork ).
-2. Create your feature branch (`git checkout -b my-new-feature`).
-3. Commit your changes (`git commit -am 'Add some feature'`).
+2. Create feature branch (`git checkout -b my-new-feature`).
+3. Commit changes (`git commit -am 'Add some feature'`).
 4. Push to the branch (`git push origin my-new-feature`).
 5. Create a new Pull Request.
 
-[![Build Status](https://travis-ci.org/konsolebox/digest-kangarootwelve-ruby.svg?branch=master)](https://travis-ci.org/konsolebox/digest-kangarootwelve-ruby)
-[![Build status](https://ci.appveyor.com/api/projects/status/bwedifhi4wa5wik7?svg=true)](https://ci.appveyor.com/project/konsolebox/digest-kangarootwelve-ruby)
+[![Build Status](https://github.com/konsolebox/digest-kangarootwelve-ruby/actions/workflows/ruby.yml/badge.svg)](https://github.com/konsolebox/digest-kangarootwelve-ruby/actions/workflows/ruby.yml)
+[![Build Status](https://ci.appveyor.com/api/projects/status/bwedifhi4wa5wik7?svg=true)](https://ci.appveyor.com/project/konsolebox/digest-kangarootwelve-ruby)

data/Rakefile

@@ -1,18 +1,72 @@
-# build, clean, clobber, install, install:local, release[remote]
+# build, clean, clobber, release[remote]
 require 'bundler/gem_tasks'
 
-# clean, clobber, compile, compile:digest/kangarootwelve
+# compile, compile:digest/kangarootwelve
 require 'rake/extensiontask'
 Rake::ExtensionTask.new('digest/kangarootwelve', Bundler::GemHelper.gemspec)
 
+# initialize_xkcp
+desc "Initialize and update XKCP submodule"
+task :initialize_xkcp => ".git" do |t|
+  puts "Initializing and updating XKCP submodule"
+  system "git submodule init && git submodule update -f"
+end
+
+file "XKCP/Makefile.build" => :initialize_xkcp
+file "XKCP/README.markdown" => :initialize_xkcp
+
+# import_xkcp_license
+task :import_xkcp_license do
+  Rake::Task["XKCP/README.markdown"].invoke
+  puts "Extracting XKCP license from \"XKCP/README.markdown\" and saving it to \"LICENSE.XKCP\"."
+  license = File.binread("XKCP/README.markdown")
+                .scan(/# Under which license is the XKCP.*?(?=^#)/m).first
+  raise "No license extracted" unless license
+  File.binwrite("LICENSE.XKCP", license.strip + "\n")
+end.instance_eval do
+  def needed?
+    !File.exist?("LICENSE.XKCP") || File.exist?("XKCP/README.markdown") &&
+        File.mtime("LICENSE.XKCP") < File.mtime("XKCP/README.markdown")
+  end
+end
+
+Rake::Task[:build].prerequisites.unshift :import_xkcp_license
+
+# import_xkcp_files_lazy
+task :import_xkcp_files_lazy do
+  Rake::Task[:import_xkcp_files].invoke
+end.instance_eval do
+  def needed?
+    %w[XKCP targets].any?{ |dir| !File.exist?("ext/digest/kangarootwelve/#{dir}") }
+  end
+end
+
+Rake::Task[:build].prerequisites.unshift :import_xkcp_files_lazy
+Rake::Task[:compile].prerequisites.unshift :import_xkcp_files_lazy
+
+# compile_lazy
+task :compile_lazy do
+  Rake::Task[:compile].invoke
+end.instance_eval do
+  def needed?
+    !File.exist?("lib/digest/kangarootwelve.so")
+  end
+end
+
 # test
 require 'rake/testtask'
-Rake::TestTask.new(:test => :compile) do |t|
+Rake::TestTask.new(:test => :compile_lazy) do |t|
   t.test_files = FileList['test/test.rb']
   t.verbose = true
 end
 
-# Set 'test' as default task.
-task :default => :test
+# default
+task :default => [:compile, :test]
+
+if File.exist?(".git")
+  CLOBBER.include "LICENSE.XKCP"
+  CLOBBER.include "ext/digest/kangarootwelve/XKCP"
+  CLOBBER.include "ext/digest/kangarootwelve/targets"
+end
 
 # Run `rake --tasks` or `rake --tasks --all` for a list of tasks.

data/digest-kangarootwelve.gemspec

@@ -1,8 +1,9 @@
 # coding: utf-8
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'digest/kangarootwelve/version'
+require 'find'
 
 Gem::Specification.new do |spec|
   spec.name          = "digest-kangarootwelve"
@@ -14,45 +15,30 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/konsolebox/digest-kangarootwelve-ruby"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = '>= 2.2'
+  spec.required_ruby_version = ">= 2.2"
 
-  spec.files = %w{Gemfile
-      LICENSE
-      README.md
-      Rakefile
-      digest-kangarootwelve.gemspec
-      ext/digest/kangarootwelve/KangarooTwelve.c
-      ext/digest/kangarootwelve/KangarooTwelve.h
-      ext/digest/kangarootwelve/KeccakP-1600-SnP.h
-      ext/digest/kangarootwelve/KeccakP-1600-compact64.c
-      ext/digest/kangarootwelve/KeccakP-1600-times2-SnP.h
-      ext/digest/kangarootwelve/KeccakP-1600-times2-on1.c
-      ext/digest/kangarootwelve/KeccakP-1600-times4-SnP.h
-      ext/digest/kangarootwelve/KeccakP-1600-times4-on1.c
-      ext/digest/kangarootwelve/KeccakP-1600-times8-SnP.h
-      ext/digest/kangarootwelve/KeccakP-1600-times8-on1.c
-      ext/digest/kangarootwelve/KeccakSponge-common.h
-      ext/digest/kangarootwelve/KeccakSponge.inc
-      ext/digest/kangarootwelve/KeccakSpongeWidth1600.c
-      ext/digest/kangarootwelve/KeccakSpongeWidth1600.h
-      ext/digest/kangarootwelve/Phases.h
-      ext/digest/kangarootwelve/PlSnP-Fallback.inc
-      ext/digest/kangarootwelve/SnP-Relaned.h
-      ext/digest/kangarootwelve/align.h
-      ext/digest/kangarootwelve/brg_endian.h
-      ext/digest/kangarootwelve/ext.c
-      ext/digest/kangarootwelve/extconf.rb
-      ext/digest/kangarootwelve/utils.h
-      lib/digest/kangarootwelve/version.rb
-      test/test.rb}
+  spec.files = %w[
+    Gemfile
+    LICENSE
+    README.md
+    Rakefile
+    digest-kangarootwelve.gemspec
+    lib/digest/kangarootwelve/version.rb
+    rakelib/alt-install-task.rake
+    test/test.rb
+  ]
+  spec.files += Find.find("ext").to_a
+  spec.files += ["LICENSE.XKCP"] if File.exist? "LICENSE.XKCP"
 
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables   = []
+  spec.test_files    = ["test/test.rb"]
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler", "~> 1.0"
   spec.add_development_dependency "minitest", "~> 5.8"
+  spec.add_development_dependency "nori"
+  spec.add_development_dependency "nokogiri"
 
   spec.extensions = %w[ext/digest/kangarootwelve/extconf.rb]
 end

data/ext/digest/kangarootwelve/{align.h → XKCP/lib/common/align.h}

@@ -1,12 +1,11 @@
 /*
-Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni,
-Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby
-denoted as "the implementer".
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
 
-For more information, feedback or questions, please refer to our websites:
-http://keccak.noekeon.org/
-http://keyak.noekeon.org/
-http://ketje.noekeon.org/
+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/
 
 To the extent possible under law, the implementer has waived all copyright
 and related or neighboring rights to the source code in this file.

data/ext/digest/kangarootwelve/{brg_endian.h → XKCP/lib/common/brg_endian.h}

@@ -114,13 +114,14 @@
       defined( __VMS )     || defined( _M_X64 )
 #  define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN
 
-#elif defined( AMIGA )   || defined( applec )    || defined( __AS400__ )  || \
-      defined( _CRAY )   || defined( __hppa )    || defined( __hp9000 )   || \
-      defined( ibm370 )  || defined( mc68000 )   || defined( m68k )       || \
-      defined( __MRC__ ) || defined( __MVS__ )   || defined( __MWERKS__ ) || \
-      defined( sparc )   || defined( __sparc)    || defined( SYMANTEC_C ) || \
-      defined( __VOS__ ) || defined( __TIGCC__ ) || defined( __TANDEM )   || \
-      defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX )
+#elif defined( AMIGA )    || defined( applec )    || defined( __AS400__ )  || \
+      defined( _CRAY )    || defined( __hppa )    || defined( __hp9000 )   || \
+      defined( ibm370 )   || defined( mc68000 )   || defined( m68k )       || \
+      defined( __MRC__ )  || defined( __MVS__ )   || defined( __MWERKS__ ) || \
+      defined( sparc )    || defined( __sparc)    || defined( SYMANTEC_C ) || \
+      defined( __VOS__ )  || defined( __TIGCC__ ) || defined( __TANDEM )   || \
+      defined( THINK_C )  || defined( __VMCMS__ ) || defined( _AIX )       || \
+      defined( __s390__ ) || defined( __s390x__ ) || defined( __zarch__ )
 #  define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN
 
 #elif defined(__arm__)

data/ext/digest/kangarootwelve/{KangarooTwelve.c → XKCP/lib/high/KangarooTwelve/KangarooTwelve.c}

@@ -1,12 +1,13 @@
 /*
-Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni,
-Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby
-denoted as "the implementer".
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
 
-For more information, feedback or questions, please refer to our websites:
-http://keccak.noekeon.org/
-http://keyak.noekeon.org/
-http://ketje.noekeon.org/
+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".
+
+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.
@@ -14,10 +15,18 @@ http://creativecommons.org/publicdomain/zero/1.0/
 */
 
 #include <string.h>
+#include <stdint.h>
 #include "KangarooTwelve.h"
-#ifndef KeccakP1600timesN_excluded
+
+#ifdef XKCP_has_KeccakP1600times2
     #include "KeccakP-1600-times2-SnP.h"
+#endif
+
+#ifdef XKCP_has_KeccakP1600times4
     #include "KeccakP-1600-times4-SnP.h"
+#endif
+
+#ifdef XKCP_has_KeccakP1600times8
     #include "KeccakP-1600-times8-SnP.h"
 #endif
 
@@ -44,7 +53,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
         \
         KeccakP1600times##Parallellism##_StaticInitialize(); \
         KeccakP1600times##Parallellism##_InitializeAll(states); \
-        fastLoopOffset = KeccakP1600times##Parallellism##_12rounds_FastLoop_Absorb(states, rateInLanes, chunkSize / laneSize, rateInLanes, localInput, Parallellism * chunkSize); \
+        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 ) { \
@@ -89,6 +98,17 @@ http://creativecommons.org/publicdomain/zero/1.0/
         if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
     }
 
+#define ProcessLeaves( Parallellism ) \
+    while ( inLen >= Parallellism * chunkSize ) { \
+        unsigned char intermediate[Parallellism*capacityInBytes]; \
+        \
+        KeccakP1600times##Parallellism##_K12ProcessLeaves(input, intermediate); \
+        input += Parallellism * chunkSize; \
+        inLen -= Parallellism * chunkSize; \
+        ktInstance->blockNumber += Parallellism; \
+        if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, intermediate, Parallellism * capacityInBytes) != 0) return 1; \
+    }
+
 static unsigned int right_encode( unsigned char * encbuf, size_t value )
 {
     unsigned int n, i;
@@ -118,7 +138,7 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
 
     if ( ktInstance->blockNumber == 0 ) {
         /* First block, absorb in final node */
-        unsigned int len = (inLen < (chunkSize - ktInstance->queueAbsorbedLen)) ? inLen : (chunkSize - ktInstance->queueAbsorbedLen);
+        unsigned int len = (inLen < (chunkSize - ktInstance->queueAbsorbedLen)) ? (unsigned int)inLen : (chunkSize - ktInstance->queueAbsorbedLen);
         if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->finalNode, input, len) != 0)
             return 1;
         input += len;
@@ -136,7 +156,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)) ? inLen : (chunkSize - ktInstance->queueAbsorbedLen);
+        unsigned int len = (inLen < (chunkSize - ktInstance->queueAbsorbedLen)) ? (unsigned int)inLen : (chunkSize - ktInstance->queueAbsorbedLen);
         if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->queueNode, input, len) != 0)
             return 1;
         input += len;
@@ -155,24 +175,30 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
         }
     }
 
-    #if defined(KeccakP1600times8_implementation)
-    #if defined(KeccakP1600times8_12rounds_FastLoop_supported)
+    #if defined(KeccakP1600times8_implementation) && !defined(KeccakP1600times8_isFallback)
+    #if defined(KeccakP1600times8_K12ProcessLeaves_supported)
+    ProcessLeaves( 8 )
+    #elif defined(KeccakP1600times8_12rounds_FastLoop_supported)
     ParallelSpongeFastLoop( 8 )
     #else
     ParallelSpongeLoop( 8 )
     #endif
     #endif
 
-    #if defined(KeccakP1600times4_implementation)
-    #if defined(KeccakP1600times4_12rounds_FastLoop_supported)
+    #if defined(KeccakP1600times4_implementation) && !defined(KeccakP1600times4_isFallback)
+    #if defined(KeccakP1600times4_K12ProcessLeaves_supported)
+    ProcessLeaves( 4 )
+    #elif defined(KeccakP1600times4_12rounds_FastLoop_supported)
     ParallelSpongeFastLoop( 4 )
     #else
     ParallelSpongeLoop( 4 )
     #endif
     #endif
 
-    #if defined(KeccakP1600times2_implementation)
-    #if defined(KeccakP1600times2_12rounds_FastLoop_supported)
+    #if defined(KeccakP1600times2_implementation) && !defined(KeccakP1600times2_isFallback)
+    #if defined(KeccakP1600times2_K12ProcessLeaves_supported)
+    ProcessLeaves( 2 )
+    #elif defined(KeccakP1600times2_12rounds_FastLoop_supported)
     ParallelSpongeFastLoop( 2 )
     #else
     ParallelSpongeLoop( 2 )
@@ -180,7 +206,7 @@ int KangarooTwelve_Update(KangarooTwelve_Instance *ktInstance, const unsigned ch
     #endif
 
     while ( inLen > 0 ) {
-        unsigned int len = (inLen < chunkSize) ? inLen : chunkSize;
+        unsigned int len = (inLen < chunkSize) ? (unsigned int)inLen : chunkSize;
         if (KeccakWidth1600_12rounds_SpongeInitialize(&ktInstance->queueNode, rate, capacity) != 0)
             return 1;
         if (KeccakWidth1600_12rounds_SpongeAbsorb(&ktInstance->queueNode, input, len) != 0)

data/ext/digest/kangarootwelve/{KangarooTwelve.h → XKCP/lib/high/KangarooTwelve/KangarooTwelve.h}

@@ -1,12 +1,13 @@
 /*
-Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni,
-Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby
-denoted as "the implementer".
+The eXtended Keccak Code Package (XKCP)
+https://github.com/XKCP/XKCP
 
-For more information, feedback or questions, please refer to our websites:
-http://keccak.noekeon.org/
-http://keyak.noekeon.org/
-http://ketje.noekeon.org/
+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".
+
+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.
@@ -16,11 +17,12 @@ http://creativecommons.org/publicdomain/zero/1.0/
 #ifndef _KangarooTwelve_h_
 #define _KangarooTwelve_h_
 
-#ifndef KeccakP1600_excluded
+#include "config.h"
+#ifdef XKCP_has_KeccakP1600
 
 #include <stddef.h>
 #include "align.h"
-#include "KeccakSpongeWidth1600.h"
+#include "KeccakSponge.h"
 #include "Phases.h"
 
 typedef KCP_Phases KangarooTwelve_Phases;
@@ -88,6 +90,8 @@ int KangarooTwelve_Final(KangarooTwelve_Instance *ktInstance, unsigned char *out
   */
 int KangarooTwelve_Squeeze(KangarooTwelve_Instance *ktInstance, unsigned char *output, size_t outputByteLen);
 
+#else
+#error This requires an implementation of Keccak-p[1600]
 #endif
 
 #endif