digest-blake2b 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6680340b4197471eab8a18c10ba0835f072c33b2537637dab4ff54ca6ce8b66c
-  data.tar.gz: 1e39d0569c7a633da86c4340840bfa32fb8c44027c5da7169578780e9afff150
+  metadata.gz: aa9d422fef855a4edaa9c46b813a70b96d50a97aa7f6c5d940bdc57f2c42b7b9
+  data.tar.gz: 9b1d6085a3882c9ab957e16d0b5342ac429cb3edeff0ac8e463505719f0d3c4c
 SHA512:
-  metadata.gz: 455c90a95243ad8b5978c279947586402a0a819ddca1d204a4032261485d34cffc1a24359243e8317a096bf86454fe0e59094e46fe3f92599abb4a773d3de643
-  data.tar.gz: aff60483ee972a43d4becf643df858d233e145ffb0b4cb3729c40d59a37142dc7bc30ecb43729b068803191c090530b45a5e9ed9f275fbe87899f4fde18b0fe9
+  metadata.gz: d7712099b5d3a8cae79e41b5d88542ae033ae9c9c4cf019e6abf08d8d3f92f89eff1e819aa2a3978db67c9c50e5943bdf64fafa13a5983403b78ff2391d8d127
+  data.tar.gz: 190c8a94604b7d45c1a16ae7ece720eeb906fe3196f0a38f15e259facfa0f6abb0914c855aaad2059d7ccdde562788bf737bec743cca8cdefbecd3f631914683

data/.circleci/config.yml

@@ -1,9 +1,9 @@
-version: 2
+version: 2.1
 
 jobs:
-  ruby_2_4:
+  ruby_2_6_x86_64:
     docker:
-      - image: circleci/ruby:2.4-node-browsers
+      - image: ruby:2.6
         environment:
           STEALTH_ENV: test
 
@@ -12,30 +12,19 @@ jobs:
     steps:
       - checkout
 
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
       - run:
           name: install dependencies
           command: |
+            gem install bundler
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
       # run tests!
       - run:
           name: run tests
           command: |
             mkdir /tmp/test-results
 
-            bundle exec rake test
+            bundle exec rake full
 
       # collect reports
       - store_test_results:
@@ -43,39 +32,28 @@ jobs:
       - store_artifacts:
           path: /tmp/test-results
           destination: test-results
-  ruby_2_5:
+  ruby_2_7_x86_64:
     docker:
-      - image: circleci/ruby:2.5-node-browsers
+      - image: ruby:2.7
 
     working_directory: ~/repo
 
     steps:
       - checkout
 
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
       - run:
           name: install dependencies
           command: |
+            gem install bundler
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
       # run tests!
       - run:
           name: run tests
           command: |
             mkdir /tmp/test-results
 
-            bundle exec rake test
+            bundle exec rake full
 
       # collect reports
       - store_test_results:
@@ -88,5 +66,5 @@ workflows:
   version: 2
   build:
     jobs:
-      - ruby_2_4
-      - ruby_2_5
+      - ruby_2_6_x86_64
+      - ruby_2_7_x86_64

data/.gitignore

@@ -1,4 +1,5 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+# See https://help.github.com/articles/ignoring-files
+# for more about ignoring files.
 #
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
@@ -6,8 +7,8 @@
 
 /checksums/*
 !/checksums/.keep
-/lib/*.bundle
-/lib/digest/blake2b_ext.so
+/lib/**/*.bundle
+/lib/digest/blake2b/ext.so
 
 *.o
 *.gem

data/Gemfile

@@ -1,2 +1,6 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
+
+# Specify your gem's dependencies in digest-blake2b.gemspec
 gemspec

data/README.md

@@ -1,36 +1,38 @@
 Digest::Blake2b
 ===============
 
