digest-sip_hash 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a7f861280074e2479ea4dd879b0689e7d68c3e1b79cd8b21d2d8a681fe3403e
-  data.tar.gz: 88f8f40d5938dff8c6c7cc07337753e91136b891e04bfeb493b83c52baf8a055
+  metadata.gz: a821cc359081b3b9c8184db677719fce137d35f3a190839b99dbe2e05b3bc9a8
+  data.tar.gz: bc743f50abfe70fff01e3c7b9f438bfbb8e73e884928118a75dff76f72e1f314
 SHA512:
-  metadata.gz: 5f6664550a1a456f862e5e4712946dcb199481ea3bdfb639ce6bb3c907dd61a221a7d3aa40fd81363a9d7367a7aa0880d99fa868565813a6b327cb398a1f0431
-  data.tar.gz: 86623e37d7da7e52d2e3d87df72b68700275801ac21d7824b127d33da91d74898f1481f0feb0da264c502cb161bd3b1797fd6093067b12ba96151af2b0e89a9f
+  metadata.gz: 4e0c910c3e8e2b0131ccaef872e39e39767563655ef66b3ed48336125a1d17d7881b19aad12b98f5515327f175e44a7c256b1df1cd231cf3a5b42a0a6068bc80
+  data.tar.gz: 63743fce636a8dcd204f04d72edd1259f031d9b07e453d43783616c9341e7a0e16082598ddf5fff44d5bf0e92b0c53e162810a077a8b831d0ef69f8e3e9ac552

data/Gemfile

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
+source 'https://rubygems.org'
+
 gemspec

data/bin/siphash

@@ -23,7 +23,7 @@ options = ARGV.options do |x|
 
   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}\""
+  x.on '-k', '--key=KEY', HexOctets, "16-octet hex key. Default: \"#{hex_key}\""
 end.freeze
 
 begin

data/lib/digest/sip_hash.rb

@@ -28,7 +28,7 @@ module Digest
     end
 
     def finish
-      sip = Sip.new @buffer, @key, @c_rounds, @d_rounds
+      sip = Sip.new @buffer, @c_rounds, @d_rounds, @key
       sip.transform
       sip.finalize
     end
@@ -40,11 +40,10 @@ module Digest
       V2 = 'lygenera'.unpack1 'Q>'
       V3 = 'tedbytes'.unpack1 'Q>'
 
-      def initialize buffer, key, c_rounds, d_rounds
-        @buffer = buffer
-        @size = @buffer.size
-        @c_rounds = c_rounds
-        @d_rounds = d_rounds
+      def initialize message, compression_rounds, finalization_rounds, key
+        @message = message
+        @compression_rounds = compression_rounds
+        @finalization_rounds = finalization_rounds
 
         k0 = key[0..7].unpack1 'Q<'
         k1 = key[8..15].unpack1 'Q<'
@@ -56,14 +55,13 @@ module Digest
       end
 
       def transform
-        return compress_block 0 if @size.zero?
-        (@size / 8).times { |n| compress_block block n }
+        (@message.size / 8).times { |n| compress_block block n }
         compress_block last_block
       end
 
       def finalize
         @v2 ^= 2 ** 8 - 1
-        @d_rounds.times { compress }
+        @finalization_rounds.times { compress }
         [@v0 ^ @v1 ^ @v2 ^ @v3].pack 'Q>'
       end
 
@@ -71,33 +69,34 @@ module Digest
 
       def compress_block n
         @v3 ^= n
-        @c_rounds.times { compress }
+        @compression_rounds.times { compress }
         @v0 ^= n
       end
 
       def block n
-        @buffer.slice(n * 8, 8).unpack1 'Q<'
+        @message.slice(n * 8, 8).unpack1 'Q<'
       end
 
       def last_block
-        remainder = @size % 8
-        offset = @size - remainder
+        size = @message.size
+        remainder = size % 8
+        offset = size - remainder
 
-        remainder.times.reverse_each.reduce @size << 56 & MASK do |last, n|
-          last | @buffer[n + offset].ord << 8 * n
+        remainder.times.reduce size << 56 & MASK do |last, n|
+          last | @message[n + offset].ord << 8 * n
         end
       end
 
       def compress
         @v0 = add @v0, @v1
-        @v1 = rotate @v1, 13, @v0
+        @v1 = rotate @v1, 13, xor: @v0
         @v0 = rotate @v0, 32
         @v2 = add @v2, @v3
-        @v3 = rotate @v3, 16, @v2
+        @v3 = rotate @v3, 16, xor: @v2
         @v0 = add @v0, @v3
