net.rb in ronin-support-0.4.0.rc1

- old
+ new
@@ -15,141 +15,10 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/network/extensions/tcp/net'
 require 'ronin/network/ssl'
 
-begin
-  require 'openssl'
-rescue ::LoadError
-end
-
 module Net
-  #
-  # Establishes a SSL connection.
-  #
-  # @param [String] host
-  #   The host to connect to.
-  #
-  # @param [Integer] port
-  #   The port to connect to.
-  #
-  # @param [Hash] options
-  #   Additional options.
-  #
-  # @option options [String] :local_host
-  #   The local host to bind to.
-  #
-  # @option options [Integer] :local_port
-  #   The local port to bind to.
-  #
-  # @option options [Symbol] :verify
-  #   Specifies whether to verify the SSL certificate.
-  #   May be one of the following:
-  #
-  #   * `:none`
-  #   * `:peer`
-  #   * `:client_once`
-  #   * `:fail_if_no_peer_cert`
-  #
-  # @option options [String] :cert
-  #   The path to the SSL certificate.
-  #
-  # @option options [String] :key
-  #   The path to the SSL key.
-  #
-  # @yield [ssl_socket]
-  #   The given block will be passed the new SSL Socket.
-  #
-  # @yieldparam [OpenSSL::SSL::SSLSocket] ssl_socket
-  #   The new SSL Socket.
-  #
-  # @return [OpenSSL::SSL::SSLSocket]
-  #   the new SSL Socket.
-  #
-  # @example
-  #   socket = Net.ssl_connect('twitter.com',443)
-  #
-  # @api public
-  #
-  def Net.ssl_connect(host,port,options={})
-    local_host = options[:local_host]
-    local_port = options[:local_port]
-
-    socket = Net.tcp_connect(host,port,local_host,local_port)
-
-    ssl_context = OpenSSL::SSL::SSLContext.new()
-    ssl_context.verify_mode = Ronin::Network::SSL::VERIFY[options[:verify]]
-
-    if options[:cert]
-      cert_file = File.new(options[:cert])
-      ssl_context.cert = OpenSSL::X509::Certificate.new(cert_file)
-    end
-
-    if options[:key]
-      key_file = File.new(options[:key])
-      ssl_context.key = OpenSSL::PKey::RSA.new(key_file)
-    end
-
-    ssl_socket = OpenSSL::SSL::SSLSocket.new(socket,ssl_context)
-    ssl_socket.sync_close = true
-    ssl_socket.connect
-
-    yield ssl_socket if block_given?
-    return ssl_socket
-  end
-
-  #
-  # Creates a new temporary SSL connection.
-  #
-  # @param [String] host
-  #   The host to connect to.
-  #
-  # @param [Integer] port
-  #   The port to connect to.
-  #
-  # @param [Hash] options
-  #   Additional options.
-  #
-  # @option options [String] :local_host
-  #   The local host to bind to.
-  #
-  # @option options [Integer] :local_port
-  #   The local port to bind to.
-  #
-  # @option options [Symbol] :verify
-  #   Specifies whether to verify the SSL certificate.
-  #
-  # @option options [String] :cert
-  #   The path to the SSL certificate.
-  #
-  # @option options [String] :key
-  #   The path to the SSL key.
-  #
-  # @yield [ssl_socket]
-  #   The given block will be passed the temporary SSL Socket.
-  #
-  # @yieldparam [OpenSSL::SSL::SSLSocket] ssl_socket
-  #   The temporary SSL Socket.
-  #
-  # @return [nil]
-  #
-  # @example
-  #   Net.ssl_session('twitter.com',443) do |sock|
-  #     sock.write("GET /\n\n")
-  #
-  #     sock.each_line { |line| puts line }
-  #   end
-  #
-  # @api public
-  #
-  def Net.ssl_session(host,port)
-    ssl_socket = Net.ssl_connect(host,port)
-
-    yield ssl_socket if block_given?
-
-    ssl_socket.close
-    return nil
-  end
+  extend Ronin::Network::SSL
 end