libuv 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4190660edd229aa2b65482254894ec253deb7dd6
-  data.tar.gz: 668f6bec567de8bf6ce856b8be5c9b8bde67cf88
+  metadata.gz: bc7d4515dcefccae48d6784b05544ea06f19f714
+  data.tar.gz: 75398d606d64641fb9d332275393eafa94d6746e
 SHA512:
-  metadata.gz: 258baedb42f399f62f863d3e40836a6867131c72f740a7eecb34b7985f41cd8245234328cbdf96b84901915e242f1a0c79bd052a061c6014f50c94e1a94cf328
-  data.tar.gz: f90552d250222e95e866c9ec5d79bda3ad8ae224e64a2a6f2d197175da3be88f0ef11cd3c6efa4ee43661c463659bcdc936eafb6816eb0d26db1cb2aa1538845
+  metadata.gz: 1b05b553383f145dac5bbe773d11a4019175d0e844c27f7b94ae7da79f18310ee9d31e459a1d4b416fee8becf5300536c6b73f3339879d615376abc53d0b4e19
+  data.tar.gz: 499c11534e2a896357f22358a84b9d14402da7590c108ea16e0120d66e99ab1a697c90a73f5fc344ff7adfa4c36a720ce51d69df532ff0d1667b3121c8e1ed4c

data/lib/libuv/tcp.rb

@@ -17,14 +17,16 @@ module Libuv
 
         attr_reader :connected
         attr_reader :protocol
+        attr_reader :tls
 
         # Check if tls active on the socket
         def tls?; !@tls.nil?; end
 
 
-        def initialize(reactor, acceptor = nil, progress: nil, flags: nil)
+        def initialize(reactor, acceptor = nil, progress: nil, flags: nil, **tls_options)
             @reactor = reactor
             @progress = progress
+            @tls_options = tls_options
 
             tcp_ptr = ::Libuv::Ext.allocate_handle_tcp
             error = if flags
@@ -55,7 +57,18 @@ module Libuv
 
             @handshake = false
             @pending_writes = []
-            @tls = ::RubyTls::SSL::Box.new(args[:server], self, args)
+            @tls_options.merge!(args)
+
+            hosts = @tls_options[:hosts]
+            if hosts && hosts[0]
+                opts = @tls_options.merge(hosts[0])
+                @tls = ::RubyTls::SSL::Box.new(opts[:server], self, opts)
+                hosts[1..-1].each do |host_opts|
+                    @tls.add_host(**host_opts)
+                end
+            else
+                @tls = ::RubyTls::SSL::Box.new(@tls_options[:server], self, @tls_options)
+            end
             @tls.start
             self
         end
@@ -192,12 +205,30 @@ module Libuv
             end
             self
         end
+
+        def add_host(**host_opts)
+            @tls_options[:hosts] ||= []
+            @tls_options[:hosts] << host_opts
+        end
+
+        def remove_host(name)
+            if @tls_options[:hosts]
+                found = nil
+                @tls_options[:hosts].each do |host|
+                    if host[:host_name] == name
+                        found = host
+                        break
+                    end 
+                end
+                @tls_options[:hosts].delete(found) if found
+            end
+        end
         #
         # END TLS Abstraction ------------------
         # --------------------------------------
         #
 
-        def bind(ip, port, callback = nil, &blk)
+        def bind(ip, port, callback = nil, **tls_options, &blk)
             return self if @closed
 
             @on_accept = callback || blk
@@ -209,6 +240,8 @@ module Libuv
             begin
                 @tcp_socket = create_socket(IPAddr.new(ip), port)
                 @tcp_socket.bind
+                @tls_options.merge!(tls_options)
+                @tls_options[:server] = true
             rescue Exception => e
                 reject(e)
             end
@@ -348,7 +381,7 @@ module Libuv
         def accept(_)
             begin
                 raise RuntimeError, CLOSED_HANDLE_ERROR if @closed
-                tcp = TCP.new(reactor, handle)
+                tcp = TCP.new(reactor, handle, **@tls_options)
 
                 ::Fiber.new {
                     begin

data/lib/libuv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Libuv
-    VERSION = '3.1.3'
+    VERSION = '3.1.4'
 end

data/spec/tcp_spec.rb

@@ -274,7 +274,7 @@ describe Libuv::TCP do
 		it "should send a ping and return a pong", :network => true do
 			@reactor.run { |reactor|
 				@server.bind('127.0.0.1', 56789) do |client|
-					client.start_tls(server: true)
+					client.start_tls
 					client.progress do |data|
 						@log << data
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libuv
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -240,6 +240,8 @@ files:
 - ext/libuv/src/unix/loop.c
 - ext/libuv/src/unix/netbsd.c
 - ext/libuv/src/unix/openbsd.c
+- ext/libuv/src/unix/os390-syscalls.c
+- ext/libuv/src/unix/os390-syscalls.h
 - ext/libuv/src/unix/os390.c
 - ext/libuv/src/unix/pipe.c
 - ext/libuv/src/unix/poll.c