Changeset 1634

Timestamp:

06/21/08 20:49:48 (2 months ago)

Author:

till

Message:

honeytrap
- cpuEmu: code stepping corrected

Files:

• honeytrap/trunk/src/modules/htm_cpuEmu.c (modified) (8 diffs)

honeytrap/trunk/src/modules/htm_cpuEmu.c

@@ -164 +164 @@
-
-                int j;
- j=0;j<8;j++ )
+j=0; j<8; j++) 
-
-                emu_memory_write_dword(mem, 0xef787c3c, 4711);
@@ -180 +180 @@
-
-                // write code to offset
-
-
+
-
-                // set eip to code
-static_offset
+CODE_OFFSET
-                emu_cpu_reg32_set(emu_cpu_get(e), esp, 0x0012fe98);
-
@@ -191 +190 @@
-
-                emu_free(e);
+
+                logmsg(LOG_NOISY, 1, "CPU Emulation - %u bytes processed.\n", attack->a_conn.payload.size);
-                return(1);
-        }
-
-        logmsg(LOG_NOISY, 1, "CPU Emulation - %u bytes processed.\n", attack->a_conn.payload.size);
-
-        return(0);
-}
@@ -202 +202 @@
-// run detected asm code on emulated CPU
-int run(struct emu *e) {
-
-
+ 
+ = 0
-        struct emu_cpu          *cpu = emu_cpu_get(e);
-        struct emu_env          *env = emu_env_new(e);
+        struct emu_hashtable    *eh = NULL;
+
-
-        if (env == NULL) {
-
+Unable to create environment: 
-                return -1;
-        }
@@ -216 +218 @@
-        emu_env_w32_export_hook(env, "ExitProcess", user_hook_ExitProcess, NULL);
-        emu_env_w32_export_hook(env, "ExitThread", user_hook_ExitThread, NULL);
+
-        emu_env_w32_export_hook(env, "CreateProcessA", user_hook_CreateProcess, NULL);
-        emu_env_w32_export_hook(env, "WaitForSingleObject", user_hook_WaitForSingleObject, NULL);
@@ -230 +233 @@
-        emu_env_w32_export_hook(env, "WSASocketA", user_hook_WSASocket, NULL);
-
-       
+        
-
-        // run the code
-        logmsg(LOG_NOISY, 1, "CPU Emulation - Running code...\n");
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-                if ((hook = emu_env_w32_eip_check(env)) != NULL) {
@@ -249 +250 @@
-                        }
-                } else {
-
-
-
-
+
+
-                        if (log_level == LOG_DEBUG) {
-                                emu_log_level_set(emu_logging_get(e),EMU_LOG_DEBUG);
@@ -258 +257 @@
-                                emu_log_level_set(emu_logging_get(e),EMU_LOG_NONE);
-                        }
+
+                        struct emu_env_hook *hook = NULL;
+
+                        if ( ret != -1 ) {
+                                if ( hook == NULL ) ret = emu_cpu_step(emu_cpu_get(e));
+                                else break;
+                        } else {
+                                logmsg(LOG_WARN, 1, "CPU Emulation Warning - CPU error: %s", emu_strerror(e));
+                                break;
+                        }
-                }
-        }
+
-        if (eh != NULL) emu_hashtable_free(eh);
-