ronin-support 1.0.7 → 1.1.0.rc1

data/lib/ronin/support/network/tls/mixin.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 #
-# Copyright (c) 2006-2023 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2024 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # Ronin Support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
@@ -16,6 +16,7 @@
 # along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+require 'ronin/support/network/tls'
 require 'ronin/support/network/ssl/mixin'
 
 module Ronin
@@ -29,45 +30,56 @@ module Ronin
           include SSL::Mixin
 
           #
-          # Creates a new TLS Context.
+          # @!macro context_kwargs
+          #   @option kwargs [1, 1.1, 1.2, 1.3, Symbol, nil] :version
+          #     The TLS version to use.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
+          #   @option kwargs [1, 1.1, 1.2, 1.3, Symbol, nil] :min_version
+          #     The minimum TLS version to use.
           #
-          # @param [Hash{Symbol => Object}] kwargs
-          #   Additional keyword arguments for {SSL.context}.
+          #   @option kwargs [1, 1.1, 1.2, 1.3, Symbol, nil] :max_version
+          #     The maximum TLS version to use.
+          #
+          #   @option kwargs [Symbol, Boolean] :verify
+          #     Specifies whether to verify the SSL certificate.
+          #     May be one of the following:
           #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
+          #     * `:none`
+          #     * `:peer`
+          #     * `:fail_if_no_peer_cert`
+          #     * `:client_once`
           #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
+          #   @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
+          #     The RSA key to use for the TLS context.
           #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
-          #   The RSA key to use for the SSL context.
+          #   @option kwargs [String] :key_file
+          #     The path to the TLS `.key` file.
           #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
+          #   @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
+          #     The X509 certificate to use for the TLS context.
           #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
-          #   The X509 certificate to use for the SSL context.
+          #   @option kwargs [String] :cert_file
+          #     The path to the TLS `.crt` file.
           #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
+          #   @option kwargs [String] :ca_bundle
+          #     Path to the CA certificate file or directory.
+          #
+
+          #
+          # Creates a new TLS Context.
+          #
+          # @param [Hash{Symbol => Object}] kwargs
+          #   Additional keyword arguments for {TLS.context}.
           #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          # @!macro context_kwargs
           #
           # @return [OpenSSL::SSL::SSLContext]
           #   The newly created SSL Context.
           #
           # @api semipublic
           #
-          def tls_context(version: 1.2, **kwargs)
-            ssl_context(version: version, **kwargs)
+          def tls_context(**kwargs)
+            TLS.context(**kwargs)
           end
 
           #
@@ -76,45 +88,31 @@ module Ronin
           # @param [TCPSocket] socket
           #   The existing TCP socket.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
-          #   Additional keyword arguments for {#ssl_context}.
-          #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
-          #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
-          #   The RSA key to use for the SSL context.
-          #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
+          #   Additional keyword arguments for {TLS.socket}.
           #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
-          #   The X509 certificate to use for the SSL context.
-          #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
-          #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          # @!macro context_kwargs
           #
           # @return [OpenSSL::SSL::SSLSocket]
           #   The new SSL Socket.
           #
           # @api public
           #
-          def tls_socket(socket, version: 1.2, **kwargs)
-            ssl_socket(socket,version: version, **kwargs)
+          def tls_socket(socket,**kwargs)
+            TLS.socket(socket,**kwargs)
           end
 
+          #
+          # @!macro connect_kwargs
+          #   @option kwargs [String] :bind_host
+          #     The local host to bind to.
+          #
+          #   @option kwargs [Integer] :bind_port
+          #     The local port to bind to.
+          #
+          #   @!macro context_kwargs
+          #
+
           #
           # Tests whether a remote SSLed TCP port is open.
           #
@@ -124,44 +122,10 @@ module Ronin
           # @param [Integer] port
           #   The port to connect to.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
-          #   Additional keyword arguments for {#ssl_connect}.
-          #
-          # @option kwargs [String] :bind_host
-          #   The local host to bind to.
-          #
-          # @option kwargs [Integer] :bind_port
-          #   The local port to bind to.
-          #
-          # @option kwargs [Integer] :timeout (5)
-          #   The maximum time to attempt connecting.
-          #
-          # @option options [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
-          #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
-          #   The RSA key to use for the SSL context.
-          #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
-          #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
-          #   The X509 certificate to use for the SSL context.
-          #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
+          #   Additional keyword arguments for {#tls_connect}.
           #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          # @!macro connect_kwargs
           #
           # @return [Boolean, nil]
           #   Specifies whether the remote SSLed TCP port is open.
