noise-ruby 0.8.4 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9016d0344507e501e7a92acab0142a15b1d472303e6dfd92ff5bd0a89e135d34
-  data.tar.gz: 68cc424b0c8e91006df86737fca0d0f7d5ea723a02ac8335a65ad0e7e746ffd9
+  metadata.gz: eb6e8b4da6da1ab86d95f9712cc5af2fde45c8fb2c6b53f8f76cd4e585c8b509
+  data.tar.gz: 7bbec8a8af754911c1b9ce7026ee21ac98b6af601a40c503e4d4fd03a4679e5a
 SHA512:
-  metadata.gz: 2c6c80f4b7c4bbafe3ff40788639c8b03bac62bcc75646ce13de59960abafd1fbc0beb68903eb8ca0120853afc46c972cac1428572b52bbb8c9b5019a75af2e9
-  data.tar.gz: 92b6ad660ee6e22acb87dbcd85925fed0bee616e87b8175d1408dfa26bcb0c8fc146a876fa21237bb74b14cc51759a0ed6da320a758d00f1f51991cc899b7bfa
+  metadata.gz: 38130604059543fb695227160b59655cc617a29a70abb4d6cac67636fee53b9c7ae78264b6123928842ce1a67ad10a634b7b438d4ec54cf23e48a4e3398aab37
+  data.tar.gz: 0124a47916e35d8267b39336327fc3f496a25068090f6886f92c4a4edf7e4479bb968cd2d78401003821703143bf936aadabd38580146819ab945df981cd0ce1

data/.rubocop.yml

@@ -21,3 +21,6 @@ Style/WordArray:
 
 AllCops:
   TargetRubyVersion: 2.4.1
+
+Naming/UncommunicativeMethodParamName:
+    MinNameLength: 1

data/README.md

@@ -9,15 +9,11 @@ This is required for Lightning Network, layer-2 protocol for bitcoin.
 
 see https://github.com/lightningnetwork/lightning-rfc/blob/master/08-transport.md
 
-## Future Works
-
-The followings are not supported yet.
-
-- DH Functions
-  - Curve448
-
 ## Installation
 
