tttls1.3 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 600d070cd1e13d0480c362a9e1a38eee26890a55e744f87ba9f3204455aecfe1
-  data.tar.gz: 9f5cc406f36d3e746f430fbf6e0fcc6ce2b84f9eb30952cbd672b42475852b43
+  metadata.gz: 990b3de64c01b392c33e66910d6419cce1ff276a9f957f3479c7aacac6909b00
+  data.tar.gz: 82702fe41052a5fbd80722f267d0ffe089f56b696d064a0f4b9a4baf59b64b97
 SHA512:
-  metadata.gz: '091354c4bdd832b8c705ad3c4349fd0de5a59b68e28bac1f8f82ca70a09b970bf7da0641bad24897aea683698da65bf2a5503b82d3faf7087037123ea33d5d6d'
-  data.tar.gz: e98c2774e0cc277a5cee70819aad60d25325de6c29d2328f400873dc8370b534452d9f07582afd0df015ae9be81e2529d9147358098bab75e9b521db7663840b
+  metadata.gz: 3d61ad9524126642b8ef1505369f2b08543a4f4ddf1a8a8d1ae15a364e29cf648b68b57840053118bc98104fe28d217519770c034bb3caed1d7401c85611f392
+  data.tar.gz: cd465dcfc8d671e10f1819ce7a49dc5b19b6310cf8855d2a09eec563947685bf2f8b860617399010a4b4c4cd34726410ed4a4b3c7a3c9332888e177feb0f0b9f

data/.rubocop.yml

@@ -14,3 +14,4 @@ Metrics/BlockLength:
   Exclude:
     - 'Rakefile'
     - 'spec/*.rb'
+    - 'interop/*.rb'

data/Gemfile

@@ -2,6 +2,7 @@
 
 source 'https://rubygems.org'
 
+gem 'logger'
 gem 'openssl'
 gem 'rake'
 
@@ -11,3 +12,5 @@ group :test do
   gem 'rspec', '3.8.0'
   gem 'rubocop', '0.67.2'
 end
+
+gemspec

data/example/helper.rb

@@ -3,7 +3,6 @@
 $LOAD_PATH << __dir__ + '/../lib'
 
 require 'socket'
-require 'openssl'
 require 'tttls1.3'
 
 def http_get(hostname)

data/interop/client_spec.rb

@@ -5,7 +5,6 @@ require_relative 'helper'
 
 TMP_DIR = __dir__ + '/../tmp'
 
-# rubocop: disable Metrics/BlockLength
 RSpec.describe Client do
   # testcases
   [
@@ -85,4 +84,3 @@ RSpec.describe Client do
     end
   end
 end
-# rubocop: enable Metrics/BlockLength

data/interop/helper.rb

@@ -4,13 +4,9 @@
 RSpec.configure(&:disable_monkey_patching!)
 
 # rubocop: disable Style/MixinUsage
-require 'openssl'
 require 'tttls1.3'
 include TTTLS13
-include TTTLS13::Error
 include TTTLS13::CipherSuite
 include TTTLS13::SignatureScheme
-include TTTLS13::Cryptograph
-include TTTLS13::Message
 include TTTLS13::Message::Extension
 # rubocop: enable Style/MixinUsage

data/lib/tttls1.3/client.rb

@@ -55,7 +55,8 @@ module TTTLS13
     psk_cipher_suite: nil,
     ticket_nonce: nil,
     ticket_age_add: nil,
-    ticket_timestamp: nil
+    ticket_timestamp: nil,
+    loglevel: Logger::WARN
   }.freeze
 
   # rubocop: disable Metrics/ClassLength
@@ -69,6 +70,8 @@ module TTTLS13
       @endpoint = :client
       @hostname = hostname
       @settings = DEFAULT_CLIENT_SETTINGS.merge(settings)
+      logger.level = @settings[:loglevel]
+
       @early_data = ''
       @early_data_write_cipher = nil # Cryptograph::$Object
       @accepted_early_data = false
@@ -118,7 +121,7 @@ module TTTLS13
     # after here                v
     #                       CONNECTED
     #
-    # https://tools.ietf.org/html/rfc8446#appendix-A
+    # https://tools.ietf.org/html/rfc8446#appendix-A.1
     #
     # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/BlockLength

data/lib/tttls1.3/connection.rb

@@ -7,6 +7,8 @@ module TTTLS13
 
   # rubocop: disable Metrics/ClassLength
   class Connection
+    include Logging
+
     # @param socket [Socket]
     def initialize(socket)
       @socket = socket
@@ -142,6 +144,7 @@ module TTTLS13
 
     # @param record [TTTLS13::Message::Record]
     def send_record(record)
