Changeset 1403

Timestamp:

10/06/07 21:14:17 (11 months ago)

Author:

common

Message:

libemu

• sctest -o for manual offset, understands hex and decimal
  

Files:

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

libemu/trunk/testsuite/sctest.c

@@ -2064 +2064 @@
-                        if ( (off = emu_shellcode_test(e, (uint8_t *)opts.scode, opts.size)) >= 0 )
-                        {
-\n"
+ (offset %i (0x%x))\n",off,(unsigned int)off
-                                opts.offset = off;
-                                test(n);
@@ -2126 +2126 @@
-                {"l", "listtests"   , NULL              , "list all tests"},
-                {"d", "dump"        , "INTEGER" , "dump the shellcode (binary) to stdout"},
-"INTEGER"
+NULL     
-                {"G", "graph"       , "FILEPATH", "save a dot formatted callgraph in filepath"},
-                {"h", "help"        , NULL              , "show this help"},
-                {"S", "stdin"           , NULL          , "read shellcode/buffer from stdin, works with -g"},
+                {"o", "offset"          , "[INT|HEX]", "manual offset for shellcode, accepts int and hexvalues"},
-        };
-
@@ -2171 +2172 @@
-                        {"help"                         , 0, 0, 'h'},
-                        {"stdin"                        , 0, 0, 'S'},
+                        {"offset"                       , 1, 0, 'o'},
-                        {0, 0, 0, 0}
-                };
-
-
+o:
-                if ( c == -1 )
-                        break;
@@ -2220 +2222 @@
-                        break;
-
+                case 'o':
+                        if (strncasecmp(optarg, "0x", 2) == 0)
+                                opts.offset = strtol(optarg+2, NULL, 16); // hex vvalue
+                        else
+                                opts.offset = strtol(optarg, NULL, 10);   // decimal vvalue
+                        printf("offset %i (0x%x)\n", opts.offset, (unsigned int)opts.offset);
+                        break;
+
+
-                default:
-                        printf ("?? getopt returned character code 0%o ??\n", c);
-                        break;
+
-                }
-        }