tttls1.3 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990b3de64c01b392c33e66910d6419cce1ff276a9f957f3479c7aacac6909b00
-  data.tar.gz: 82702fe41052a5fbd80722f267d0ffe089f56b696d064a0f4b9a4baf59b64b97
+  metadata.gz: 1951707edb6c1281f07975d9632817a783a0e9f69e9e40da6b1fe45487955c2a
+  data.tar.gz: 1c4aa360d27a89a9f81dfa6ae3f744115da70189c641618f8d6b9dd0e4519da9
 SHA512:
-  metadata.gz: 3d61ad9524126642b8ef1505369f2b08543a4f4ddf1a8a8d1ae15a364e29cf648b68b57840053118bc98104fe28d217519770c034bb3caed1d7401c85611f392
-  data.tar.gz: cd465dcfc8d671e10f1819ce7a49dc5b19b6310cf8855d2a09eec563947685bf2f8b860617399010a4b4c4cd34726410ed4a4b3c7a3c9332888e177feb0f0b9f
+  metadata.gz: b6ee2640200f2384732e9c24c2cdd02aad995b6da04f94a3dcc70cae19ef501f9b90e26cddad399822e9514e2aae1cecf4252d513741234e428f9b94fe8f1de3
+  data.tar.gz: e5de7b6c20bad449cec2a0fb041db8e4d03a12d6932fcef9ee3b579f9b0e35da80e19604b5b328d292a2cb6393de1f3fe515e4289233b09f6cbff916f6d43735

data/lib/tttls1.3/client.rb

@@ -133,6 +133,8 @@ module TTTLS13
       loop do
         case @state
         when ClientState::START
+          logger.debug('ClientState::START')
+
           send_client_hello
           if use_early_data?
             @early_data_write_cipher \
@@ -144,6 +146,8 @@ module TTTLS13
 
           @state = ClientState::WAIT_SH
         when ClientState::WAIT_SH
+          logger.debug('ClientState::WAIT_SH')
+
           sh = recv_server_hello
           terminate(:illegal_parameter) unless valid_sh_legacy_version?
           terminate(:illegal_parameter) unless valid_sh_legacy_session_id_echo?
@@ -201,6 +205,8 @@ module TTTLS13
                                     @key_schedule.server_handshake_write_iv)
           @state = ClientState::WAIT_EE
         when ClientState::WAIT_EE
+          logger.debug('ClientState::WAIT_EE')
+
           ee = recv_encrypted_extensions
           terminate(:illegal_parameter) if ee.any_forbidden_extensions?
           terminate(:unsupported_extension) \
@@ -215,6 +221,8 @@ module TTTLS13
           @state = ClientState::WAIT_CERT_CR
           @state = ClientState::WAIT_FINISHED unless @psk.nil?
         when ClientState::WAIT_CERT_CR
+          logger.debug('ClientState::WAIT_EE')
+
           message = recv_message
           if message.msg_type == Message::HandshakeType::CERTIFICATE
             @transcript[CT] = ct = message
@@ -235,6 +243,8 @@ module TTTLS13
             terminate(:unexpected_message)
           end
         when ClientState::WAIT_CERT
+          logger.debug('ClientState::WAIT_EE')
+
           ct = recv_certificate
           terminate(:unsupported_extension) \
             unless ct.certificate_list.map(&:extensions)
@@ -246,10 +256,14 @@ module TTTLS13
 
           @state = ClientState::WAIT_CV
         when ClientState::WAIT_CV
+          logger.debug('ClientState::WAIT_EE')
+
           recv_certificate_verify
           terminate(:decrypt_error) unless verify_certificate_verify
           @state = ClientState::WAIT_FINISHED
         when ClientState::WAIT_FINISHED
+          logger.debug('ClientState::WAIT_EE')
+
           recv_finished
           terminate(:decrypt_error) unless verify_finished
           send_ccs # compatibility mode
@@ -264,6 +278,8 @@ module TTTLS13
                                     @key_schedule.server_application_write_iv)
           @state = ClientState::CONNECTED
         when ClientState::CONNECTED
+          logger.debug('ClientState::WAIT_EE')
+
           break
         end
       end

data/lib/tttls1.3/connection.rb

@@ -144,7 +144,7 @@ module TTTLS13
 
     # @param record [TTTLS13::Message::Record]
     def send_record(record)
-      logger.debug(record.inspect)
+      logger.debug('send ' + record.inspect)
       @socket.write(record.serialize(@send_record_size))
     end
 
@@ -205,7 +205,7 @@ module TTTLS13
         terminate(:unexpected_message)
       end
 
-      logger.debug(record.inspect)
+      logger.debug('receive ' + record.inspect)
       record
     end
 

data/lib/tttls1.3/cryptograph/aead.rb

@@ -112,9 +112,9 @@ module TTTLS13
       #
       # @return [Integer]
       def scan_zeros(clear)
-        i = 0
+        i = 1
         i += 1 while clear[-i] == "\x00"
-        i
+        i - 1
       end
     end
   end

data/lib/tttls1.3/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TTTLS13
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tttls1.3
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - thekuwayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler