ruby-tls 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38cbb22373f7491d827fc4a025b9876bdc362185
-  data.tar.gz: 7f3196ae038b7d74127e42a1094ca2e9e44e364b
+  metadata.gz: 7c9c124353ba1b6a23290984f4c5056d9b329ec1
+  data.tar.gz: 430655662c8f8431463ba77c902b2f9adb28ab64
 SHA512:
-  metadata.gz: bf66425b0c70535efe45e6580491c5cf32423c131b232ff647b656bd195da06059fcd5075cf1694726de6785a64d51772c9adc22215388cf25f78c4239f7a1b7
-  data.tar.gz: 4bd331cc6a150b3f6a5443d49dfd951af82cf1f56f203dac08322c8f8b7c376e69b51d589449002fddb3b0ce3db6b288185edd66d46041a3369c00d7f953177e
+  metadata.gz: 4994faf8f0fc967c12419b2a998017f9a2a738525ccdfb5ae09c6dad5442b0eec2851c852a3342c6ad62264313f653e461a6403f449216f4aae438a562ea7e1b
+  data.tar.gz: 0a090301d6ebc62c2719120cb55164ad05bee8dbf09e1cda9ee85779ed6f7affa5092c90d609c28e3cd2a795c6dca7bcd7420106e708c2585444593f05116652

data/lib/ruby-tls/ssl.rb

@@ -10,16 +10,15 @@ module RubyTls
     module SSL
         extend FFI::Library
         if FFI::Platform.windows?
-            ffi_lib 'libeay32', 'ssleay32'
+            begin
+                ffi_lib 'libeay32', 'ssleay32'
+            rescue LoadError
+                ffi_lib 'libcrypto-1_1-x64', 'libssl-1_1-x64'
+            end
         else
             ffi_lib 'ssl'
         end
 
-        attach_function :SSL_library_init, [], :int
-        attach_function :SSL_load_error_strings, [], :void
-        attach_function :ERR_load_crypto_strings, [], :void
-
-
         # Common structures
         typedef :pointer, :user_data
         typedef :pointer, :bio
@@ -33,14 +32,36 @@ module RubyTls
         typedef :int, :pass_length
         typedef :int, :read_write_flag
 
+        SSL_ST_OK = 0x03
+        begin
+            attach_function :SSL_library_init, [], :int
+            attach_function :SSL_load_error_strings, [], :void
+            attach_function :ERR_load_crypto_strings, [], :void
 
-        # Multi-threaded support
-        callback :locking_cb, [:int, :int, :string, :int], :void
-        callback :thread_id_cb, [], :ulong
-        attach_function :CRYPTO_num_locks, [], :int
-        attach_function :CRYPTO_set_locking_callback, [:locking_cb], :void
-        attach_function :CRYPTO_set_id_callback, [:thread_id_cb], :void
+            attach_function :SSL_state, [:ssl], :int
+            def self.SSL_is_init_finished(ssl)
+                SSL_state(ssl) == SSL_ST_OK
+            end
+
+            OPENSSL_V1_1 = false
+        rescue FFI::NotFoundError
+            OPENSSL_V1_1 = true
+            OPENSSL_INIT_LOAD_SSL_STRINGS = 0x200000
+            OPENSSL_INIT_NO_LOAD_SSL_STRINGS = 0x100000
+            attach_function :OPENSSL_init_ssl, [:uint64_t, :pointer], :int
+
+            attach_function :SSL_get_state, [:ssl], :int
+            def self.SSL_is_init_finished(ssl)
+                SSL_get_state(ssl) == SSL_ST_OK
+            end
+        end
 
+        # Multi-threaded support
+        #callback :locking_cb, [:int, :int, :string, :int], :void
+        #callback :thread_id_cb, [], :ulong
+        #attach_function :CRYPTO_num_locks, [], :int
+        #attach_function :CRYPTO_set_locking_callback, [:locking_cb], :void
+        #attach_function :CRYPTO_set_id_callback, [:thread_id_cb], :void
 
         # InitializeDefaultCredentials
         attach_function :BIO_new_mem_buf, [:string, :buffer_length], :bio
@@ -54,13 +75,6 @@ module RubyTls
 
         attach_function :BIO_free, [:bio], :int
 
-        # CONSTANTS
-        SSL_ST_OK = 0x03
-        attach_function :SSL_state, [:ssl], :int
-        def self.SSL_is_init_finished(ssl)
-            SSL_state(ssl) == SSL_ST_OK
-        end
-
         # GetPeerCert
         attach_function :SSL_get_peer_certificate, [:ssl], :x509
 
