rex-socket 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f7be9a5921f70d75641dc2356ede27c47e38f7b
-  data.tar.gz: 39aa328105ad28c50e3ca44ad8a6692800dca622
+  metadata.gz: e03fb63e7486cc7a61cc293d0dbb37393498c616
+  data.tar.gz: 683f42beeb59df6ce2b424a206aa26790108d163
 SHA512:
-  metadata.gz: 5bd2c349091a42d5b16e6823ddef15435a55ba3aeb7852628ea769ab1f3b16ce12afb457effd4b989fc89a33fc23fc36b51ec803dc79b15b702908d575ded5aa
-  data.tar.gz: b2788b704b6a52759e427b197f77db7fdee9f5ee2ee418ad8801b7a15b2cf474b54e4062bc570683f5659755e979f441f25f38f0218f3deba5b327cc9a366c2e
+  metadata.gz: 1e374551466dfb1faed2dffb38848a951d306e93206611b3d4cbefc2ecc0cfc5d6d2e69d18871679c6b4734809f66ea46c7d7019a99199b7df047359b01a58b7
+  data.tar.gz: d98c67986b353ccb5078ceb6a572fe2f40616b7c6f614b4d5855fdf09ca2ec89d2d1f7defd51ff9e6b0a3f63f400843048b329121a499f549dbb07dedae9fcf4

data/lib/rex/socket/ssl_tcp.rb

@@ -43,6 +43,22 @@ begin
   #
   ##
 
+  def self.system_ssl_methods
+    ssl_context = OpenSSL::SSL::SSLContext
+    if ssl_context.const_defined? :METHODS_MAP
+      ssl_context.const_get(:METHODS_MAP).keys
+    else
+      ssl_context::METHODS
+    end
+  end
+
+  def self.supported_ssl_methods
+    @@methods ||= ['Auto', 'TLS'] + system_ssl_methods
+      .reject { |method| method.match(/server|client/) }
+      .select {|m| OpenSSL::SSL::SSLContext.new(m) && true rescue false} \
+      .map {|m| m.to_s.sub(/v/, '').sub('_', '.')}
+  end
+
   #
   # Initializes the SSL socket.
   #
@@ -72,8 +88,9 @@ begin
     end
 
     # Raise an error if no selected versions are supported
-    if ! OpenSSL::SSL::SSLContext::METHODS.include? version
-      raise ArgumentError, 'The system OpenSSL does not support the requested SSL/TLS version'
+    unless Rex::Socket::SslTcp.system_ssl_methods.include? version
+      raise ArgumentError,
+        "This version of Ruby does not support the requested SSL/TLS version #{params.ssl_version}"
     end
 
     # Try intializing the socket with this SSL/TLS version

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.12"
+    VERSION = "0.1.13"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - David Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler