From ca7caae62276231da58c6fd311dbdf082f4f0143 Mon Sep 17 00:00:00 2001
From: Jacob Robles <jrobles@rapid7.com>
Date: Tue, 20 Mar 2018 10:19:57 -0500
Subject: [PATCH] Change External Module Type Names

Change the a couple of external module type names
to be consistent with the template files.
---
 lib/msf/core/modules/external/shim.rb                  | 4 ++--
 modules/auxiliary/scanner/ssl/bleichenbacher_oracle.py | 2 +-
 modules/auxiliary/scanner/wproxy/att_open_proxy.py     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/msf/core/modules/external/shim.rb b/lib/msf/core/modules/external/shim.rb
index 1971e48cbd..b5ba42286b 100644
--- a/lib/msf/core/modules/external/shim.rb
+++ b/lib/msf/core/modules/external/shim.rb
@@ -13,9 +13,9 @@ class Msf::Modules::External::Shim
       capture_server(mod)
     when 'dos'
       dos(mod)
-    when 'scanner.single'
+    when 'single_scanner'
       single_scanner(mod)
-    when 'scanner.multi'
+    when 'multi_scanner'
       multi_scanner(mod)
     else
       # TODO have a nice load error show up in the logs
diff --git a/modules/auxiliary/scanner/ssl/bleichenbacher_oracle.py b/modules/auxiliary/scanner/ssl/bleichenbacher_oracle.py
index 4b5bab7f6b..907487f463 100755
--- a/modules/auxiliary/scanner/ssl/bleichenbacher_oracle.py
+++ b/modules/auxiliary/scanner/ssl/bleichenbacher_oracle.py
@@ -60,7 +60,7 @@ metadata = {
         {'type': 'aka', 'ref': 'ROBOT'},
         {'type': 'aka', 'ref': 'Adaptive chosen-ciphertext attack'}
      ],
-    'type': 'scanner.single',
+    'type': 'single_scanner',
     'options': {
         'rhost': {'type': 'address', 'description': 'The target address', 'required': True, 'default': None},
         'rport': {'type': 'port', 'description': 'The target port', 'required': True, 'default': 443},
diff --git a/modules/auxiliary/scanner/wproxy/att_open_proxy.py b/modules/auxiliary/scanner/wproxy/att_open_proxy.py
index f963ca82b6..15a0b94072 100755
--- a/modules/auxiliary/scanner/wproxy/att_open_proxy.py
+++ b/modules/auxiliary/scanner/wproxy/att_open_proxy.py
@@ -23,7 +23,7 @@ metadata = {
         {'type': 'aka', 'ref': 'SharknAT&To'},
         {'type': 'aka', 'ref': 'sharknatto'}
      ],
-    'type': 'scanner.multi',
+    'type': 'multi_scanner',
     'options': {
         'rhosts': {'type': 'address_range', 'description': 'The target address', 'required': True, 'default': None},
         'rport': {'type': 'port', 'description': 'The target port', 'required': True, 'default': 49152},