Land #4929, duplicate hash key fixes (final pass)
commit
b0a8fd864c
|
@ -131,11 +131,8 @@ class Metasploit4 < Msf::Auxiliary
|
||||||
'emailaddress' => Rex::Text.rand_text_alpha(8) + '@' + Rex::Text.rand_text_alpha(8) + '.com',
|
'emailaddress' => Rex::Text.rand_text_alpha(8) + '@' + Rex::Text.rand_text_alpha(8) + '.com',
|
||||||
'userQuestions' => %Q([{"Id":1,"Answer":"#{answers.first}"},{"Id":2,"Answer":"#{answers.last}"}]),
|
'userQuestions' => %Q([{"Id":1,"Answer":"#{answers.first}"},{"Id":2,"Answer":"#{answers.last}"}]),
|
||||||
'updatequesChk' => 'false',
|
'updatequesChk' => 'false',
|
||||||
'SelectedQuestion' => 1,
|
|
||||||
'SelectedQuestion' => 2,
|
'SelectedQuestion' => 2,
|
||||||
'answer' => answers.first,
|
|
||||||
'answer' => answers.last,
|
'answer' => answers.last,
|
||||||
'confirmanswer' => answers.first,
|
|
||||||
'confirmanswer' => answers.last
|
'confirmanswer' => answers.last
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
@ -185,7 +185,6 @@ class Metasploit3 < Msf::Exploit::Remote
|
||||||
"wan_hwaddr2" => @wan_hwaddr2_orig,
|
"wan_hwaddr2" => @wan_hwaddr2_orig,
|
||||||
"wan_hwaddr_pc" => @wan_hwaddr_pc_orig,
|
"wan_hwaddr_pc" => @wan_hwaddr_pc_orig,
|
||||||
"wan_nat" => @wan_nat_orig,
|
"wan_nat" => @wan_nat_orig,
|
||||||
"opendns_parental_ctrl" => @opendns_parental_ctrl_orig,
|
|
||||||
"pppoe_flet_sel" => @pppoe_flet_sel_orig,
|
"pppoe_flet_sel" => @pppoe_flet_sel_orig,
|
||||||
"pppoe_flet_type" => @pppoe_flet_type_orig,
|
"pppoe_flet_type" => @pppoe_flet_type_orig,
|
||||||
"pppoe_temp" => @pppoe_temp_orig,
|
"pppoe_temp" => @pppoe_temp_orig,
|
||||||
|
|
|
@ -127,19 +127,18 @@ class Metasploit3 < Msf::Post
|
||||||
"n" => "p" , "m" => "q" , "l" => "r" , "k" => "s" , "j" => "t" ,
|
"n" => "p" , "m" => "q" , "l" => "r" , "k" => "s" , "j" => "t" ,
|
||||||
"i" => "u" , "h" => "v" , "P" => "w" , "Q" => "x" , "R" => "y" ,
|
"i" => "u" , "h" => "v" , "P" => "w" , "Q" => "x" , "R" => "y" ,
|
||||||
"o" => "z" , "p" => "A" , "q" => "B" , "r" => "C" , "t" => "D" ,
|
"o" => "z" , "p" => "A" , "q" => "B" , "r" => "C" , "t" => "D" ,
|
||||||
"s" => "E" , "L" => "F" , "N" => "G" , "M" => "H" , "O" => "I" ,
|
"s" => "E" , "L" => "F" , "M" => "H" , "O" => "I" , "N" => "J" ,
|
||||||
"N" => "J" , "J" => "K" , "v" => "L" , "u" => "M" , "z" => "N" ,
|
"J" => "K" , "v" => "L" , "u" => "M" , "z" => "N" , "y" => "O" ,
|
||||||
"y" => "O" , "w" => "P" , "x" => "Q" , "G" => "R" , "H" => "S" ,
|
"w" => "P" , "x" => "Q" , "G" => "R" , "H" => "S" , "A" => "T" ,
|
||||||
"A" => "T" , "B" => "U" , "D" => "V" , "C" => "W" , "E" => "X" ,
|
"B" => "U" , "D" => "V" , "C" => "W" , "E" => "X" , "F" => "Y" ,
|
||||||
"F" => "Y" , "I" => "Z" , "?" => "1" , "3" => "2" , "4" => "3" ,
|
"I" => "Z" , "?" => "1" , "3" => "2" , "4" => "3" , "5" => "4" ,
|
||||||
"5" => "4" , "6" => "5" , "7" => "6" , "8" => "7" , "9" => "8" ,
|
"6" => "5" , "7" => "6" , "8" => "7" , "9" => "8" , "2" => "9" ,
|
||||||
"2" => "9" , "." => "0" , "+" => "+" , "\"" => "\"" , "*" => "*" ,
|
"." => "0" , "+" => "+" , "\"" => "\"" , "*" => "*" , "%" => "%" ,
|
||||||
"%" => "%" , "&" => "&" , "Z" => "/" , "(" => "(" , ")" => ")" ,
|
"&" => "&" , "Z" => "/" , "(" => "(" , ")" => ")" , "=" => "=" ,
|
||||||
"=" => "=" , "," => "?" , "!" => "!" , "$" => "$" , "-" => "-" ,
|
"," => "?" , "!" => "!" , "$" => "$" , "-" => "-" , "_" => "_" ,
|
||||||
"_" => "_" , "b" => ":" , "0" => "." , ";" => ";" , "1" => "," ,
|
"b" => ":" , "0" => "." , ";" => ";" , "1" => "," , "\\" => "\\" ,
|
||||||
"\\" => "\\" , "a" => "<" , "Y" => ">" , "'" => "'" , "^" => "^" ,
|
"a" => "<" , "Y" => ">" , "'" => "'" , "^" => "^" , "{" => "{" ,
|
||||||
"{" => "{" , "}" => "}" , "[" => "[" , "]" => "]" , "~" => "~" ,
|
"}" => "}" , "[" => "[" , "]" => "]" , "~" => "~" , "`" => "`"
|
||||||
"`" => "`"
|
|
||||||
}
|
}
|
||||||
password=''
|
password=''
|
||||||
for letter in encrypted_password.chomp.each_char
|
for letter in encrypted_password.chomp.each_char
|
||||||
|
|
Loading…
Reference in New Issue