tttls1.3 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 434477f28514352dc19f51a5164df0544e4f10c0902726fb6daea7dd6a3b418e
-  data.tar.gz: 2efb6ab4f448b4e96d733f33475e21df10d0286faa8fde16ead1e88d3a4d09b4
+  metadata.gz: c4d612bec845851394778f851e83cd26a402c28b28282eadf1630684781dbfad
+  data.tar.gz: 2b2ac159212b899dfd2f0281b756469033ab58ac57276a2c834166e9e1c1a659
 SHA512:
-  metadata.gz: 6459d7ac7994d985e6877e599908fd1d18fe35e70f476fc5091a8e59909c08c61ad9d4f9a3356c030fb53ce0a8c10d39d4963bb2f06255f95ae2068e952e88ad
-  data.tar.gz: 06efcf0f787fb07c88541df0874046c9b81a7e774d012e548f785fa9a8fcb0abe30bf3cf0da1b6e4f315bd4316b438a37d935bf6cc955104bc1c9bc74aeccf64
+  metadata.gz: 902358ead54f4e37bcb6921f8ac26cb0d365ff90c96f8b1d148286a08a057af719989ed0b24d34e99e646965ca7dbfbcdf2b07d9f28b84d3e00e62d904d8ff3f
+  data.tar.gz: 33781ec8908342d9aa0670c1ce82516bd7a0fafbed7f49f470765b0d053883cee66b913fc14c060c83abe82dca863653ec7632efcbbcbc4b84dce577eef21764

data/lib/tttls1.3/client.rb

@@ -294,7 +294,7 @@ module TTTLS13
           @state = ClientState::WAIT_CERT_CR
           @state = ClientState::WAIT_FINISHED unless psk.nil?
         when ClientState::WAIT_CERT_CR
-          logger.debug('ClientState::WAIT_EE')
+          logger.debug('ClientState::WAIT_CERT_CR')
 
           message = recv_message(receivable_ccs: true, cipher: hs_rcipher)
           if message.msg_type == Message::HandshakeType::CERTIFICATE
@@ -310,14 +310,14 @@ module TTTLS13
             terminate(:unexpected_message)
           end
         when ClientState::WAIT_CERT
-          logger.debug('ClientState::WAIT_EE')
+          logger.debug('ClientState::WAIT_CERT')
 
           ct = transcript[CT] = recv_certificate(hs_rcipher)
           terminate_invalid_certificate(ct, transcript[CH])
 
           @state = ClientState::WAIT_CV
         when ClientState::WAIT_CV
-          logger.debug('ClientState::WAIT_EE')
+          logger.debug('ClientState::WAIT_CV')
 
           cv = transcript[CV] = recv_certificate_verify(hs_rcipher)
           digest = CipherSuite.digest(@cipher_suite)
@@ -329,7 +329,7 @@ module TTTLS13
 
           @state = ClientState::WAIT_FINISHED
         when ClientState::WAIT_FINISHED
-          logger.debug('ClientState::WAIT_EE')
+          logger.debug('ClientState::WAIT_FINISHED')
 
           sf = transcript[SF] = recv_finished(hs_rcipher)
           digest = CipherSuite.digest(@cipher_suite)
@@ -361,6 +361,7 @@ module TTTLS13
             key_schedule.server_application_write_key,
             key_schedule.server_application_write_iv
           )
+          @exporter_master_secret = key_schedule.exporter_master_secret
           @resumption_master_secret = key_schedule.resumption_master_secret
           @state = ClientState::CONNECTED
         when ClientState::CONNECTED
@@ -456,10 +457,8 @@ module TTTLS13
     # @return [String]
     def gen_psk_from_nst(resumption_master_secret, ticket_nonce, digest)
       hash_len = OpenSSL::Digest.new(digest).digest_length