+      logger.debug(record.inspect)
       @socket.write(record.serialize(@send_record_size))
     end
 
@@ -202,6 +205,7 @@ module TTTLS13
         terminate(:unexpected_message)
       end
 
+      logger.debug(record.inspect)
       record
     end
 

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

@@ -33,7 +33,8 @@ module TTTLS13
         @length_of_padding = length_of_padding
       end
 
-      # AEAD-Encrypt(write_key, nonce, additional_data, plaintext)
+      # NOTE:
+      #     AEAD-Encrypt(write_key, nonce, additional_data, plaintext)
       #
       # @param content [String]
       # @param type [TTTLS13::Message::ContentType]
@@ -50,8 +51,9 @@ module TTTLS13
         encrypted_data + cipher.auth_tag
       end
 
-      # AEAD-Decrypt(peer_write_key, nonce,
-      #              additional_data, AEADEncrypted)
+      # NOTE:
+      #     AEAD-Decrypt(peer_write_key, nonce,
+      #                  additional_data, AEADEncrypted)
       #
       # @param encrypted_record [String]
       # @param auth_data [String]
@@ -78,7 +80,7 @@ module TTTLS13
       #     struct {
       #         opaque content[TLSPlaintext.length];
       #         ContentType type;
-      #        uint8 zeros[length_of_padding];
+      #         uint8 zeros[length_of_padding];
       #     } TLSInnerPlaintext;
       #
       # @param record_size_limit [Integer]
@@ -93,6 +95,7 @@ module TTTLS13
       # @return [String]
       def additional_data(plaintext_len)
         ciphertext_len = plaintext_len + 16 # length of auth_tag is 16
+
         Message::ContentType::APPLICATION_DATA \
         + Message::ProtocolVersion::TLS_1_2 \
         + ciphertext_len.to_uint16
@@ -105,7 +108,7 @@ module TTTLS13
         @cipher.iv = @sequence_number.xor(@write_iv, iv_len)
       end
 
-      # @param [String]
+      # @param clear [String]
       #
       # @return [Integer]
       def scan_zeros(clear)

data/lib/tttls1.3/logging.rb

@@ -0,0 +1,14 @@
+# encoding: ascii-8bit
+# frozen_string_literal: true
+
+module TTTLS13
+  module Logging
+    def logger
+      Logging.logger
+    end
+
+    def self.logger
+      @logger ||= Logger.new(STDERR, Logger::WARN)
+    end
+  end
+end

data/lib/tttls1.3/version.rb

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

data/lib/tttls1.3.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require 'openssl'
+require 'logger'
 
 require 'tttls1.3/version'
 require 'tttls1.3/utils'
+require 'tttls1.3/logging'
 require 'tttls1.3/error'
 require 'tttls1.3/cipher_suites'
 require 'tttls1.3/signature_scheme'

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@
 RSpec.configure(&:disable_monkey_patching!)
 
 # rubocop: disable Style/MixinUsage
-require 'openssl'
 require 'tttls1.3'
 include TTTLS13
 include TTTLS13::Error
@@ -439,7 +438,6 @@ BIN
 
 # https://tools.ietf.org/html/rfc8448#section-4
 # 4.  Resumed 0-RTT Handshake
-
 TESTBINARY_0_RTT_CLIENT_HELLO = <<BIN.split.map(&:hex).map(&:chr).join
   01 00 01 fc 03 03 1b c3     ce b6 bb e3 9c ff 93 83
   55 b5 a5 0a db 6d b2 1b     7a 6a f6 49 d7 b4 bc 41
@@ -565,7 +563,6 @@ TESTBINARY_0_RTT_CLIENT_APPLICATION_WRITE_IV \
 
 # https://tools.ietf.org/html/rfc8448#section-5
 # 5.  HelloRetryRequest
-
 TESTBINARY_HRR_CLIENT_HELLO1 = <<BIN.split.map(&:hex).map(&:chr).join
   01 00 00 b0 03 03 b0 b1     c5 a5 aa 37 c5 91 9f 2e
   d1 d5 c6 ff f7 fc b7 84     97 16 94 5a 2b 8c ee 92

data/tttls1.3.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_dependency             'logger'
   spec.add_dependency             'openssl'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tttls1.3
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - thekuwayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  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: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +84,7 @@ files:
 - lib/tttls1.3/cryptograph/passer.rb
 - lib/tttls1.3/error.rb
 - lib/tttls1.3/key_schedule.rb
+- lib/tttls1.3/logging.rb
 - lib/tttls1.3/message.rb
 - lib/tttls1.3/message/alert.rb
 - lib/tttls1.3/message/application_data.rb