From 2545410bc70669b28d3efb92ef1d691fbb34bd4a Mon Sep 17 00:00:00 2001
From: Joshua Drake <github.jdrake@qoop.org>
Date: Thu, 19 Aug 2010 21:08:51 +0000
Subject: [PATCH] make exe template names more consistent

git-svn-id: file:///home/svn/framework3/trunk@10065 4d416f70-5f16-0410-b530-b9f4589650da
---
 data/templates/src/pe/dll/build.sh                |  14 +++++++++++---
 data/templates/src/pe/exe/service/Service.vcproj  |   2 +-
 data/templates/template_armle_linux.bin           | Bin
 data/templates/template_x64_windows.dll           | Bin
 data/templates/template_x64_windows.exe           | Bin
 ...rvice_x64.exe => template_x64_windows_svc.exe} | Bin
 .../{template.dll => template_x86_windows.dll}    | Bin
 .../{template.exe => template_x86_windows.exe}    | Bin
 ...plate-old.exe => template_x86_windows_old.exe} | Bin
 .../{service.exe => template_x86_windows_svc.exe} | Bin
 lib/msf/util/exe.rb                               |  12 ++++++------
 .../exploits/multi/browser/java_signed_applet.rb  |   2 +-
 12 files changed, 19 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 data/templates/template_armle_linux.bin
 mode change 100755 => 100644 data/templates/template_x64_windows.dll
 mode change 100644 => 100755 data/templates/template_x64_windows.exe
 rename data/templates/{service_x64.exe => template_x64_windows_svc.exe} (100%)
 mode change 100644 => 100755
 rename data/templates/{template.dll => template_x86_windows.dll} (100%)
 mode change 100755 => 100644
 rename data/templates/{template.exe => template_x86_windows.exe} (100%)
 mode change 100644 => 100755
 rename data/templates/{template-old.exe => template_x86_windows_old.exe} (100%)
 mode change 100644 => 100755
 rename data/templates/{service.exe => template_x86_windows_svc.exe} (100%)

diff --git a/data/templates/src/pe/dll/build.sh b/data/templates/src/pe/dll/build.sh
index 1b2ab63d04..bc23dc4de7 100755
--- a/data/templates/src/pe/dll/build.sh
+++ b/data/templates/src/pe/dll/build.sh
@@ -1,3 +1,11 @@
+#
+# XXX: NOTE: this will only compile the x86 version.
+#
+# To compile the x64 version, use:
+# C:\> call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" amd64
+# C:\> cl.exe -LD /Zl /GS- /DBUILDMODE=2 /link /entry:DllMain kernel32.lib
+#
+
 if [ -z "$PREFIX" ]; then
   PREFIX=i586-mingw32msvc
 fi
@@ -7,10 +15,10 @@ $PREFIX-gcc -c template.c
 $PREFIX-windres -o rc.o template.rc
 $PREFIX-gcc -mdll -o junk.tmp -Wl,--base-file,base.tmp template.o rc.o
 rm -f junk.tmp
-$PREFIX-dlltool --dllname template.dll --base-file base.tmp --output-exp temp.exp --def template.def
+$PREFIX-dlltool --dllname template_x86_windows.dll --base-file base.tmp --output-exp temp.exp --def template.def
 rm -f base.tmp
-$PREFIX-gcc -mdll -o template.dll template.o rc.o -Wl,temp.exp
+$PREFIX-gcc -mdll -o template_x86_windows.dll template.o rc.o -Wl,temp.exp
 rm -f temp.exp
 
-$PREFIX-strip template.dll
+$PREFIX-strip template_x86_windows.dll
 rm -f *.o
diff --git a/data/templates/src/pe/exe/service/Service.vcproj b/data/templates/src/pe/exe/service/Service.vcproj
index 433e9d5578..d9e12be859 100644
--- a/data/templates/src/pe/exe/service/Service.vcproj
+++ b/data/templates/src/pe/exe/service/Service.vcproj
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../../../service_x64.exe"
+				OutputFile="../../../../template_x64_windows_svc.exe"
 				LinkIncremental="1"
 				GenerateManifest="false"
 				GenerateDebugInformation="false"
diff --git a/data/templates/template_armle_linux.bin b/data/templates/template_armle_linux.bin
old mode 100644
new mode 100755
diff --git a/data/templates/template_x64_windows.dll b/data/templates/template_x64_windows.dll
old mode 100755
new mode 100644
diff --git a/data/templates/template_x64_windows.exe b/data/templates/template_x64_windows.exe
old mode 100644
new mode 100755
diff --git a/data/templates/service_x64.exe b/data/templates/template_x64_windows_svc.exe
old mode 100644
new mode 100755
similarity index 100%
rename from data/templates/service_x64.exe
rename to data/templates/template_x64_windows_svc.exe
diff --git a/data/templates/template.dll b/data/templates/template_x86_windows.dll
old mode 100755
new mode 100644
similarity index 100%
rename from data/templates/template.dll
rename to data/templates/template_x86_windows.dll
diff --git a/data/templates/template.exe b/data/templates/template_x86_windows.exe
old mode 100644
new mode 100755
similarity index 100%
rename from data/templates/template.exe
rename to data/templates/template_x86_windows.exe
diff --git a/data/templates/template-old.exe b/data/templates/template_x86_windows_old.exe
old mode 100644
new mode 100755
similarity index 100%
rename from data/templates/template-old.exe
rename to data/templates/template_x86_windows_old.exe
diff --git a/data/templates/service.exe b/data/templates/template_x86_windows_svc.exe
similarity index 100%
rename from data/templates/service.exe
rename to data/templates/template_x86_windows_svc.exe
diff --git a/lib/msf/util/exe.rb b/lib/msf/util/exe.rb
index 962a59ace4..a6f6df7067 100644
--- a/lib/msf/util/exe.rb
+++ b/lib/msf/util/exe.rb
@@ -78,7 +78,7 @@ require 'metasm'
 	def self.to_win32pe(framework, code, opts={})
 
 		# Allow the user to specify their own EXE template
-		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "template.exe")
+		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "template_x86_windows.exe")
 
 		# Copy the code to a new RWX segment to allow for self-modifying encoders
 		payload = win32_rwx_exec(code)
@@ -170,7 +170,7 @@ require 'metasm'
 		end
 
 		if(not text)
-			raise RuntimeError, "No .text section found in the template exe"
+			raise RuntimeError, "No .text section found in the template_x86_windows.exe"
 		end
 
 		if ! text.contains_rva?(pe.hdr.opt.AddressOfEntryPoint)
@@ -280,7 +280,7 @@ require 'metasm'
 	def self.to_win32pe_old(framework, code, opts={})
 
 		# Allow the user to specify their own EXE template
-		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "template-old.exe")
+		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "template_x86_windows_old.exe")
 
 		pe = ''
 		File.open(opts[:template], "rb") { |fd|
@@ -344,7 +344,7 @@ require 'metasm'
 		name = opts[:servicename] || 'SERVICENAME'
 
 		# Allow the user to specify their own service EXE template
-		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "service.exe")
+		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "template_x86_windows_svc.exe")
 
 		pe = ''
 		File.open(opts[:template], 'rb') { |fd|
@@ -367,7 +367,7 @@ require 'metasm'
 	def self.to_win64pe_service(framework, code, opts={})
 
 		# Allow the user to specify their own service EXE template
-		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "service_x64.exe")
+		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "template_x64_windows_svc.exe")
 
 		pe = ''
 		File.open(opts[:template], "rb") { |fd|
@@ -390,7 +390,7 @@ require 'metasm'
 	def self.to_win32pe_dll(framework, code, opts={})
 
 		# Allow the user to specify their own DLL template
-		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "template.dll")
+		opts[:template] ||= File.join(File.dirname(__FILE__), "..", "..", "..", "data", "templates", "template_x86_windows.dll")
 
 		pe = ''
 		File.open(opts[:template], "rb") { |fd|
diff --git a/modules/exploits/multi/browser/java_signed_applet.rb b/modules/exploits/multi/browser/java_signed_applet.rb
index cab17e3e67..b36712a9e6 100644
--- a/modules/exploits/multi/browser/java_signed_applet.rb
+++ b/modules/exploits/multi/browser/java_signed_applet.rb
@@ -104,7 +104,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		register_advanced_options(
 			[
 				OptString.new('SaveToFile',		[ false, "When set, source is saved to this directory under external/source/", nil ]),
-				OptString.new('Template',		[ true, "The default executable template to use", File.join(Msf::Config.install_root, "data", "templates", "template.exe") ]),
+				OptString.new('Template',		[ true, "The default executable template to use", File.join(Msf::Config.install_root, "data", "templates", "template_x86_windows.exe") ]),
 				OptString.new('InsertPayload',	[ false, "Inject payload into template without affecting executable behavior", nil ])
 			], self.class)
 	end