-      info = hash_len.to_uint16
-      info += 'tls13 resumption'.prefix_uint8_length
-      info += ticket_nonce.prefix_uint8_length
-      KeySchedule.hkdf_expand(resumption_master_secret, info, hash_len, digest)
+      KeySchedule.hkdf_expand_label(resumption_master_secret, 'resumption',
+                                    ticket_nonce, hash_len, digest)
     end
 
     # @return [TTTLS13::Message::Extensions]

data/lib/tttls1.3/connection.rb

@@ -24,6 +24,7 @@ module TTTLS13
       @state = 0 # ClientState or ServerState
       @send_record_size = Message::DEFAULT_RECORD_SIZE_LIMIT
       @alpn = nil # String
+      @exporter_master_secret = nil # String
     end
 
     # @raise [TTTLS13::Error::ConfigError]
@@ -101,8 +102,45 @@ module TTTLS13
       @alpn
     end
 
+    # @param label [String]
+    # @param context [String]
+    # @param key_length [Integer]
+    #
+    # @return [String, nil]
+    def exporter(label, context, key_length)
+      return nil if @exporter_master_secret.nil? || @cipher_suite.nil?
+
+      digest = CipherSuite.digest(@cipher_suite)
+      do_exporter(@exporter_master_secret, digest, label, context, key_length)
+    end
+
     private
 
+    # @param secret [String] (early_)exporter_master_secret
+    # @param digest [String] name of digest algorithm
+    # @param label [String]
+    # @param context [String]
+    # @param key_length [Integer]
+    #
+    # @return [String]
+    def do_exporter(secret, digest, label, context, key_length)
+      derived_secret = KeySchedule.hkdf_expand_label(
+        secret,
+        label,
+        OpenSSL::Digest.digest(digest, ''),
+        OpenSSL::Digest.new(digest).digest_length,
+        digest
+      )
+
+      KeySchedule.hkdf_expand_label(
+        derived_secret,
+        'exporter',
+        OpenSSL::Digest.digest(digest, context),
+        key_length,
+        digest
+      )
+    end
+
     # @param cipher_suite [TTTLS13::CipherSuite]
     # @param write_key [String]
     # @param write_iv [String]

data/lib/tttls1.3/key_schedule.rb

@@ -33,14 +33,14 @@ module TTTLS13
     def binder_key_ext
       hash = OpenSSL::Digest.digest(@digest, '')
       base_key = derive_secret(early_secret, 'ext binder', hash)
-      hkdf_expand_label(base_key, 'finished', '', @hash_len)
+      self.class.hkdf_expand_label(base_key, 'finished', '', @hash_len, @digest)
     end
 
     # @return [String]
     def binder_key_res
       hash = OpenSSL::Digest.digest(@digest, '')
       base_key = derive_secret(early_secret, 'res binder', hash)
-      hkdf_expand_label(base_key, 'finished', '', @hash_len)
+      self.class.hkdf_expand_label(base_key, 'finished', '', @hash_len, @digest)
     end
 
     # @return [String]
@@ -52,13 +52,13 @@ module TTTLS13
     # @return [String]
     def early_data_write_key
       secret = client_early_traffic_secret
-      hkdf_expand_label(secret, 'key', '', @key_len)
+      self.class.hkdf_expand_label(secret, 'key', '', @key_len, @digest)
     end
 
     # @return [String]
     def early_data_write_iv
       secret = client_early_traffic_secret
-      hkdf_expand_label(secret, 'iv', '', @iv_len)
+      self.class.hkdf_expand_label(secret, 'iv', '', @iv_len, @digest)
     end
 
     # @return [String]
@@ -87,19 +87,19 @@ module TTTLS13
     # @return [String]
     def client_finished_key
       secret = client_handshake_traffic_secret
-      hkdf_expand_label(secret, 'finished', '', @hash_len)
+      self.class.hkdf_expand_label(secret, 'finished', '', @hash_len, @digest)
     end
 
     # @return [String]
     def client_handshake_write_key
       secret = client_handshake_traffic_secret
