Mostly cosmetic changes from local tree

git-svn-id: file:///home/svn/framework3/trunk@7970 4d416f70-5f16-0410-b530-b9f4589650da

external/source/shellcode/windows/x86/build.py

@@ -1,5 +1,5 @@
 #=============================================================================#
-# A simple python build script to build the singles/stages/stagers and 
+# A simple python build script to build the singles/stages/stagers and
 # some usefull information such as offsets and a hex dump. The binary output
 # will be placed in the bin directory. A hex string and usefull comments will
 # be printed to screen.
@@ -59,9 +59,11 @@ def xmit( name, dump_ruby=True ):
   f = open( bin, 'rb')
   data = f.read()
   print "# Name: %s\n# Length: %d bytes" % ( name, len( data ) )
-  xmit_offset( data, "Port", pack( ">H", 4444 ) )           # 4444
+  xmit_offset( data, "Port", pack( ">H", 4444 ) )           # 4444
+  xmit_offset( data, "LEPort", pack( "<H", 4444 ) )         # 4444
   xmit_offset( data, "Host", pack( ">L", 0x7F000001 ) )     # 127.0.0.1
-  xmit_offset( data, "CodeLen", pack( "<L", 0x12345678 ) )  # Filler
+  xmit_offset( data, "CodeLen", pack( "<L", 0x12345678 ) )  # Filler
+  xmit_offset( data, "Hostname", "https" )
   xmit_offset( data, "ExitFunk", pack( "<L", 0x0A2A1DE0 ) ) # kernel32.dll!ExitThread
   xmit_offset( data, "ExitFunk", pack( "<L", 0x56A2B5F0 ) ) # kernel32.dll!ExitProcess
   xmit_offset( data, "ExitFunk", pack( "<L", 0xEA320EFE ) ) # kernel32.dll!SetUnhandledExceptionFilter
@@ -96,4 +98,5 @@ def main( argv=None ):
 #=============================================================================#
 if __name__ == "__main__":
   main()
-#=============================================================================#
+#=============================================================================#
+

external/source/shellcode/windows/x86/src/single/alloc_execute.asm

@@ -9,6 +9,9 @@
 [BITS 32]
 [ORG 0]
 
+; Disabled until this is better tested
+; %include "./src/block/block_antidebug.asm"
+
   cld                    ; Clear the direction flag.
   call start             ; Call start, this pushes the address of 'api_call' onto the stack.
 delta:                   ;