noise-ruby 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e5b9a60ad373cac4331e555d8372ea83ddfa64c0
-  data.tar.gz: 23eba0e2151a9c9515654cc6f864120e8db6bf51
+SHA256:
+  metadata.gz: b575cce1d3b48ad4ef2df8bdf9e2306e42c7e17528c9dd3d7a7e115f4384e94f
+  data.tar.gz: a297a4c972d1341afb2ba4b21c155ddf69a319b362763983fc5b96a9931fa3da
 SHA512:
-  metadata.gz: 3f618a4552c53fc5134d5acb82737e0b4764707f5e78544b2433993fed3a13c842b7cdbe7d1f3031e17a6f49d73265f67912f1b1170cf546563850d29036e206
-  data.tar.gz: e186f84ae901a3aa3a4cac973785ba3fa7c4779009b457e0a2ea69d8b59753e53e4ee9c62c973bdddc5adf4116b91a01c69399b96a58af5061e9ac831cdaa833
+  metadata.gz: f8a814b5fd365f3f56d91b14c2c69121bbe1f3d8fc869b4c9040b5e3d989305cfc755ddb9c6233a3fc2bbb081b99269bd3f08e45f07b1d56ed7fc1b1b6a06c84
+  data.tar.gz: b9b25f4cb0c217327527c266a81e004ce96055fd06339767287396d119306264327bd7c5448b59a1d96b7c16624815cb27ab86882699cba994a33e21bbe01b3e

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.0

data/Gemfile

@@ -6,5 +6,3 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in noise.gemspec
 gemspec
-
-gem 'aead', git: 'https://github.com/FredericHeihoff/aead.git', branch: :master

data/README.md

@@ -29,6 +29,11 @@ This library requires [libsecp256k1](https://github.com/bitcoin-core/secp256k1).
     $ make
     $ sudo make install
 
+In addition, libsodium is required.
+
+    $ brew install libsodium
+
+
 Add this line to your application's Gemfile:
 
 ```

data/lib/noise/functions/cipher/aes_gcm.rb

@@ -1,25 +1,28 @@
 # frozen_string_literal: true
 
-require 'aead'
-
 module Noise
   module Functions
     module Cipher
       class AesGcm
         def encrypt(k, n, ad, plaintext)
-          mode = AEAD::Cipher.new('AES-256-GCM')
-          cipher = mode.new(k)
-          cipher.encrypt(nonce_to_bytes(n), ad, plaintext)
+          cipher = OpenSSL::Cipher::AES.new(256, :GCM).encrypt
+          cipher.key = k
+          cipher.iv = nonce_to_bytes(n)
+          cipher.auth_data = ad
+          cipher.update(plaintext) + cipher.final + cipher.auth_tag
         end
 
         def decrypt(k, n, ad, ciphertext)
-          mode = AEAD::Cipher.new('AES-256-GCM')
-          cipher = mode.new(k)
-          cipher.decrypt(nonce_to_bytes(n), ad, ciphertext)
+          cipher = OpenSSL::Cipher::AES.new(256, :GCM).decrypt
+          cipher.key = k
+          cipher.iv = nonce_to_bytes(n)
+          cipher.auth_data = ad
+          cipher.auth_tag = ciphertext[-16..-1]
+          cipher.update(ciphertext[0...-16]) + cipher.final
         end
 
         def nonce_to_bytes(n)
-          "\00" * 4 + format('%16x', n).htb
+          "\x00" * 4 + format('%16x', n).htb
         end
       end
     end

data/lib/noise/functions/cipher/cha_cha_poly.rb

@@ -15,7 +15,7 @@ module Noise
         end
 
         def nonce_to_bytes(n)
-          "\00" * 4 + format('%16x', n).htb.reverse
+          "\x00" * 4 + format('%16x', n).htb.reverse
         end
       end
     end

data/lib/noise/state/handshake_state.rb

@@ -72,18 +72,12 @@ module Noise
             @symmetric_state.mix_key(dh_fn.dh(@e[0], @re[1]))
             next
           when 'es'
-            if @initiator
-              @symmetric_state.mix_key(dh_fn.dh(@e[0], @rs[1]))
-            else
-              @symmetric_state.mix_key(dh_fn.dh(@s[0], @re[1]))
-            end
+            private_key, public_key = @initiator ? [@e[0], @rs[1]] : [@s[0], @re[1]]
+            @symmetric_state.mix_key(dh_fn.dh(private_key, public_key))
             next
           when 'se'
-            if @initiator
-              @symmetric_state.mix_key(dh_fn.dh(@s[0], @re[1]))
-            else
-              @symmetric_state.mix_key(dh_fn.dh(@e[0], @rs[1]))
-            end
+            private_key, public_key = @initiator ? [@s[0], @re[1]] : [@e[0], @rs[1]]
+            @symmetric_state.mix_key(dh_fn.dh(private_key, public_key))
             next
           when 'ss'
             @symmetric_state.mix_key(dh_fn.dh(@s[0], @rs[1]))
@@ -119,18 +113,12 @@ module Noise
             @symmetric_state.mix_key(dh_fn.dh(@e[0], @re[1]))
             next
           when 'es'
-            if @initiator
-              @symmetric_state.mix_key(dh_fn.dh(@e[0], @rs[1]))
-            else
-              @symmetric_state.mix_key(dh_fn.dh(@s[0], @re[1]))
-            end
+            private_key, public_key = @initiator ? [@e[0], @rs[1]] : [@s[0], @re[1]]
+            @symmetric_state.mix_key(dh_fn.dh(private_key, public_key))
             next
           when 'se'
-            if @initiator
-              @symmetric_state.mix_key(dh_fn.dh(@s[0], @re[1]))
-            else
-              @symmetric_state.mix_key(dh_fn.dh(@e[0], @rs[1]))
-            end
+            private_key, public_key = @initiator ? [@s[0], @re[1]] : [@e[0], @rs[1]]
+            @symmetric_state.mix_key(dh_fn.dh(private_key, public_key))
             next
           when 'ss'
             @symmetric_state.mix_key(dh_fn.dh(@s[0], @rs[1]))

data/lib/noise/version.rb

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

data/noise.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 
-  spec.add_runtime_dependency 'aead'
   spec.add_runtime_dependency 'secp256k1-ruby'
   spec.add_runtime_dependency 'ecdsa'
   spec.add_runtime_dependency 'rbnacl'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noise-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: aead
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: secp256k1-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A Ruby implementation of the Noise Protocol framework