-        @v3 = rotate @v3, 21, @v0
+        @v3 = rotate @v3, 21, xor: @v0
         @v2 = add @v2, @v1
-        @v1 = rotate @v1, 17, @v2
+        @v1 = rotate @v1, 17, xor: @v2
         @v2 = rotate @v2, 32
       end
 
@@ -105,7 +104,7 @@ module Digest
         a + b & MASK
       end
 
-      def rotate n, by, xor = 0
+      def rotate n, by, xor: 0
         n << by & MASK | n >> 64 - by ^ xor
       end
     end

data/lib/digest/sip_hash/version.rb

@@ -4,6 +4,6 @@ require 'digest'
 
 module Digest
   class SipHash < Digest::Class
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/runner.rb

@@ -13,6 +13,10 @@ describe Digest::SipHash do
       assert_equal '8264ceeccb16bcbe', Digest::SipHash13.hexdigest('siphash')
       assert_equal 'ce31007e34130c0a', Digest::SipHash13.hexdigest('digest-sip_hash')
       assert_equal '1b47c0cc4dd21f05', Digest::SipHash13.hexdigest('x' * 1_000)
+      assert_equal '136ea6cf74ee7506', Digest::SipHash13.hexdigest('abc' * 10_000)
+      assert_equal '8421ff50252ef54c', Digest::SipHash13.hexdigest('bulldozer')
+      assert_equal '1ad2b299abf672fd', Digest::SipHash13.hexdigest('ishmael')
+      assert_equal '1403853b32c9a3d7', Digest::SipHash13.hexdigest('latour')
     end
 
     describe 'with a key' do
@@ -25,6 +29,10 @@ describe Digest::SipHash do
         assert_equal 'd5518fe19f28c745', Digest::SipHash13.hexdigest('siphash', key: key)
         assert_equal '71783f159400d4b5', Digest::SipHash13.hexdigest('digest-sip_hash', key: key)
         assert_equal '2a82bb3e74675b16', Digest::SipHash13.hexdigest('x' * 1_000, key: key)
+        assert_equal '13152caa40a6671a', Digest::SipHash13.hexdigest('abc' * 10_000, key: key)
+        assert_equal '503567849e7ff802', Digest::SipHash13.hexdigest('bulldozer', key: key)
+        assert_equal '39b0f77e620b9655', Digest::SipHash13.hexdigest('ishmael', key: key)
+        assert_equal '6aafa6fdaf07577a', Digest::SipHash13.hexdigest('latour', key: key)
       end
     end
   end
@@ -35,6 +43,10 @@ describe Digest::SipHash do
       assert_equal '59caaeb90d542464', Digest::SipHash24.hexdigest('siphash')
       assert_equal '4b5cd6bb2500bc8f', Digest::SipHash24.hexdigest('digest-sip_hash')
       assert_equal 'a07a230346e2656b', Digest::SipHash24.hexdigest('x' * 1_000)
+      assert_equal '2e05ad971738666e', Digest::SipHash24.hexdigest('abc' * 10_000)
+      assert_equal '35e35e884f56688f', Digest::SipHash24.hexdigest('bulldozer')
+      assert_equal '98585807dafda42b', Digest::SipHash24.hexdigest('ishmael')
+      assert_equal '3802759a0e659a96', Digest::SipHash24.hexdigest('latour')
     end
 
     describe 'with a key' do
@@ -45,8 +57,12 @@ describe Digest::SipHash do
       it 'is the correct hexdigest' do
         assert_equal '726fdb47dd0e0e31', Digest::SipHash24.hexdigest('', key: key)
         assert_equal '882768570dc71c92', Digest::SipHash24.hexdigest('siphash', key: key)
-        assert_equal '882768570dc71c92', Digest::SipHash24.hexdigest('siphash', key: key)
-        assert_equal '882768570dc71c92', Digest::SipHash24.hexdigest('siphash', key: key)
+        assert_equal '064ced3bea4abf32', Digest::SipHash24.hexdigest('digest-sip_hash', key: key)
+        assert_equal '3d1ce6276d329229', Digest::SipHash24.hexdigest('x' * 1_000, key: key)
+        assert_equal 'd0da1f6b4e838b97', Digest::SipHash24.hexdigest('abc' * 10_000, key: key)
+        assert_equal 'dae7cd2313f56d73', Digest::SipHash24.hexdigest('bulldozer', key: key)
+        assert_equal 'd1ce681ecf6810e4', Digest::SipHash24.hexdigest('ishmael', key: key)
+        assert_equal '383e7b1932947fd0', Digest::SipHash24.hexdigest('latour', key: key)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digest-sip_hash
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Shannon Skipper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake