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

sinn3r · sinn3r · commit 7db7f1bfdfd0 · 2012-10-27T18:51:41.000-05:00
diff --git a/modules/exploits/windows/ftp/turboftp_port.rb b/modules/exploits/windows/ftp/turboftp_port.rb
@@ -23,7 +23,7 @@ def initialize(info = {})
 			},
 			'Author'         =>
 				[
-					'Zhao Liang',    #Initial Descovery
+					'Zhao Liang',    #Initial Discovery
 					'Lincoln',       #Metasploit
 					'corelanc0d3r',  #Metasploit
 					'thelightcosine' #Metasploit
@@ -36,9 +36,7 @@ def initialize(info = {})
 				],
 			'Payload'        =>
 				{
-					'BadChars'       => "\x00",
-					'EncoderType'    => Msf::Encoder::Type::AlphanumMixed,
-					'EncoderOptions' => { 'BufferRegister' => 'EDI' }
+					'BadChars'       => "\x00\x0a\x0d\x20",
 					},
 			'Targets'        =>
 				[

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ def initialize(info = {})`
`23`	`23`	`},`
`24`	`24`	`'Author' =>`
`25`	`25`	`[`
`26`		`- 'Zhao Liang', #Initial Descovery`
	`26`	`+ 'Zhao Liang', #Initial Discovery`
`27`	`27`	`'Lincoln', #Metasploit`
`28`	`28`	`'corelanc0d3r', #Metasploit`
`29`	`29`	`'thelightcosine' #Metasploit`
`@@ -36,9 +36,7 @@ def initialize(info = {})`
`36`	`36`	`],`
`37`	`37`	`'Payload' =>`
`38`	`38`	`{`
`39`		`- 'BadChars' => "\x00",`
`40`		`- 'EncoderType' => Msf::Encoder::Type::AlphanumMixed,`
`41`		`- 'EncoderOptions' => { 'BufferRegister' => 'EDI' }`
	`39`	`+ 'BadChars' => "\x00\x0a\x0d\x20",`
`42`	`40`	`},`
`43`	`41`	`'Targets' =>`
`44`	`42`	`[`