@@ -176,8 +140,10 @@ module Ronin
           #
           # @api public
           #
-          def tls_open?(host,port, version: 1.2, **kwargs)
-            ssl_open?(host,port, version: version, **kwargs)
+          # @see TLS.open?
+          #
+          def tls_open?(host,port,**kwargs)
+            TLS.open?(host,port,**kwargs)
           end
 
           #
@@ -189,41 +155,10 @@ module Ronin
           # @param [Integer] port
           #   The port to connect to.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
           #   Additional keyword arguments for {#tls_socket}.
           #
-          # @option kwargs [String] :bind_host
-          #   The local host to bind to.
-          #
-          # @option kwargs [Integer] :bind_port
-          #   The local port to bind to.
-          #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
-          #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
-          #   The RSA key to use for the SSL context.
-          #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
-          #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
-          #   The X509 certificate to use for the SSL context.
-          #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
-          #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          # @!macro connect_kwargs
           #
           # @yield [tls_socket]
           #   The given block will be passed the new SSL socket. Once the block
@@ -250,8 +185,10 @@ module Ronin
           #
           # @api public
           #
-          def tls_connect(host,port, version: 1.2, **kwargs, &block)
-            ssl_connect(host,port, version: version, **kwargs, &block)
+          # @see TLS.connect
+          #
+          def tls_connect(host,port,**kwargs, &block)
+            TLS.connect(host,port,**kwargs, &block)
           end
 
           #
@@ -266,52 +203,23 @@ module Ronin
           # @param [Integer] port
           #   The port to connect to.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
           #   Additional keyword arguments for {#tls_connect}.
           #
-          # @option kwargs [String] :bind_host
-          #   The local host to bind to.
-          #
-          # @option kwargs [Integer] :bind_port
-          #   The local port to bind to.
-          #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
+          # @!macro connect_kwargs
           #
           # @yield [tls_socket]
-          #   The given block will be passed the newly created SSL Socket.
-          #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
-          #   The RSA key to use for the SSL context.
-          #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
-          #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
-          #   The X509 certificate to use for the SSL context.
-          #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
-          #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          #   The given block will be passed the newly created TLS Socket.
           #
           # @yieldparam [OpenSSL::SSL::SSLSocket] tls_socket
           #   The newly created SSL Socket.
           #
           # @api public
           #
-          def tls_connect_and_send(data,host,port, version: 1.2, **kwargs, &block)
-            ssl_connect_and_send(data,host,port, version: version, **kwargs, &block)
+          # @see TLS.connect_and_send
+          #
+          def tls_connect_and_send(data,host,port,**kwargs, &block)
+            TLS.connect_and_send(data,host,port,**kwargs, &block)
           end
 
           #
@@ -323,50 +231,18 @@ module Ronin
           # @param [Integer] port
           #   The port to connect to.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
           #   Additional keyword arguments for {#tls_connect}.
           #
-          # @option kwargs [String] :bind_host
-          #   The local host to bind to.
-          #
-          # @option kwargs [Integer] :bind_port
-          #   The local port to bind to.
-          #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
-          #
-          # @yield [tls_socket]
-          #   The given block will be passed the newly created SSL Socket.
-          #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
-          #   The RSA key to use for the SSL context.
-          #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
-          #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
-          #   The X509 certificate to use for the SSL context.
-          #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
-          #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          # @!macro connect_kwargs
           #
           # @return [OpenSSL::X509::Certificate]
           #   The server's certificate.
           #
-          def tls_cert(host,port, version: 1.2, **kwargs)
-            ssl_cert(host,port, version: version, **kwargs)
+          # @see TLS.get_cert
+          #
+          def tls_cert(host,port,**kwargs)
+            TLS.get_cert(host,port,**kwargs)
           end
 
           #
@@ -379,41 +255,10 @@ module Ronin
           # @param [Integer] port
           #   The port to connect to.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
           #   Additional keyword arguments for {#tls_connect}.
           #
-          # @option kwargs [String] :bind_host
-          #   The local host to bind to.
-          #
-          # @option kwargs [Integer] :bind_port
-          #   The local port to bind to.
-          #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
-          #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
-          #   The RSA key to use for the SSL context.
-          #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
-          #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
-          #   The X509 certificate to use for the SSL context.
-          #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
-          #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          # @!macro connect_kwargs
           #
           # @yield [banner]
           #   If a block is given, it will be passed the grabbed banner.
@@ -430,8 +275,10 @@ module Ronin
           #
           # @api public
           #
-          def tls_banner(host,port, version: 1.2, **kwargs, &block)
-            ssl_banner(host,port, version: version, **kwargs, &block)
+          # @see TLS.banner
+          #
+          def tls_banner(host,port,**kwargs, &block)
+            TLS.banner(host,port,**kwargs, &block)
           end
 
           #
@@ -447,41 +294,10 @@ module Ronin
           # @param [Integer] port
           #   The port to connect to.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
           #   Additional keyword arguments for {#tls_connect}.
           #
-          # @option kwargs [String] :bind_host
-          #   The local host to bind to.
-          #
-          # @option kwargs [Integer] :bind_port
-          #   The local port to bind to.
-          #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
-          #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key
-          #   The RSA key to use for the SSL context.
-          #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
-          #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert
-          #   The X509 certificate to use for the SSL context.
-          #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
-          #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          # @!macro connect_kwargs
           #
           # @return [true]
           #   The data was successfully sent.
@@ -493,82 +309,119 @@ module Ronin
           #
           # @api public
           #
-          def tls_send(data,host,port, version: 1.2, **kwargs)
-            ssl_send(data,host,port, version: version, **kwargs)
+          # @see TLS.send
+          #
+          def tls_send(data,host,port,**kwargs)
+            TLS.send(data,host,port,**kwargs)
           end
 
+          #
+          # @!macro server_context_kwargs
+          #   @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key (SSL.key)
+          #     The RSA key to use for the TLS context.
+          #
+          #   @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert (SSL.cert)
+          #     The X509 certificate to use for the TLS context.
+          #
+          #   @!macro context_kwargs
+          #
+
           #
           # Accepts an SSL session from an existing TCP socket.
           #
           # @param [TCPSocket] socket
           #   The existing TCP socket.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
           #   Additional keyword arguments for {#tls_socket}.
           #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
+          # @!macro server_context_kwargs
           #
           # @return [OpenSSL::SSL::SSLSocket]
           #   The new SSL Socket.
           #
           # @api public
           #
-          def tls_server_socket(socket, version: 1.2, **kwargs)
-            ssl_server_socket(socket, version: version, **kwargs)
+          # @see TLS.server_socket
+          #
+          def tls_server_socket(socket,**kwargs)
+            TLS.server_socket(socket,**kwargs)
           end
 
           #
-          # Creates a new SSL socket listening on a given host and port,
-          # accepting clients in a loop.
+          # @!macro server_kwargs
+          #   @option kwargs [Integer] :port (0)
+          #     The local port to listen on.
+          #
+          #   @option kwargs [String, nil] :host
+          #     The host to bind to.
+          #
+          #   @option kwargs [Integer] :backlog (5)
+          #     The maximum backlog of pending connections.
+          #
+          #   @!macro server_context_kwargs
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
+
+          #
+          # Creates a new TLS server listening on a given host and port.
           #
           # @param [Hash{Symbol => Object}] kwargs
-          #   Additional keyword arguments for {#tls_server_socket}.
+          #   Additional keyword arguments for {#tls_context}.
           #
-          # @option kwargs [Integer] :port
-          #   The local port to listen on.
+          # @!macro server_kwargs
           #
-          # @option kwargs [String] :host
-          #   The host to bind to.
+          # @yield [server]
+          #   The given block will be passed the newly created SSL server.
           #
-          # @option kwargs [Integer] :backlog (5)
-          #   The maximum backlog of pending connections.
+          # @yieldparam [OpenSSL::SSL::SSLServer] server
+          #   The newly created SSL server.
           #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
+          # @return [OpenSSL::SSL::SSLServer]
+          #   The newly created SSL server.
           #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
+          # @api public
           #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key (Network::SSL.key)
-          #   The RSA key to use for the SSL context.
+          # @since 1.1.0
           #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
