Browse Source

Pull in consts from rex-arch gem...

Pearce Barry 3 years ago
parent
commit
05afaa1162
No account linked to committer's email address
4 changed files with 2 additions and 67 deletions
  1. 2
    0
      lib/msf/core.rb
  2. 0
    1
      lib/msf/core/payload/uuid.rb
  3. 0
    1
      lib/rex.rb
  4. 0
    65
      lib/rex/constants.rb

+ 2
- 0
lib/msf/core.rb View File

@@ -16,6 +16,8 @@ require 'msf/sanity'
16 16
 # The framework-core depends on Rex
17 17
 require 'rex'
18 18
 require 'rex/ui'
19
+require 'rex/arch'
20
+include Rex::Arch
19 21
 
20 22
 module Msf
21 23
   autoload :Author, 'msf/core/author'

+ 0
- 1
lib/msf/core/payload/uuid.rb View File

@@ -2,7 +2,6 @@
2 2
 
3 3
 require 'msf/core'
4 4
 require 'msf/core/module/platform'
5
-require 'rex/constants'
6 5
 require 'rex/text'
7 6
 
8 7
 #

+ 0
- 1
lib/rex.rb View File

@@ -59,7 +59,6 @@ require 'rex/struct2'
59 59
 require 'rex/ole'
60 60
 
61 61
 # Generic classes
62
-require 'rex/constants'
63 62
 require 'rex/exceptions'
64 63
 require 'rex/transformer'
65 64
 require 'rex/random_identifier'

+ 0
- 65
lib/rex/constants.rb View File

@@ -1,65 +0,0 @@
1
-# -*- coding: binary -*-
2
-
3
-#
4
-# Architecture constants
5
-#
6
-ARCH_ANY     = '_any_'
7
-ARCH_X86     = 'x86'
8
-ARCH_X86_64  = 'x86_64'
9
-ARCH_X64     = 'x64' # To be used for compatability with ARCH_X86_64
10
-ARCH_MIPS    = 'mips'
11
-ARCH_MIPSLE  = 'mipsle'
12
-ARCH_MIPSBE  = 'mipsbe'
13
-ARCH_PPC     = 'ppc'
14
-ARCH_PPC64   = 'ppc64'
15
-ARCH_CBEA    = 'cbea'
16
-ARCH_CBEA64  = 'cbea64'
17
-ARCH_SPARC   = 'sparc'
18
-ARCH_CMD     = 'cmd'
19
-ARCH_PHP     = 'php'
20
-ARCH_TTY     = 'tty'
21
-ARCH_ARMLE   = 'armle'
22
-ARCH_ARMBE   = 'armbe'
23
-ARCH_JAVA    = 'java'
24
-ARCH_RUBY    = 'ruby'
25
-ARCH_DALVIK  = 'dalvik'
26
-ARCH_PYTHON  = 'python'
27
-ARCH_NODEJS  = 'nodejs'
28
-ARCH_FIREFOX = 'firefox'
29
-ARCH_ZARCH   = 'zarch'
30
-ARCH_TYPES   =
31
-  [
32
-    ARCH_X86,
33
-    ARCH_X86_64,
34
-    ARCH_MIPS,
35
-    ARCH_MIPSLE,
36
-    ARCH_MIPSBE,
37
-    ARCH_PPC,
38
-    ARCH_PPC64,
39
-    ARCH_CBEA,
40
-    ARCH_CBEA64,
41
-    ARCH_SPARC,
42
-    ARCH_ARMLE,
43
-    ARCH_ARMBE,
44
-    ARCH_CMD,
45
-    ARCH_PHP,
46
-    ARCH_TTY,
47
-    ARCH_JAVA,
48
-    ARCH_RUBY,
49
-    ARCH_DALVIK,
50
-    ARCH_PYTHON,
51
-    ARCH_NODEJS,
52
-    ARCH_FIREFOX,
53
-    ARCH_ZARCH,
54
-  ]
55
-
56
-ARCH_ALL = ARCH_TYPES
57
-
58
-#
59
-# Endian constants
60
-#
61
-ENDIAN_LITTLE = 0
62
-ENDIAN_BIG    = 1
63
-
64
-IS_ENDIAN_LITTLE = ( [1].pack('s') == "\x01\x00" ) ? true : false
65
-IS_ENDIAN_BIG    = ( not IS_ENDIAN_LITTLE )

Loading…
Cancel
Save