sha3 1.0.1 → 1.0.4

data/ext/sha3/extconf.rb

@@ -3,19 +3,18 @@ require 'rbconfig'
 
 target_cpu = RbConfig::CONFIG['target_cpu']
 
-if 1.size == 4 and target_cpu =~ /i386|x86_32/   # x86 32bit optimized code
-  Logging::message "=== Using reference  ===\n"
-  FileUtils.cp Dir["#{$srcdir}/Reference/*"].collect { |f| File.expand_path(f) }, "#{$srcdir}/"
-elsif 1.size == 8 and target_cpu =~ /i686|x86_64/
-  Logging::message "=== Using optimized (64-bit) ===\n"
+if 1.size == 8 and target_cpu =~ /i686|x86_64/
+  Logging.message "=== Using optimized (64-bit) ===\n"
   FileUtils.cp Dir["#{$srcdir}/Optimized64/*"].collect { |f| File.expand_path(f) }, "#{$srcdir}/"
 else
-  Logging::message "=== Using reference ===\n"
+  Logging.message "=== Using reference ===\n"
   FileUtils.cp Dir["#{$srcdir}/Reference/*"].collect { |f| File.expand_path(f) }, "#{$srcdir}/"
 end
 
-find_header("sha3.h")
-find_header("digest.h")
+find_header('sha3.h')
+find_header('digest.h')
+
+$CFLAGS += ' -fomit-frame-pointer -O3 -g0 -fms-extensions '
+$CFLAGS += ' -march=native ' if enable_config('march-tune-native', false)
 
-$CFLAGS = ' -fomit-frame-pointer -O3 -g0 -march=nocona '
 create_makefile 'sha3_n'

data/ext/sha3/sha3.c

@@ -7,40 +7,56 @@ VALUE eSHA3Error;
 
 int get_hlen(VALUE obj)
 {
-  int hlen;
-
-  if (TYPE(obj) == T_SYMBOL) {
-    ID symid;
-
-    symid = SYM2ID(obj);
-
-    if (rb_intern("sha224") == symid)
-      hlen = 224;
-    else if (rb_intern("sha256") == symid)
-      hlen = 256;
-    else if (rb_intern("sha384") == symid)
-      hlen = 384;
-    else if (rb_intern("sha512") == symid)
-      hlen = 512;
+    int hlen;
+
+    if (TYPE(obj) == T_SYMBOL)
+    {
+        ID symid;
+
+        symid = SYM2ID(obj);
+
+        if (rb_intern("sha224") == symid)
+        {
+            hlen = 224;
+        }
+        else if (rb_intern("sha256") == symid)
+        {
+            hlen = 256;
+        }
+        else if (rb_intern("sha384") == symid)
+        {
+            hlen = 384;
+        }
+        else if (rb_intern("sha512") == symid)
+        {
+            hlen = 512;
+        }
+        else
+        {
+            rb_raise(eSHA3Error, "invalid hash bit symbol (should be: :sha224, :sha256, :sha384, or :sha512");
+        }
+    }
+    else if (TYPE(obj) == T_FIXNUM)
+    {
+        hlen = NUM2INT(obj);
+
+        if ((hlen != 224) && (hlen != 256) && (hlen != 384) && (hlen != 512))
+        {
+            rb_raise(rb_eArgError, "invalid hash bit length (should be: 224, 256, 384, or 512)");
+        }
+    }
     else
-      rb_raise(eSHA3Error, "invalid hash bit symbol (should be: :sha224, :sha256, :sha384, or :sha512");
-  }
-  else if (TYPE(obj) == T_FIXNUM) {
-    hlen = NUM2INT(obj);
-
-    if ((hlen != 224) && (hlen != 256) && (hlen != 384) && (hlen != 512))
-      rb_raise(rb_eArgError, "invalid hash bit length (should be: 224, 256, 384, or 512)");
-  }
-  else
-    rb_raise(eSHA3Error, "unknown type value");
-
-  return hlen;
+    {
+        rb_raise(eSHA3Error, "unknown type value");
+    }
+
+    return hlen;
 }
 
 void Init_sha3_n()
 {
-  mSHA3 = rb_define_module("SHA3");
-  eSHA3Error = rb_define_class_under(mSHA3, "SHA3Error", rb_eStandardError);
+    mSHA3 = rb_define_module("SHA3");
+    eSHA3Error = rb_define_class_under(mSHA3, "SHA3Error", rb_eStandardError);
 
-  Init_sha3_n_digest();
+    Init_sha3_n_digest();
 }