@@ -120,6 +134,21 @@ module RubyTls
         begin
             attach_function :TLS_server_method, [], :pointer
             attach_function :TLS_client_method, [], :pointer
+        rescue FFI::NotFoundError
+            attach_function :SSLv23_server_method, [], :pointer
+            attach_function :SSLv23_client_method, [], :pointer
+
+            def self.TLS_server_method; self.SSLv23_server_method; end
+            def self.TLS_client_method; self.SSLv23_client_method; end
+        end
+
+        # Version can be one of:
+        # :SSL3, :TLS1, :TLS1_1, :TLS1_2, :TLS1_3, :TLS_MAX
+        begin
+            attach_function :SSL_CTX_set_min_proto_version, [:ssl_ctx, :int], :int
+            attach_function :SSL_CTX_set_max_proto_version, [:ssl_ctx, :int], :int
+
+            VERSION_SUPPORTED = true
 
             SSL3_VERSION    = 0x0300
             TLS1_VERSION    = 0x0301
@@ -128,18 +157,11 @@ module RubyTls
             TLS1_3_VERSION  = 0x0304
             TLS_MAX_VERSION = TLS1_3_VERSION
             ANY_VERSION     = 0
-            attach_function :SSL_CTX_set_min_proto_version, [:ssl_ctx, :int], :int
-            attach_function :SSL_CTX_set_max_proto_version, [:ssl_ctx, :int], :int
-            VERSION_SUPPORTED = true
         rescue FFI::NotFoundError
-            attach_function :SSLv23_server_method, [], :pointer
-            attach_function :SSLv23_client_method, [], :pointer
-
-            def self.TLS_server_method; self.SSLv23_server_method; end
-            def self.TLS_client_method; self.SSLv23_client_method; end
-
             VERSION_SUPPORTED = false
         end
+
+
         attach_function :SSL_CTX_new, [:pointer], :ssl_ctx
 
         attach_function :SSL_CTX_ctrl, [:ssl_ctx, :int, :ulong, :pointer], :long
@@ -287,10 +309,13 @@ keystr
         # INIT CODE
         @init_required ||= false
         unless @init_required
-            self.SSL_load_error_strings
-            self.SSL_library_init
-            self.ERR_load_crypto_strings
-
+            if OPENSSL_V1_1
+                self.OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, ::FFI::Pointer::NULL)
+            else
+                self.SSL_load_error_strings
+                self.SSL_library_init
+                self.ERR_load_crypto_strings
+            end
 
             # Setup multi-threaded support
             #SSL_LOCKS = []
@@ -401,20 +426,23 @@ keystr
 
             # Version can be one of:
             # :SSL3, :TLS1, :TLS1_1, :TLS1_2, :TLS1_3, :TLS_MAX
-            def set_min_proto_version(version)
-                return false unless VERSION_SUPPORTED
-                num = SSL.const_get("#{version}_VERSION")
-                SSL.SSL_CTX_set_min_proto_version(@ssl_ctx, num) == 1
-            rescue NameError
-                false
-            end
-
-            def set_max_proto_version(version)
-                return false unless VERSION_SUPPORTED
-                num = SSL.const_get("#{version}_VERSION")
-                SSL.SSL_CTX_set_max_proto_version(@ssl_ctx, num) == 1
-            rescue NameError
-                false
+            if SSL::VERSION_SUPPORTED
+                def set_min_proto_version(version)
+                    num = SSL.const_get("#{version}_VERSION")
+                    SSL.SSL_CTX_set_min_proto_version(@ssl_ctx, num) == 1
+                rescue NameError
+                    false
+                end
+
+                def set_max_proto_version(version)
+                    num = SSL.const_get("#{version}_VERSION")
+                    SSL.SSL_CTX_set_max_proto_version(@ssl_ctx, num) == 1
+                rescue NameError
+                    false
+                end
+            else
+                def set_min_proto_version(version); false; end
+                def set_max_proto_version(version); false; end
             end
 
             def cleanup

data/lib/ruby-tls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyTls
-    VERSION = '2.3.3'
+    VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-tls
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
@@ -115,8 +115,8 @@ signing_key:
 specification_version: 4
 summary: Abstract TLS for Ruby
 test_files:
-- spec/alpn_spec.rb
 - spec/client.crt
-- spec/client.key
 - spec/comms_spec.rb
 - spec/verify_spec.rb
+- spec/alpn_spec.rb
+- spec/client.key