ruby-tls 1.0.3 → 2.0.0

data/spec/verify_spec.rb

@@ -1,120 +1,155 @@
-require 'ruby-tls'
-
-
-describe RubyTls do
-    describe RubyTls::Connection do
-        before :each do
-            @client = RubyTls::Connection.new
-            @server = RubyTls::Connection.new
-
-            @server_started  = false
-            @server_stop = false
-            @client_stop = false
-
-            @dir = File.dirname(File.expand_path(__FILE__)) + '/'
-            @cert_from_file = File.read(@dir + 'client.crt')
-        end
-
-        it "should verify the peer" do
-            @server_data = []
-            @client_data = []
-
-            @client.close_cb do
-                @client_data << 'close'
-                @client_stop = true
-            end
-            @client.dispatch_cb do |data|
-                @client_data << data
-            end
-            @client.transmit_cb do |data|
-                if not @server_started
-                    @server_started = true
-                    @server.start(:server => true, :verify_peer => true)
-                end
-                @server.decrypt(data) unless @client_stop
-            end
-            @client.handshake_cb do
-                @client_data << 'ready'
-            end
-
-            @server.close_cb do
-                @server_data << 'close'
-                @server_stop = true
-            end
-            @server.dispatch_cb do |data|
-                @server_data << data
-            end
-            @server.transmit_cb do |data|
-                @client.decrypt(data) unless @server_stop
-            end
-            @server.handshake_cb do
-                @server_data << 'ready'
-            end
-            @server.verify_cb do |cert|
-                @server_data << 'verify'
-                @cert_from_server = cert
-                true
-            end
-
-            @client.start(:private_key_file => @dir + 'client.key', :cert_chain_file => @dir + 'client.crt')
-            @client.cleanup
-            @server.cleanup
-            
-            expect(@client_data).to eq(['ready'])
-            expect(@server_data).to eq(['verify', 'verify', 'verify', 'ready'])
-            expect(@cert_from_server).to eq(@cert_from_file)
-        end
-
-
-        it "should deny the connection" do
-            @server_data = []
-            @client_data = []
-
-            @client.close_cb do
-                @client_data << 'close'
-                @client_stop = true
-            end
-            @client.dispatch_cb do |data|
-                @client_data << data
-            end
-            @client.transmit_cb do |data|
-                if not @server_started
-                    @server_started = true
-                    @server.start(:server => true, :verify_peer => true)
-                end
-                @server.decrypt(data) unless @client_stop
-            end
-            @client.handshake_cb do
-                @client_data << 'ready'
-            end
-
-            @server.close_cb do
-                @server_data << 'close'
-                @server_stop = true
-            end
-            @server.dispatch_cb do |data|
-                @server_data << data
-            end
-            @server.transmit_cb do |data|
-                @client.decrypt(data) unless @server_stop
-            end
-            @server.handshake_cb do
-                @server_data << 'ready'
-            end
-            @server.verify_cb do |cert|
-                @server_data << 'verify'
-                @cert_from_server = cert
-                false
-            end
-
-            @client.start(:private_key_file => @dir + 'client.key', :cert_chain_file => @dir + 'client.crt')
-            @client.cleanup
-            @server.cleanup
-            
-            expect(@client_data).to eq([])
-            expect(@server_data).to eq(['verify', 'close', 'verify', 'close'])
-            expect(@cert_from_server).to eq(@cert_from_file)
-        end
-    end
-end
-
+require 'ruby-tls'
+
+
+describe RubyTls do
+
+    class Client2
+        def initialize(client_data, dir)
+            @client_data = client_data
+            @ssl = RubyTls::SSL::Box.new(false, self, private_key: dir + 'client.key', cert_chain: dir + 'client.crt')
+        end
+
+        attr_reader :ssl
+        attr_accessor :stop
+        attr_accessor :server
+
+        def close_cb
+            @client_data << 'close'
+            @stop = true
+        end
+
+        def dispatch_cb(data)
+            @client_data << data
+        end
+
+        def transmit_cb(data)
+            if not @server.started
+                @server.started = true
+                @server.ssl.start
+            end
+            @server.ssl.decrypt(data) unless @stop
+        end
+
+        def handshake_cb
+            @client_data << 'ready'
+        end
+    end
+
+    describe RubyTls::SSL::Box do
+        before :each do
+            @dir = File.dirname(File.expand_path(__FILE__)) + '/'
+            @cert_from_file = File.read(@dir + 'client.crt')
+        end
+
+        it "should verify the peer" do
+            @server_data = []
+            @client_data = []
+
+
+            class Server2
+                def initialize(client, server_data)
+                    @client = client
+                    @server_data = server_data
+                    @ssl = RubyTls::SSL::Box.new(true, self, verify_peer: true)
+                end
+
+                attr_reader :ssl
+                attr_accessor :started
+                attr_accessor :stop
+                attr_accessor :cert_from_server
+
+                def close_cb
+                    @server_data << 'close'
+                    @stop = true
+                end
+
+                def dispatch_cb(data)
+                    @server_data << data
+                end
+
+                def transmit_cb(data)
+                    @client.ssl.decrypt(data) unless @stop
+                end
+
+                def handshake_cb
+                    @server_data << 'ready'
+                end
+
+                def verify_cb(cert)
+                    @server_data << 'verify'
+                    @cert_from_server = cert
+                    true
+                end
+            end
+
+
+            @client = Client2.new(@client_data, @dir)
+            @server = Server2.new(@client, @server_data)
+            @client.server = @server
+
+            @client.ssl.start
+            @client.ssl.cleanup
+            @server.ssl.cleanup
+            
+            expect(@client_data).to eq(['ready'])
+            expect(@server_data).to eq(['ready', 'verify', 'verify', 'verify'])
+            expect(@server.cert_from_server).to eq(@cert_from_file)
+        end
+
+
+        it "should deny the connection" do
+            @server_data = []
+            @client_data = []
+
+            class Server3
+                def initialize(client, server_data)
+                    @client = client
+                    @server_data = server_data
+                    @ssl = RubyTls::SSL::Box.new(true, self, verify_peer: true)
+                end
+
+                attr_reader :ssl
+                attr_accessor :started
+                attr_accessor :stop
+                attr_accessor :cert_from_server
+
+                def close_cb
+                    @server_data << 'close'
+                    @stop = true
+                end
+
+                def dispatch_cb(data)
+                    @server_data << data
+                end
+
+                def transmit_cb(data)
+                    @client.ssl.decrypt(data) unless @stop
+                end
+
+                def handshake_cb
+                    @server_data << 'ready'
+                end
+
+                def verify_cb(cert)
+                    @server_data << 'verify'
+                    @cert_from_server = cert
+                    false
+                end
+            end
+
+            @client = Client2.new(@client_data, @dir)
+            @server = Server3.new(@client, @server_data)
+            @client.server = @server
+
+            @client.ssl.start
+            @client.ssl.cleanup
+            @server.ssl.cleanup
+            
+            expect(@client_data).to eq(['ready'])
+            expect(@server_data).to eq(['ready', 'verify', 'close'])
+
+            expect(@server.cert_from_server).to eq(@cert_from_file)
+        end
+    end
+end
+

metadata

@@ -1,121 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: ruby-tls
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Stephen von Takach
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: yard
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
           Allows transport layers outside Ruby TCP be secured.
 email:
 - steve@cotag.me
 executables: []
-extensions:
-- ext/Rakefile
+extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- README.md
 - lib/ruby-tls.rb
-- lib/ruby-tls/connection.rb
-- lib/ruby-tls/ext.rb
+- lib/ruby-tls/ssl.rb
 - lib/ruby-tls/version.rb
-- Rakefile
 - ruby-tls.gemspec
-- README.md
-- EM-LICENSE
-- ext/tls/ssl.cpp
-- ext/tls/ssl.h
-- ext/tls/page.cpp
-- ext/tls/page.h
 - spec/client.crt
 - spec/client.key
 - spec/comms_spec.rb
 - spec/verify_spec.rb
-- ext/Rakefile
 homepage: https://github.com/cotag/ruby-tls
 licenses:
-- Ruby
-- GPL
+- MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5
+signing_key: 
 specification_version: 4
 summary: Abstract TLS for Ruby
 test_files:
@@ -123,4 +113,4 @@ test_files:
 - spec/client.key
 - spec/comms_spec.rb
 - spec/verify_spec.rb
-has_rdoc:
+has_rdoc: 

data/EM-LICENSE

@@ -1,60 +0,0 @@
-EventMachine is copyrighted free software owned by Francis Cianfrocca
-(blackhedd ... gmail.com). The Owner of this software permits you to
-redistribute and/or modify the software under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below ("Ruby License"):
-
-  1. You may make and give away verbatim copies of the source form of this
-     software without restriction, provided that you retain ALL of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the Owner.
-
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
-
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in a manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the Owner.
-
-  4. You may modify and include parts of the software into any other
-     software (possibly commercial), provided you comply with the terms in
-     Sections 1, 2, and 3 above. But some files in the distribution
-     are not written by the Owner, so they may be made available to you
-     under different terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whoever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-