digest-sip_hash 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97550c1117af3f364f69b7cf6fe0811b98abe710c1de440d75d43e2d8da30fc9
-  data.tar.gz: 50f608c0b241a416890727a44be29dda80ba78e213c7b74cee9e114dfed62822
+  metadata.gz: 5a7f861280074e2479ea4dd879b0689e7d68c3e1b79cd8b21d2d8a681fe3403e
+  data.tar.gz: 88f8f40d5938dff8c6c7cc07337753e91136b891e04bfeb493b83c52baf8a055
 SHA512:
-  metadata.gz: 3e1ce5568375369e28fe69708ae0780d29e74c7859d3df3e8ae248e484a8f6c13d2d851c932a3084831deaf3f8ca7b05f75184bd616a2716151cd08ea9fbd30e
-  data.tar.gz: 47537c8a82aae0818eb6eeea9e879bc6d33e6f340e70efa11d2cb14f6a267bbe1a54bb7b8b651afacd23be918ec6d97133e422706c82dfbd9c0b519bec7e1694
+  metadata.gz: 5f6664550a1a456f862e5e4712946dcb199481ea3bdfb639ce6bb3c907dd61a221a7d3aa40fd81363a9d7367a7aa0880d99fa868565813a6b327cb398a1f0431
+  data.tar.gz: 86623e37d7da7e52d2e3d87df72b68700275801ac21d7824b127d33da91d74898f1481f0feb0da264c502cb161bd3b1797fd6093067b12ba96151af2b0e89a9f

data/bin/siphash

@@ -6,8 +6,9 @@ require 'digest/sip_hash'
 require 'optionparser'
 
 hex_key = Digest::SipHash::DEFAULT_KEY.unpack1 'H*'
-Settings = Struct.new :c, :d, :key, keyword_init: true
-settings = Settings.new c: 1, d: 3, key: hex_key
+Config = Struct.new :c, :d, :key, keyword_init: true
+config = Config.new c: 1, d: 3, key: hex_key
+
 options = ARGV.options do |x|
   x.banner = "Usage: #{x.program_name} [OPTIONS] FILE"
   x.version = Digest::SipHash::VERSION
@@ -15,13 +16,23 @@ options = ARGV.options do |x|
   UnsignedInteger = /\A\d+\z/
   x.accept UnsignedInteger, UnsignedInteger, &:to_i
 
-  x.on '-c=ROUNDS', UnsignedInteger, "Number of c rounds. Default: #{settings.c}"
-  x.on '-d=ROUNDS', UnsignedInteger, "Number of d rounds. Default: #{settings.d}"
-  x.on '-k', '--key=KEY', String, "Sixteen-byte hex key. Default: \"#{hex_key}\""
+  HexOctets = /\A\h{32}\z/
+  x.accept HexOctets, HexOctets do |octets|
+    [octets].pack('H*').b
+  end
+
+  x.on '-c=ROUNDS', UnsignedInteger, "Number of c rounds. Default: #{config.c}"
+  x.on '-d=ROUNDS', UnsignedInteger, "Number of d rounds. Default: #{config.d}"
+  x.on '-k', '--key=KEY', HexOctets, "Sixteen-byte hex key. Default: \"#{hex_key}\""
 end.freeze
-options.permute! into: settings
+
+begin
+  options.permute! into: config
+rescue OptionParser::ParseError => e
+  abort e.message
+end
 
 path = ARGV.fetch 0, '-'
-hash = Digest::SipHash.new(settings.c, settings.d, key: [settings.key].pack('H*')).hexdigest ARGF.read
+hash = Digest::SipHash.new(config.c, config.d, key: config.key).hexdigest ARGF.read
 
 puts "#{hash}  #{path}"

data/lib/digest/sip_hash.rb

@@ -56,9 +56,9 @@ module Digest
       end
 
       def transform
-        return compress_word 0 if @size.zero?
-        (@size / 8).times { |n| compress_word word n }
-        compress_word last_word
+        return compress_block 0 if @size.zero?
+        (@size / 8).times { |n| compress_block block n }
+        compress_block last_block
       end
 
       def finalize
@@ -69,53 +69,44 @@ module Digest
 
       private
 
-      def compress_word m
-        @v3 ^= m
+      def compress_block n
+        @v3 ^= n
         @c_rounds.times { compress }
-        @v0 ^= m
+        @v0 ^= n
       end
 
-      def word n
+      def block n
         @buffer.slice(n * 8, 8).unpack1 'Q<'
       end
 
-      def last_word
+      def last_block
         remainder = @size % 8
         offset = @size - remainder
 
-        last = @size << 56 & MASK
-
-        7.downto 0 do |n|
-          next if n >= remainder
-          last |= @buffer[n + offset].ord << 8 * n
+        remainder.times.reverse_each.reduce @size << 56 & MASK do |last, n|
+          last | @buffer[n + offset].ord << 8 * n
         end
-
-        last
       end
 
       def compress
-        @v0 += @v1
-        @v0 &= MASK
-        @v1 = rotate @v1, by: 13
-        @v1 ^= @v0
-        @v0 = rotate @v0, by: 32
-        @v2 += @v3
-        @v2 &= MASK
-        @v3 = rotate @v3, by: 16
-        @v3 ^= @v2
-        @v0 += @v3
-        @v0 &= MASK
-        @v3 = rotate @v3, by: 21
-        @v3 ^= @v0
-        @v2 += @v1
-        @v2 &= MASK
-        @v1 = rotate @v1, by: 17
-        @v1 ^= @v2
-        @v2 = rotate @v2, by: 32
+        @v0 = add @v0, @v1
+        @v1 = rotate @v1, 13, @v0
+        @v0 = rotate @v0, 32
+        @v2 = add @v2, @v3
+        @v3 = rotate @v3, 16, @v2
+        @v0 = add @v0, @v3
+        @v3 = rotate @v3, 21, @v0
+        @v2 = add @v2, @v1
+        @v1 = rotate @v1, 17, @v2
+        @v2 = rotate @v2, 32
+      end
+
+      def add a, b
+        a + b & MASK
       end
 
-      def rotate n, by:
-        n << by & MASK | n >> 64 - by
+      def rotate n, by, xor = 0
+        n << by & MASK | n >> 64 - by ^ xor
       end
     end
   end

data/lib/digest/sip_hash/version.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'digest'
+
 module Digest
   class SipHash < Digest::Class
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/spec/helper.rb

@@ -5,4 +5,9 @@ $LOAD_PATH.prepend lib unless $LOAD_PATH.include? lib
 
 require 'digest/sip_hash'
 require 'minitest/autorun'
+require 'minitest/hell'
 require 'minitest/pride'
+
+class Minitest::Test
+  prove_it!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digest-sip_hash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Shannon Skipper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,7 +38,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-description: An implementation of SipHash 1-3 and 2-4 in pure Ruby.
+- !ruby/object:Gem::Dependency
+  name: minitest-proveit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+description: An implementation of SipHash 1-3, 2-4, etc. in pure Ruby.
 email:
 - shannonskipper@gmail.com
 executables: