digest-blake2b 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664bd156e4290bfe01d6977508732cdaef1b950d0f1a5d632165106c4670f11a
-  data.tar.gz: 392f665ea5dca923c1d05f4f7aa2b2b0fc4e853e115d8cf4a7b884ce335b1f83
+  metadata.gz: 1e61524cd89cbe401a0a8f1bec0c89b933083e42b6d6db81d3ec36d4065180c4
+  data.tar.gz: bc803b62b04aa54a348cf422d85a076cac60d960c9ad9eacdf355a1be5dafb6a
 SHA512:
-  metadata.gz: 8daabe85e4c187b61fc65edb6dffb23ee6c6bbc68199521f8a2b4eafdec7c6d35c090a48941ef17748c1e87481771dbe4124d9c8ea6b5a6213f45da6b2cda481
-  data.tar.gz: 6434d4681b9a4d500ec861315512cec3e1233a5f7afaf376f85a999875d23259b03b1405fd8907b47675bb106ce1499f3a06d70664c13ffb7ba3248d840e684d
+  metadata.gz: fd2e07ed2b0ea5e17c05ad35a635f7ac259116953135c948f1392a6be8c4d72fb3dbb77fa1ee92e24de07f7a4ed6bd13620b94844ab5f6a4adbf2ee4f69f750f
+  data.tar.gz: 54ca65c115efd9cf3aa8137986ed1be25d31e4bf9e74cc7cb8e586bcb0531adeaa3c2c63e8a868426e751411495197d81af8cdf5c306fdee522376c98dd13fa8

data/.gitignore

@@ -9,7 +9,6 @@
 !/checksums/.keep
 /lib/**/*.bundle
 /lib/digest/blake2b/ext.so
-/lib/digest/blake2b/sse.so
 
 *.o
 *.gem

data/Gemfile

@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in digest-blake2b.gemspec
 gemspec
+
+gem 'minitest',      require: false
+gem 'rake',          require: false
+gem 'rake-compiler', require: false

data/Rakefile

@@ -1,22 +1,16 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
-require 'rake/testtask'
+require 'minitest/test_task'
 require 'rake/extensiontask'
 
 spec = Gem::Specification.load('digest-blake2b.gemspec')
 
-Rake::ExtensionTask.new "digest/blake2b/#{Digest::Blake2b::IMPL}", spec do |ext|
+Rake::ExtensionTask.new 'digest/blake2b/ext', spec do |ext|
   ext.source_pattern = '*.{c,h}'
-  ext.ext_dir = "ext/digest/blake2b/#{Digest::Blake2b::IMPL}"
 end
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-  t.warning = true
-end
+Minitest::TestTask.create
 
 task default: :full
 

data/digest-blake2b.gemspec

@@ -4,7 +4,6 @@ lib = File.expand_path('lib', __dir__).freeze
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 
 require 'digest/blake2b/version'
-require 'digest/blake2b/impl'
 
 Gem::Specification.new do |spec|
   spec.name     = 'digest-blake2b'
@@ -14,10 +13,10 @@ Gem::Specification.new do |spec|
   spec.summary  = 'The BLAKE2b cryptographic hash function.'
   spec.platform = Gem::Platform::RUBY
 
-  spec.required_ruby_version = '>= 2.1', '< 4'
+  spec.required_ruby_version = '>= 3.1', '< 4.1'
 
   spec.authors = ['Alex Kotov', 'Franck Verrot', 'Mauricio Gomes']
-  spec.email   = %w[mauricio@edge14.com]
+  spec.email   = %w[kotovalexarian@gmail.com]
 
   spec.description = <<-DESCRIPTION.split.join ' '
     BLAKE2b is a cryptographic hash function
@@ -25,8 +24,11 @@ Gem::Specification.new do |spec|
   DESCRIPTION
 
   spec.metadata = {
-    'homepage_uri'    => 'https://github.com/kotovalexarian/digest-blake2b',
-    'source_code_uri' => 'https://github.com/kotovalexarian/digest-blake2b',
+    'rubygems_mfa_required' => 'true',
+    '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',
   }.freeze
@@ -34,18 +36,10 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.require_paths = ['lib']
 
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match %r{^(test|spec|features)/}
-  end
-
-  spec.test_files = spec.files.grep %r{^(test|spec|features)/}
+  spec.files = `git ls-files -z`.split("\x0")
 
   spec.executables = spec.files.grep %r{^exe/}, &File.method(:basename)
