From e8097791fe6807944daa0448d1e038dd5c850f0b Mon Sep 17 00:00:00 2001
From: h00die <michaeltcyr@gmail.com>
Date: Thu, 11 Oct 2018 21:46:45 -0400
Subject: [PATCH] remove spaces at eol

---
 .../scanner/http/cisco_device_manager.md      |  1 +
 lib/msf/core/auxiliary/cisco.rb               | 30 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/documentation/modules/auxiliary/scanner/http/cisco_device_manager.md b/documentation/modules/auxiliary/scanner/http/cisco_device_manager.md
index e6a710c400..bfb260d78f 100644
--- a/documentation/modules/auxiliary/scanner/http/cisco_device_manager.md
+++ b/documentation/modules/auxiliary/scanner/http/cisco_device_manager.md
@@ -41,6 +41,7 @@
   [+] 2.2.2.2:80 MD5 Encrypted Enable Password: $1$TF.y$3E7pZ2szVvQw5JG8SDjNa1
   [+] 2.2.2.2:80 Username 'cisco' with MD5 Encrypted Password: $1$DaqN$iP32E5WcOOui/H66R63QB0
   [+] 2.2.2.2:80 SNMP Community (RO): public
+  [+] 2.2.2.2:80 ePhone Username 'phoneone' with Password: 111111
   [*] Scanned 1 of 1 hosts (100% complete)
   [*] Auxiliary module execution completed
   ```
diff --git a/lib/msf/core/auxiliary/cisco.rb b/lib/msf/core/auxiliary/cisco.rb
index f9862f4083..7c839d2c16 100644
--- a/lib/msf/core/auxiliary/cisco.rb
+++ b/lib/msf/core/auxiliary/cisco.rb
@@ -34,7 +34,7 @@ module Auxiliary::Cisco
   end
 
   def cisco_ios_config_eater(thost, tport, config)
-    
+
     credential_data = {
       address: thost,
       port: tport,
@@ -88,7 +88,7 @@ module Auxiliary::Cisco
             shash = cisco_ios_decrypt7(shash) rescue shash
             print_good("#{thost}:#{tport} Decrypted Enable Password: #{shash}")
             store_loot("cisco.ios.enable_pass", "text/plain", thost, shash, "enable_password.txt", "Cisco IOS Enable Password")
-            
+
             cred = credential_data.dup
             cred[:private_data] = shash
             cred[:private_type] = :password
@@ -131,27 +131,27 @@ module Auxiliary::Cisco
           spass = cisco_ios_decrypt7(spass) rescue spass
 
           print_good("#{thost}:#{tport} Decrypted VTY Password: #{spass}")
-          
+
           cred = credential_data.dup
           cred[:private_data] = spass
           cred[:private_type] = :password
           create_credential_and_login(cred)
-          
+
 
         when /^\s*(password|secret) 5 (.*)/i
           shash = $2.strip
           print_good("#{thost}:#{tport} MD5 Encrypted VTY Password: #{shash}")
           store_loot("cisco.ios.vty_password", "text/plain", thost, shash, "vty_password_hash.txt", "Cisco IOS VTY Password Hash (MD5)")
-          
+
           cred = credential_data.dup
           cred[:private_data] = shash
           cred[:private_type] = :nonreplayable_hash
           create_credential_and_login(cred)
-          
+
         when /^\s*password (0 |)([^\s]+)/i
           spass = $2.strip
           print_good("#{thost}:#{tport} Unencrypted VTY Password: #{spass}")
-          
+
           cred = credential_data.dup
           cred[:private_data] = spass
           cred[:private_type] = :nonreplayable_hash
@@ -212,7 +212,7 @@ module Auxiliary::Cisco
           cred[:private_data] = spass
           cred[:private_type] = :nonreplayable_hash
           create_credential_and_login(cred)
-          
+
         when /^\s*interface tunnel(\d+)/i
           tuniface = $1
 
@@ -222,24 +222,24 @@ module Auxiliary::Cisco
 
           print_good("#{thost}:#{tport} GRE Tunnel Key #{spass} for Interface Tunnel #{siface}")
           store_loot("cisco.ios.gre_tunnel_key", "text/plain", thost, "tunnel#{siface}_#{spass}", "gre_tunnel_key.txt", "Cisco GRE Tunnel Key")
-          
+
           cred = credential_data.dup
           cred[:private_data] = spass
           cred[:private_type] = :nonreplayable_hash
           create_credential_and_login(cred)
-          
+
         when /^\s*ip nhrp authentication ([^\s]+)/i
           spass = $1
           siface = tuniface
 
           print_good("#{thost}:#{tport} NHRP Authentication Key #{spass} for Interface Tunnel #{siface}")
           store_loot("cisco.ios.nhrp_tunnel_key", "text/plain", thost, "tunnel#{siface}_#{spass}", "nhrp_tunnel_key.txt", "Cisco NHRP Authentication Key")
-          
+
           cred = credential_data.dup
           cred[:private_data] = spass
           cred[:private_type] = :nonreplayable_hash
           create_credential_and_login(cred)
-          
+
 
 #
 # Various authentication secrets
@@ -287,7 +287,7 @@ module Auxiliary::Cisco
         when /^\s*username (?:&#34;)([^\s]+)(?:&#34;) password ([^\s]+)/i
           user  = $1
           spass = $2
-          print_good("#{thost}:#{tport} Phone Username '#{user}' with Password: #{spass}")
+          print_good("#{thost}:#{tport} ePhone Username '#{user}' with Password: #{spass}")
           store_loot("cisco.ios.ephone.username_password", "text/plain", thost, "#{user}:#{spass}", "ephone_username_password.txt", "Cisco IOS ephone Username and Password")
             cred = credential_data.dup
             cred[:private_data] = spass
@@ -338,7 +338,7 @@ module Auxiliary::Cisco
           if stype == 5
             print_good("#{thost}:#{tport} PPP Username #{suser} MD5 Encrypted Password: #{spass}")
             store_loot("cisco.ios.ppp_username_password_hash", "text/plain", thost, "#{suser}:#{spass}", "ppp_username_password_hash.txt", "Cisco IOS PPP Username and Password Hash (MD5)")
-            
+
             cred = credential_data.dup
             cred[:private_data] = spass
             cred[:private_type] = :nonreplayable_hash
@@ -348,7 +348,7 @@ module Auxiliary::Cisco
           if stype == 0
             print_good("#{thost}:#{tport} PPP Username: #{suser} Password: #{spass}")
             store_loot("cisco.ios.ppp_username_password", "text/plain", thost, "#{suser}:#{spass}", "ppp_username_password.txt", "Cisco IOS PPP Username and Password")
-            
+
             cred = credential_data.dup
             cred[:private_data] = spass
             cred[:private_type] = :nonreplayable_hash