sslshake 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73fea6614c1a8dac99abcc7e97607e4e33a2f4e1
-  data.tar.gz: 8ffbb4598f29d65b3b03c574641404f76f9ed85c
+  metadata.gz: 1be749edc70a8e63fcfa91c7ca8d4bdff8a31bb8
+  data.tar.gz: dd0fcb2ee6a7c03c1922f37b2612e2012945a0a4
 SHA512:
-  metadata.gz: c6ee7096edd757778e9b13a8a4090ce4f3982762373132213cc8b605bf7129032a63c44351ccebcaf11a2f5f9f32766269e7c2713703f8fcc0164a77f3be9ca7
-  data.tar.gz: 278ea0a3d288c0d636fe4bb12c34f36bf5be30859e09636932bc45ded810cf8aefd38b8c04a5a3d62b5aad46184a739f3fbaf480aed3c57f227c79ec8f7405ea
+  metadata.gz: 89b67cee12439d7375bb22f154ae90a34f601370896bdc84ca045f92ecfa0ef12a41296ccf918f1ccc22fa1d8cf0ea2895a48cecacc509520314b07626352e71
+  data.tar.gz: d5c24d0bea8b6d5845370c6dd3f9270ccf680b42153b932143c08962743d1dbe7e9a9302c5367db9d615c6d8fe4c8d13d709bbba80b1bd7d49fd7caaf820811e

data/.gitignore

@@ -1,3 +1,6 @@
 performance
 .ssldummies
 .testssl
+*.gem
+*.json
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,12 @@
+# encoding: utf-8
+source 'https://rubygems.org'
+gemspec
+
+group :development do
+  gem 'pry'
+  gem 'rb-readline'
+end
+
+group :test do
+  gem 'messages'
+end

data/README.md

@@ -13,6 +13,13 @@ require 'sslshake'
 SSLShake.hello('my.host', port: 4443, protocol: 'tls1.2')
 ```
 
+## Test (requires Docker)
+
+```bash
+bundle install
+bundle exec test/accuracy/test.rb
+```
+
 ## License
 
 MPLv2, see [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/)

data/lib/sslshake/sslv2.rb

@@ -53,7 +53,8 @@ module SSLShake
       end
 
       len = head & 0x7fff
-      res['raw'] = response = socket.read(len).unpack('H*')[0].upcase
+      res['raw'] = response = socket_read(socket, len, opts[:timeout], opts[:retries])
+                              .unpack('H*')[0].upcase
       raw = response.scan(/../)
 
       res['message_type'] = MESSAGE_TYPES.key(raw.shift)

data/lib/sslshake/tls.rb

@@ -67,8 +67,10 @@ module SSLShake
         ciphers = cipher_string(SSL3_CIPHERS, cipher_search)
       when 'tls1.0', 'tls1.1'
         ciphers = cipher_string(TLS10_CIPHERS, cipher_search)
+        extensions ||= '000f000101' # add Heartbeat
       when 'tls1.2'
         ciphers = cipher_string(TLS_CIPHERS, cipher_search)
+        extensions ||= '000f000101' # add Heartbeat
       else
         fail UserError, "This version is not supported: #{version.inspect}"
       end
@@ -90,7 +92,8 @@ module SSLShake
       res['version'] = VERSIONS.key(raw.shift(2).join(''))
       len = raw.shift(2).join.to_i(16)
 
-      res['raw'] = response = socket.read(len).unpack('H*')[0].upcase
+      res['raw'] = response = socket_read(socket, len, opts[:timeout], opts[:retries])
+                              .unpack('H*')[0].upcase
       raw = response.scan(/../)
 
       res['handshake_type'] = HANDSHAKE_TYPES.key(raw.shift)

data/lib/sslshake/version.rb

@@ -3,5 +3,5 @@
 # license: MPLv2
 
 module SSLShake
-  VERSION = '1.0.12'.freeze
+  VERSION = '1.0.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sslshake
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies: []
 description: This is a library to simulate SSL and TLS handshake from SSLv2, SSLv3,
   to TLS 1.0-1.2. It does not rely on OpenSSL and is not designed as a replacement
@@ -23,6 +23,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
 - README.md
 - lib/sslshake.rb
 - lib/sslshake/ciphers.rb