sample/exeencode: fix inline sample source

jjyg · May 13, 2009 · 7263390 · 7263390
1 parent 7591f15
commit 7263390
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 35 deletions.
diff --git a/samples/elfencode.rb b/samples/elfencode.rb
@@ -10,32 +10,15 @@
 load File.join(File.dirname(__FILE__), 'exeencode.rb')
 
 __END__
-.interp '/lib/ld-linux.so.2'
 .pt_gnu_stack rw
-
-.data
-toto db "world", 0
-fmt db "Hello, %s !\n", 0
-
 .text
 .entrypoint
- call metasm_intern_geteip
- mov esi, eax
- lea eax, [esi-metasm_intern_geteip+toto]
- push eax
- lea eax, [esi-metasm_intern_geteip+fmt]
- push eax
- call printf
- add esp, 8
+push bla
+push fmt
+call printf
+push 0
+call exit
 
-push 28h
-call _exit
-add esp, 4
-ret
-
-metasm_intern_geteip:
- call 1f
-1:
- pop eax
- add eax, metasm_intern_geteip - 1b
- ret
+.data
+bla db "world", 0
+fmt db "Hello, %s !\n", 0
diff --git a/samples/exeencode.rb b/samples/exeencode.rb
@@ -62,14 +62,21 @@
 end
 
 __END__
-.text
-.entrypoint
-push bla
-push fmt
-call printf
-push 0
-call exit
+#include <asm/unistd_32.h>
+jmp getip
+gotip:
+mov eax, __NR_write
+mov ebx, 1
+pop ecx
+mov edx, strend-str
+int 80h
 
-.data
-bla db "world", 0
-fmt db "Hello, %s !\n", 0
+mov eax, __NR_exit
+mov ebx, 1
+int 80h
+
+getip:
+call gotip
+
+str db "Hello, world!", 0xa
+strend: