From 5f3def5beebebf9b3985130f279918a9d30e86fd Mon Sep 17 00:00:00 2001 From: HD Moore Date: Fri, 2 Apr 2010 21:34:15 +0000 Subject: [PATCH] License corrections git-svn-id: file:///home/svn/framework3/trunk@8982 4d416f70-5f16-0410-b530-b9f4589650da --- lib/msf/ui/gtk2.rb | 2 +- lib/msf/util/exe.rb | 21 +++++++++++---------- lib/rex.rb | 4 ++-- lib/rex.rb.ts.rb | 4 ++-- lib/rex/LICENSE | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/msf/ui/gtk2.rb b/lib/msf/ui/gtk2.rb index fa54531a6a..2a40481e31 100644 --- a/lib/msf/ui/gtk2.rb +++ b/lib/msf/ui/gtk2.rb @@ -4,7 +4,7 @@ module Msf TITLE = 'Metasploit Framework' DESCRIPTION = 'A cross-platform GUI interface for the Metasploit Framework.' - COPYRIGHT = 'Copyright (C) 2006-2009 Metasploit LLC' + COPYRIGHT = 'Copyright (C) 2006-2009 Rapid7 LLC' AUTHORS = [ 'Fabrice MOURRON ', 'H D Moore ', diff --git a/lib/msf/util/exe.rb b/lib/msf/util/exe.rb index cc418f0842..4a3b4da8ca 100644 --- a/lib/msf/util/exe.rb +++ b/lib/msf/util/exe.rb @@ -90,7 +90,7 @@ require 'metasm' raise RuntimeError, "Junk at end of file. Is this a packed exe?" end - #find first section file offset and free RVA for new section + #find first section file offset and free RVA for new section free_rva = pe.hdr.opt.AddressOfEntryPoint first_off = fsize pe.sections.each do |sec| @@ -103,12 +103,12 @@ require 'metasm' #See if we can add a section first_sechead_file_off = pe.hdr.dos.e_lfanew + Rex::PeParsey::PeBase::IMAGE_FILE_HEADER_SIZE + pe.hdr.file.SizeOfOptionalHeader new_sechead_file_off = first_sechead_file_off + pe.hdr.file.NumberOfSections * Rex::PeParsey::PeBase::IMAGE_SIZEOF_SECTION_HEADER - if new_sechead_file_off + Rex::PeParsey::PeBase::IMAGE_SIZEOF_SECTION_HEADER > first_off + if new_sechead_file_off + Rex::PeParsey::PeBase::IMAGE_SIZEOF_SECTION_HEADER > first_off raise RuntimeError, "Not enough room for new section header" end # figure out where in the new section to put the start. Right now just putting at the beginning of the new section - start_rva = free_rva + start_rva = free_rva #make new section, starting at free RVA new_sec = win32_rwx_exec_thread(code, pe.hdr.opt.AddressOfEntryPoint - start_rva) @@ -1046,8 +1046,8 @@ require 'metasm' # This wrapper is responsible for allocating RWX memory, copying the # target code there, setting an exception handler that calls ExitProcess, - # starting the code in a new thread, and finally jumping back to the next - # code to execute. block_offset is the offset of the next code from + # starting the code in a new thread, and finally jumping back to the next + # code to execute. block_offset is the offset of the next code from # the start of this code def self.win32_rwx_exec_thread(code, block_offset) @@ -1194,7 +1194,7 @@ require 'metasm' exitblock: #{stub_exit} - + set_handler: xor eax,eax ; push dword [fs:eax] @@ -1208,9 +1208,9 @@ require 'metasm' push 0x160D6838 ; hash( "kernel32.dll", "CreateThread" ) call ebp ; Spawn payload thread - pop eax ; Skip -; pop eax ; Skip - pop eax ; Skip + pop eax ; Skip +; pop eax ; Skip + pop eax ; Skip popad ; Get our registers back ; sub esp, 44 ; Move stack pointer back past the handler ^ @@ -1247,7 +1247,7 @@ require 'metasm' cnt_jmp += 1 wrapper << "jmp autojump#{cnt_jmp}\n" - 1.upto(rand(8)+1) do + 1.upto(rand(8)+10) do wrapper << "db 0x#{"%.2x" % rand(0x100)}\n" cnt_nop -= 1 end @@ -1273,3 +1273,4 @@ require 'metasm' end end end + diff --git a/lib/rex.rb b/lib/rex.rb index 54ea057d27..c6fcba7d96 100644 --- a/lib/rex.rb +++ b/lib/rex.rb @@ -2,7 +2,7 @@ The Metasploit Rex library is provided under the 3-clause BSD license. -Copyright (c) 2005-2006, Metasploit LLC +Copyright (c) 2005-2006, Rapid7 LLC All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -15,7 +15,7 @@ are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Metasploit LLC nor the names of its contributors may be + * Neither the name of Rapid7 LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/lib/rex.rb.ts.rb b/lib/rex.rb.ts.rb index 078ec209c3..4a6b6205e3 100644 --- a/lib/rex.rb.ts.rb +++ b/lib/rex.rb.ts.rb @@ -4,7 +4,7 @@ The Metasploit Rex library is provided under the 3-clause BSD license. -Copyright (c) 2005-2006, Metasploit LLC +Copyright (c) 2005-2006, Rapid7 LLC All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -17,7 +17,7 @@ are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Metasploit LLC nor the names of its contributors may be + * Neither the name of Rapid7 LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/lib/rex/LICENSE b/lib/rex/LICENSE index 421b3065c7..0c087d9684 100644 --- a/lib/rex/LICENSE +++ b/lib/rex/LICENSE @@ -1,6 +1,6 @@ The Metasploit Rex library is provided under the 3-clause BSD license. -Copyright (c) 2005-2006, Metasploit LLC +Copyright (c) 2005-2006, Rapid7 LLC All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -13,7 +13,7 @@ are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Metasploit LLC nor the names of its contributors may be + * Neither the name of Rapid7 LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.