Changeset 1628

Timestamp:

06/19/08 16:45:51 (2 months ago)

Author:

common

Message:

libemu

• sctest, introduce --cmd to allow overriding commands
  example sctest --cmd cmd="/bin/sh -c \"cd ~/.wine/drive_c/; wine 'c:\windows\system32\cmd_orig.exe' \"" will execute a real windows shell using wine if cmd is executed by shellcode
  

Files:

• libemu/trunk/testsuite/sctest.c (modified) (9 diffs)

libemu/trunk/testsuite/sctest.c

@@ -120 +120 @@
-                        int port;
-                }bind;
+
+                struct 
+                {
+                        struct emu_hashtable *commands;
+                }commands;
+
-        }override;
-} opts;
+
+
-
-
@@ -1596 +1604 @@
-}
-
+bool string_cmp(void *a, void *b)
+{
+        if ( strcmp(a, b)  )
+                return true;
+
+        return false;
+}
+
+uint32_t string_hash(void *key)
+{
+    uint32_t hash = 0;
+    char *c = (char *)key;
+        uint8_t num = 0x13;
+
+        while (*c != 0)
+        {
+                hash = hash << (32-num) | hash >> (num);
+//              hash = hash >> (32-num) | hash << (num);
+                hash += *c;
+                c++;
+        }
+
+    return hash;
+}
-
-
@@ -1677 +1709 @@
-                        dup2(psiStartInfo->hStdError,  fileno(stderr));
-
-
+
+
+
+
+
+
-                        exit(EXIT_SUCCESS);
-                }
@@ -2472 +2509 @@
-        {
-                {"a", "argos-csi"   , "PATH"    , "use this argos csi files as input"},
-
-
+
+
+
-                {"d", "dump"        , "INTEGER" , "dump the shellcode (binary) to stdout"},
-                {"g", "getpc"       , NULL      , "run getpc mode, try to detect a shellcode"},
@@ -2481 +2519 @@
-                {"l", "listtests"   , NULL      , "list all tests"},
-                {"o", "offset"      , "[INT|HEX]", "manual offset for shellcode, accepts int and hexvalues"},
-                , "PATH"        
+     , "PATH"    
-                {"S", "stdin"       , NULL      , "read shellcode/buffer from stdin, works with -g"},
-                {"s", "steps"       , "INTEGER" , "max number of steps to run"},
@@ -2753 +2791 @@
-        opts.offset = 0;
-
+        opts.override.commands.commands = emu_hashtable_new(16, string_hash, string_cmp);
+
-        while ( 1 )
-        {
@@ -2759 +2799 @@
-                static struct option long_options[] = {
-                        {"argos-csi"        , 1, 0, 'a'},
-
-
+
+
+
-                        {"dump"             , 1, 0, 'd'},
-                        {"getpc"            , 0, 0, 'g'},
-                        {"graph"            , 1, 0, 'G'},
-                        {"help"             , 0, 0, 'h'},
-1
+0
-                        {"listtests"        , 0, 0, 'l'},
-                        {"offset"           , 1, 0, 'o'},
-                        {"profile"          , 1, 0, 'p'},
+                        {"steps"            , 1, 0, 's'},
-                        {"stdin"            , 0, 0, 'S'},
-                        {"steps"            , 1, 0, 's'},
-                        {"testnumber"       , 1, 0, 't'},
-                        {"verbose"          , 0, 0, 'v'},
@@ -2776 +2817 @@
-                };
-
-
+C:
-                if ( c == -1 )
-                        break;
@@ -2818 +2859 @@
-                        break;
-
+                case 'C':
+                        {
+                                char *cmd = strdup(optarg);
+
+                                char *value = strstr(cmd, "=");
+                                *value = '\0';
+                                value++;
+                                printf("command for %s is %s\n", cmd, value );
+                                emu_hashtable_insert(opts.override.commands.commands, cmd, value);
+                        }
+                        break;
+
-                case 'd':
-                        dump(atoi(optarg));