+  spec.test_files  = spec.files.grep %r{^(test|spec|features)/}
 
-  spec.extensions << "ext/digest/blake2b/#{Digest::Blake2b::IMPL}/extconf.rb"
-
-  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'
+  spec.extensions << 'ext/digest/blake2b/ext/extconf.rb'
 end

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/{sse → 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_sse() {
+void Init_ext() {
   mDigest = rb_define_module("Digest");
 
   mDigest_cBlake2 = rb_define_class_under(mDigest, "Blake2b", rb_cObject);

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

@@ -303,14 +303,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/lib/digest/blake2b/version.rb

@@ -2,6 +2,6 @@
 
 module Digest
   class Blake2b
-    VERSION = '0.0.4'
+    VERSION = '0.0.6'
   end
 end

data/lib/digest/blake2b.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'digest/blake2b/key'
 require 'digest/blake2b/version'
-require 'digest/blake2b/impl'
-
-require "digest/blake2b/#{Digest::Blake2b::IMPL}"
+require 'digest/blake2b/key'
+require 'digest/blake2b/ext'
 
 module Digest
   class Blake2b

data/test/blake2/key_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+class KeyTest < Minitest::Test
+  def test_none
+    key = Digest::Blake2b::Key.none
+    assert_equal [], key.bytes
+  end
+
+  def test_from_string
+    key = Digest::Blake2b::Key.from_string('foo bar baz')
+    assert_equal [102, 111, 111, 32, 98, 97, 114, 32, 98, 97, 122], key.bytes
+  end
+
+  def test_from_string_raises_on_non_ascii_string
+    assert_raises(ArgumentError) { Digest::Blake2b::Key.from_string('💩') }
+  end
+
+  def test_from_hex
+    key = Digest::Blake2b::Key.from_hex('DEADBEAF')
+    assert_equal [222, 173, 190, 175], key.bytes
+  end
+
+  def test_from_hex_raises_on_non_hex_string
+    assert_raises(ArgumentError) { Digest::Blake2b::Key.from_hex('DEADBEAFZZ') }
+  end
+
+  def test_from_bytes_hex
+    key = Digest::Blake2b::Key.from_bytes([0xDE, 0xAD, 0xBE, 0xAF])
+    assert_equal [222, 173, 190, 175], key.bytes
+  end
+
+  def test_from_bytes_int
+    key = Digest::Blake2b::Key.from_bytes([222, 173, 190, 175])
+    assert_equal [222, 173, 190, 175], key.bytes
+  end
+
+  def test_from_hex_raises_on_non_valid_byte_array
+    assert_raises(ArgumentError) { Digest::Blake2b::Key.from_bytes([-1]) }
+    assert_raises(ArgumentError) { Digest::Blake2b::Key.from_bytes([256]) }
+    assert_raises(ArgumentError) { Digest::Blake2b::Key.from_bytes(['foo']) }
+  end
+end

data/test/blake2b_api_test.rb

@@ -0,0 +1,74 @@
+require 'test_helper'
+
+class Blake2bTest < Minitest::Test
+  def test_hex_with_input_only
+    res = Digest::Blake2b.hex('abc')
+    assert_kind_of String, res
+    assert_equal 'bddd813c634239723171ef3fee98579b94964e3bb1cb3e427262c8c068d52319', res
+  end
+
+  def test_hex_with_input_and_key
+    res = Digest::Blake2b.hex('abc', Digest::Blake2b::Key.none)
+    assert_kind_of String, res
+    assert_equal 'bddd813c634239723171ef3fee98579b94964e3bb1cb3e427262c8c068d52319', res
+  end
+
+  # From the computation in the RFC
+  # https://tools.ietf.org/html/rfc7693#appendix-A
+  def test_hex_with_input_key_and_length
+    res = Digest::Blake2b.hex('abc', Digest::Blake2b::Key.none, 64)
+    assert_kind_of String, res
+    assert_equal 'ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923', res
+  end
+
+  def test_hex_with_blank_input_key_and_length
+    res = Digest::Blake2b.hex('', Digest::Blake2b::Key.none, 64)
+    assert_kind_of String, res
+    assert_equal '786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce', res
+  end
+
+  def test_hex_with_known_input_key_and_length
+    res = Digest::Blake2b.hex('The quick brown fox jumps over the lazy dog', Digest::Blake2b::Key.none, 64)
+    assert_kind_of String, res
+    assert_equal 'a8add4bdddfd93e4877d2746e62817b116364a1fa7bc148d95090bc7333b3673f82401cf7aa2e4cb1ecd90296e3f14cb5413f8ed77be73045b13914cdcd6a918', res
+  end
+
+  def test_bytes_with_input_only
+    res = Digest::Blake2b.bytes('abc')
+    assert_kind_of Array, res
+    assert_equal [189, 221, 129, 60, 99, 66, 57, 114, 49, 113, 239, 63, 238, 152, 87, 155, 148, 150, 78, 59, 177, 203, 62, 66, 114, 98, 200, 192, 104, 213, 35, 25], res
+  end
+
+  def test_bytes_with_input_and_key
+    res = Digest::Blake2b.bytes('abc', Digest::Blake2b::Key.none)
+    assert_kind_of Array, res
+    assert_equal [189, 221, 129, 60, 99, 66, 57, 114, 49, 113, 239, 63, 238, 152, 87, 155, 148, 150, 78, 59, 177, 203, 62, 66, 114, 98, 200, 192, 104, 213, 35, 25], res
+  end
+
+  def test_bytes_with_input_key_and_length
+    res = Digest::Blake2b.bytes('abc', Digest::Blake2b::Key.none, 32)
+    assert_kind_of Array, res
+    assert_equal [189, 221, 129, 60, 99, 66, 57, 114, 49, 113, 239, 63, 238, 152, 87, 155, 148, 150, 78, 59, 177, 203, 62, 66, 114, 98, 200, 192, 104, 213, 35, 25], res
+  end
+
+  def test_input_raises_on_non_string
+    assert_raises(ArgumentError) { Digest::Blake2b.hex(nil) }
+    assert_raises(ArgumentError) { Digest::Blake2b.bytes(nil) }
+  end
+
+  def test_key_raises_on_non_key
+    assert_raises(ArgumentError) { Digest::Blake2b.hex('abc', []) }
+    assert_raises(ArgumentError) { Digest::Blake2b.bytes('abc', []) }
+  end
+
+  def test_length_raises_on_invalid
+    assert_raises(ArgumentError) { Digest::Blake2b.hex('abc', Digest::Blake2b::Key.none, -1) }
+    assert_raises(ArgumentError) { Digest::Blake2b.hex('abc', Digest::Blake2b::Key.none, 0) }
+    assert_raises(ArgumentError) { Digest::Blake2b.hex('abc', Digest::Blake2b::Key.none, 65) }
+    assert_raises(ArgumentError) { Digest::Blake2b.hex('abc', Digest::Blake2b::Key.none, '32') }
+    assert_raises(ArgumentError) { Digest::Blake2b.bytes('abc', Digest::Blake2b::Key.none, -1) }
+    assert_raises(ArgumentError) { Digest::Blake2b.bytes('abc', Digest::Blake2b::Key.none, 0) }
+    assert_raises(ArgumentError) { Digest::Blake2b.bytes('abc', Digest::Blake2b::Key.none, 65) }
+    assert_raises(ArgumentError) { Digest::Blake2b.bytes('abc', Digest::Blake2b::Key.none, '32') }
+  end
+end

data/test/blake2b_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class Blake2bTest < Minitest::Test
+  def setup
+    out_len = 64
+    key     = Digest::Blake2b::Key.from_string('foo bar baz')
+
+    @digestor = Digest::Blake2b.new(out_len, key)
+
+    @input    = 'The quick brown fox jumps over the lazy dog'
+    @expected = '2c2d3abee08b19d67e4de4e953bbe0dba2f9e878f61e087191d00cf459a173281d93b0e28ea5303fe488312178dd7603d45b8d09311affe4aaa9a467cae3c9ef'
+  end
+
+  def test_to_hex
+    res = @digestor.digest(@input, :to_hex)
+    assert_kind_of String, res
+    assert_equal @expected, res
+  end
+
+  def test_to_bytes
+    res = @digestor.digest(@input, :to_bytes)
+    assert_kind_of Array, res
+    assert_equal [@expected].pack('H*').bytes, res
+  end
+end