data/ext/sha3/sha3.h

@@ -8,17 +8,18 @@
 #include "KeccakHash.h"
 #include "digest.h"
 
-#ifdef  __cplusplus
-extern "C" {
+#ifdef __cplusplus
+extern "C"
+{
 #endif
 
-extern VALUE mSHA3;
-extern VALUE eSHA3Error;
+    extern VALUE mSHA3;
+    extern VALUE eSHA3Error;
 
-int get_hlen(VALUE);
-void Init_sha3_n(void);
+    int get_hlen(VALUE);
+    void Init_sha3_n(void);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 

data/lib/sha3/doc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest'
 
 module SHA3
@@ -99,8 +101,7 @@ module SHA3
     # @example
     #   SHA3::Digest.hexdigest(256, 'compute me, please')
     #   SHA3::Digest::SHA256.hexdigest('compute me, please') # => Alternate syntax
-    def self.hexdigest(type, data)
-    end
+    def self.hexdigest(type, data); end
 
     # Returns computed hash value for given hash type, and data in bytes.
     #
@@ -112,8 +113,7 @@ module SHA3
     # @example
     #   SHA3::Digest.digest(256, 'compute me, please')
     #   SHA3::Digest::SHA256.digest('compute me, please') # => Alternate syntax
-    def self.digest(type, data)
-    end
+    def self.digest(type, data); end
   end
 
   class DigestError < StandardError

data/lib/sha3/version.rb

@@ -1,10 +1,9 @@
-module SHA3
-  extend self
+# frozen_string_literal: true
 
+module SHA3
   # sha3 release version
-  VERSION = "1.0.1"
+  VERSION = '1.0.4'
 
   # keccak version number
-  KECCAK_VERSION = "4.0"
+  KECCAK_VERSION = '4.0'
 end
-

data/lib/sha3.rb

@@ -1,35 +1,37 @@
+# frozen_string_literal: true
+
 require 'sha3_n'
 require 'sha3/version'
 
 module SHA3
   class Digest
-
     # Based on 'OpenSSL for Ruby 2' project
     # Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
-    alg = { :sha224 => "SHA224", :sha256 => "SHA256", :sha384 => "SHA384", :sha512 => "SHA512"}
+    alg = { sha224: 'SHA224', sha256: 'SHA256', sha384: 'SHA384', sha512: 'SHA512' }
 
     def self.digest(name, data)
       super(data, name)
     end
 
-    alg.each { |key, name|
-      klass = Class.new(Digest) {
-        define_method(:initialize) { |*data|
+    alg.each do |key, name|
+      klass = Class.new(Digest) do
+        define_method(:initialize) do |*data|
           if data.length > 1
             raise ArgumentError,
-              "wrong number of arguments (#{data.length} for 1)"
+                  "wrong number of arguments (#{data.length} for 1)"
           end
 
           super(key, data.first)
-        }
-      }
+        end
+      end
+
       singleton = (class << klass; self; end)
-      singleton.class_eval{
-        define_method(:digest){ |data| Digest.digest(key, data) }
-        define_method(:hexdigest){ |data| Digest.hexdigest(key, data) }
-      }
+      singleton.class_eval do
+        define_method(:digest) { |data| Digest.digest(key, data) }
+        define_method(:hexdigest) { |data| Digest.hexdigest(key, data) }
+      end
 
       const_set(name, klass)
-    }
+    end
   end
 end

data/sha3.gemspec

@@ -1,25 +1,53 @@
-# -*- encoding: utf-8 -*-
-
-require File.expand_path('../lib/sha3/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.name          = "sha3"
-  gem.version       = SHA3::VERSION
-  gem.summary       = %q{SHA3 for Ruby}
-  gem.description   = %q{SHA3 for Ruby is a native (C) FIPS 202 compliant implementation of SHA3 (Keccak) cryptographic hashing algorithm.}
-  gem.license       = "MIT"
-  gem.authors       = ["Johanns Gregorian"]
-  gem.email         = "io+sha3@jsg.io"
-  gem.homepage      = "https://github.com/johanns/sha3#readme"
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ['lib']
-  gem.extensions    = ['ext/sha3/extconf.rb']
-
-  gem.add_development_dependency "rake-compiler"
-  gem.add_development_dependency 'rspec', '~> 3.3'
-  gem.add_development_dependency 'rubygems-tasks'
-  gem.add_development_dependency 'yard'
+# frozen_string_literal: true
+
+require_relative 'lib/sha3/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'sha3'
+  spec.version = SHA3::VERSION
+
+  spec.authors = ['Johanns Gregorian']
+  spec.email = ['io+sha3@jsg.io']
+
+  spec.description = 'SHA3 for Ruby is a native (C) FIPS 202 compliant implementation of SHA3 (Keccak) cryptographic hashing algorithm.'
+  spec.summary = 'SHA3 (FIPS 202) cryptographic hashing algorithm'
+
+  spec.homepage = 'https://github.com/johanns/sha3'
+  spec.license = 'MIT'
+  spec.required_ruby_version = '>= 2.6.0'
+
+  spec.metadata['changelog_uri'] = "#{spec.homepage}/CHANGELOG.md"
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.extensions = ['ext/sha3/extconf.rb']
+  spec.require_paths = ['lib']
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  spec.add_development_dependency('bundler', '~> 2.3')
+  spec.add_development_dependency('rake', '~> 13.0')
+  spec.add_development_dependency('rake-compiler', '~> 1.1')
+  spec.add_development_dependency('rspec', '~> 3.11')
+  spec.add_development_dependency('rubocop', '~> 1.25')
+  spec.add_development_dependency('rubocop-rake', '~> 0.6')
+  spec.add_development_dependency('rubocop-rspec', '~> 2.9')
+
+  spec.cert_chain = ['certs/johanns.pem']
+  spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME =~ /gem\z/
 end

data/tests.sh

@@ -5,22 +5,22 @@ rm -fv spec/sha3_digest*.rb
 
 if [ -d "spec/data" ]
 then
-  rm -rfv spec/data/*
+    rm -rfv spec/data/*
 else
-  mkdir "spec/data"
+    mkdir "spec/data"
 fi
 
 pushd "spec/data"
 
 if [ -f "*.txt" ]
 then
-  rm -v *.txt
+    rm -v *.txt
 fi
 
-wget "https://raw.githubusercontent.com/gvanas/KeccakCodePackage/master/TestVectors/ShortMsgKAT_SHA3-224.txt"
-wget "https://raw.githubusercontent.com/gvanas/KeccakCodePackage/master/TestVectors/ShortMsgKAT_SHA3-256.txt"
-wget "https://raw.githubusercontent.com/gvanas/KeccakCodePackage/master/TestVectors/ShortMsgKAT_SHA3-384.txt"
-wget "https://raw.githubusercontent.com/gvanas/KeccakCodePackage/master/TestVectors/ShortMsgKAT_SHA3-512.txt"
+wget "https://raw.githubusercontent.com/XKCP/XKCP/master/tests/TestVectors/ShortMsgKAT_SHA3-224.txt"
+wget "https://raw.githubusercontent.com/XKCP/XKCP/master/tests/TestVectors/ShortMsgKAT_SHA3-256.txt"
+wget "https://raw.githubusercontent.com/XKCP/XKCP/master/tests/TestVectors/ShortMsgKAT_SHA3-384.txt"
+wget "https://raw.githubusercontent.com/XKCP/XKCP/master/tests/TestVectors/ShortMsgKAT_SHA3-512.txt"
 
 cd ".."
 

metadata

@@ -1,90 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: sha3
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Johanns Gregorian
-autorequire: 
-bindir: bin
-cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+autorequire:
+bindir: exe
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEFDCCAnygAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDDA9pby9E
+  Qz1qc2cvREM9aW8wHhcNMjIwMzA5MDcyODEwWhcNMjMwMzA5MDcyODEwWjAaMRgw
+  FgYDVQQDDA9pby9EQz1qc2cvREM9aW8wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAw
+  ggGKAoIBgQCuPwkDs4uoBV6pQhKp3uA58LkDPRR7VoI4QryuH7PbIwuO3xbuyR6T
+  xEqwcb9GgVnMxiFyXeVkWiriuGXqZ26Pp5zH/xxQNgPGCIyXuXeJMpASkWjJ9J6h
+  +jOdaG5jdL6zRcw/5XaJSQTLGO32BNOIezUZCF9JtMoEBQYHRWFjoD5BryjYnU3f
+  SstXg9nD8KOyk5Vzqk/wvJs5X+b2jcZL0KmSP1UgaCakfTCKf8LA9I5zAbvv2M9n
+  F0JQfKw4AUlmykzmOMEsITVxtM8lIVxm99KAS+lFn19xEjOs7nr3GktyLJxav8qI
+  3yXW/q5wUbOFrj/e1tk6r/W3bM6TQzGFBsBJgXEoFFZ+OQdEW8PXU0H5CIg59SxB
+  lXwSC1rKlxSeGNcKDXeIN1AU3pqv/PJj2SKg2+uQ9Staya0Mtek/caPDVfIy8AgH
+  ulTeTVN7m5SdVjVBl3rIehH/j0R/JF7ygsMkJEQAxrwPxqmazXkPAGLNNIqppaxi
+  VyHhxSnGefUCAwEAAaNlMGMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFBZFuuJYra4ctzMvtfzlTq3pW4idMBQGA1UdEQQNMAuBCWlvQGpzZy5pbzAU
+  BgNVHRIEDTALgQlpb0Bqc2cuaW8wDQYJKoZIhvcNAQELBQADggGBAF2jXh+4LzPg
+  Mj8gTCVTxj4/OhQ303cS5gasgh+R9Zxcf1cfTXOxEeIXdrqJiMhILWVWgCYZxagL
+  B5pU6MOyIOi4XAm5RMO3mIyTrY05Q/JbQ5j2ccuIOlL+XvhjAYKZmt9BkJLKfLEp
+  hagXHZe40Hd3qwkgJ3ug3T28gkBWaTq8FSbTOfCVX9uNjQrukAP/VrfnKZiNnpJ7
+  FOtEKDk3l9JWCyX8LQwfljPmQhvFHYnMRyt0l2b0I5li6MWUE4JmrbtK8/Fyo0I0
+  PChRryVpy0HnKvqoKQyqeMspLbbKCsO1PRS5VFZ/ybrPy63paFPdikeKMZIH3oJQ
+  wePRJFEp3gdQZcSjfkzC38QFh9JuKFJFMC4Y3e5uVeeydEGGUekH1s/B5/EuBCRi
+  vaoldWA6C6e/X/XQsMNdC04+d7IdgNRf8NkN/atZdJLcFVcaXGS9MncPZnwBC2GD
+  GBMFs3s6mx0HRpclYTMXK71jLsfqtM2SriIbx1VqiuUMUtddNrGcOw==
+  -----END CERTIFICATE-----
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
-  name: rubygems-tasks
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 description: SHA3 for Ruby is a native (C) FIPS 202 compliant implementation of SHA3
   (Keccak) cryptographic hashing algorithm.
-email: io+sha3@jsg.io
+email:
+- io+sha3@jsg.io
 executables: []
 extensions:
 - ext/sha3/extconf.rb
 extra_rdoc_files: []
 files:
 - ".document"
-- ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - ".yardopts"
 - ChangeLog.rdoc
 - Gemfile
-- Gemfile.ci
 - LICENSE.txt
 - README.md
 - Rakefile
+- certs/johanns.pem
 - ext/sha3/KeccakF-1600-interface.h
 - ext/sha3/KeccakHash.c
 - ext/sha3/KeccakHash.h
@@ -113,15 +180,16 @@ files:
 - lib/sha3/doc.rb
 - lib/sha3/version.rb
 - sha3.gemspec
-- spec/generate_tests.rb
-- spec/sha3_core_spec.rb
-- spec/spec_helper.rb
 - tests.sh
-homepage: https://github.com/johanns/sha3#readme
+homepage: https://github.com/johanns/sha3
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/johanns/sha3/CHANGELOG.md
+  homepage_uri: https://github.com/johanns/sha3
+  source_code_uri: https://github.com/johanns/sha3
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,20 +197,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
-summary: SHA3 for Ruby
-test_files:
-- spec/generate_tests.rb
-- spec/sha3_core_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+summary: SHA3 (FIPS 202) cryptographic hashing algorithm
+test_files: []

data/.gitignore

@@ -1,24 +0,0 @@
-*.gem
-*.rbc
-*.rbx
-*.bundle
-*.so
-*.dll
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-Gemfile.lock
-
-.idea/

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - rbx-2
-
-gemfile: Gemfile.ci
-
-branches:
-  only:
-    - master
-
-os:
-  - linux
-  - osx
-
-matrix:
-  allow_failures:
-    - os: osx

data/Gemfile.ci

@@ -1,14 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
-gem 'rubygems-tasks'
-gem 'rake'
-gem 'rspec', '~> 3.3'
-gem 'yard'
-
-platforms :rbx do
-  gem 'racc'
-  gem 'rubysl', '~> 2.0'
-  gem 'psych'
-end