-      hkdf_expand_label(secret, 'key', '', @key_len)
+      self.class.hkdf_expand_label(secret, 'key', '', @key_len, @digest)
     end
 
     # @return [String]
     def client_handshake_write_iv
       secret = client_handshake_traffic_secret
-      hkdf_expand_label(secret, 'iv', '', @iv_len)
+      self.class.hkdf_expand_label(secret, 'iv', '', @iv_len, @digest)
     end
 
     # @return [String]
@@ -111,19 +111,19 @@ module TTTLS13
     # @return [String]
     def server_finished_key
       secret = server_handshake_traffic_secret
-      hkdf_expand_label(secret, 'finished', '', @hash_len)
+      self.class.hkdf_expand_label(secret, 'finished', '', @hash_len, @digest)
     end
 
     # @return [String]
     def server_handshake_write_key
       secret = server_handshake_traffic_secret
-      hkdf_expand_label(secret, 'key', '', @key_len)
+      self.class.hkdf_expand_label(secret, 'key', '', @key_len, @digest)
     end
 
     # @return [String]
     def server_handshake_write_iv
       secret = server_handshake_traffic_secret
-      hkdf_expand_label(secret, 'iv', '', @iv_len)
+      self.class.hkdf_expand_label(secret, 'iv', '', @iv_len, @digest)
     end
 
     # @return [String]
@@ -147,13 +147,13 @@ module TTTLS13
     # @return [String]
     def client_application_write_key
       secret = client_application_traffic_secret
-      hkdf_expand_label(secret, 'key', '', @key_len)
+      self.class.hkdf_expand_label(secret, 'key', '', @key_len, @digest)
     end
 
     # @return [String]
     def client_application_write_iv
       secret = client_application_traffic_secret
-      hkdf_expand_label(secret, 'iv', '', @iv_len)
+      self.class.hkdf_expand_label(secret, 'iv', '', @iv_len, @digest)
     end
 
     # @return [String]
@@ -165,13 +165,13 @@ module TTTLS13
     # @return [String]
     def server_application_write_key
       secret = server_application_traffic_secret
-      hkdf_expand_label(secret, 'key', '', @key_len)
+      self.class.hkdf_expand_label(secret, 'key', '', @key_len, @digest)
     end
 
     # @return [String]
     def server_application_write_iv
       secret = server_application_traffic_secret
-      hkdf_expand_label(secret, 'iv', '', @iv_len)
+      self.class.hkdf_expand_label(secret, 'iv', '', @iv_len, @digest)
     end
 
     # @return [String]
@@ -198,13 +198,14 @@ module TTTLS13
     # @param label [String]
     # @param context [String]
     # @param length [Integer]
+    # @param digest [String] name of digest algorithm
     #
     # @return [String]
-    def hkdf_expand_label(secret, label, context, length)
+    def self.hkdf_expand_label(secret, label, context, length, digest)
       binary = length.to_uint16
       binary += ('tls13 ' + label).prefix_uint8_length
       binary += context.prefix_uint8_length
-      self.class.hkdf_expand(secret, binary, length, @digest)
+      hkdf_expand(secret, binary, length, digest)
     end
 
     # @param secret [String]
@@ -235,7 +236,7 @@ module TTTLS13
     #
     # @return [String]
     def derive_secret(secret, label, context)
-      hkdf_expand_label(secret, label, context, @hash_len)
+      self.class.hkdf_expand_label(secret, label, context, @hash_len, @digest)
     end
   end
   # rubocop: enable Metrics/ClassLength

data/lib/tttls1.3/server.rb

@@ -266,6 +266,7 @@ module TTTLS13
             key_schedule.client_application_write_key,
             key_schedule.client_application_write_iv
           )
+          @exporter_master_secret = key_schedule.exporter_master_secret
           @state = ServerState::CONNECTED
         when ServerState::CONNECTED
           logger.debug('ServerState::CONNECTED')

data/lib/tttls1.3/version.rb

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

metadata

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