Commit Graph

346 Commits (f9d74b0701db8190f74c06f6758581e635d5b95d)

Author SHA1 Message Date
kris 37c2e301ed replacing defunct framework URL in header comments in most modules and pcap_log
git-svn-id: file:///home/svn/framework3/trunk@6479 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-13 14:33:26 +00:00
kris 1eb8c8dfc0 meh, what can I say? I like my name
git-svn-id: file:///home/svn/framework3/trunk@6459 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-03 15:05:35 +00:00
kris 9482b4080e set a few more modules' Versions to Revision, only did aux by accident last time
git-svn-id: file:///home/svn/framework3/trunk@6439 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 01:09:09 +00:00
HD Moore eccfcdfced Sets svn keywords on modules missing it, tweaks the emailer module
git-svn-id: file:///home/svn/framework3/trunk@6407 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 06:03:35 +00:00
HD Moore 13706d1bde Tons of new Mac OS X code from Dino Dai Zovi and Charlie Miller, more to follow
git-svn-id: file:///home/svn/framework3/trunk@6353 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-18 23:28:24 +00:00
James Lee fd7399210d updated info for payload/php/shell_findsock
git-svn-id: file:///home/svn/framework3/trunk@6231 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 06:04:02 +00:00
James Lee 3cfee47b00 remove dll option from reflectivevncinject
git-svn-id: file:///home/svn/framework3/trunk@6180 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 03:44:59 +00:00
James Lee 55daaf64bd remove dll option from reflectivemeterpreter, too
git-svn-id: file:///home/svn/framework3/trunk@6179 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 03:29:07 +00:00
James Lee 3a8935b2c6 remove the ability to set the dll path for meterp and vncinject
git-svn-id: file:///home/svn/framework3/trunk@6178 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 23:06:10 +00:00
HD Moore 70feb8152c Switch to the new TTY session type
git-svn-id: file:///home/svn/framework3/trunk@6141 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 07:02:22 +00:00
HD Moore 4fdca1f6d7 Update info to reflect TTY class
git-svn-id: file:///home/svn/framework3/trunk@6138 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 06:47:53 +00:00
HD Moore 5b75b5d5a6 Move interact_tty to the TTY arch
git-svn-id: file:///home/svn/framework3/trunk@6137 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 06:47:04 +00:00
druid 0d1ca42ed6 Adds support for exploitation over dialup via the new Telephony library.
git-svn-id: file:///home/svn/framework3/trunk@6120 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 06:09:02 +00:00
James Lee 114067e7bb standardize names
git-svn-id: file:///home/svn/framework3/trunk@6059 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-02 21:21:10 +00:00
James Lee 200cedeb25 clean up name and description
git-svn-id: file:///home/svn/framework3/trunk@6058 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-02 21:18:51 +00:00
kris 232145819b Adding Linux/x86 inline IPv6 bind shell payload
git-svn-id: file:///home/svn/framework3/trunk@6036 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-21 07:10:27 +00:00
kris 4ae6d81616 Add bind_ruby and reverse_ruby cmd payloads for unix and windows
git-svn-id: file:///home/svn/framework3/trunk@5967 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-20 03:42:55 +00:00
kris d7ad8fa452 Adding Linux/x86 IPv6 bind and reverse-connect stagers
git-svn-id: file:///home/svn/framework3/trunk@5951 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 21:01:26 +00:00
Ramon de C Valle 26692d3437 Added AIX Power payload modules
git-svn-id: file:///home/svn/framework3/trunk@5900 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 01:58:36 +00:00
Ramon de C Valle dfbf6b34a5 Added Linux Power/Cell Broadband Engine Architecture payload modules and advanced payload options
git-svn-id: file:///home/svn/framework3/trunk@5899 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 01:57:53 +00:00
Ramon de C Valle ec4fffaa61 Removing old AIX Power payload modules
git-svn-id: file:///home/svn/framework3/trunk@5897 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 01:52:57 +00:00
James Lee 75feaa6fab allow passing args to meterpreter scripts through AutoRunScript
git-svn-id: file:///home/svn/framework3/trunk@5853 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 19:39:06 +00:00
HD Moore be3bfb36a9 Correct the DLL path
git-svn-id: file:///home/svn/framework3/trunk@5844 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-05 06:13:26 +00:00
HD Moore 187f79eddf Switch the DLLs for vnc/meterp to Stephen Fewer's reflective versions, check in the reflectve_meterpreter source code project
git-svn-id: file:///home/svn/framework3/trunk@5837 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 20:08:24 +00:00
James Lee 0193cd5219 fix session vs client variable problems with meterpreter AutoRunScript and make usage actually reflect what the code does
git-svn-id: file:///home/svn/framework3/trunk@5834 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 06:40:12 +00:00
HD Moore 56a413d803 Reflective DLL injection payloads from Stephen Fewer
git-svn-id: file:///home/svn/framework3/trunk@5806 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 22:17:32 +00:00
Ramon de C Valle 8d19ba7bbf Changed AIX_VERSION to AIXLEVEL
git-svn-id: file:///home/svn/framework3/trunk@5786 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-23 13:22:12 +00:00
Ramon de C Valle c66d6c4e46 Set property 'svn:keywords'
git-svn-id: file:///home/svn/framework3/trunk@5783 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-23 02:43:21 +00:00
Ramon de C Valle eb0c6d1a65 Added missing Linux x86 payload modules from unixasm
git-svn-id: file:///home/svn/framework3/trunk@5782 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-23 02:19:50 +00:00
Ramon de C Valle 693202fd4b Updated AIX POWER/PowerPC payload modules
git-svn-id: file:///home/svn/framework3/trunk@5781 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-23 02:04:18 +00:00
Ramon de C Valle e6127313c9 Updated AIX POWER/PowerPC payload modules
git-svn-id: file:///home/svn/framework3/trunk@5774 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:41:12 +00:00
Ramon de C Valle f124597a56 Code cleanups
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:03:39 +00:00
James Lee 76dc2920d5 implemented in lib/msf/core/payload/php.rb
git-svn-id: file:///home/svn/framework3/trunk@5745 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-13 05:49:11 +00:00
James Lee 38b565399e actually randomize myexec function name
git-svn-id: file:///home/svn/framework3/trunk@5744 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-13 05:31:36 +00:00
HD Moore fd256ec4a1 This massive commit changes the metasploit 3 module format. The new syntax allows for greater scalability and future improvements to the metasploit module loader. This change also makes it easier for users to add new modules, since the class name no longer needs to match the directory structure.
git-svn-id: file:///home/svn/framework3/trunk@5709 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-02 05:23:59 +00:00
HD Moore 422e58c51f Close the listening socket, allows the same shellcode to beused on the same port repeatedly, thanks antoine!
git-svn-id: file:///home/svn/framework3/trunk@5705 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 16:16:34 +00:00
James Lee 647118f333 remove debug statements, add disabled_functions evasion in php findsock stuff
git-svn-id: file:///home/svn/framework3/trunk@5700 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 19:56:16 +00:00
James Lee 36a06e7576 initial commit of php findsock. This patch makes all http connections global and removes the "close if (!pipelining)" checks, so beware of bugs.
git-svn-id: file:///home/svn/framework3/trunk@5678 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 04:41:51 +00:00
Ramon de C Valle 309618a3f8 Fixed indentation
git-svn-id: file:///home/svn/framework3/trunk@5673 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-21 21:59:15 +00:00
Ramon de C Valle 40b8f1896e Moving it in again. Thanks antoine for the fix!
git-svn-id: file:///home/svn/framework3/trunk@5672 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-21 19:35:27 +00:00
Ramon de C Valle 89ba4c289c Moving out temporarily
git-svn-id: file:///home/svn/framework3/trunk@5671 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-20 18:18:29 +00:00
Ramon de C Valle 590ac24121 Moving out temporarily
git-svn-id: file:///home/svn/framework3/trunk@5670 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-20 18:17:05 +00:00
Ramon de C Valle 58cef5775e Added ARCH_POWER constant and fixed AIX payload modules
git-svn-id: file:///home/svn/framework3/trunk@5663 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 01:42:51 +00:00
HD Moore 07c838e4e0 Merge patch and module from Robert, adds a x86 int3 payload for debugging, patches for the testsrv
git-svn-id: file:///home/svn/framework3/trunk@5660 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-15 19:38:50 +00:00
HD Moore 6772685f3e Merge patch from Julien TINNES for MIPS support (LE/BE)
git-svn-id: file:///home/svn/framework3/trunk@5658 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-15 18:50:34 +00:00
Ramon de C Valle 4dd9b23f37 Added AIX POWER/PowerPC payload modules
git-svn-id: file:///home/svn/framework3/trunk@5655 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-10 20:15:38 +00:00
James Lee f0976fad87 avoid logging socket errors
git-svn-id: file:///home/svn/framework3/trunk@5651 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-04 03:52:02 +00:00
James Lee 98632ac069 add simple command execution payload for php
git-svn-id: file:///home/svn/framework3/trunk@5646 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-01 04:41:18 +00:00
HD Moore d53dd66701 Adds initial support for IPv6, including two stager. Tested Meterpreter over IPv6 stages on XP and Vista. Using this is still tricky, I will add a wiki page tomorrow to explain the ScopeID stuff for link-local testing. This commit also includes the raw (oversized) assembler for the stagers as well as the entire old metasploit assembly set (useful for development).
git-svn-id: file:///home/svn/framework3/trunk@5635 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 06:34:57 +00:00
HD Moore cb2efe6356 Swap the new NX-enabled stagers for the old ones, keep the old ones since they are still much smaller.
git-svn-id: file:///home/svn/framework3/trunk@5628 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-13 01:49:07 +00:00
HD Moore fae008d1b0 Adds the bind_nx_tcp stager (NX support)
git-svn-id: file:///home/svn/framework3/trunk@5625 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-11 22:51:28 +00:00
HD Moore eaa91fd8f4 Adds a reverse_tcp stager that downloads the stage into a RWX page created with VirtualAlloc. Results in NX support
git-svn-id: file:///home/svn/framework3/trunk@5624 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-11 22:41:35 +00:00
James Lee 9b3c8e2d72 tebodell's patch to autorun meterpeter scripts on session creation
git-svn-id: file:///home/svn/framework3/trunk@5557 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-19 04:52:12 +00:00
James Lee 8800372e46 initial commit of browser_autopwn;
revamp php payloads;
socks5 for IPv6 (untested)



