diff options
| -rw-r--r-- | miasm2/os_dep/common.py | 2 | ||||
| -rw-r--r-- | miasm2/os_dep/win_api_x86_32.py | 7 | ||||
| -rw-r--r-- | miasm2/os_dep/win_api_x86_32_seh.py | 9 |
3 files changed, 11 insertions, 7 deletions
diff --git a/miasm2/os_dep/common.py b/miasm2/os_dep/common.py index 83b00ae6..41d24405 100644 --- a/miasm2/os_dep/common.py +++ b/miasm2/os_dep/common.py @@ -1,4 +1,4 @@ -from miasm2.jitter.csts import * +from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE def get_str_ansi(jitter, ad_str, max_char=None): l = 0 diff --git a/miasm2/os_dep/win_api_x86_32.py b/miasm2/os_dep/win_api_x86_32.py index 5a673265..e47c6024 100644 --- a/miasm2/os_dep/win_api_x86_32.py +++ b/miasm2/os_dep/win_api_x86_32.py @@ -29,9 +29,10 @@ try: except ImportError: print "cannot find crypto, skipping" -from miasm2.jitter.csts import * -from miasm2.core.utils import * -from miasm2.os_dep.common import * +from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE, PAGE_EXEC +from miasm2.core.utils import pck16, pck32, upck32, hexdump +from miasm2.os_dep.common \ + import heap, set_str_ansi, set_str_unic, get_str_ansi, get_str_unic from miasm2.os_dep.win_api_x86_32_seh import FS_0_AD log = logging.getLogger("win_api_x86_32") diff --git a/miasm2/os_dep/win_api_x86_32_seh.py b/miasm2/os_dep/win_api_x86_32_seh.py index e77e30d9..7b10c88c 100644 --- a/miasm2/os_dep/win_api_x86_32_seh.py +++ b/miasm2/os_dep/win_api_x86_32_seh.py @@ -19,11 +19,14 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # import logging +import os +import struct + from elfesteem import pe_init -from miasm2.jitter.csts import * -from miasm2.core.utils import * + +from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE +from miasm2.core.utils import pck32, upck32 import miasm2.arch.x86.regs as x86_regs -import os # Constants Windows EXCEPTION_BREAKPOINT = 0x80000003 |