update architecture

Brent Cook · Brent Cook · commit 005d34991b4c · 2016-11-20T19:09:33.000-06:00
diff --git a/modules/exploits/linux/http/empire_skywalker.rb b/modules/exploits/linux/http/empire_skywalker.rb
@@ -42,7 +42,7 @@ def initialize(info = {})
         [
           [ 'Python', { 'Arch' => ARCH_PYTHON, 'Platform' => 'python' } ],
           [ 'Linux x86', { 'Arch' => ARCH_X86, 'Platform' => 'linux' } ],
-          [ 'Linux x64', { 'Arch' => ARCH_X86_64, 'Platform' => 'linux' } ]
+          [ 'Linux x64', { 'Arch' => ARCH_X64, 'Platform' => 'linux' } ]
         ],
       'DefaultOptions'  => { 'WfsDelay' => 75 },
       'DefaultTarget'   => 0,
@@ -222,7 +222,7 @@ def exploit
       cron_command = "python #{payload_path}"
       payload_data = payload.raw
 
-    when ARCH_X86, ARCH_X86_64
+    when ARCH_X86, ARCH_X64
       cron_command = "chmod +x #{payload_path} && #{payload_path}"
       payload_data = payload.encoded_exe
 
diff --git a/modules/exploits/linux/local/bpf_priv_esc.rb b/modules/exploits/linux/local/bpf_priv_esc.rb
@@ -27,7 +27,7 @@ def initialize(info={})
             'h00die <mike@shorebreaksecurity.com>' # metasploit module
           ],
         'Platform'      => [ 'linux' ],