+          def tls_server(**kwargs, &block)
+            TLS.server(**kwargs, &block)
+          end
+
+          #
+          # Creates a new temporary TLS server listening on a given host and
+          # port.
           #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert (Network::SSL.cert)
-          #   The X509 certificate to use for the SSL context.
+          # @param [Hash{Symbol => Object}] kwargs
+          #   Additional keyword arguments for {#tls_context}.
           #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
+          # @!macro server_kwargs
           #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
+          # @yield [server]
+          #   The given block will be passed the newly created SSL server.
+          #
+          # @yieldparam [OpenSSL::SSL::SSLServer] server
+          #   The newly created SSL server. Once the block has finished,
+          #   the server will be closed.
+          #
+          # @return [OpenSSL::SSL::SSLServer]
+          #   The newly created SSL server.
+          #
+          # @api public
+          #
+          # @since 1.1.0
+          #
+          def tls_server_session(**kwargs, &block)
+            TLS.server_session(**kwargs, &block)
+          end
+
+          #
+          # Creates a new SSL socket listening on a given host and port,
+          # accepting clients in a loop.
+          #
+          # @param [Hash{Symbol => Object}] kwargs
+          #   Additional keyword arguments for {#tls_server_socket}.
+          #
+          # @!macro server_kwargs
           #
           # @yield [client]
           #   The given block will be passed the newly connected client.
@@ -590,54 +443,20 @@ module Ronin
           #
           # @api public
           #
-          def tls_server_loop(version: 1.2, **kwargs, &block)
-            ssl_server_loop(version: 1.2, **kwargs, &block)
+          # @see TLS.server_loop
+          #
+          def tls_server_loop(**kwargs,&block)
+            TLS.server_loop(**kwargs,&block)
           end
 
           #
           # Creates a new SSL socket listening on a given host and port,
           # accepts only one client and then stops listening.
           #
-          # @param [1, 1.1, 1.2, String, Symbol, nil] version
-          #   The TLS version to use.
-          #
           # @param [Hash{Symbol => Object}] kwargs
           #   Additional keyword arguments for {#tls_server_socket}.
           #
-          # @option kwargs [Integer] :port
-          #   The local port to listen on.
-          #
-          # @option kwargs [String] :host
-          #   The host to bind to.
-          #
-          # @option kwargs [Symbol, Boolean] :verify
-          #   Specifies whether to verify the SSL certificate.
-          #   May be one of the following:
-          #
-          #   * `:none`
-          #   * `:peer`
-          #   * `:fail_if_no_peer_cert`
-          #   * `:client_once`
-          #
-          # @option kwargs [Crypto::Key::RSA, OpenSSL::PKey::RSA, nil] :key (Network::SSL.key)
-          #   The RSA key to use for the SSL context.
-          #
-          # @option kwargs [String] :key_file
-          #   The path to the SSL `.key` file.
-          #
-          # @option kwargs [Crypto::Cert, OpenSSL::X509::Certificate, nil] :cert (Network::SSL.cert)
-          #   The X509 certificate to use for the SSL context.
-          #
-          # @option kwargs [String] :cert_file
-          #   The path to the SSL `.crt` file.
-          #
-          # @option kwargs [String] :ca_bundle
-          #   Path to the CA certificate file or directory.
-          #
-          # @example
-          #   tls_accept(1337) do |client|
-          #     client.puts 'lol'
-          #   end
+          # @!macro server_kwargs
           #
           # @yield [client]
           #   The given block will be passed the newly connected client.
@@ -650,6 +469,11 @@ module Ronin
           # @return [nil]
           #
           # @example
+          #   tls_accept(1337) do |client|
+          #     client.puts 'lol'
+          #   end
+          #
+          # @example Using a self-signed certificate:
           #   # $ openssl genrsa -out ssl.key 1024
           #   # $ openssl req -new -key ssl.key -x509 -days 3653 -out ssl.crt
           #   # $ cat ssl.key ssl.crt > ssl.pem
@@ -660,8 +484,10 @@ module Ronin
           #
           # @api public
           #
-          def tls_accept(version: 1.2, **kwargs, &block)
-            ssl_accept(version: version, **kwargs, &block)
+          # @see TLS.accept
+          #
+          def tls_accept(**kwargs, &block)
+            TLS.accept(**kwargs, &block)
           end
         end
       end