Description: Add support for python3
Author: Philippe Thierry.
Last-Update: 2018-08-09
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/arm/LinuxARMLELF32.py
+++ b/arm/LinuxARMLELF32.py
@@ -52,7 +52,7 @@
     def pack_ip_addresses(self):
         hostocts = []
         if self.HOST is None:
-            print "This shellcode requires a HOST parameter -H"
+            print("This shellcode requires a HOST parameter -H")
             sys.exit(1)
         for i, octet in enumerate(self.HOST.split('.')):
                 hostocts.append(int(octet))
@@ -162,7 +162,7 @@
         For user supplied shellcode
         """
         if self.SUPPLIED_SHELLCODE is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print("[!] User must provide shellcode for this module (-U)")
             sys.exit(0)
         else:
             supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
--- a/intel/FreeBSDIntelELF32.py
+++ b/intel/FreeBSDIntelELF32.py
@@ -50,7 +50,7 @@
     def pack_ip_addresses(self):
         hostocts = []
         if self.HOST is None:
-            print "This shellcode requires a HOST parameter -H"
+            print ("This shellcode requires a HOST parameter -H")
             return False
         for i, octet in enumerate(self.HOST.split('.')):
                 hostocts.append(int(octet))
@@ -127,7 +127,7 @@
         For position independent shellcode from the user
         """
         if self.SUPPLIED_SHELLCODE is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print ("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
--- a/intel/intelCore.py
+++ b/intel/intelCore.py
@@ -63,9 +63,9 @@
         compliment_you = random.randint(1, 4228250625)
         compliment_me = int('0xFFFFFFFF', 16) - compliment_you
         if self.VERBOSE is True:
-            print "First ones compliment:", hex(compliment_you)
-            print "2nd ones compliment:", hex(compliment_me)
-            print "'AND' the compliments (0): ", compliment_you & compliment_me
+            print("First ones compliment:", hex(compliment_you))
+            print("2nd ones compliment:", hex(compliment_me))
+            print("'AND' the compliments (0): ", compliment_you & compliment_me)
         self.compliment_you = struct.pack('<I', compliment_you)
         self.compliment_me = struct.pack('<I', compliment_me)
 
@@ -73,7 +73,7 @@
         """
         Updated to use Capstone-Engine
         """
-        print "[*] Reading win32 entry instructions"
+        print("[*] Reading win32 entry instructions")
         self.f.seek(self.flItms['LocOfEntryinCode'])
         self.count = 0
         self.flItms['ImpList'] = []
@@ -104,7 +104,7 @@
         """
         For x64 files. Updated to use Capstone-Engine.
         """
-        print "[*] Reading win64 entry instructions"
+        print("[*] Reading win64 entry instructions")
         self.f.seek(self.flItms['LocOfEntryinCode'], 0)
         self.count = 0
         self.flItms['ImpList'] = []
@@ -135,7 +135,7 @@
         This function takes the flItms dict and patches the
         executable entry point to jump to the first code cave.
         """
-        print "[*] Patching initial entry instructions"
+        print("[*] Patching initial entry instructions")
         self.f.seek(self.flItms['LocOfEntryinCode'], 0)
         #This is the JMP command in the beginning of the
         #code entry point that jumps to the codecave
@@ -154,7 +154,7 @@
         """
         For x64 exes...
         """
-        print "[*] Creating win64 resume execution stub"
+        print("[*] Creating win64 resume execution stub")
         #pause loop for code cave clearing stub
         resumeExe = ''
         resumeExe += "\x51"             # push ecx
@@ -270,7 +270,7 @@
         This section of code imports the self.flItms['ImpList'] from pe32_entry_instr
         to patch the executable after shellcode execution
         """
-        print "[*] Creating win32 resume execution stub"
+        print("[*] Creating win32 resume execution stub")
         resumeExe = ''
         # buffer for zeroing shellcode (no performance impact)
         resumeExe += "\x51"             # push ecx
--- a/intel/LinuxIntelELF32.py
+++ b/intel/LinuxIntelELF32.py
@@ -50,7 +50,7 @@
     def pack_ip_addresses(self):
         hostocts = []
         if self.HOST is None:
-            print "This shellcode requires a HOST parameter -H"
+            print("This shellcode requires a HOST parameter -H")
             return False
         for i, octet in enumerate(self.HOST.split('.')):
                 hostocts.append(int(octet))
@@ -124,7 +124,7 @@
         For user supplied shellcode
         """
         if self.SUPPLIED_SHELLCODE is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
--- a/intel/LinuxIntelELF64.py
+++ b/intel/LinuxIntelELF64.py
@@ -51,7 +51,7 @@
     def pack_ip_addresses(self):
         hostocts = []
         if self.HOST is None:
-            print "This shellcode requires a HOST parameter -H"
+            print("This shellcode requires a HOST parameter -H")
             return False
         for i, octet in enumerate(self.HOST.split('.')):
                 hostocts.append(int(octet))
@@ -121,7 +121,7 @@
         For user supplied shellcode
         """
         if self.SUPPLIED_SHELLCODE is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
--- a/intel/MachoIntel32.py
+++ b/intel/MachoIntel32.py
@@ -175,7 +175,7 @@
 
     def user_supplied_shellcode(self):
         if self.SUPPLIED_SHELLCODE is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print ("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
--- a/intel/MachoIntel64.py
+++ b/intel/MachoIntel64.py
@@ -192,7 +192,7 @@
 
     def user_supplied_shellcode(self):
         if self.SUPPLIED_SHELLCODE is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
--- a/intel/WinIntelPE32.py
+++ b/intel/WinIntelPE32.py
@@ -92,7 +92,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print("This payload requires a HOST parameter -H")
             return False
 
         #breakupvar is the distance between codecaves
@@ -160,7 +160,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print("This payload requires a HOST parameter -H")
             return False
 
         flItms['stager'] = True
@@ -298,7 +298,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         flItms['stager'] = True
@@ -438,7 +438,7 @@
         flItms['stager'] = True
 
         if flItms['supplied_shellcode'] is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print ("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             self.supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
@@ -560,7 +560,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         self.shellcode1 = "\xfc"   # CLD
@@ -659,7 +659,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         flItms['stager'] = True
@@ -900,7 +900,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         flItms['stager'] = True
@@ -1154,7 +1154,7 @@
         flItms['stager'] = True
 
         if flItms['supplied_shellcode'] is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print ("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             self.supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
--- a/intel/WinIntelPE64.py
+++ b/intel/WinIntelPE64.py
@@ -95,7 +95,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         breakupvar = eat_code_caves(flItms, 0, 1)
@@ -171,7 +171,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         flItms['stager'] = True
@@ -435,7 +435,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         flItms['stager'] = True
@@ -715,7 +715,7 @@
         flItms['stager'] = True
 
         if flItms['supplied_shellcode'] is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print ("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             self.supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
@@ -943,7 +943,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         self.shellcode1 = "\xfc"   # CLD
@@ -1157,7 +1157,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         #overloading the class stackpreserve
@@ -1604,7 +1604,7 @@
             return False
 
         if self.HOST is None:
-            print "This payload requires a HOST parameter -H"
+            print ("This payload requires a HOST parameter -H")
             return False
 
         #overloading the class stackpreserve
@@ -1913,7 +1913,7 @@
                               )
 
         if flItms['supplied_shellcode'] is None:
-            print "[!] User must provide shellcode for this module (-U)"
+            print ("[!] User must provide shellcode for this module (-U)")
             return False
         else:
             self.supplied_shellcode = open(self.SUPPLIED_SHELLCODE, 'r+b').read()
--- a/osslsigncode/misc/pagehash.py
+++ b/osslsigncode/misc/pagehash.py
@@ -9,16 +9,16 @@
 f = open(sys.argv[1], 'rb')
 filehdr = f.read(1024)
 if filehdr[0:2] != 'MZ':
-    print "Not a DOS file."
+    print("Not a DOS file.")
     sys.exit(0)
 pepos = struct.unpack('<I', filehdr[60:64])[0]
 if filehdr[pepos:pepos+4] != 'PE\0\0':
-    print "Not a PE file."
+    print("Not a PE file.")
     sys.exit(0)
 pepos += 4
 
 nsections = struct.unpack('<H', filehdr[pepos+2:pepos+4])[0]
-print "#sections", nsections
+print("#sections", nsections)
 
 magic = struct.unpack('<H', filehdr[pepos+20:pepos+22])[0]
 pe32plus = 0
@@ -27,15 +27,15 @@
 elif magic == 0x10b:
     pe32plus = 0
 else:
-    print "Unknown magic", magic
+    print("Unknown magic", magic)
     sys.exit(0)
 
 sectoralign = struct.unpack('<I', filehdr[pepos+52:pepos+56])[0]
-print "Sector alignment", sectoralign
+print("Sector alignment", sectoralign)
 
 pos = pepos + 112 + pe32plus*16
 nrvas = struct.unpack('<I', filehdr[pos:pos+4])[0]
-print "#rvas", nrvas
+print("#rvas", nrvas)
 
 pos += 4
 tpos = pos
@@ -52,13 +52,13 @@
     sections.append((vsize,vaddr,rsize,raddr))
 
 hdrend = pos
-print "End of headers", pos
-print rvas
-print sections
+print("End of headers", pos)
+print(rvas)
+print(sections)
 
 sigpos,siglen = rvas[4]
 if sigpos == 0:
-    print "No signature found"
+    print("No signature found")
     sys.exit(0)
 
 f.seek(sigpos)
@@ -68,7 +68,7 @@
 oid_ph_v2 = "\x06\x01\x04\x01\x82\x37\x02\x03\x02"
 p = sigblob.find(cid_page_hash)
 if p == -1:
-    print "No page hash present"
+    print("No page hash present")
     sys.exit(0)
 
 p += len(cid_page_hash)
@@ -77,7 +77,7 @@
 if i == -1:
     i = sigblob.find(oid_ph_v2)
     if i == -1:
-        print "No page hash found"
+        print("No page hash found")
         sys.exit(0)
     sha1 = False
 p = i + len(oid_ph_v1)
@@ -106,9 +106,9 @@
 md.update(b)
 digest = md.hexdigest()
 
-print ""
-print "Checking page hash..."
-print ""
+print ("")
+print ("Checking page hash...")
+print ("")
 
 nph = [(0,digest)]
 lastpos = 0
@@ -136,4 +136,4 @@
     x=ph[i]
     y=nph[i]
     if x[0] != y[0] or x[1] != y[1]:
-        print "Not matching:", x, "!=", y
+        print ("Not matching:", x, "!=", y)
--- a/payloadtests.py
+++ b/payloadtests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 '''
 
 Copyright (c) 2013-2017, Joshua Pitts
@@ -64,9 +64,9 @@
     Usage: ./payloadtests.py file 127.0.0.1 8080
     '''
     if len(sys.argv) != 4:
-        print "Will create patched binaries for each stock shellcode/payload for the "
-        print "type of binary provided. Each payload type has it's own port number."
-        print "Usage:" + str(sys.argv[0]) + " binary HOST PORT"
+        print ("Will create patched binaries for each stock shellcode/payload for the ")
+        print ("type of binary provided. Each payload type has it's own port number.")
+        print ("Usage:" + str(sys.argv[0]) + " binary HOST PORT")
         sys.exit()
 
     file = sys.argv[1]
@@ -86,7 +86,7 @@
                 if 'cave_miner' in aShell or 'user_supplied' in aShell:
                     continue
                 aName = aShell + "." + patchtype + "." + str(host) + "." + str(port) + "." + file
-                print "Creating File:", aName
+                print ("Creating File:", aName)
                 if patchtype == 'APPEND':
                     supported_file = pebin.pebin(FILE=file, OUTPUT=aName,
                                                  SHELL=aShell, HOST=host,
@@ -113,7 +113,7 @@
             if 'cave_miner' in aShell or 'user_supplied' in aShell:
                 continue
             aName = aShell + "." + str(host) + "." + str(port) + "." + file
-            print "Creating File:", aName
+            print ("Creating File:", aName)
             supported_file = elfbin.elfbin(FILE=file, OUTPUT=aName,
                                            SHELL=aShell, HOST=host,
                                            PORT=port)
@@ -130,7 +130,7 @@
             if 'cave_miner' in aShell or 'user_supplied' in aShell:
                 continue
             aName = aShell + "." + str(host) + "." + str(port) + "." + file
-            print "Creating File:", aName
+            print ("Creating File:", aName)
             supported_file = machobin.machobin(FILE=file, OUTPUT=aName,
                                                SHELL=aShell, HOST=host,
                                                PORT=port, FAT_PRIORITY='ALL')
@@ -139,10 +139,10 @@
 
             port += 1
 
-    print "Successful files are in backdoored:"
+    print ("Successful files are in backdoored:")
     for afile, aresult in outputfiles.iteritems():
         if aresult is True:
-            print afile, 'Success'
+            print (afile, 'Success')
         else:
-            print afile, 'Fail'
+            print (afile, 'Fail')
             os.remove('backdoored/' + afile)
--- a/preprocessor/debug.py
+++ b/preprocessor/debug.py
@@ -40,7 +40,7 @@
         return self.result
 
     def print_debug(self):
-        print "*"*25, "DEBUG INFO", "*"*25
+        print ("*"*25, "DEBUG INFO", "*"*25)
 
         try:
             for item, data in vars(self.BDF).iteritems():
@@ -48,18 +48,18 @@
                 if item == 'flItms':
                     continue
                 # This will give ARGS info
-                print item, ":" ,data
+                print (item, ":" ,data)
             
             # BDF functions are exposed | print PE flItms (PE only)
             if 'flItms' in vars(self.BDF):
                 self.BDF.print_flItms(self.BDF.flItms)
 
-        except Exception, e:
-            print "!" * 50
-            print "\t[!] Exception:", str(e)
-            print "!" * 50
+        except e:
+            print ("!" * 50)
+            print ("\t[!] Exception:", str(e))
+            print ("!" * 50)
 
             self.result = False
 
-        print "*"*25, "END DEBUG INFO", "*"*25
+        print ("*"*25, "END DEBUG INFO", "*"*25)
 
--- a/preprocessor/nsis_3_0.py
+++ b/preprocessor/nsis_3_0.py
@@ -40,14 +40,14 @@
         self.nsis30()
 
     def nsis30(self):
-        print '\tNSIS 3.0 CRC32 Check | Patch Out Preprocessor'
+        print ('\tNSIS 3.0 CRC32 Check | Patch Out Preprocessor')
         with open(self.BDF.tmp_file.name, 'r+b') as self.f:
             self.check_NSIS()
             if self.nsis_binary is True:
-                print "\t[*] NSIS 3.0 Binary loaded"
+                print ("\t[*] NSIS 3.0 Binary loaded")
                 self.patch_crc32_check()
             else:
-                print "\t[*] NSIS 3.0 Binary NOT loaded"
+                print ("\t[*] NSIS 3.0 Binary NOT loaded")
 
     def check_NSIS(self):
         check_one = False
@@ -78,12 +78,12 @@
             locations.append(m.start())
          
         if len(locations) > 1:
-            print "\t[*] More than one binary match, picking first"
+            print ("\t[*] More than one binary match, picking first")
             match_loc = locations[0]
         else:
             match_loc = locations[0]
 
-        print "\t[*] Patch location", hex(match_loc)
+        print ("\t[*] Patch location", hex(match_loc))
         
         self.f.seek(match_loc + 4)
         self.f.write("\x84")
--- a/preprocessor/template.py
+++ b/preprocessor/template.py
@@ -44,9 +44,9 @@
         # add a tab for readability
         try:
 
-            print '\t[*] Default Template test complete'
+            print ('\t[*] Default Template test complete')
 
         #  Of course this doesn't fail
-        except Exception, e:
-            print "Why fail?", str(e)
+        except e:
+            print ("Why fail?", str(e))
             self.result = False
--- a/asm/build.py
+++ b/asm/build.py
@@ -38,7 +38,7 @@
 		p.wait()
 		xmit( name )
 	else:
-		print "[-] Unable to locate '%s.asm' in the src directory" % name
+		print ("[-] Unable to locate '%s.asm' in the src directory" % name)
 
 #=============================================================================#
 def xmit_dump_ruby( data, length=16 ):
@@ -49,20 +49,20 @@
 		if i+length <= len(data):
 			hex += " +"
 		dump += "%s\n" % ( hex )
-	print dump
+	print (dump)
 
 #=============================================================================#
 def xmit_offset( data, name, value, match_offset=0 ):
 	offset = data.find( value );
 	if offset != -1:
-		print "# %s Offset: %d" % ( name, offset + match_offset )
+		print ("# %s Offset: %d" % ( name, offset + match_offset ))
 
 #=============================================================================#
 def xmit( name, dump_ruby=True ):
 	bin = os.path.normpath( os.path.join( "./bin/", "%s.bin" % name ) )
 	f = open( bin, 'rb')
 	data = f.read()
-	print "# Name: %s\n# Length: %d bytes" % ( name, len( data ) )
+	print ("# Name: %s\n# Length: %d bytes" % ( name, len( data ) ))
 	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
@@ -84,7 +84,7 @@
 	if( name.find( "egghunter" ) >= 0 ):
 		null_count = data.count( "\x00" )
 		if( null_count > 0 ):
-			print "# Note: %d NULL bytes found." % ( null_count )
+			print ("# Note: %d NULL bytes found." % ( null_count ))
 	if dump_ruby:
 		xmit_dump_ruby( data )
 
@@ -94,9 +94,9 @@
 		argv = sys.argv
 	try:
 		if len( argv ) == 1:
-			print "Usage: build.py [clean|all|<name>]"
+			print ("Usage: build.py [clean|all|<name>]")
 		else:
-			print "# Built on %s\n" % (  time.asctime( time.localtime() ) )
+			print ("# Built on %s\n" % (  time.asctime( time.localtime() ) ))
 			if argv[1] == "clean":
 				clean()
 			elif argv[1] == "all":
@@ -120,8 +120,8 @@
 						build( name[:-4] )
 			else:
 				build( argv[1] )
-	except Exception, e:
-		print "[-] ", e
+	except e:
+		print ("[-] ", e)
 #=============================================================================#
 if __name__ == "__main__":
   main()