+[![CircleCI](https://circleci.com/gh/kotovalexarian/digest-blake2b/tree/master.svg?style=svg)](https://circleci.com/gh/kotovalexarian/digest-blake2b/tree/master)
+
 BLAKE2 is a cryptographic hash function faster than MD5, SHA-1, SHA-2, and SHA-3, yet is at least as secure as the latest standard SHA-3. BLAKE2 has been adopted by many projects due to its high speed, security, and simplicity.
 
 More info at: [https://blake2.net](https://blake2.net).
 
 ## Summary
 
-This gem is a C-extension to enable using BLAKE2b in Ruby. This BLAKE2b implementation (or just BLAKE2) is optimized for 64-bit platforms with SSE support (excluding NEON-enabled ARMs). It produces digests of any size between 1 and 64 bytes.
+This gem is a C-extension to enable using BLAKE2b in Ruby. This reference BLAKE2b implementation (or just BLAKE2). For 64-bit x86 platforms with SSE support optimized implementation is used. It produces digests of any size between 1 and 64 bytes.
 
 The C code for this gem is taken from the [official reference C implementation](https://github.com/BLAKE2/BLAKE2) as of commit [ca4c89314abff54e3806b44e4a08164f8204f09a](https://github.com/BLAKE2/BLAKE2/tree/ca4c89314abff54e3806b44e4a08164f8204f09a).
 
 ## Install
 
 ```
-gem install blake2b
+gem install digest-blake2b
 ```
 
 ## Usage
 
 ``` ruby
-require 'blake2b'
+require 'digest/blake2b'
 
 # The UTF-8 String (Required) that you want to digest.
 input   = 'abc'
 
 # The main application of keyed BLAKE2 is as a message authentication code (MAC)
-# By default `Blake2b::Key.none` is used.
-key = Blake2b::Key.none
-# key = Blake2b::Key.from_string("foo bar baz")
-# key = Blake2b::Key.from_hex('DEADBEAF')
-# key = Blake2b::Key.from_bytes([222, 173, 190, 175])
+# By default `Digest::Blake2b::Key.none` is used.
+key = Digest::Blake2b::Key.none
+# key = Digest::Blake2b::Key.from_string("foo bar baz")
+# key = Digest::Blake2b::Key.from_hex('DEADBEAF')
+# key = Digest::Blake2b::Key.from_bytes([222, 173, 190, 175])
 
 # The output length in Bytes of the Hash, Max and Default is 32.
 out_len = 32
@@ -38,32 +40,32 @@ out_len = 32
 # HEX OUTPUT
 ############
 
-Blake2b.hex(input)
+Digest::Blake2b.hex(input)
 => "508c5e8c327c14e2e1a72ba34eeb452f37458b209ed63a294d999b4c86675982"
 
-Blake2b.hex(input, key)
+Digest::Blake2b.hex(input, key)
 => "508c5e8c327c14e2e1a72ba34eeb452f37458b209ed63a294d999b4c86675982"
 
-Blake2b.hex(input, key, out_len)
+Digest::Blake2b.hex(input, key, out_len)
 => "508c5e8c327c14e2e1a72ba34eeb452f37458b209ed63a294d999b4c86675982"
 
 # BYTES OUTPUT
 ##############
 
-Blake2b.bytes(input)
+Digest::Blake2b.bytes(input)
 => [80, 140, 94, ...]
 
-Blake2b.bytes(input, key)
+Digest::Blake2b.bytes(input, key)
 => [80, 140, 94, ...]
 
-Blake2b.bytes(input, key, out_len)
+Digest::Blake2b.bytes(input, key, out_len)
 => [80, 140, 94, ...]
 
 ```
 
 ## Performance
 
-`Blake2b` really shines on larger inputs. Here are some benchmarks on various input sizes. You can find the performance suite used for these benchmarks at `performance/performance_suite.rb`. All tests were run on an iMac 27" Late 2014, 4GHz Core i7 CPU (4790K) w/ SSE4.1 + SSE4.2, 32GB DDR3 RAM.
+`Digest::Blake2b` really shines on larger inputs. Here are some benchmarks on various input sizes. You can find the performance suite used for these benchmarks at `performance/performance_suite.rb`. All tests were run on an iMac 27" Late 2014, 4GHz Core i7 CPU (4790K) w/ SSE4.1 + SSE4.2, 32GB DDR3 RAM.
 
 ### 1KB (1M digests)
 
@@ -108,8 +110,8 @@ Hopefully this gem will not be required once Ruby [issue #12802](https://bugs.ru
 
 ## License
 
-Blake2b is based heavily on [Blake2](https://github.com/franckverrot/blake2) by Franck Verrot, Copyright 2014.
+Digest::Blake2b is based heavily on [Blake2](https://github.com/franckverrot/blake2) by Franck Verrot, Copyright 2014.
 
-Blake2b is copyright 2018, Mauricio Gomes.
+Digest::Blake2b is copyright 2018, Mauricio Gomes.
 
-The original work (Blake2) and the modified work (Blake2b) are licensed GPL v3.0. See LICENSE for details.
+The original work (Blake2) and the modified work (Digest::Blake2b) are licensed GPL v3.0. See LICENSE for details.

data/Rakefile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rake/extensiontask'
 
 spec = Gem::Specification.load('digest-blake2b.gemspec')
 
-Rake::ExtensionTask.new('digest/blake2b_ext', spec) do |ext|
+Rake::ExtensionTask.new 'digest/blake2b/ext', spec do |ext|
   ext.source_pattern = '*.{c,h}'
 end
 
@@ -18,7 +20,7 @@ end
 task default: :full
 
 desc 'clean, compile, and run the full test suite'
-task full: %w(clean compile test)
+task full: %i[clean compile test]
 
 def gemspec
   @gemspec ||= begin

data/digest-blake2b.gemspec

@@ -9,12 +9,13 @@ Gem::Specification.new do |spec|
   spec.name     = 'digest-blake2b'
   spec.version  = Digest::Blake2b::VERSION
   spec.license  = 'GPL-3.0'
-  spec.homepage = 'https://github.com/kotovalexarian/digest-blake2b.rb'
+  spec.homepage = 'https://github.com/kotovalexarian/digest-blake2b'
   spec.summary  = 'The BLAKE2b cryptographic hash function.'
+  spec.platform = Gem::Platform::RUBY
 
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '>= 2.1', '< 4'
 
-  spec.authors = ['Franck Verrot', 'Mauricio Gomes']
+  spec.authors = ['Alex Kotov', 'Franck Verrot', 'Mauricio Gomes']
   spec.email   = %w[mauricio@edge14.com]
 
   spec.description = <<-DESCRIPTION.split.join ' '
@@ -23,10 +24,10 @@ Gem::Specification.new do |spec|
   DESCRIPTION
 
   spec.metadata = {
-    'homepage_uri'    => 'https://github.com/kotovalexarian/digest-blake2b.rb',
-    'source_code_uri' => 'https://github.com/kotovalexarian/digest-blake2b.rb',
+    'homepage_uri'    => 'https://github.com/kotovalexarian/digest-blake2b',
+    'source_code_uri' => 'https://github.com/kotovalexarian/digest-blake2b',
     'bug_tracker_uri' =>
-      'https://github.com/kotovalexarian/digest-blake2b.rb/issues',
+      'https://github.com/kotovalexarian/digest-blake2b/issues',
   }.freeze
 
   spec.bindir        = 'exe'
@@ -40,10 +41,10 @@ Gem::Specification.new do |spec|
 
   spec.executables = spec.files.grep %r{^exe/}, &File.method(:basename)
 
-  spec.extensions << 'ext/digest/blake2b_ext/extconf.rb'
+  spec.extensions << 'ext/digest/blake2b/ext/extconf.rb'
 
-  spec.add_development_dependency 'rake-compiler', '~> 0.9'
-  spec.add_development_dependency 'bundler'      , '~> 1.5'
-  spec.add_development_dependency 'rake'         , '~> 11.1'
+  spec.add_development_dependency 'bundler'      , '~> 2.2'
   spec.add_development_dependency 'minitest'     , '~> 5.11'
+  spec.add_development_dependency 'rake'         , '~> 13.0'
+  spec.add_development_dependency 'rake-compiler', '~> 0.9'
 end

data/ext/digest/{blake2b_ext → blake2b/ext}/blake2-impl.h

@@ -12,6 +12,7 @@
    More information about the BLAKE2 hash function can be found at
    https://blake2.net.
 */
+
 #ifndef BLAKE2_IMPL_H
 #define BLAKE2_IMPL_H
 
@@ -19,7 +20,7 @@
 #include <string.h>
 
 #if !defined(__cplusplus) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
-  #if   defined(_MSC_VER)
+  #ifdef _MSC_VER
     #define BLAKE2_INLINE __inline
   #elif defined(__GNUC__)
     #define BLAKE2_INLINE __inline__
@@ -32,7 +33,7 @@
 
 static BLAKE2_INLINE uint32_t load32( const void *src )
 {
-#if defined(NATIVE_LITTLE_ENDIAN)
+#ifdef NATIVE_LITTLE_ENDIAN
   uint32_t w;
   memcpy(&w, src, sizeof w);
   return w;
@@ -47,7 +48,7 @@ static BLAKE2_INLINE uint32_t load32( const void *src )
 
 static BLAKE2_INLINE uint64_t load64( const void *src )
 {
-#if defined(NATIVE_LITTLE_ENDIAN)
+#ifdef NATIVE_LITTLE_ENDIAN
   uint64_t w;
   memcpy(&w, src, sizeof w);
   return w;
@@ -66,7 +67,7 @@ static BLAKE2_INLINE uint64_t load64( const void *src )
 
 static BLAKE2_INLINE uint16_t load16( const void *src )
 {
-#if defined(NATIVE_LITTLE_ENDIAN)
+#ifdef NATIVE_LITTLE_ENDIAN
   uint16_t w;
   memcpy(&w, src, sizeof w);
   return w;
@@ -79,7 +80,7 @@ static BLAKE2_INLINE uint16_t load16( const void *src )
 
 static BLAKE2_INLINE void store16( void *dst, uint16_t w )
 {
-#if defined(NATIVE_LITTLE_ENDIAN)
+#ifdef NATIVE_LITTLE_ENDIAN
   memcpy(dst, &w, sizeof w);
 #else
   uint8_t *p = ( uint8_t * )dst;
@@ -90,7 +91,7 @@ static BLAKE2_INLINE void store16( void *dst, uint16_t w )
 
 static BLAKE2_INLINE void store32( void *dst, uint32_t w )
 {
-#if defined(NATIVE_LITTLE_ENDIAN)
+#ifdef NATIVE_LITTLE_ENDIAN
   memcpy(dst, &w, sizeof w);
 #else
   uint8_t *p = ( uint8_t * )dst;
@@ -103,7 +104,7 @@ static BLAKE2_INLINE void store32( void *dst, uint32_t w )
 
 static BLAKE2_INLINE void store64( void *dst, uint64_t w )
 {
-#if defined(NATIVE_LITTLE_ENDIAN)
+#ifdef NATIVE_LITTLE_ENDIAN
   memcpy(dst, &w, sizeof w);
 #else
   uint8_t *p = ( uint8_t * )dst;

data/ext/digest/{blake2b_ext → blake2b/ext}/blake2.h

@@ -12,19 +12,20 @@
    More information about the BLAKE2 hash function can be found at
    https://blake2.net.
 */
+
 #ifndef BLAKE2_H
 #define BLAKE2_H
 
 #include <stddef.h>
 #include <stdint.h>
 
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
 #define BLAKE2_PACKED(x) __pragma(pack(push, 1)) x __pragma(pack(pop))
 #else
 #define BLAKE2_PACKED(x) x __attribute__((packed))
 #endif
 
-#if defined(__cplusplus)
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -188,7 +189,7 @@ extern "C" {
   /* This is simply an alias for blake2b */
   int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
 
-#if defined(__cplusplus)
+#ifdef __cplusplus
 }
 #endif
 

data/ext/digest/blake2b/ext/blake2b-ref.c

@@ -0,0 +1,7 @@
+#ifdef IMPL_REF
+#include "ref/blake2b-ref.c"
+#endif
+
+#ifdef IMPL_SSE
+#include "sse/blake2b-ref.c"
+#endif

data/ext/digest/blake2b/ext/extconf.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'mkmf'
+
+$CFLAGS += ' -std=c99 -pedantic -Wall -Wextra'
+
+if RUBY_PLATFORM =~ /^x86_64/
+  $CPPFLAGS += ' -DIMPL_SSE'
+  $CFLAGS += ' -Wno-long-long'
+else
+  $CPPFLAGS += ' -DIMPL_REF'
+end
+
+create_makefile 'digest/blake2b/ext'

data/ext/digest/{blake2b_ext → blake2b/ext}/rbext.c

@@ -1,6 +1,7 @@
+#include "blake2.h"
+
 #include <ruby/ruby.h>
 #include <ruby/encoding.h>
-#include "blake2.h"
 
 typedef struct {
   size_t key_length;
@@ -100,7 +101,7 @@ VALUE m_blake2_digest(VALUE self, VALUE _input, VALUE _representation) {
   return result;
 }
 
-void Init_blake2b_ext() {
+void Init_ext() {
   mDigest = rb_define_module("Digest");
 
   mDigest_cBlake2 = rb_define_class_under(mDigest, "Blake2b", rb_cObject);

data/ext/digest/blake2b/ext/ref/blake2b-ref.c

@@ -0,0 +1,379 @@
+/*
+   BLAKE2 reference source code package - reference C implementations
+
+   Copyright 2012, Samuel Neves <sneves@dei.uc.pt>.  You may use this under the
+   terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at
+   your option.  The terms of these licenses can be found at:
+
+   - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+   - OpenSSL license   : https://www.openssl.org/source/license.html
+   - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+
+   More information about the BLAKE2 hash function can be found at
+   https://blake2.net.
+*/
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "blake2.h"
+#include "blake2-impl.h"
+
+static const uint64_t blake2b_IV[8] =
+{
+  0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
+  0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
+  0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
+  0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
+};
+
+static const uint8_t blake2b_sigma[12][16] =
+{
+  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
+  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
+  { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
+  {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
+  {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
+  {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
+  { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
+  { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
+  {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
+  { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
+  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
+  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
+};
+
+
+static void blake2b_set_lastnode( blake2b_state *S )
+{
+  S->f[1] = (uint64_t)-1;
+}
+
+/* Some helper functions, not necessarily useful */
+static int blake2b_is_lastblock( const blake2b_state *S )
+{
+  return S->f[0] != 0;
+}
+
+static void blake2b_set_lastblock( blake2b_state *S )
+{
+  if( S->last_node ) blake2b_set_lastnode( S );
+
+  S->f[0] = (uint64_t)-1;
+}
+
+static void blake2b_increment_counter( blake2b_state *S, const uint64_t inc )
+{
+  S->t[0] += inc;
+  S->t[1] += ( S->t[0] < inc );
+}
+
+static void blake2b_init0( blake2b_state *S )
+{
+  size_t i;
+  memset( S, 0, sizeof( blake2b_state ) );
+
+  for( i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i];
+}
+
+/* init xors IV with input parameter block */
+int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
+{
+  const uint8_t *p = ( const uint8_t * )( P );
+  size_t i;
+
+  blake2b_init0( S );
+
+  /* IV XOR ParamBlock */
+  for( i = 0; i < 8; ++i )
+    S->h[i] ^= load64( p + sizeof( S->h[i] ) * i );
+
+  S->outlen = P->digest_length;
+  return 0;
+}
+
+
+
+int blake2b_init( blake2b_state *S, size_t outlen )
+{
+  blake2b_param P[1];
+
+  if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
+
+  P->digest_length = (uint8_t)outlen;
+  P->key_length    = 0;
+  P->fanout        = 1;
+  P->depth         = 1;
+  store32( &P->leaf_length, 0 );
+  store32( &P->node_offset, 0 );
+  store32( &P->xof_length, 0 );
+  P->node_depth    = 0;
+  P->inner_length  = 0;
+  memset( P->reserved, 0, sizeof( P->reserved ) );
+  memset( P->salt,     0, sizeof( P->salt ) );
+  memset( P->personal, 0, sizeof( P->personal ) );
+  return blake2b_init_param( S, P );
+}
+
+
+int blake2b_init_key( blake2b_state *S, size_t outlen, const void *key, size_t keylen )
+{
+  blake2b_param P[1];
+
+  if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
+
+  if ( !key || !keylen || keylen > BLAKE2B_KEYBYTES ) return -1;
+
+  P->digest_length = (uint8_t)outlen;
+  P->key_length    = (uint8_t)keylen;
+  P->fanout        = 1;
+  P->depth         = 1;
+  store32( &P->leaf_length, 0 );
+  store32( &P->node_offset, 0 );
+  store32( &P->xof_length, 0 );
+  P->node_depth    = 0;
+  P->inner_length  = 0;
+  memset( P->reserved, 0, sizeof( P->reserved ) );
+  memset( P->salt,     0, sizeof( P->salt ) );
+  memset( P->personal, 0, sizeof( P->personal ) );
+
+  if( blake2b_init_param( S, P ) < 0 ) return -1;
+
+  {
+    uint8_t block[BLAKE2B_BLOCKBYTES];
+    memset( block, 0, BLAKE2B_BLOCKBYTES );
+    memcpy( block, key, keylen );
+    blake2b_update( S, block, BLAKE2B_BLOCKBYTES );
+    secure_zero_memory( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from stack */
+  }
+  return 0;
+}
+
+#define G(r,i,a,b,c,d)                      \
+  do {                                      \
+    a = a + b + m[blake2b_sigma[r][2*i+0]]; \
+    d = rotr64(d ^ a, 32);                  \
+    c = c + d;                              \
+    b = rotr64(b ^ c, 24);                  \
+    a = a + b + m[blake2b_sigma[r][2*i+1]]; \
+    d = rotr64(d ^ a, 16);                  \
+    c = c + d;                              \
+    b = rotr64(b ^ c, 63);                  \
+  } while(0)
+
+#define ROUND(r)                    \
+  do {                              \
+    G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
+    G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
+    G(r,2,v[ 2],v[ 6],v[10],v[14]); \
+    G(r,3,v[ 3],v[ 7],v[11],v[15]); \
+    G(r,4,v[ 0],v[ 5],v[10],v[15]); \
+    G(r,5,v[ 1],v[ 6],v[11],v[12]); \
+    G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
+    G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
+  } while(0)
+
+static void blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] )
+{
+  uint64_t m[16];
+  uint64_t v[16];
+  size_t i;
+
+  for( i = 0; i < 16; ++i ) {
+    m[i] = load64( block + i * sizeof( m[i] ) );
+  }
+
+  for( i = 0; i < 8; ++i ) {
+    v[i] = S->h[i];
+  }
+
+  v[ 8] = blake2b_IV[0];
+  v[ 9] = blake2b_IV[1];
+  v[10] = blake2b_IV[2];
+  v[11] = blake2b_IV[3];
+  v[12] = blake2b_IV[4] ^ S->t[0];
+  v[13] = blake2b_IV[5] ^ S->t[1];
+  v[14] = blake2b_IV[6] ^ S->f[0];
+  v[15] = blake2b_IV[7] ^ S->f[1];
+
+  ROUND( 0 );
+  ROUND( 1 );
+  ROUND( 2 );
+  ROUND( 3 );
+  ROUND( 4 );
+  ROUND( 5 );
+  ROUND( 6 );
+  ROUND( 7 );
+  ROUND( 8 );
+  ROUND( 9 );
+  ROUND( 10 );
+  ROUND( 11 );
+
+  for( i = 0; i < 8; ++i ) {
+    S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
+  }
+}
+
+#undef G
+#undef ROUND
+
+int blake2b_update( blake2b_state *S, const void *pin, size_t inlen )
+{
+  const unsigned char * in = (const unsigned char *)pin;
+  if( inlen > 0 )
+  {
+    size_t left = S->buflen;
+    size_t fill = BLAKE2B_BLOCKBYTES - left;
+    if( inlen > fill )
+    {
+      S->buflen = 0;
+      memcpy( S->buf + left, in, fill ); /* Fill buffer */
+      blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
+      blake2b_compress( S, S->buf ); /* Compress */
+      in += fill; inlen -= fill;
+      while(inlen > BLAKE2B_BLOCKBYTES) {
+        blake2b_increment_counter(S, BLAKE2B_BLOCKBYTES);
+        blake2b_compress( S, in );
+        in += BLAKE2B_BLOCKBYTES;
+        inlen -= BLAKE2B_BLOCKBYTES;
+      }
+    }
+    memcpy( S->buf + S->buflen, in, inlen );
+    S->buflen += inlen;
+  }
+  return 0;
+}
+
+int blake2b_final( blake2b_state *S, void *out, size_t outlen )
+{
+  uint8_t buffer[BLAKE2B_OUTBYTES] = {0};
+  size_t i;
+
+  if( out == NULL || outlen < S->outlen )
+    return -1;
+
+  if( blake2b_is_lastblock( S ) )
+    return -1;
+
+  blake2b_increment_counter( S, S->buflen );
+  blake2b_set_lastblock( S );
+  memset( S->buf + S->buflen, 0, BLAKE2B_BLOCKBYTES - S->buflen ); /* Padding */
+  blake2b_compress( S, S->buf );
+
+  for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
+    store64( buffer + sizeof( S->h[i] ) * i, S->h[i] );
+
+  memcpy( out, buffer, S->outlen );
+  secure_zero_memory(buffer, sizeof(buffer));
+  return 0;
+}
+
+/* inlen, at least, should be uint64_t. Others can be size_t. */
+int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen )
+{
+  blake2b_state S[1];
+
+  /* Verify parameters */
+  if ( NULL == in && inlen > 0 ) return -1;
+
+  if ( NULL == out ) return -1;
+
+  if( NULL == key && keylen > 0 ) return -1;
+
+  if( !outlen || outlen > BLAKE2B_OUTBYTES ) return -1;
+
+  if( keylen > BLAKE2B_KEYBYTES ) return -1;
+
+  if( keylen > 0 )
+  {
+    if( blake2b_init_key( S, outlen, key, keylen ) < 0 ) return -1;
+  }
+  else
+  {
+    if( blake2b_init( S, outlen ) < 0 ) return -1;
+  }
+
+  blake2b_update( S, ( const uint8_t * )in, inlen );
+  blake2b_final( S, out, outlen );
+  return 0;
+}
+
+int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen ) {
+  return blake2b(out, outlen, in, inlen, key, keylen);
+}
+
+#ifdef SUPERCOP
+int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
+{
+  return blake2b( out, BLAKE2B_OUTBYTES, in, inlen, NULL, 0 );
+}
+#endif
+
+#ifdef BLAKE2B_SELFTEST
+#include <string.h>
+#include "blake2-kat.h"
+int main( void )
+{
+  uint8_t key[BLAKE2B_KEYBYTES];
+  uint8_t buf[BLAKE2_KAT_LENGTH];
+  size_t i, step;
+
+  for( i = 0; i < BLAKE2B_KEYBYTES; ++i )
+    key[i] = ( uint8_t )i;
+
+  for( i = 0; i < BLAKE2_KAT_LENGTH; ++i )
+    buf[i] = ( uint8_t )i;
+
+  /* Test simple API */
+  for( i = 0; i < BLAKE2_KAT_LENGTH; ++i )
+  {
+    uint8_t hash[BLAKE2B_OUTBYTES];
+    blake2b( hash, BLAKE2B_OUTBYTES, buf, i, key, BLAKE2B_KEYBYTES );
+
+    if( 0 != memcmp( hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES ) )
+    {
+      goto fail;
+    }
+  }
+
+  /* Test streaming API */
+  for(step = 1; step < BLAKE2B_BLOCKBYTES; ++step) {
+    for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
+      uint8_t hash[BLAKE2B_OUTBYTES];
+      blake2b_state S;
+      uint8_t * p = buf;
+      size_t mlen = i;
+      int err = 0;
+
+      if( (err = blake2b_init_key(&S, BLAKE2B_OUTBYTES, key, BLAKE2B_KEYBYTES)) < 0 ) {
+        goto fail;
+      }
+
+      while (mlen >= step) {
+        if ( (err = blake2b_update(&S, p, step)) < 0 ) {
+          goto fail;
+        }
+        mlen -= step;
+        p += step;
+      }
+      if ( (err = blake2b_update(&S, p, mlen)) < 0) {
+        goto fail;
+      }
+      if ( (err = blake2b_final(&S, hash, BLAKE2B_OUTBYTES)) < 0) {
+        goto fail;
+      }
+
+      if (0 != memcmp(hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES)) {
+        goto fail;
+      }
+    }
+  }
+
+  puts( "ok" );
+  return 0;
+fail:
+  puts("error");
+  return -1;
+}
+#endif

data/ext/digest/{blake2b_ext → blake2b/ext/sse}/blake2-config.h

@@ -12,6 +12,7 @@
    More information about the BLAKE2 hash function can be found at
    https://blake2.net.
 */
+
 #ifndef BLAKE2_CONFIG_H
 #define BLAKE2_CONFIG_H
 
@@ -20,23 +21,22 @@
 #define HAVE_SSE2
 #endif
 
-#if defined(__SSSE3__)
+#ifdef __SSSE3__
 #define HAVE_SSSE3
 #endif
 
-#if defined(__SSE4_1__)
+#ifdef __SSE4_1__
 #define HAVE_SSE41
 #endif
 
-#if defined(__AVX__)
+#ifdef __AVX__
 #define HAVE_AVX
 #endif
 
-#if defined(__XOP__)
+#ifdef __XOP__
 #define HAVE_XOP
 #endif
 
-
 #ifdef HAVE_AVX2
 #ifndef HAVE_AVX
 #define HAVE_AVX
@@ -65,7 +65,7 @@
 #define HAVE_SSE2
 #endif
 
-#if !defined(HAVE_SSE2)
+#ifndef HAVE_SSE2
 #error "This code requires at least SSE2."
 #endif
 

data/ext/digest/{blake2b_ext → blake2b/ext/sse}/blake2b-ref.c

@@ -26,16 +26,16 @@
 #include <intrin.h> /* for _mm_set_epi64x */
 #endif
 #include <emmintrin.h>
-#if defined(HAVE_SSSE3)
+#ifdef HAVE_SSSE3
 #include <tmmintrin.h>
 #endif
-#if defined(HAVE_SSE41)
+#ifdef HAVE_SSE41
 #include <smmintrin.h>
 #endif
-#if defined(HAVE_AVX)
+#ifdef HAVE_AVX
 #include <immintrin.h>
 #endif
-#if defined(HAVE_XOP)
+#ifdef HAVE_XOP
 #include <x86intrin.h>
 #endif
 
@@ -160,7 +160,7 @@ static void blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2B_BLOC
   const __m128i r16 = _mm_setr_epi8( 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9 );
   const __m128i r24 = _mm_setr_epi8( 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10 );
 #endif
-#if defined(HAVE_SSE41)
+#ifdef HAVE_SSE41
   const __m128i m0 = LOADU( block + 00 );
   const __m128i m1 = LOADU( block + 16 );
   const __m128i m2 = LOADU( block + 32 );
@@ -297,14 +297,14 @@ int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *
   return blake2b(out, outlen, in, inlen, key, keylen);
 }
 
-#if defined(SUPERCOP)
+#ifdef SUPERCOP
 int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
 {
   return blake2b( out, BLAKE2B_OUTBYTES, in, inlen, NULL, 0 );
 }
 #endif
 
-#if defined(BLAKE2B_SELFTEST)
+#ifdef BLAKE2B_SELFTEST
 #include <string.h>
 #include "blake2-kat.h"
 int main( void )

data/ext/digest/{blake2b_ext → blake2b/ext/sse}/blake2b-round.h

@@ -12,6 +12,7 @@
    More information about the BLAKE2 hash function can be found at
    https://blake2.net.
 */
+
 #ifndef BLAKE2B_ROUND_H
 #define BLAKE2B_ROUND_H
 
@@ -80,7 +81,7 @@
   row2l = _mm_roti_epi64(row2l, -63); \
   row2h = _mm_roti_epi64(row2h, -63); \
 
-#if defined(HAVE_SSSE3)
+#ifdef HAVE_SSSE3
 #define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
   t0 = _mm_alignr_epi8(row2h, row2l, 8); \
   t1 = _mm_alignr_epi8(row2l, row2h, 8); \
@@ -136,7 +137,7 @@
 
 #endif
 
-#if defined(HAVE_SSE41)
+#ifdef HAVE_SSE41
 #include "blake2b-load-sse41.h"
 #else
 #include "blake2b-load-sse2.h"

data/lib/digest/blake2b/version.rb

@@ -2,6 +2,6 @@
 
 module Digest
   class Blake2b
-    VERSION = '0.0.1'
+    VERSION = '0.0.5'
   end
 end

data/lib/digest/blake2b.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require 'digest/blake2b_ext'
-
-require 'digest/blake2b/key'
 require 'digest/blake2b/version'
+require 'digest/blake2b/key'
+require 'digest/blake2b/ext'
 
 module Digest
   class Blake2b

metadata

@@ -1,79 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: digest-blake2b
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
+- Alex Kotov
 - Franck Verrot
 - Mauricio Gomes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '0.9'
 description: BLAKE2b is a cryptographic hash function faster than MD5, SHA-1, SHA-2,
   and SHA-3 for 64-bit systems.
 email:
 - mauricio@edge14.com
 executables: []
 extensions:
-- ext/digest/blake2b_ext/extconf.rb
+- ext/digest/blake2b/ext/extconf.rb
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
@@ -84,42 +85,47 @@ files:
 - Rakefile
 - checksums/.keep
 - digest-blake2b.gemspec
-- ext/digest/blake2b_ext/blake2-config.h
-- ext/digest/blake2b_ext/blake2-impl.h
-- ext/digest/blake2b_ext/blake2.h
-- ext/digest/blake2b_ext/blake2b-load-sse2.h
-- ext/digest/blake2b_ext/blake2b-load-sse41.h
-- ext/digest/blake2b_ext/blake2b-ref.c
-- ext/digest/blake2b_ext/blake2b-round.h
-- ext/digest/blake2b_ext/extconf.rb
-- ext/digest/blake2b_ext/rbext.c
+- ext/digest/blake2b/ext/blake2-impl.h
+- ext/digest/blake2b/ext/blake2.h
+- ext/digest/blake2b/ext/blake2b-ref.c
+- ext/digest/blake2b/ext/extconf.rb
+- ext/digest/blake2b/ext/rbext.c
+- ext/digest/blake2b/ext/ref/blake2b-ref.c
+- ext/digest/blake2b/ext/sse/blake2-config.h
+- ext/digest/blake2b/ext/sse/blake2b-load-sse2.h
+- ext/digest/blake2b/ext/sse/blake2b-load-sse41.h
+- ext/digest/blake2b/ext/sse/blake2b-ref.c
+- ext/digest/blake2b/ext/sse/blake2b-round.h
 - lib/digest/blake2b.rb
 - lib/digest/blake2b/key.rb
 - lib/digest/blake2b/version.rb
 - performance/performance_suite.rb
-homepage: https://github.com/kotovalexarian/digest-blake2b.rb
+homepage: https://github.com/kotovalexarian/digest-blake2b
 licenses:
 - GPL-3.0
 metadata:
-  homepage_uri: https://github.com/kotovalexarian/digest-blake2b.rb
-  source_code_uri: https://github.com/kotovalexarian/digest-blake2b.rb
-  bug_tracker_uri: https://github.com/kotovalexarian/digest-blake2b.rb/issues
+  homepage_uri: https://github.com/kotovalexarian/digest-blake2b
+  source_code_uri: https://github.com/kotovalexarian/digest-blake2b
+  bug_tracker_uri: https://github.com/kotovalexarian/digest-blake2b/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.1'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: The BLAKE2b cryptographic hash function.

data/ext/digest/blake2b_ext/extconf.rb

@@ -1,3 +0,0 @@
-require 'mkmf'
-$CFLAGS += ' -Wall -Wextra -std=c99 -pedantic -Wno-long-long'
-create_makefile 'digest/blake2b_ext'