-        'Arch'          => [ ARCH_X86, ARCH_X86_64 ],
+        'Arch'          => [ ARCH_X86, ARCH_X64 ],
         'SessionTypes'  => [ 'shell', 'meterpreter' ],
         'References'    =>
           [
@@ -39,7 +39,7 @@ def initialize(info={})
         'Targets'       =>
           [
             [ 'Linux x86',       { 'Arch' => ARCH_X86 } ],
-            [ 'Linux x64',       { 'Arch' => ARCH_X86_64 } ]
+            [ 'Linux x64',       { 'Arch' => ARCH_X64 } ]
           ],
         'DefaultOptions' =>
           {
diff --git a/modules/exploits/linux/local/overlayfs_priv_esc.rb b/modules/exploits/linux/local/overlayfs_priv_esc.rb
@@ -37,7 +37,7 @@ def initialize(info = {})
           ],
         'DisclosureDate' => 'Jun 16 2015',
         'Platform'       => [ 'linux'],
-        'Arch'           => [ ARCH_X86, ARCH_X86_64 ],
+        'Arch'           => [ ARCH_X86, ARCH_X64 ],
         'SessionTypes'   => [ 'shell', 'meterpreter' ],
         'Targets'        =>
           [
diff --git a/modules/exploits/linux/misc/opennms_java_serialize.rb b/modules/exploits/linux/misc/opennms_java_serialize.rb
@@ -31,7 +31,7 @@ def initialize(info = {})
         'Targets'        =>
           [
             [ 'OpenNMS / Linux x86',    { 'Arch' => ARCH_X86, 'Platform' => 'linux' } ],
-            [ 'OpenNMS / Linux x86_64', { 'Arch' => ARCH_X86_64, 'Platform' => 'linux' } ]
+            [ 'OpenNMS / Linux x86_64', { 'Arch' => ARCH_X64, 'Platform' => 'linux' } ]
           ],
         'DefaultTarget'  => 0,
         'DisclosureDate' => 'Nov 19 2014'
diff --git a/modules/exploits/multi/http/bassmaster_js_injection.rb b/modules/exploits/multi/http/bassmaster_js_injection.rb
@@ -30,7 +30,7 @@ def initialize(info = {})
         ],
       'License'        => MSF_LICENSE,
       'Platform'    => ['linux', 'bsd'],                                                 # binary > native JavaScript
-      'Arch'        => [ARCH_X86, ARCH_X86_64],
+      'Arch'        => [ARCH_X86, ARCH_X64],
       'Privileged'     => false,
       'Targets'     =>
         [
diff --git a/modules/exploits/windows/fileformat/office_ole_multiple_dll_hijack.rb b/modules/exploits/windows/fileformat/office_ole_multiple_dll_hijack.rb
@@ -57,7 +57,7 @@ def initialize(info = {})
         },
       'Payload' => { 'Space'	=> 2048, },
       'Platform' => 'win',
-      'Arch' => [ ARCH_X86, ARCH_X86_64 ],
+      'Arch' => [ ARCH_X86, ARCH_X64 ],
       'Targets' =>
         [
           [ 'All', {} ],
diff --git a/modules/exploits/windows/local/panda_psevents.rb b/modules/exploits/windows/local/panda_psevents.rb
@@ -35,7 +35,7 @@ def initialize(info={})
       'SessionTypes'  => [ 'meterpreter' ],
       'Targets'       => [
           [ 'Windows x86', { 'Arch' => ARCH_X86 } ],
-          [ 'Windows x64', { 'Arch' => ARCH_X86_64 } ]
+          [ 'Windows x64', { 'Arch' => ARCH_X64 } ]
       ],
       'DefaultTarget' => 0,
       'DefaultOptions' => {
diff --git a/modules/exploits/windows/misc/hta_server.rb b/modules/exploits/windows/misc/hta_server.rb
@@ -28,7 +28,7 @@ def initialize(info = {})
       'Targets'        =>
         [
           [ 'Powershell x86', { 'Platform' => 'win', 'Arch' => ARCH_X86 } ],
-          [ 'Powershell x64', { 'Platform' => 'win', 'Arch' => ARCH_X86_64 } ]
+          [ 'Powershell x64', { 'Platform' => 'win', 'Arch' => ARCH_X64 } ]
         ],
       'DefaultTarget'  => 0,
       'DisclosureDate' => 'Oct 06 2016'

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ def initialize(info={})`
`27`	`27`	`'h00die <[email protected]>' # metasploit module`
`28`	`28`	`],`
`29`	`29`	`'Platform' => [ 'linux' ],`
`30`		`- 'Arch' => [ ARCH_X86, ARCH_X86_64 ],`
	`30`	`+ 'Arch' => [ ARCH_X86, ARCH_X64 ],`
`31`	`31`	`'SessionTypes' => [ 'shell', 'meterpreter' ],`
`32`	`32`	`'References' =>`
`33`	`33`	`[`
`@@ -39,7 +39,7 @@ def initialize(info={})`
`39`	`39`	`'Targets' =>`
`40`	`40`	`[`
`41`	`41`	`[ 'Linux x86', { 'Arch' => ARCH_X86 } ],`
`42`		`- [ 'Linux x64', { 'Arch' => ARCH_X86_64 } ]`
	`42`	`+ [ 'Linux x64', { 'Arch' => ARCH_X64 } ]`
`43`	`43`	`],`
`44`	`44`	`'DefaultOptions' =>`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ def initialize(info = {})`
`37`	`37`	`],`
`38`	`38`	`'DisclosureDate' => 'Jun 16 2015',`
`39`	`39`	`'Platform' => [ 'linux'],`
`40`		`- 'Arch' => [ ARCH_X86, ARCH_X86_64 ],`
	`40`	`+ 'Arch' => [ ARCH_X86, ARCH_X64 ],`
`41`	`41`	`'SessionTypes' => [ 'shell', 'meterpreter' ],`
`42`	`42`	`'Targets' =>`
`43`	`43`	`[`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ def initialize(info = {})`
`31`	`31`	`'Targets' =>`
`32`	`32`	`[`
`33`	`33`	`[ 'OpenNMS / Linux x86', { 'Arch' => ARCH_X86, 'Platform' => 'linux' } ],`
`34`		`- [ 'OpenNMS / Linux x86_64', { 'Arch' => ARCH_X86_64, 'Platform' => 'linux' } ]`
	`34`	`+ [ 'OpenNMS / Linux x86_64', { 'Arch' => ARCH_X64, 'Platform' => 'linux' } ]`
`35`	`35`	`],`
`36`	`36`	`'DefaultTarget' => 0,`
`37`	`37`	`'DisclosureDate' => 'Nov 19 2014'`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ def initialize(info = {})`
`30`	`30`	`],`
`31`	`31`	`'License' => MSF_LICENSE,`
`32`	`32`	`'Platform' => ['linux', 'bsd'], # binary > native JavaScript`
`33`		`- 'Arch' => [ARCH_X86, ARCH_X86_64],`
	`33`	`+ 'Arch' => [ARCH_X86, ARCH_X64],`
`34`	`34`	`'Privileged' => false,`
`35`	`35`	`'Targets' =>`
`36`	`36`	`[`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ def initialize(info = {})`
`57`	`57`	`},`
`58`	`58`	`'Payload' => { 'Space' => 2048, },`
`59`	`59`	`'Platform' => 'win',`
`60`		`- 'Arch' => [ ARCH_X86, ARCH_X86_64 ],`
	`60`	`+ 'Arch' => [ ARCH_X86, ARCH_X64 ],`
`61`	`61`	`'Targets' =>`
`62`	`62`	`[`
`63`	`63`	`[ 'All', {} ],`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ def initialize(info = {})`
`28`	`28`	`'Targets' =>`
`29`	`29`	`[`
`30`	`30`	`[ 'Powershell x86', { 'Platform' => 'win', 'Arch' => ARCH_X86 } ],`
`31`		`- [ 'Powershell x64', { 'Platform' => 'win', 'Arch' => ARCH_X86_64 } ]`
	`31`	`+ [ 'Powershell x64', { 'Platform' => 'win', 'Arch' => ARCH_X64 } ]`
`32`	`32`	`],`
`33`	`33`	`'DefaultTarget' => 0,`
`34`	`34`	`'DisclosureDate' => 'Oct 06 2016'`