noise-ruby 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fcf6ecf59b631aacb32b66661719e57a205ccea71a487748d3bb2979fc2ee4b
-  data.tar.gz: 22bee13bda1fe1a9339777261eccd6d173e32679e969e78b065abe457d06884e
+  metadata.gz: ecfac7577c0e2c49956249076aa5351f4c002fc135341f4bb21b9279cf54ba56
+  data.tar.gz: d65b64e5ce9df56c2ad0599a75fabb4070b9739ff7313961ec0e6b3ab11b68cd
 SHA512:
-  metadata.gz: 2cbd93529da1345b646b9be626591bf81eb1fe53d211d70a75fe6fe1f56d99c7b55bdedc7102aed3d20c27080fcf4f04b0619b7bacd8f664f8301397f3f4e069
-  data.tar.gz: '0845488f8a48edb3f09fba247a8f7950aefd0c5a6cade1ae114e3b3e683e4f66dbc3d34267b2ee298f066d170ddd84343da3d843a5a89587ce592cac906da849'
+  metadata.gz: be99c89230f89d0f286a4dc1da6aadb10ce06ba64206325381cca8032ae71abec0406d1a957fafe0946791f72f346ef23cce019c74868605280e5fa357287e18
+  data.tar.gz: b11a5a496096daf4f4abe9dbfb6f2bba693ec4b5be2c680be6b42b450d7be89a7f119535f20e46bba7429c1f5024ebd62896922c7a944c24a76d951e2df8df4c

data/lib/noise/connection/base.rb

@@ -3,9 +3,10 @@
 module Noise
   module Connection
     class Base
-      attr_reader :protocol, :handshake_started, :handshake_finished, :handshake_hash
+      attr_reader :protocol, :handshake_started, :handshake_finished, :handshake_hash, :handshake_state
       attr_reader :cipher_state_encrypt, :cipher_state_decrypt, :cipher_state_handshake
       attr_accessor :psks, :prologue
+      attr_reader :s, :rs
 
       def initialize(name, keypairs: { s: nil, e: nil, rs: nil, re: nil })
         @protocol = Protocol.create(name)
@@ -103,6 +104,8 @@ module Noise
 
       def handshake_done(_c1, _c2)
         @handshake_hash = @symmetric_state.handshake_hash
+        @s = @handshake_state.s
+        @rs = @handshake_state.rs
         @handshake_state = nil
         @symmetric_state = nil
         @cipher_state_handshake = nil

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

@@ -4,6 +4,8 @@ module Noise
   module Functions
     module Cipher
       class AesGcm
+        MAX_NONCE = 2**64 - 1
+
         def encrypt(k, n, ad, plaintext)
           cipher = OpenSSL::Cipher::AES.new(256, :GCM).encrypt
           cipher.key = k
@@ -24,6 +26,16 @@ module Noise
         def nonce_to_bytes(n)
           "\x00" * 4 + format('%16x', n).htb
         end
+
+        # Returns a new 32-byte cipher key as a pseudorandom function of k.
+        # If this function is not specifically defined for some set of cipher
+        # functions, then it defaults to returning the first 32 bytes from
+        # ENCRYPT(k,maxnonce, zerolen, zeros), where  maxnonce equals 264-1,
+        # zerolen is a zero-length byte sequence, and zeros is a sequence of
+        # 32 bytes filled with zeros.
+        def rekey(k)
+          encrypt(k, MAX_NONCE, '', "\x00" * 32)[0...32]
+        end
       end
     end
   end

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

@@ -4,16 +4,18 @@ module Noise
   module Functions
     module Cipher
       class ChaChaPoly
+        MAX_NONCE = 2**64 - 1
+
         def encrypt(k, n, ad, plaintext)
-          @cipher = RbNaCl::AEAD::ChaCha20Poly1305IETF.new(String.new(k).force_encoding('ASCII-8BIT'))
-          @cipher.encrypt(nonce_to_bytes(n), plaintext, ad)
+          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
         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)
+          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
         end
@@ -21,6 +23,16 @@ module Noise
         def nonce_to_bytes(n)
           "\x00" * 4 + format('%16x', n).htb.reverse
         end
+
+        # Returns a new 32-byte cipher key as a pseudorandom function of k.
+        # If this function is not specifically defined for some set of cipher
+        # functions, then it defaults to returning the first 32 bytes from
+        # ENCRYPT(k,maxnonce, zerolen, zeros), where  maxnonce equals 2**64-1,
+        # zerolen is a zero-length byte sequence, and zeros is a sequence of
+        # 32 bytes filled with zeros.
+        def rekey(k)
+          encrypt(k, MAX_NONCE, '', "\x00" * 32)[0..32]
+        end
       end
     end
   end

data/lib/noise/state/handshake_state.rb

@@ -18,6 +18,7 @@ module Noise
     #     Each message pattern is a sequence of tokens from the set ("e", "s", "ee", "es", "se", "ss").
     class HandshakeState
       attr_reader :message_patterns, :symmetric_state
+      attr_reader :s, :rs
 
       def initialize(connection, protocol, initiator, prologue, keypairs)
         @connection = connection

data/lib/noise/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noise-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler