Land #4929, duplicate hash key fixes (final pass)

rapid7 · Mar 16, 2015 · b0a8fd8 · b0a8fd8
2 parents bb81107 + 4d3a1a2
commit b0a8fd8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/modules/auxiliary/scanner/http/bmc_trackit_passwd_reset.rb b/modules/auxiliary/scanner/http/bmc_trackit_passwd_reset.rb
@@ -131,11 +131,8 @@ def run_host(ip)
         '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}"}]),
         'updatequesChk' => 'false',
-        'SelectedQuestion' => 1,
         'SelectedQuestion' => 2,
-        'answer' => answers.first,
         'answer' => answers.last,
-        'confirmanswer' => answers.first,
         'confirmanswer' => answers.last
       }
     )

diff --git a/modules/exploits/linux/http/netgear_dgn2200b_pppoe_exec.rb b/modules/exploits/linux/http/netgear_dgn2200b_pppoe_exec.rb
@@ -185,7 +185,6 @@ def request(cmd,user,pass,uri)
             "wan_hwaddr2" => @wan_hwaddr2_orig,
             "wan_hwaddr_pc" => @wan_hwaddr_pc_orig,
             "wan_nat" => @wan_nat_orig,
-            "opendns_parental_ctrl" => @opendns_parental_ctrl_orig,
             "pppoe_flet_sel" => @pppoe_flet_sel_orig,
             "pppoe_flet_type" => @pppoe_flet_type_orig,
             "pppoe_temp" => @pppoe_temp_orig,

diff --git a/modules/post/windows/gather/credentials/razorsql.rb b/modules/post/windows/gather/credentials/razorsql.rb
@@ -127,19 +127,18 @@ def decrypt( encrypted_password )
       "n" => "p" , "m" => "q" , "l" => "r" , "k" => "s" , "j" => "t" ,
       "i" => "u" , "h" => "v" , "P" => "w" , "Q" => "x" , "R" => "y" ,
       "o" => "z" , "p" => "A" , "q" => "B" , "r" => "C" , "t" => "D" ,
-      "s" => "E" , "L" => "F" , "N" => "G" , "M" => "H" , "O" => "I" ,
-      "N" => "J" , "J" => "K" , "v" => "L" , "u" => "M" , "z" => "N" ,
-      "y" => "O" , "w" => "P" , "x" => "Q" , "G" => "R" , "H" => "S" ,
-      "A" => "T" , "B" => "U" , "D" => "V" , "C" => "W" , "E" => "X" ,
-      "F" => "Y" , "I" => "Z" , "?" => "1" , "3" => "2" , "4" => "3" ,
-      "5" => "4" , "6" => "5" , "7" => "6" , "8" => "7" , "9" => "8" ,
-      "2" => "9" , "." => "0" , "+" => "+" , "\"" => "\"" , "*" => "*" ,
-      "%" => "%" , "&" => "&" , "Z" => "/" , "(" => "(" , ")" => ")" ,
-      "=" => "=" , "," => "?" , "!" => "!" , "$" => "$" , "-" => "-" ,
-      "_" => "_" , "b" => ":" , "0" => "." , ";" => ";" , "1" => "," ,
-      "\\" => "\\" , "a" => "<" , "Y" => ">" , "'" => "'" , "^" => "^" ,
-      "{" => "{" , "}" => "}" , "[" => "[" , "]" => "]" , "~" => "~" ,
-      "`" => "`"
+      "s" => "E" , "L" => "F" , "M" => "H" , "O" => "I" , "N" => "J" ,
+      "J" => "K" , "v" => "L" , "u" => "M" , "z" => "N" , "y" => "O" ,
+      "w" => "P" , "x" => "Q" , "G" => "R" , "H" => "S" , "A" => "T" ,
+      "B" => "U" , "D" => "V" , "C" => "W" , "E" => "X" , "F" => "Y" ,
+      "I" => "Z" , "?" => "1" , "3" => "2" , "4" => "3" , "5" => "4" ,
+      "6" => "5" , "7" => "6" , "8" => "7" , "9" => "8" , "2" => "9" ,
+      "." => "0" , "+" => "+" , "\"" => "\"" , "*" => "*" , "%" => "%" ,
+      "&" => "&" , "Z" => "/" , "(" => "(" , ")" => ")" , "=" => "=" ,
+      "," => "?" , "!" => "!" , "$" => "$" , "-" => "-" , "_" => "_" ,
+      "b" => ":" , "0" => "." , ";" => ";" , "1" => "," , "\\" => "\\" ,
+      "a" => "<" , "Y" => ">" , "'" => "'" , "^" => "^" , "{" => "{" ,
+      "}" => "}" , "[" => "[" , "]" => "]" , "~" => "~" , "`" => "`"
     }
     password=''
     for letter in encrypted_password.chomp.each_char