noise-ruby 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 224564f27800225c1ed1317359e630a06fe343b64db95db7456aece250b56026
-  data.tar.gz: aef9533145ef39d8b9ca9ff7d31d2dd0b2e20808090b818601c3246e5c228eab
+  metadata.gz: 9731ebe9c0021aacc2dd916c8c37d42a4354a0aea6ef90c1f2983dc6cc200c48
+  data.tar.gz: 057bf0bf52963ba3f988f75ea0ed69d6c93df359ec0bd9017476960f492fef1c
 SHA512:
-  metadata.gz: 7b18a8fbe1d077dab40e880dd6cea6920f788307365186eebe798a72bc5d337fb95caca237cbfaf5f12447bbec15b5499332ea86e0003d6d8bff9229e0d0e5f7
-  data.tar.gz: 6a06a1687846b22e88a1634615b7cfdf633619e59773c1929c108c6ff69d742f53112f1cba24952689f473d2577fa25a614cebefe85e7021ea53237097c0775c
+  metadata.gz: 908ad0b81ab191a5f90b86a772b2af393ce82ef9df7fcda0deedfae345f449f5f997fa686e554139b1795fd29c74126eb12ef8c03543d362f9d2d1913a47b7b1
+  data.tar.gz: c11189bf83c51b1b4d80c054f5e0db0c2a43cad1304929816bc155b0cc38ef35e88e9b42f629b7c48de0b754ba87106d16d06b5c0b01776e9f1350a0b81e2273

data/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at h_yamaguchi@haw.co.jp. All
+reported by contacting the project team at gen.yamaguchi0@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

data/Gemfile

@@ -6,3 +6,6 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in noise.gemspec
 gemspec
+
+# Use secp256k1 as hash function
+# gem 'secp256k1-ruby'

data/README.md

@@ -15,20 +15,9 @@ The followings are not supported yet.
 
 - DH Functions
   - Curve448
-- Hash Functions
-  - Blake2s
 
 ## Installation
 
-This library requires [libsecp256k1](https://github.com/bitcoin-core/secp256k1).
-
-    $ git clone https://github.com/bitcoin-core/secp256k1
-    $ cd secp256k1
-    $ ./autogen.sh
-    $ ./configure --enable-experimental --enable-module-ecdh --enable-module-recovery --enable-benchmark=false
-    $ make
-    $ sudo make install
-
 Add this line to your application's Gemfile:
 
 ```
@@ -43,6 +32,21 @@ Or install it yourself as:
 
     $ gem install noise-ruby
 
+If you use Secp256k1, you must install [libsecp256k1](https://github.com/bitcoin-core/secp256k1).
+
+    $ git clone https://github.com/bitcoin-core/secp256k1
+    $ cd secp256k1
+    $ ./autogen.sh
+    $ ./configure --enable-module-recovery --enable-experimental --enable-module-ecdh
+    $ make
+    $ sudo make install
+
+and, add this line to your Gemfile:
+
+```
+gem 'secp256k1-ruby'
+```
+
 ## Usage
 
 TODO: Write usage instructions here

data/lib/noise.rb

@@ -5,7 +5,6 @@ require 'noise/version'
 require 'ecdsa'
 require 'rbnacl'
 require 'ruby_hmac'
-require 'secp256k1'
 require 'securerandom'
 
 require 'noise/utils/hash'

data/lib/noise/functions/dh/secp256k1.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'secp256k1'
+
 module Noise
   module Functions
     module DH

data/lib/noise/functions/hash.rb

@@ -9,11 +9,12 @@ module Noise
       autoload :Sha512, 'noise/functions/hash/sha512'
 
       def self.hmac_hash(key, data, digest)
-        # TODO: support for blake2b, blake2s
         if digest.include?('SHA')
           OpenSSL::HMAC.digest(OpenSSL::Digest.new(digest), key, data)
         elsif digest.include?('BLAKE2b')
           Noise::Functions::Hash::Blake2bHMAC.new(key).update(data).digest
+        elsif digest.include?('BLAKE2s')
+          Noise::Functions::Hash::Blake2sHMAC.new(key).update(data).digest
         end
       end
 

data/lib/noise/functions/hash/blake2s.rb

@@ -7,7 +7,7 @@ module Noise
         HASHLEN = 32
         BLOCKLEN = 64
         def hash(data)
-          throw NotImplementedError
+          Noise::Functions::Hash::Blake2sDigester.new.update(data).digest
         end
 
         def hashlen
@@ -18,6 +18,177 @@ module Noise
           BLOCKLEN
         end
       end
+
+      class Blake2sHMAC < HMAC::Base
+        def initialize(key = '')
+          super(Blake2sDigester, Blake2s::BLOCKLEN, Blake2s::HASHLEN, key)
+        end
+        public_class_method :new, :digest, :hexdigest
+      end
+
+      class Blake2sDigester
+        IV = [0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19]
+        SIGMA = [
+          [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ],
+          [ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 ],
+          [ 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 ],
+          [ 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 ],
+          [ 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 ],
+          [ 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 ],
+          [ 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 ],
+          [ 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 ],
+          [ 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 ],
+          [ 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 ]
+        ]
+
+        def initialize(key: '')
+          @key = key
+          @ctx = init(Blake2s::HASHLEN, @key.unpack("C*"))
+        end
+
+        def update(data)
+          update_internal(@ctx, data.unpack("C*"))
+          self
+        end
+
+        def digest
+          out = []
+          final(@ctx, out)
+          out.pack("C*")
+        end
+
+        # @return context
+        def init(out_len, key)
+          raise ArgumentError if out_len == 0 || out_len > 32
+          h = IV.dup
+          h[0] ^= 0x01010000 ^ (key.size << 8) ^ out_len
+          t = [0, 0]
+          c = 0
+          b = Array.new(Blake2s::BLOCKLEN).fill(0, key.size)
+          ctx = Context.new(b, h, t, c, out_len)
+          if key.size > 0
+            update_internal(ctx, key)
+            ctx.c = 64
+          end
+          ctx
+        end
+
+        def update_internal(ctx, input)
+          input.size.times do |i|
+            if ctx.c == Blake2s::BLOCKLEN
+              ctx.t[0] += ctx.c
+              # if ctx.t[0] < ctx.c
+              if ctx.t[0] > 0xFFFFFFFF
+                ctx.t[0] = ctx.t[0] - 0xFFFFFFFF
+                ctx.t[1] += 1
+              end
+              compress(ctx, false)
+              ctx.c = 0
+            end
+
+            ctx.b[ctx.c] = input[i]
+            ctx.c += 1
+          end
+        end
+
+        def final(ctx, out)
+          ctx.t[0] += ctx.c
+          if ctx.t[0] > 0xFFFFFFFF
+            ctx.t[0] = ctx.t[0] - 0xFFFFFFFF
+            ctx.t[1] += 1
+          end
+
+          while ctx.c < Blake2s::BLOCKLEN
+            ctx.b[ctx.c] = 0
+            ctx.c += 1
+          end
+          compress(ctx, true)
+          ctx.out_len.times do |i|
+            out << ((ctx.h[i >> 2] >> (8 * (i & 3))) & 0xff)
+          end
+        end
+
+        private
+
+        def to_int32(x)
+          x = x & 0xFFFFFFFF
+          x < 0x80000000 ? x : x - 2**32
+        end
+
+        def rshift(x, y, range=32)
+          (x + (x > 0 ? 0 : 2 ** range)) >> y
+        end
+
+        def rotr32(x, y)
+          to_int32(x << (32 - y) ^ rshift(x & 0xFFFFFFFF, y))
+        end
+
+        def get32(p0, p1, p2, p3)
+          (p0 & 0xFF) | ((p1 & 0xFF) << 8) | ((p2 & 0xFF) << 16) | ((p3 & 0xFF) << 24)
+        end
+
+        def mix_g(v, a, b, c, d, x, y)
+          v[a] = v[a] + v[b] + x
+          v[d] = v[d] ^ v[a]
+          v[d] = rotr32(v[d], 16)
+          v[c] = v[c] + v[d]
+          v[b] = v[b] ^ v[c]
+          v[b] = rotr32(v[b], 12)
+
+          v[a] = v[a] + v[b] + y
+          v[d] = v[d] ^ v[a]
+          v[d] = rotr32(v[d], 8)
+          v[c] = v[c] + v[d]
+          v[b] = v[b] ^ v[c]
+          v[b] = rotr32(v[b], 7)
+        end
+
+        def compress(ctx, last)
+          v = Array.new(16)
+          m = Array.new(16)
+          8.times do |i|
+            v[i] = ctx.h[i]
+            v[i + 8] = IV[i]
+          end
+
+          v[12] ^= ctx.t[0]
+          v[13] ^= ctx.t[1]
+
+          if last
+            v[14] = ~v[14] & 0xFFFFFFFF
+          end
+
+          16.times do |i|
+            m[i] = get32(ctx.b[4 * i], ctx.b[4 * i + 1], ctx.b[4 * i + 2], ctx.b[4 * i + 3])
+          end
+
+          10.times do |i|
+            mix_g(v, 0, 4,  8, 12, m[SIGMA[i][ 0]], m[SIGMA[i][ 1]])
+            mix_g(v, 1, 5,  9, 13, m[SIGMA[i][ 2]], m[SIGMA[i][ 3]])
+            mix_g(v, 2, 6, 10, 14, m[SIGMA[i][ 4]], m[SIGMA[i][ 5]])
+            mix_g(v, 3, 7, 11, 15, m[SIGMA[i][ 6]], m[SIGMA[i][ 7]])
+            mix_g(v, 0, 5, 10, 15, m[SIGMA[i][ 8]], m[SIGMA[i][ 9]])
+            mix_g(v, 1, 6, 11, 12, m[SIGMA[i][10]], m[SIGMA[i][11]])
+            mix_g(v, 2, 7,  8, 13, m[SIGMA[i][12]], m[SIGMA[i][13]])
+            mix_g(v, 3, 4,  9, 14, m[SIGMA[i][14]], m[SIGMA[i][15]])
+          end
+
+          8.times do |i|
+            ctx.h[i] ^= v[i] ^ v[i + 8]
+          end
+        end
+
+        class Context
+          attr_accessor :b, :h, :t, :c, :out_len
+          def initialize(b, h, t, c, out_len)
+            @b = b
+            @h = h
+            @t = t
+            @c = c
+            @out_len = out_len
+          end
+        end
+      end
     end
   end
 end

data/lib/noise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Noise
-  VERSION = '0.6.3'
+  VERSION = '0.7.0'
 end

data/noise.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'secp256k1-ruby'
 
-  spec.add_runtime_dependency 'secp256k1-ruby'
   spec.add_runtime_dependency 'ecdsa'
   spec.add_runtime_dependency 'rbnacl'
   spec.add_runtime_dependency 'ruby-hmac'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noise-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,7 +59,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: