noise-ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0c3d02c47e652a285fbe31fcc7b5ff4c3d7cc05
-  data.tar.gz: '0930939cdcee4d1215b35eb89351f12f1faf6538'
+  metadata.gz: c16d9319142dc02bcf5e1524c141aaa99a923942
+  data.tar.gz: b926ad7e994d5387fe48fab254b8f5c0ccb124fe
 SHA512:
-  metadata.gz: e3a80f068ff0e387d2bca7cb0df4ecd19edb2728a6ee6d4c5b54a5487f1a7f0cc470d2e8d0ec173257d3efb25c1f121659b3cf61029dfba072faa39e4e5f6d5b
-  data.tar.gz: 1359c45f4a39ea567809dff276c6e91da4711b4d45a89909a6f7682e627986ab37f2ab14cba7d89c96fe71752e7db2c045ab9a6e3315d01b749a0304037d95e7
+  metadata.gz: d1cafc8d1343cba342d73451a6817001faf4e3298fbc239e6e4efb8d1454087f0826602a73c3c503c9d498eafcfe0aca79fd91bfe3eb2ba401bec13d1b12e9fd
+  data.tar.gz: 40dfacc90d63bb5807dc8ce7b13d01beac299f2a62ef405f98971bf5381e6ff6bf9a2c637eedab26a9d451c95c1715c19991c8ed5014aee0ce28cc426944c3f0

data/.rubocop.yml

@@ -10,6 +10,12 @@ Style/Documentation:
 Style/LambdaCall:
   Enabled: false
 
+Style/SymbolArray:
+  MinSize: 100
+
+Style/WordArray:
+  MinSize: 100
+
 AllCops:
   TargetRubyVersion: 2.4.1
 

data/Gemfile

@@ -4,3 +4,5 @@ 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

@@ -1,15 +1,23 @@
 # Noise
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/noise`. To experiment with that code, run `bin/console` for an interactive prompt.
+A Ruby implementation of the Noise Protocol framework(http://noiseprotocol.org/).
 
-TODO: Delete this and the text above, and describe your gem
+## Future Works
+
+The followings are not supported yet.
+
+- DH Functions
+  - Curve448
+- Hash Functions
+  - Blake2s
+- PSK Mode
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-```ruby
-gem 'noise'
+```
+gem 'noise-ruby'
 ```
 
 And then execute:
@@ -18,7 +26,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install noise
+    $ gem install noise-ruby
 
 ## Usage
 

data/lib/noise.rb

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

data/lib/noise/connection.rb

@@ -22,8 +22,8 @@ module Noise
       @handshake_started = false
       @handshake_finished = false
       @fn = nil
-      @write_message_proc = lambda {|payload| write_message(payload)}
-      @read_message_proc = lambda {|payload| read_message(payload)}
+      @write_message_proc = ->(payload) { write_message(payload) }
+      @read_message_proc = ->(payload) { read_message(payload) }
     end
 
     def prologue=(prologue)

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

@@ -1,19 +1,25 @@
 # frozen_string_literal: true
 
+require 'aead'
+
 module Noise
   module Functions
     module Cipher
       class AesGcm
         def encrypt(k, n, ad, plaintext)
-          throw NotImplementedError
+          mode = AEAD::Cipher.new('AES-256-GCM')
+          cipher = mode.new(k)
+          cipher.encrypt(nonce_to_bytes(n), ad, plaintext)
         end
 
         def decrypt(k, n, ad, ciphertext)
-          throw NotImplementedError
+          mode = AEAD::Cipher.new('AES-256-GCM')
+          cipher = mode.new(k)
+          cipher.decrypt(nonce_to_bytes(n), ad, ciphertext)
         end
 
         def nonce_to_bytes(n)
-          "\00" * 4 + sprintf('%16x', n).htb
+          "\00" * 4 + format('%16x', n).htb
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noise
   module Functions
     module DH

data/lib/noise/functions/hash.rb

@@ -10,13 +10,17 @@ module Noise
 
       def self.hmac_hash(key, data, digest)
         # TODO: support for blake2b, blake2s
-        OpenSSL::HMAC.digest(OpenSSL::Digest.new(digest), key, data)
+        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
+        end
       end
 
       def self.create_hkdf_fn(digest)
-        ->(chaining_key, input_key_material, num_output) {
+        lambda do |chaining_key, input_key_material, num_output|
           hkdf(chaining_key, input_key_material, num_output, digest)
-        }
+        end
       end
 
       def self.hkdf(chaining_key, input_key_material, num_outputs, digest)

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

@@ -18,6 +18,13 @@ module Noise
           BLOCKLEN
         end
       end
+
+      class Blake2bHMAC < HMAC::Base
+        def initialize(key = nil)
+          super(RbNaCl::Hash::Blake2b, 128, 64, key)
+        end
+        public_class_method :new, :digest, :hexdigest
+      end
     end
   end
 end

data/lib/noise/pattern.rb

@@ -30,14 +30,20 @@ module Noise
 
     # initiator [Boolean]
     def required_keypairs(initiator)
+      initiator ? required_keypairs_of_initiator : required_keypairs_of_responder
+    end
+
+    def required_keypairs_of_initiator
+      required = []
+      required << :s if %w[K X I].include?(@name[0])
+      required << :rs if @one_way || @name[1] == 'K'
+      required
+    end
+
+    def required_keypairs_of_responder
       required = []
-      if initiator
-        required << :s if ['K', 'X', 'I'].include?(@name[0])
-        required << :rs if @one_way || @name[1] == 'K'
-      else
-        required << :rs if @name[0] == 'K'
-        required << :s if @one_way || ['K', 'X'].include?(@name[1])
-      end
+      required << :rs if @name[0] == 'K'
+      required << :s if @one_way || %w[K X].include?(@name[1])
       required
     end
 
@@ -187,37 +193,3 @@ module Noise
     end
   end
 end
-    #
-    # def has_pre_messages(self):
-    #     return any(map(lambda x: len(x) > 0, self.pre_messages))
-    #
-    # def get_initiator_pre_messages(self) -> list:
-    #     return self.pre_messages[0].copy()
-    #
-    # def get_responder_pre_messages(self) -> list:
-    #     return self.pre_messages[1].copy()
-    #
-    # def apply_pattern_modifiers(self, modifiers: List[str]) -> None:
-    #     # Applies given pattern modifiers to self.tokens of the Pattern instance.
-    #     for modifier in modifiers:
-    #         if modifier.startswith('psk'):
-    #             try:
-    #                 index = int(modifier.replace('psk', '', 1))
-    #             except ValueError:
-    #                 raise ValueError('Improper psk modifier {}'.format(modifier))
-    #
-    #             if index // 2 > len(self.tokens):
-    #                 raise ValueError('Modifier {} cannot be applied - pattern has not enough messages'.format(modifier))
-    #
-    #             # Add TOKEN_PSK in the correct place in the correct message
-    #             if index == 0:  # if 0, insert at the beginning of first message
-    #                 self.tokens[0].insert(0, TOKEN_PSK)
-    #             else:  # if bigger than zero, append at the end of first, second etc.
-    #                 self.tokens[index - 1].append(TOKEN_PSK)
-    #             self.psk_count += 1
-    #
-    #         elif modifier == 'fallback':
-    #             raise NotImplementedError  # TODO implement
-    #
-    #         else:
-    #             raise ValueError('Unknown pattern modifier {}'.format(modifier))

data/lib/noise/state/handshake_state.rb

@@ -109,7 +109,6 @@ module Noise
             temp = message[0...len + offset]
             message = message[(len + offset)..-1]
             @rs = @protocol.dh_fn.class.from_public(@symmetric_state.decrypt_and_hash(temp))
-            # @protocol.keypair.load(@symmetric_state.decrypt_and_hash(temp))
             next
           when 'ee'
             @symmetric_state.mix_key(dh_fn.dh(@e[0], @re[1]))

data/lib/noise/state/symmetric_state.rb

@@ -67,13 +67,8 @@ module Noise
         c2 = CipherState.new(cipher: @protocol.cipher_fn)
         c1.initialize_key(temp_k1)
         c2.initialize_key(temp_k2)
-        if @protocol.initiator
-          @protocol.cipher_state_encrypt = c1
-          @protocol.cipher_state_decrypt = c2
-        else
-          @protocol.cipher_state_encrypt = c2
-          @protocol.cipher_state_decrypt = c1
-        end
+        @protocol.cipher_state_encrypt = @protocol.initiator ? c1 : c2
+        @protocol.cipher_state_decrypt = @protocol.initiator ? c2 : c1
         @protocol.handshake_done
         [c1, c2]
       end

data/lib/noise/utils/string.rb

@@ -2,9 +2,10 @@
 
 class String
   def htb
-    [self].pack("H*")
+    [self].pack('H*')
   end
+
   def bth
-    self.unpack("H*").first
+    unpack('H*').first
   end
 end

data/lib/noise/version.rb

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

data/noise.gemspec

@@ -23,7 +23,8 @@ 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 'ecdsa'
   spec.add_runtime_dependency 'rbnacl'
-  spec.add_runtime_dependency 'rb-pure25519'
+  spec.add_runtime_dependency 'ruby-hmac'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noise-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ 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: ecdsa
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-pure25519
+  name: ruby-hmac
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="