Land #2066, use Rex instead of Base64

unstable
William Vu 2013-07-03 12:21:06 -05:00
commit c37884c6c7
2 changed files with 2 additions and 4 deletions

View File

@ -9,7 +9,6 @@ require 'msf/core'
require 'rex'
require 'msf/core/post/windows/priv'
require 'msf/core/post/windows/registry'
require 'base64'
require 'msf/core/auxiliary/report'
class Metasploit3 < Msf::Post
@ -141,7 +140,7 @@ class Metasploit3 < Msf::Post
line.chomp
line_num += 1
if line_num == 8
enc_password = Base64.decode64(line)
enc_password = Rex::Text.decode_base64(line)
password = decrypt_password(enc_password)
elsif line_num == 12
if line.match(/<(.*)>.(.*)/)

View File

@ -8,7 +8,6 @@
require 'msf/core'
require 'rex'
require 'rex/parser/ini'
require 'base64'
require 'msf/core/post/windows/user_profiles'
require 'msf/core/post/windows/registry'
require 'msf/core/auxiliary/report'
@ -103,7 +102,7 @@ class Metasploit3 < Msf::Post
114, 101, 115, 111, 108, 118, 101, 32, 72, 84, 84, 80, 32, 112, 114, 111,
120, 0]
decpass = Base64.decode64(epass)
decpass = Rex::Text.decode_base64(epass)
plaintext = [decpass].pack("H*").unpack("C*")
for i in 0 .. plaintext.length-2 do