sha3 1.0.1 → 1.0.2

data/ext/sha3/extconf.rb

@@ -17,5 +17,5 @@ end
 find_header("sha3.h")
 find_header("digest.h")
 
-$CFLAGS = ' -fomit-frame-pointer -O3 -g0 -march=nocona '
+$CFLAGS = ' -fomit-frame-pointer -O3 -g0 -march=native '
 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/version.rb

@@ -2,9 +2,8 @@ module SHA3
   extend self
 
   # sha3 release version
-  VERSION = "1.0.1"
+  VERSION = '1.0.2'.freeze
 
   # keccak version number
-  KECCAK_VERSION = "4.0"
+  KECCAK_VERSION = '4.0'.freeze
 end
-

data/sha3.gemspec

@@ -1,25 +1,23 @@
-# -*- encoding: utf-8 -*-
-
-require File.expand_path('../lib/sha3/version', __FILE__)
+require File.expand_path('lib/sha3/version', __dir__)
 
 Gem::Specification.new do |gem|
-  gem.name          = "sha3"
+  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.summary       = 'SHA3 for Ruby'
+  gem.description   = '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.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 'rake-compiler', '~> 1.1'
   gem.add_development_dependency 'rspec', '~> 3.3'
-  gem.add_development_dependency 'rubygems-tasks'
-  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
+  gem.add_development_dependency 'yard', '~> 0.9'
 end

data/spec/generate_tests.rb

@@ -4,46 +4,47 @@ FILES = [
   ['data/ShortMsgKAT_SHA3-224.txt', 224],
   ['data/ShortMsgKAT_SHA3-256.txt', 256],
   ['data/ShortMsgKAT_SHA3-384.txt', 384],
-  ['data/ShortMsgKAT_SHA3-512.txt', 512],
-]
+  ['data/ShortMsgKAT_SHA3-512.txt', 512]
+].freeze
 
 def gen_digest_byte_tests
   FILES.each do |path, hashlen|
     name = File.basename(path).split('.')[0]
 
-    f = File.new("sha3_digest_#{name}_spec.rb", "w")
+    f = File.new("sha3_digest_#{name}_spec.rb", 'w')
     f.puts(
-%Q{require 'spec_helper'
+      %{require 'spec_helper'
 require 'sha3'
 
 describe "SHA3::Digest.new(#{hashlen})" do
   it "should match byte-length test vectors (#{name})." do
-})
+}
+    )
     contents = File.read(path).split('Len = ')
     contents.each do |test|
       lines = test.split("\n")
-      if !lines.empty? && lines[0] !~ /^#/
-        length = lines[0].to_i
-        if length % 8 == 0 && length != 0
-          msg_raw = [lines[1].split(' = ').last].pack("H*")
-          md = lines[2].split(' = ').last.downcase
-          f.puts(
-%Q{   expect(SHA3::Digest.new(#{hashlen}, #{msg_raw.inspect}).hexdigest).to eq("#{md}")
-})
-        end
-      end
+      next unless !lines.empty? && lines[0] !~ /^#/
+
+      length = lines[0].to_i
+      next unless (length % 8).zero? && length != 0
+
+      msg_raw = [lines[1].split(' = ').last].pack('H*')
+      md = lines[2].split(' = ').last.downcase
+      f.puts(
+        %{   expect(SHA3::Digest.new(#{hashlen}, #{msg_raw.inspect}).hexdigest).to eq("#{md}")
+                    }
+      )
     end
     f.puts(
-%Q{ end
+      %( end
 end
-})
+)
+    )
     f.close
   end
 end
 
-def setup
-
-end
+def setup; end
 
 gen_digest_byte_tests
 gen_compute_bit_tests

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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sha3
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Johanns Gregorian
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !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
@@ -42,30 +42,30 @@ dependencies:
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: SHA3 for Ruby is a native (C) FIPS 202 compliant implementation of SHA3
   (Keccak) cryptographic hashing algorithm.
 email: io+sha3@jsg.io
@@ -121,7 +121,7 @@ homepage: https://github.com/johanns/sha3#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,13 +136,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.4
+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: