noise-ruby 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9731ebe9c0021aacc2dd916c8c37d42a4354a0aea6ef90c1f2983dc6cc200c48
-  data.tar.gz: 057bf0bf52963ba3f988f75ea0ed69d6c93df359ec0bd9017476960f492fef1c
+  metadata.gz: 52f9bedd93319f9cf54acb51c1a83c64fcfd25cfdaef69204f709b59c83060c4
+  data.tar.gz: c72fb7afa8aab1c577b305f1d57316ab34ad183b6bbf249d420b3b17d4bb81e6
 SHA512:
-  metadata.gz: 908ad0b81ab191a5f90b86a772b2af393ce82ef9df7fcda0deedfae345f449f5f997fa686e554139b1795fd29c74126eb12ef8c03543d362f9d2d1913a47b7b1
-  data.tar.gz: c11189bf83c51b1b4d80c054f5e0db0c2a43cad1304929816bc155b0cc38ef35e88e9b42f629b7c48de0b754ba87106d16d06b5c0b01776e9f1350a0b81e2273
+  metadata.gz: be31e461a923db0af2f6ae19b42fa74ac3b70fcac8e332a281a46377ac0fa0164ce799567ba19e862fbbc40b367b06672bd095ea850bcd4bfaec2291b1b4ab16
+  data.tar.gz: e3495a893d23263a534d7f490fdcd84a5f33c81b4e5d8437d1a268abc8111940916ecf6f832f2b13bf610d5ec9f1059129c16a9f2a0728a823b96a147482e7ac

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

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-require 'secp256k1'
+begin
+  require 'secp256k1'
+rescue LoadError
+end
+
 
 module Noise
   module Functions

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

@@ -62,7 +62,7 @@ module Noise
           raise ArgumentError if out_len == 0 || out_len > 32
           h = IV.dup
           h[0] ^= 0x01010000 ^ (key.size << 8) ^ out_len
-          t = [0, 0]
+          t = 0
           c = 0
           b = Array.new(Blake2s::BLOCKLEN).fill(0, key.size)
           ctx = Context.new(b, h, t, c, out_len)
@@ -76,12 +76,7 @@ module Noise
         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
+              ctx.t += ctx.c
               compress(ctx, false)
               ctx.c = 0
             end
@@ -92,12 +87,7 @@ module Noise
         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
-
+          ctx.t += ctx.c
           while ctx.c < Blake2s::BLOCKLEN
             ctx.b[ctx.c] = 0
             ctx.c += 1
@@ -151,12 +141,10 @@ module Noise
             v[i + 8] = IV[i]
           end
 
-          v[12] ^= ctx.t[0]
-          v[13] ^= ctx.t[1]
+          v[12] ^= ctx.t & 0xFFFFFFFF
+          v[13] ^= (ctx.t / 0x100000000) & 0xFFFFFFFF
 
-          if last
-            v[14] = ~v[14] & 0xFFFFFFFF
-          end
+          v[14] = (last ? ~v[14] : v[14]) & 0xFFFFFFFF
 
           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])

data/lib/noise/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noise-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Hajime Yamaguchi