Merge branch 'turboftp_update' of git://github.com/corelanc0d3r/metasploit-framework into corelanc0d3r-turboftp_update

2012-10-27 18:51:41 -05:00 · 2012-10-27 18:51:41 -05:00 · 7db7f1bfdf
parent 5c23e0af7b b48e355a6d
commit 7db7f1bfdf
1 changed files with 2 additions and 4 deletions
--- a/modules/exploits/windows/ftp/turboftp_port.rb
+++ b/modules/exploits/windows/ftp/turboftp_port.rb
@ -23,7 +23,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			},
 			'Author'         =>
 				[
-					'Zhao Liang',    #Initial Descovery
+					'Zhao Liang',    #Initial Discovery
 					'Lincoln',       #Metasploit
 					'corelanc0d3r',  #Metasploit
 					'thelightcosine' #Metasploit
@ -36,9 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				],
 			'Payload'        =>
 				{
-					'BadChars'       => "\x00",
-					'EncoderType'    => Msf::Encoder::Type::AlphanumMixed,
-					'EncoderOptions' => { 'BufferRegister' => 'EDI' }
+					'BadChars'       => "\x00\x0a\x0d\x20",
 					},
 			'Targets'        =>
 				[