Land #11524, remove some unused bits from modules

modules/auxiliary/dos/ssl/dtls_changecipherspec.rb

@@ -6,7 +6,6 @@
 class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::Dos
   include Msf::Exploit::Capture
-  include Exploit::Remote::Tcp
 
   def initialize(info = {})
     super(update_info(info,
@@ -28,6 +27,12 @@ class MetasploitModule < Msf::Auxiliary
         ],
       'DisclosureDate' => 'Apr 26 2000'))
 
+    register_options([
+        Opt::RPORT(80),
+        Opt::RHOST
+      ]
+    )
+
     deregister_options('FILTER','PCAPFILE', 'INTERFACE', 'SNAPLEN', 'TIMEOUT')
   end
 

modules/auxiliary/gather/shodan_honeyscore.rb

@@ -29,10 +29,6 @@ class MetasploitModule < Msf::Auxiliary
       )
     )
 
-    deregister_options('RHOST', 'SSL', 'DOMAIN', 'DigestAuthIIS', 'NTLM::SendLM',
-      'NTLM::SendNTLM', 'VHOST', 'RPORT', 'NTLM::SendSPN', 'NTLM::UseLMKey',
-      'NTLM::UseNTLM2_session', 'NTLM::UseNTLMv2')
-
     register_options(
       [
         OptString.new('TARGET', [true, 'The target to get the score of']),

modules/auxiliary/gather/shodan_search.rb

@@ -7,7 +7,6 @@ require 'net/https'
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
-  include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
   def initialize(info = {})
@@ -32,10 +31,6 @@ class MetasploitModule < Msf::Auxiliary
       )
     )
 
-    deregister_options('RHOST', 'DOMAIN', 'DigestAuthIIS', 'NTLM::SendLM',
-      'NTLM::SendNTLM', 'VHOST', 'RPORT', 'NTLM::SendSPN', 'NTLM::UseLMKey',
-      'NTLM::UseNTLM2_session', 'NTLM::UseNTLMv2')
-
     register_options(
       [
         OptString.new('SHODAN_APIKEY', [true, 'The SHODAN API key']),

modules/auxiliary/gather/windows_deployment_services_shares.rb

@@ -39,7 +39,6 @@ class MetasploitModule < Msf::Auxiliary
         OptString.new('SMBDomain', [ false, "SMB Domain", '']),
       ])
 
-    deregister_options('RHOST', 'CHOST', 'CPORT', 'SSL', 'SSLVersion')
   end
 
   # Determine the type of share based on an ID type value

modules/auxiliary/gather/zoomeye_search.rb

@@ -26,10 +26,6 @@ class MetasploitModule < Msf::Auxiliary
       'License'     => MSF_LICENSE
       ))
 
-      deregister_options('RHOST', 'DOMAIN', 'DigestAuthIIS', 'NTLM::SendLM',
-            'NTLM::SendNTLM', 'VHOST', 'RPORT', 'NTLM::SendSPN', 'NTLM::UseLMKey',
-            'NTLM::UseNTLM2_session', 'NTLM::UseNTLMv2', 'SSL')
-
       register_options(
         [
           OptString.new('USERNAME', [true, 'The ZoomEye username']),