+This gem needs libsodium and libgoldilocks library.
+To install these library, see https://github.com/jedisct1/libsodium and https://github.com/otrv4/libgoldilocks
+
 Add this line to your application's Gemfile:
 
 ```

data/lib/noise/connection/base.rb

@@ -55,6 +55,7 @@ module Noise
         raise Noise::Exceptions::NoiseHandshakeError unless @handshake_started
         raise Noise::Exceptions::NoiseHandshakeError if @next_message != :write
         raise Noise::Exceptions::NoiseHandshakeError if @handshake_finished
+
         @next_message = :read
         buffer = +''
         result = @handshake_state.write_message(payload, buffer)
@@ -77,11 +78,13 @@ module Noise
 
       def encrypt(data)
         raise Noise::Exceptions::NoiseHandshakeError unless @handshake_finished
+
         @cipher_state_encrypt.encrypt_with_ad('', data)
       end
 
       def decrypt(data)
         raise Noise::Exceptions::NoiseHandshakeError unless @handshake_finished
+
         @cipher_state_decrypt.decrypt_with_ad('', data)
       end
 
@@ -100,6 +103,7 @@ module Noise
         validate_psk! if psk_handshake?
 
         raise Noise::Exceptions::NoiseValidationError if valid_keypairs?
+
         true
       end
 

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

@@ -12,6 +12,8 @@ module Noise
           cipher.iv = nonce_to_bytes(n)
           cipher.auth_data = ad
           cipher.update(plaintext) + cipher.final + cipher.auth_tag
+        rescue OpenSSL::Cipher::CipherError => e
+          raise Noise::Exceptions::EncryptError.new(e)
         end
 
         def decrypt(k, n, ad, ciphertext)
@@ -21,6 +23,8 @@ module Noise
           cipher.auth_data = ad
           cipher.auth_tag = ciphertext[-16..-1]
           cipher.update(ciphertext[0...-16]) + cipher.final
+        rescue OpenSSL::Cipher::CipherError => e
+          raise Noise::Exceptions::DecryptError.new(e)
         end
 
         def nonce_to_bytes(n)

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

@@ -10,14 +10,14 @@ module Noise
           cipher = RbNaCl::AEAD::ChaCha20Poly1305IETF.new(String.new(k).force_encoding('ASCII-8BIT'))
           cipher.encrypt(nonce_to_bytes(n), plaintext, ad)
         rescue ::RbNaCl::CryptoError => e
-          raise Noise::Exceptions::EncryptError, e
+          raise Noise::Exceptions::EncryptError.new(e)
         end
 
         def decrypt(k, n, ad, ciphertext)
           cipher = RbNaCl::AEAD::ChaCha20Poly1305IETF.new(String.new(k).force_encoding('ASCII-8BIT'))
           cipher.decrypt(nonce_to_bytes(n), ciphertext, ad)
         rescue ::RbNaCl::CryptoError => e
-          raise Noise::Exceptions::DecryptError, e
+          raise Noise::Exceptions::DecryptError.new(e)
         end
 
         def nonce_to_bytes(n)

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

@@ -1,21 +1,35 @@
 # frozen_string_literal: true
 
+begin
+  require 'ed448'
+  Ed448.init
+rescue LoadError
+end
+
 module Noise
   module Functions
     module DH
       class ED448
-        DHLEN = 56
+        DHLEN = Ed448::X448::X448_PRIVATE_BYTES
+
         def generate_keypair
-          throw NotImplementedError
+          private_key = SecureRandom.random_bytes(DHLEN)
+          public_key = Ed448::X448.derive_public_key(private_key)
+          Noise::Key.new(private_key, public_key)
         end
 
-        def dh(_key_pair, _public_key)
-          throw NotImplementedError
+        def dh(private_key, public_key)
+          Ed448::X448.dh(public_key, private_key)
         end
 
         def dhlen
           DHLEN
         end
+
+        def self.from_private(private_key)
+          public_key = Ed448::X448.derive_public_key(private_key)
+          Noise::Key.new(private_key, public_key)
+        end
       end
     end
   end

data/lib/noise/state/handshake_state.rb

@@ -46,8 +46,8 @@ module Noise
         # Sets message_patterns to the message patterns from handshake_pattern
         @message_patterns = @protocol.pattern.tokens.dup
 
-        @protocol.pattern.initiator_pre_messages&.map do |message|
-          keypair = initiator_keypair_getter.call(message)
+        @protocol.pattern.initiator_pre_messages&.map do |token|
+          keypair = initiator_keypair_getter.call(token)
           @symmetric_state.mix_hash(keypair)
         end
 
@@ -57,8 +57,8 @@ module Noise
           @symmetric_state.mix_hash(public_key)
         end
 
-        @protocol.pattern.responder_pre_messages&.map do |message|
-          keypair = responder_keypair_getter.call(message)
+        @protocol.pattern.responder_pre_messages&.map do |token|
+          keypair = responder_keypair_getter.call(token)
           @symmetric_state.mix_hash(keypair)
         end
       end
@@ -66,18 +66,18 @@ module Noise
       def expected_message_length(payload_size)
         has_key = @symmetric_state.cipher_state.key?
         pattern = @message_patterns.first
-        len = pattern.inject(0) do |len, token|
+        len = pattern.inject(0) do |l, token|
           case token
           when 'e'
-            len += @protocol.dh_fn.dhlen
+            l += @protocol.dh_fn.dhlen
             has_key = true if @protocol.psk_handshake?
           when 's'
-            len += @protocol.dh_fn.dhlen
-            len += 16 if has_key
+            l += @protocol.dh_fn.dhlen
+            l += 16 if has_key
           when 'ee', 'es', 'se', 'ss', 'psk'
             has_key = true
           end
-          len
+          l
         end
         len += payload_size
         len += 16 if has_key

data/lib/noise/version.rb

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

data/noise.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ecdsa'
   spec.add_runtime_dependency 'rbnacl'
   spec.add_runtime_dependency 'ruby-hmac'
+  spec.add_runtime_dependency 'ed448'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noise-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.4
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ed448
+  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'
 description: A Ruby implementation of the Noise Protocol framework(http://noiseprotocol.org/).
 email:
 - gen.yamaguchi0@gmail.com