git-svn-id: file:///home/svn/framework3/trunk@5546 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-01 01:44:56 +00:00
James Lee 2db9dd6ab2 Reversing over greedy commit. =(
git-svn-id: file:///home/svn/framework3/trunk@5506 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 06:17:41 +00:00
James Lee 93199c5610 "set foo" prints the value of foo if it exists
git-svn-id: file:///home/svn/framework3/trunk@5505 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 05:29:32 +00:00
James Lee 297e4f4b4d Fork doesn't work on windows
git-svn-id: file:///home/svn/framework3/trunk@5495 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-25 04:37:53 +00:00
Patrick Webster 6cb21b2dc7 Windows port of the Perl based cmd payloads
git-svn-id: file:///home/svn/framework3/trunk@5465 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-03 09:36:01 +00:00
James Lee 9019b077bd fix timeout issues in reverse php shell
git-svn-id: file:///home/svn/framework3/trunk@5461 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-01 02:08:19 +00:00
HD Moore 7f5d7c5a29 Update payloads from toto
git-svn-id: file:///home/svn/framework3/trunk@5449 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-18 15:57:38 +00:00
HD Moore cfaa70cf30 New chmod payload from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5439 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-10 21:21:51 +00:00
James Lee c546d6ec9c Really fix the empty LHOST bug
git-svn-id: file:///home/svn/framework3/trunk@5431 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-04 21:40:04 +00:00
James Lee 7b10ffbae6 Fix empty LHOST problem and space generation
git-svn-id: file:///home/svn/framework3/trunk@5430 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-04 20:50:39 +00:00
James Lee dfa0f6c0c4 More reliable reverse shell
git-svn-id: file:///home/svn/framework3/trunk@5429 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-04 07:34:26 +00:00
James Lee 77f431fea3 autoload meterpreter's priv extension if the exploit gave us admin
git-svn-id: file:///home/svn/framework3/trunk@5427 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 23:07:33 +00:00
HD Moore 685241ab31 I suck.
git-svn-id: file:///home/svn/framework3/trunk@5414 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-13 16:02:39 +00:00
HD Moore d8d9db3299 Fixes #188. This adds an exec stage to the OSX payloads
git-svn-id: file:///home/svn/framework3/trunk@5405 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-09 07:58:38 +00:00
HD Moore 6677beb174 Merged revisions 5366-5377 via svnmerge from
svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1

........
  r5366 | hdm | 2008-01-26 20:30:53 -0600 (Sat, 26 Jan 2008) | 2 lines
  
  Update version information
........
  r5367 | hdm | 2008-01-26 21:10:57 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Updated for version 3.1
........
  r5369 | hdm | 2008-01-26 21:13:31 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Wipe the private directories from the branch. 
........
  r5371 | hdm | 2008-01-27 17:24:24 -0600 (Sun, 27 Jan 2008) | 5 lines
  
  Timeout options added for dcerpc connect and read times. Addition of novell netware as a supported target platform. Inclusion of the serverprotect exploit (still works on the latest version). Addition of the first remote netware kernel exploit that leads to a shell, addition of netware stager and shell, and first draft of the release notes for 3.1
........
  r5372 | hdm | 2008-01-27 17:30:08 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Formatting, indentation, fixed the static IP embedded in the request
........
  r5373 | hdm | 2008-01-27 20:02:48 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Correctly trap exploit errors in a way that works with all of the UIs
........
  r5374 | hdm | 2008-01-27 20:23:25 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More last-minute bug fixes
........
  r5375 | hdm | 2008-01-27 20:37:43 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Force multi-bind off in netware, correct label display in gtk gui labels
........
  r5376 | hdm | 2008-01-27 20:50:03 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More exception handling fun
........


git-svn-id: file:///home/svn/framework3/trunk@5378 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-28 03:06:31 +00:00
HD Moore 31d121da82 Speedup to local relay
git-svn-id: file:///home/svn/framework3/trunk@5358 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-26 22:17:59 +00:00
HD Moore 5ebeacda65 Automaticalyl use the ipwn file path
git-svn-id: file:///home/svn/framework3/trunk@5204 4d416f70-5f16-0410-b530-b9f4589650da
2007-11-26 22:22:18 +00:00
HD Moore 053165eb72 git-svn-id: file:///home/svn/framework3/trunk@5164 4d416f70-5f16-0410-b530-b9f4589650da 2007-10-20 17:32:46 +00:00
HD Moore 3a5a25c133 A new iphone/itouch stages which remounts the drive rwx, writes an exe, and executes it with stdio mapped to the socket
git-svn-id: file:///home/svn/framework3/trunk@5163 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-20 03:51:15 +00:00
HD Moore a927464cd8 8Mb > 32k :-)
git-svn-id: file:///home/svn/framework3/trunk@5162 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-20 02:08:42 +00:00
HD Moore ad050b492d Adding the staged versions of the OS X payloads. One step closer to download + execute
git-svn-id: file:///home/svn/framework3/trunk@5160 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-19 07:53:23 +00:00
HD Moore 83fdda022e Correct the euid to 0
git-svn-id: file:///home/svn/framework3/trunk@5158 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-19 06:39:10 +00:00
Matt Miller 46d14f16b3 typo fix
git-svn-id: file:///home/svn/framework3/trunk@5138 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-05 21:10:37 +00:00
HD Moore 6f79e14c91 Fixes #157. Patches from egypt@nmt.edu
git-svn-id: file:///home/svn/framework3/trunk@5137 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-05 19:23:45 +00:00
HD Moore b113940b03 Buzzer payload! http://securityevaluators.com/iphone/bh07.pdf
git-svn-id: file:///home/svn/framework3/trunk@5121 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-25 04:21:48 +00:00
HD Moore 1527d92154 Correct offset typos in the new iphone modules. Add EXE output support for OS X PPC, Linux x86, and make the OS X ARM smaller.
git-svn-id: file:///home/svn/framework3/trunk@5119 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-25 01:50:05 +00:00
HD Moore aa51f559e8 Keywords for SVN
git-svn-id: file:///home/svn/framework3/trunk@5111 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 03:13:50 +00:00
HD Moore b6e1dc00f7 nops and payloads for arm-darwin (aka iphone) :-)
git-svn-id: file:///home/svn/framework3/trunk@5110 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 03:13:08 +00:00
HD Moore 04c6dbc748 Updated svn:keywords
git-svn-id: file:///home/svn/framework3/trunk@5100 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-10 01:01:20 +00:00
Matt Miller 7b65a56d65 initial support for metasm integration, ported sample payload to use it
git-svn-id: file:///home/svn/framework3/trunk@5076 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-11 00:37:50 +00:00
Ramon de C Valle 6462ede937 Fixes #106. Added new single shell_bind_tcp payload module for Linux x86. See #106.
git-svn-id: file:///home/svn/framework3/trunk@5068 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-31 02:10:49 +00:00
Ramon de C Valle f60810d00c Added more advanced payload options and advanced payload options support for Solaris.
git-svn-id: file:///home/svn/framework3/trunk@5060 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-25 03:24:51 +00:00
Ramon de C Valle f3dd74cfc9 Added advanced payload options for *BSD, improved solaris targets of lsa_transnames_heap.rb, some code cleanups.
git-svn-id: file:///home/svn/framework3/trunk@5044 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-11 03:19:28 +00:00
Ramon de C Valle d186725ac6 Added new Samba lsa_io_trans_names heap overflow exploit module for Solaris x86 and SPARC.
git-svn-id: file:///home/svn/framework3/trunk@5039 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-08 04:11:53 +00:00
Ramon de C Valle 99f806b0e9 Added OSX payloads advanced options and improved Samba exploit module.
git-svn-id: file:///home/svn/framework3/trunk@5033 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-06 01:22:54 +00:00
Ramon de C Valle 735c0b5d4e Added svn:keywords and adjusted code indentation.
git-svn-id: file:///home/svn/framework3/trunk@5031 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-05 02:02:39 +00:00
Ramon de C Valle 7a5c4c29cc Added new Samba lsa_io_trans_names heap overflow exploit module for Mac OS X x86 and PowerPC
git-svn-id: file:///home/svn/framework3/trunk@5030 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-05 01:41:39 +00:00
HD Moore fe56bc418f Sample payload rewrite that uses METASM
git-svn-id: file:///home/svn/framework3/trunk@5017 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:22:32 +00:00
Matt Miller d33675d870 framework now properly handles using singles without handlers as both stages and singles, fixes #115
git-svn-id: file:///home/svn/framework3/trunk@4994 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-16 05:04:03 +00:00
HD Moore 40511cffb7 This adds a Linux-payload specific mixin which allows for new advanced options, such as setuid/chroot prepends.
git-svn-id: file:///home/svn/framework3/trunk@4984 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-09 02:25:31 +00:00
HD Moore fe4f3119c1 More payloads from Ramon (fixes #98, #99, #100, #101)
git-svn-id: file:///home/svn/framework3/trunk@4840 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-03 03:11:49 +00:00
HD Moore 2af13aa4ef Fixes #88 #89 #90 #91 #92. Replaces bind/reverse for BSD x86, replaces bind for OS X x86, adds reverse/find for OS X x86.
git-svn-id: file:///home/svn/framework3/trunk@4803 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-28 19:00:34 +00:00
HD Moore 6df72d9f41 Patch from GML to fix call calculation
git-svn-id: file:///home/svn/framework3/trunk@4438 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 22:38:54 +00:00
HD Moore 7136d6bbd4 PassiveX only works with IE 6 (5.x and 7.x fail)
git-svn-id: file:///home/svn/framework3/trunk@4428 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 06:19:42 +00:00
HD Moore 52ebcde5a0 mention IE 6 dependency in the description
git-svn-id: file:///home/svn/framework3/trunk@4426 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 06:16:38 +00:00
HD Moore abbeb2e87e Adding an Id tag and a standard header to all modules
git-svn-id: file:///home/svn/framework3/trunk@4419 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 00:10:39 +00:00
HD Moore 854607771c fixes #4. This is just a test of the post-commit hook
git-svn-id: file:///home/svn/framework3/trunk@4408 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-17 23:44:05 +00:00
HD Moore ce01a25e0c This patch fixes #4. Pick a random file descriptor and make sure its closed before we use it
git-svn-id: file:///home/svn/framework3/trunk@4407 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-17 23:41:22 +00:00
HD Moore bf2f1a7472 Updates from diaul
git-svn-id: file:///home/svn/framework3/trunk@4314 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 01:53:43 +00:00
HD Moore 4a484d8c68 Fancy new metasploit.com address for lin0xx
git-svn-id: file:///home/svn/framework3/trunk@4309 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-03 05:03:55 +00:00
HD Moore d1033c5832 Importing lin0xx's XPFW killing bind payload
git-svn-id: file:///home/svn/framework3/trunk@4308 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-03 04:59:12 +00:00
HD Moore 68274d6870 PHP tags are now added by the php_include handler and no longer a part of the payloads themselves
git-svn-id: file:///home/svn/framework3/trunk@4254 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-05 03:31:18 +00:00
HD Moore 2bd17e31a8 new payloads from diaul
git-svn-id: file:///home/svn/framework3/trunk@4220 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-18 22:06:19 +00:00
HD Moore ffc626675b Initial support for PHP payloads
git-svn-id: file:///home/svn/framework3/trunk@4215 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-17 07:57:51 +00:00
HD Moore 8a922d0641 Always use IO.read vs IO.readlines.join
git-svn-id: file:///home/svn/framework3/trunk@4211 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-17 07:00:44 +00:00
Matt Miller b477547a3d partial fix for mod cache issue? committed vlad's new stagers
git-svn-id: file:///home/svn/framework3/trunk@4013 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-10 06:44:15 +00:00
HD Moore c0f55ed478 Corrected the authors line
git-svn-id: file:///home/svn/framework3/trunk@3999 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-01 16:52:55 +00:00
HD Moore 7376f9a421 Imported the download-exec payload from msf 2.x
git-svn-id: file:///home/svn/framework3/trunk@3998 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-01 16:50:13 +00:00
Matt Miller ea06abe5bb support for generic payloads
git-svn-id: file:///home/svn/framework3/trunk@3843 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-26 02:13:25 +00:00
Matt Miller 66b99d69ae more fixes for the meterpreter pivoting issues
git-svn-id: file:///home/svn/framework3/trunk@3840 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-22 07:19:59 +00:00
Matt Miller d8b2f95178 auto load stdapi before interact, implement type? interface
git-svn-id: file:///home/svn/framework3/trunk@3833 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-15 04:07:25 +00:00
HD Moore 25c08bb206 Bug fixes, list of known bugs, final prep for beta-1
git-svn-id: file:///home/svn/framework3/trunk@3803 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-02 06:30:36 +00:00
HD Moore c572f4cb8c Typo fix
git-svn-id: file:///home/svn/framework3/trunk@3765 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 21:03:24 +00:00
HD Moore d086a1bedf BSD license the default for non-msfdev created modules.
git-svn-id: file:///home/svn/incoming/trunk@3636 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-06 16:34:39 +00:00
Matt Miller 3a37749de6 support for demand-loading of modules to improve load speed, expect problems
git-svn-id: file:///home/svn/incoming/trunk@3534 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-21 03:10:58 +00:00
bmc d14646e084 * remove redundant stringification
git-svn-id: file:///home/svn/incoming/trunk@3510 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-06 15:15:41 +00:00
HD Moore 5b497d5e4d Added Irix platform
Tweaked reverse.rb to use a subshell and background it
Added Irix lpdexec


git-svn-id: file:///home/svn/incoming/trunk@3505 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-05 18:10:08 +00:00
HD Moore 868d7bf561 Working findtag + samba
Removed call to evasions that didnt have corresponding definition


git-svn-id: file:///home/svn/incoming/trunk@3501 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-04 21:04:50 +00:00
HD Moore 2290b14c7d PPC fixes
git-svn-id: file:///home/svn/incoming/trunk@3500 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-04 20:40:25 +00:00
HD Moore 04341837f7 Bug fix to msfencode when invalid -e is specified
Small tweaks to type77, mostly for print_status and -find
Fixed busted payload port in shell_reverse_tcp


git-svn-id: file:///home/svn/incoming/trunk@3469 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-29 21:47:51 +00:00
bmc 4d432875d0 via perl...
git-svn-id: file:///home/svn/incoming/trunk@3454 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 15:11:16 +00:00
HD Moore e249d9ebe5 Massive update to tab indentation (used ./dev/tabify.rb)
git-svn-id: file:///home/svn/incoming/trunk@3450 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 05:00:35 +00:00
bmc 7cedfcc828 * connectback perl payload
git-svn-id: file:///home/svn/incoming/trunk@3435 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-23 17:14:33 +00:00
HD Moore ec46bc70fd Typo
git-svn-id: file:///home/svn/incoming/trunk@3431 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-22 20:01:38 +00:00
HD Moore 1bffccf605 New licensing terms, revision bump to v3
git-svn-id: file:///home/svn/incoming/trunk@3425 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-21 22:10:20 +00:00
bmc 49016b9d99 * perl bind shell
git-svn-id: file:///home/svn/incoming/trunk@3417 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-20 22:31:58 +00:00
Matt Miller d07e5fd330 patch from bmc
git-svn-id: file:///home/svn/incoming/trunk@3410 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-19 17:03:55 +00:00
Matt Miller 68a8a5262b change unknown license to GPL
git-svn-id: file:///home/svn/incoming/trunk@3379 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 03:48:36 +00:00
Matt Miller 2e19a86843 added license to all modules
git-svn-id: file:///home/svn/incoming/trunk@3377 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 02:59:47 +00:00
HD Moore 75a0aa2e76 Bind added, reverse fixed module name
git-svn-id: file:///home/svn/incoming/trunk@3373 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-15 21:13:41 +00:00
HD Moore 884fffa28c Ported the unix revers command payloads and handler
git-svn-id: file:///home/svn/incoming/trunk@3372 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-14 20:12:53 +00:00
vlad902 eccdce049c Fixed attribution to reference spoonm
git-svn-id: file:///home/svn/incoming/trunk@3357 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-09 02:09:40 +00:00
vlad902 c5993b7b9b Is now smaller and deletes the file after execution
git-svn-id: file:///home/svn/incoming/trunk@3345 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 06:08:43 +00:00
vlad902 b011d080b3 No stagers can use this
git-svn-id: file:///home/svn/incoming/trunk@3344 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 03:26:41 +00:00
vlad902 ed5323e72b Smaller stager
git-svn-id: file:///home/svn/incoming/trunk@3341 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 02:23:49 +00:00
vlad902 443a34da7a Smaller stager, that also does closesocket so you can use it on the same port repeatdly.
git-svn-id: file:///home/svn/incoming/trunk@3340 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 02:23:36 +00:00
vlad902 d0a00445d7 Clear space for variables
git-svn-id: file:///home/svn/incoming/trunk@3339 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 01:47:23 +00:00
vlad902 d7813bf8c7 My version of upexec,doesn't depend on hd's EBP shellcode structure
git-svn-id: file:///home/svn/incoming/trunk@3333 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 23:58:59 +00:00
Matt Miller 2f4467ebcd stupid cvs
git-svn-id: file:///home/svn/incoming/trunk@3330 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 19:41:31 +00:00
Matt Miller b5cb5e913c change name
git-svn-id: file:///home/svn/incoming/trunk@3329 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 19:39:53 +00:00
vlad902 45bfed8935 17 bytes smaller.
git-svn-id: file:///home/svn/incoming/trunk@3328 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 19:31:24 +00:00
vlad902 a6d4abb4cd My shell stage
git-svn-id: file:///home/svn/incoming/trunk@3327 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 19:26:09 +00:00
Matt Miller ab05f41a40 remove pipe shell
git-svn-id: file:///home/svn/incoming/trunk@3326 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 19:26:00 +00:00
Matt Miller 4934bd7709 rename pipe shell to shell and shell to shell_revert
git-svn-id: file:///home/svn/incoming/trunk@3325 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 19:25:18 +00:00
Matt Miller ae5c816e85 various enhancements to support passivex, seems to be functional, somewhat
git-svn-id: file:///home/svn/incoming/trunk@3322 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 10:04:30 +00:00
Matt Miller a77bdaa93c rename author to jt, fix bug in html escape in payloads section of msfweb
git-svn-id: file:///home/svn/incoming/trunk@3306 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-05 02:04:04 +00:00
HD Moore 2bcfd6f0e5 Bug fixen
git-svn-id: file:///home/svn/incoming/trunk@3291 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 19:21:39 +00:00
HD Moore f468b10cff Tweaks
git-svn-id: file:///home/svn/incoming/trunk@3286 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 18:03:02 +00:00
vlad902 3234172a41 Fix payload (missing +)
git-svn-id: file:///home/svn/incoming/trunk@3283 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-30 21:07:47 +00:00
HD Moore c8d273cec0 Wee, works
git-svn-id: file:///home/svn/incoming/trunk@3258 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-27 04:16:23 +00:00
HD Moore 93c3178732 No so worky
git-svn-id: file:///home/svn/incoming/trunk@3257 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-27 03:07:46 +00:00
HD Moore 97129d0303 New modules, module renames
git-svn-id: file:///home/svn/incoming/trunk@3254 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-26 14:34:22 +00:00
Matt Miller 51ed1b3eca fixed up vncinject a bit
git-svn-id: file:///home/svn/incoming/trunk@3206 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-13 03:48:33 +00:00
Matt Miller bbb94762b2 support for disabling the courtesy shell
git-svn-id: file:///home/svn/incoming/trunk@3205 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-13 03:43:17 +00:00
Matt Miller 22278ce458 vncinject payload
git-svn-id: file:///home/svn/incoming/trunk@3201 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-12 07:07:19 +00:00
Matt Miller ca149ac9fa fix for meterp hang
git-svn-id: file:///home/svn/incoming/trunk@3090 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 20:46:38 +00:00
Matt Miller 0e9c5bab5b logging fix, meterpreter multi-load fixed, advanced option display, meterpreter optino to autoload stdapi
git-svn-id: file:///home/svn/incoming/trunk@3052 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-19 15:09:41 +00:00
Matt Miller 9fee6fe983 copy/paste prob
git-svn-id: file:///home/svn/incoming/trunk@2983 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-30 23:10:58 +00:00
Matt Miller b06a2ca030 initial support for compat filtering, may be buggy
git-svn-id: file:///home/svn/incoming/trunk@2971 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-19 01:48:10 +00:00
Matt Miller 95d77b761a solaris singles
git-svn-id: file:///home/svn/incoming/trunk@2966 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-16 01:31:59 +00:00
Matt Miller acd28ca7b5 solaris x86 singles
git-svn-id: file:///home/svn/incoming/trunk@2965 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-16 01:24:20 +00:00
Matt Miller 9b9e13be5b some of the osx payloads
git-svn-id: file:///home/svn/incoming/trunk@2964 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-12 05:44:15 +00:00
Matt Miller efc02cfd89 sparc payloads, untested
git-svn-id: file:///home/svn/incoming/trunk@2963 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-11 22:37:41 +00:00
Matt Miller 49788fe34a bsdi payloads
git-svn-id: file:///home/svn/incoming/trunk@2960 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-11 07:40:59 +00:00
Matt Miller b66a1dae2d bsdi singles
git-svn-id: file:///home/svn/incoming/trunk@2959 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-11 07:37:10 +00:00
Matt Miller 28785b573b bsd payloads
git-svn-id: file:///home/svn/incoming/trunk@2958 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-11 07:32:21 +00:00
Matt Miller 5d4e95c94f bsd single payloads
git-svn-id: file:///home/svn/incoming/trunk@2957 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-11 07:22:38 +00:00
Matt Miller 55a27a01f6 updated convention on some payload stagers
git-svn-id: file:///home/svn/incoming/trunk@2927 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-01 06:22:25 +00:00
Matt Miller f07ae8dcb0 more foo
git-svn-id: file:///home/svn/incoming/trunk@2832 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-26 02:01:27 +00:00
Matt Miller c494a71957 find port/tag stagers
git-svn-id: file:///home/svn/incoming/trunk@2799 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-19 14:33:25 +00:00
Matt Miller 203f185ad7 rockin 32 windows payloads, fixed some bugs, other cool shit, OptInt, what what what
git-svn-id: file:///home/svn/incoming/trunk@2796 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 23:32:34 +00:00
Matt Miller 4679586c49 more meterp action
git-svn-id: file:///home/svn/incoming/trunk@2791 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 05:13:21 +00:00
Matt Miller 7f8db62b9c workin on integrating meterp client
git-svn-id: file:///home/svn/incoming/trunk@2790 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 04:07:56 +00:00
Matt Miller 577a5c3095 dll injection working, had to fix nop stack alignment crap
git-svn-id: file:///home/svn/incoming/trunk@2788 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 02:01:36 +00:00
Matt Miller cc32a21386 bind tcp stager/inline for linux
git-svn-id: file:///home/svn/incoming/trunk@2776 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 07:43:24 +00:00
Matt Miller 46c2cd2ac1 added ui subscriber stuff
git-svn-id: file:///home/svn/incoming/trunk@2775 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 07:06:05 +00:00
Matt Miller 11724ac797 fixed stager merging, made things a bit more pimply
git-svn-id: file:///home/svn/incoming/trunk@2774 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 06:01:11 +00:00
Matt Miller 2f2363d141 it lives, major changes, fixed bugs, exploiting works with the test exploit
git-svn-id: file:///home/svn/incoming/trunk@2763 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-16 07:32:11 +00:00
Matt Miller d4f569dddf switched to x86 from ia32
git-svn-id: file:///home/svn/incoming/trunk@2745 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 18:54:41 +00:00
Matt Miller f1691c5470 worked on payload encoding, exploit driver wrapper, platforms updates, spoon would probably hate it
git-svn-id: file:///home/svn/incoming/trunk@2744 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 18:06:12 +00:00
Matt Miller 9e48b1393e changed payload names around so little spoony can get his way
git-svn-id: file:///home/svn/incoming/trunk@2734 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 22:51:25 +00:00
Matt Miller 0e357337a5 started working on exploit stuff, changed aliases a bit for windows payloads, pimped targets to the max, added wrappers to exploit for payload stuff
git-svn-id: file:///home/svn/incoming/trunk@2729 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 15:34:31 +00:00
Matt Miller 543dce4684 added option deregistration, kinda lame, need to think of a better way
git-svn-id: file:///home/svn/incoming/trunk@2723 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 05:21:19 +00:00
Matt Miller 1237b31617 win32 add user, need a way to hide options
git-svn-id: file:///home/svn/incoming/trunk@2722 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 05:15:30 +00:00
Matt Miller 1be7b9337e implemented a single payload for grins, spoon will hate it
git-svn-id: file:///home/svn/incoming/trunk@2721 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 04:24:11 +00:00
Matt Miller f1aba8e7ba introducing handlers to the mix
git-svn-id: file:///home/svn/incoming/trunk@2719 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 04:07:52 +00:00
Matt Miller 62c50e6b04 yea, stuff
git-svn-id: file:///home/svn/incoming/trunk@2701 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 04:56:33 +00:00
Matt Miller 558b6300b1 fixed the module loader a bit, still needs more work
git-svn-id: file:///home/svn/incoming/trunk@2698 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 23:48:41 +00:00
Spoon M 55f8cdb41a motisha4lif
git-svn-id: file:///home/svn/incoming/trunk@2691 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 21:22:32 +00:00
Matt Miller 21f440028c stuff
git-svn-id: file:///home/svn/incoming/trunk@2683 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 19:35:29 +00:00
Matt Miller 5f18b24e8b added windows payload for exitfunc substitution
git-svn-id: file:///home/svn/incoming/trunk@2680 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 01:03:11 +00:00
Matt Miller 40e36360a1 started hacking on payload stuff
git-svn-id: file:///home/svn/incoming/trunk@2679 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 00:24:02 +00:00
Matt Miller bdda20cb14 my prototype shit so far
git-svn-id: file:///home/svn/incoming/trunk@2490 4d416f70-5f16-0410-b530-b9f4589650da
2005-05-15 21:32:55 +00:00