James Lee
7a3770f87b
don't use java_basicservice_impl in browser autopwn because it doesn't work in an iframe against IE and causes popups in other browsers
...
git-svn-id: file:///home/svn/framework3/trunk@11101 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 20:44:16 +00:00
James Lee
669ef3b86e
clarify targets
...
git-svn-id: file:///home/svn/framework3/trunk@11099 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 17:53:49 +00:00
Joshua Drake
75873aedb4
add exploit for foxit reader title stack bof
...
git-svn-id: file:///home/svn/framework3/trunk@11096 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 17:43:42 +00:00
James Lee
d608db778c
we're not sending an applet, just a jar, clarify the output
...
git-svn-id: file:///home/svn/framework3/trunk@11084 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-21 19:58:04 +00:00
James Lee
6f7af42667
add an exploit for cve-2010-3563, thanks Matthias Kaiser
...
git-svn-id: file:///home/svn/framework3/trunk@11078 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 23:02:35 +00:00
Joshua Drake
3b6edefe44
fix up auto targeting to not assign to "target"
...
git-svn-id: file:///home/svn/framework3/trunk@11072 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:33:34 +00:00
Steve Tornio
8f3b64e15c
add cve and osvdb refs
...
git-svn-id: file:///home/svn/framework3/trunk@11068 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 14:17:35 +00:00
Mario Ceballos
df9a0cfea8
added exploit module realwin_10.rb
...
git-svn-id: file:///home/svn/framework3/trunk@11067 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-18 23:45:40 +00:00
Mario Ceballos
1729f8f075
removed extra stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@11063 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-18 12:31:55 +00:00
Joshua Drake
32c26f18f3
style compliance fixes, set test exploits to manual rank, fix s/ranking/rank/ in some exploits
...
git-svn-id: file:///home/svn/framework3/trunk@11039 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 19:03:24 +00:00
HD Moore
a12d9f8dbf
This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads.
...
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 06:19:49 +00:00
James Lee
326dc42bca
add EncodedPayload#encoded_exe, encoded_jar, and encoded_war. simplifies exploits that need java and native payloads. see #406 and #3009
...
git-svn-id: file:///home/svn/framework3/trunk@10999 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 23:01:35 +00:00
Joshua Drake
3992eb7ef8
Mass RE-update: fix all framework URL references
...
git-svn-id: file:///home/svn/framework3/trunk@10998 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:43:22 +00:00
Joshua Drake
9fc6f2f3a3
Mass update: fix all framework URL references
...
git-svn-id: file:///home/svn/framework3/trunk@10996 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:25:13 +00:00
Steve Tornio
2f118dfc50
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10990 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 20:09:15 +00:00
Joshua Drake
a758dfe37d
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10988 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 18:20:52 +00:00
Mario Ceballos
8042bf202f
added exploit module bacnet_csv.rb
...
git-svn-id: file:///home/svn/framework3/trunk@10985 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:35:01 +00:00
Joshua Drake
eab0a40caa
switch up IE6 target to work on older version
...
git-svn-id: file:///home/svn/framework3/trunk@10978 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 02:54:56 +00:00
Tod Beardsley
996cc49408
Be more accomodating for SMB domains when bruteforcing SMB hosts.
...
git-svn-id: file:///home/svn/framework3/trunk@10977 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 02:07:31 +00:00
Joshua Drake
61e5d00722
switch title, comment out IE8 target for now
...
git-svn-id: file:///home/svn/framework3/trunk@10963 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 23:12:48 +00:00
Patrick Webster
5073e28854
Added citect_scada_odbc exploit module.
...
git-svn-id: file:///home/svn/framework3/trunk@10956 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 05:07:18 +00:00
Steve Tornio
be7d349d60
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10940 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-07 14:58:55 +00:00
Mario Ceballos
f7717e5f51
added exploit module moxa_mdmtool.rb
...
git-svn-id: file:///home/svn/framework3/trunk@10935 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 22:25:36 +00:00
Steve Tornio
338d6e3693
add osvdb refs
...
git-svn-id: file:///home/svn/framework3/trunk@10914 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 02:58:01 +00:00
Joshua Drake
b0f64ebba1
add a debug target
...
git-svn-id: file:///home/svn/framework3/trunk@10912 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 00:08:55 +00:00
Joshua Drake
76123e79c1
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10909 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:59:56 +00:00
Joshua Drake
b7f2d57709
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10908 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:50:35 +00:00
Joshua Drake
979ddcd8e5
add exploit for cve-2010-3962
...
git-svn-id: file:///home/svn/framework3/trunk@10907 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:44:23 +00:00
Mario Ceballos
f517b88d9c
added exploit modules lgserver_multi.rb and moxa_mediadbplayback.rb
...
git-svn-id: file:///home/svn/framework3/trunk@10904 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 22:19:26 +00:00
Patrick Webster
fc708df5c6
Added exploit module pgp_keyserver7.
...
git-svn-id: file:///home/svn/framework3/trunk@10897 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 15:44:21 +00:00
Joshua Drake
dee671318e
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10895 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 02:54:16 +00:00
Mario Ceballos
99eadeff89
added exploit module lgserver_rxssetdatagrowthscheduleandfilter.rb
...
git-svn-id: file:///home/svn/framework3/trunk@10893 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 01:51:54 +00:00
Mario Ceballos
e276697af9
heh, put not puts.
...
git-svn-id: file:///home/svn/framework3/trunk@10892 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 22:09:44 +00:00
Patrick Webster
b97cbff5af
Added webster_http exploit module.
...
git-svn-id: file:///home/svn/framework3/trunk@10887 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 12:19:19 +00:00
Steve Tornio
d79bbd8440
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10886 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 11:17:25 +00:00
Mario Ceballos
45fd14417c
removed. worked fine under IIS 6.0
...
git-svn-id: file:///home/svn/framework3/trunk@10874 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:51:17 +00:00
Mario Ceballos
b12d03b7c4
add exploit module coldfusion_fckeditor.rb
...
git-svn-id: file:///home/svn/framework3/trunk@10865 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 20:13:36 +00:00
Joshua Drake
b572414eac
add exploit for cve-2010-3654
...
git-svn-id: file:///home/svn/framework3/trunk@10857 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-01 22:34:13 +00:00
Steve Tornio
9f5fca12f7
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10828 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-26 15:28:04 +00:00
Joshua Drake
f909b360ba
note tested on 6u11
...
git-svn-id: file:///home/svn/framework3/trunk@10820 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-25 20:22:08 +00:00
Joshua Drake
3fffd15549
add exploit for cve-2010-3552 (w/dep bypass)
...
git-svn-id: file:///home/svn/framework3/trunk@10819 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-25 20:21:41 +00:00
Steve Tornio
0251c446f1
add cve, osvdb refs
...
git-svn-id: file:///home/svn/framework3/trunk@10784 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 12:21:30 +00:00
Joshua Drake
6bd75bb2d5
add shockwave exploit from abysssec/rel1k
...
git-svn-id: file:///home/svn/framework3/trunk@10779 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 03:15:22 +00:00
Steve Tornio
27d2761ec0
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10775 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 11:41:18 +00:00
Mario Ceballos
d384863a83
exploit module fatplayer_wav.rb from dookie.
...
git-svn-id: file:///home/svn/framework3/trunk@10764 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 11:53:12 +00:00
Joshua Drake
04858c69fc
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10758 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 22:54:19 +00:00
Joshua Drake
20e2742596
fix indent
...
git-svn-id: file:///home/svn/framework3/trunk@10750 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 15:52:33 +00:00
Mario Ceballos
0411111dfd
couple of modules from Luigi Auriemma's DATAC RealWin advisory
...
git-svn-id: file:///home/svn/framework3/trunk@10734 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 21:20:02 +00:00
Joshua Drake
8a17803279
add exploit for ZDI-10-190
...
git-svn-id: file:///home/svn/framework3/trunk@10726 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 07:05:22 +00:00
Joshua Drake
f3f7b1dc83
fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@10725 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 07:04:57 +00:00
HD Moore
f88033f0cc
Merge in R3L1K's Powershell enhancements and powerdump code (hashdump through powershell)
...
git-svn-id: file:///home/svn/framework3/trunk@10721 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 17:39:43 +00:00
Steve Tornio
62622d51c2
add osvdb refs
...
git-svn-id: file:///home/svn/framework3/trunk@10703 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 12:17:51 +00:00
Joshua Drake
4ca2007d67
add ranking
...
git-svn-id: file:///home/svn/framework3/trunk@10665 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-13 03:03:24 +00:00
Joshua Drake
b11fbb67eb
oops, messed up whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@10661 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 18:40:13 +00:00
Joshua Drake
e0e4aebcc1
fix a few stack bof vulnerability descriptions
...
git-svn-id: file:///home/svn/framework3/trunk@10660 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 18:39:21 +00:00
Joshua Drake
ad4064ed20
add ftp client fuzzer and exploits from corelanc0d3r!
...
git-svn-id: file:///home/svn/framework3/trunk@10658 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 17:31:18 +00:00
Joshua Drake
ae04e34cf7
fix some non-full-namespace includes
...
git-svn-id: file:///home/svn/framework3/trunk@10617 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 06:55:52 +00:00
Steve Tornio
ba2f6f5efa
add osvdb ref, add advisory link
...
git-svn-id: file:///home/svn/framework3/trunk@10613 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 22:59:19 +00:00
Joshua Drake
c6d2f8b550
huh?
...
git-svn-id: file:///home/svn/framework3/trunk@10612 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 22:39:58 +00:00
Joshua Drake
996dfe86db
fix egghunter reference
...
git-svn-id: file:///home/svn/framework3/trunk@10611 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 21:58:06 +00:00
Joshua Drake
dd380c0716
add nuance pdf stack bof exploit from corelan
...
git-svn-id: file:///home/svn/framework3/trunk@10610 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 21:52:43 +00:00
Joshua Drake
ede859f60e
use Msf::WindowsError, see #2214
...
git-svn-id: file:///home/svn/framework3/trunk@10607 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 19:51:50 +00:00
Joshua Drake
425757a6e7
move more platform designations from target to exploit info block
...
git-svn-id: file:///home/svn/framework3/trunk@10559 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 23:41:17 +00:00
Joshua Drake
de159e3fe7
rename with msXX_XXX name, fix platform
...
git-svn-id: file:///home/svn/framework3/trunk@10558 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 23:39:14 +00:00
Joshua Drake
b36e383581
clean up exceptions a bit further
...
git-svn-id: file:///home/svn/framework3/trunk@10557 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 23:23:17 +00:00
Joshua Drake
74db9d7fe4
demote to manual ranking due to domain requirement
...
git-svn-id: file:///home/svn/framework3/trunk@10554 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 19:29:10 +00:00
Joshua Drake
d2c5d62606
do not wait for WfsDelay if unable to enum printers
...
git-svn-id: file:///home/svn/framework3/trunk@10553 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 19:03:52 +00:00
Steve Tornio
3276451e3d
add osvdb refs
...
git-svn-id: file:///home/svn/framework3/trunk@10551 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 12:38:46 +00:00
Mario Ceballos
dc7a9cb321
use the right bid id.
...
git-svn-id: file:///home/svn/framework3/trunk@10550 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 01:05:49 +00:00
Joshua Drake
739bff4fb2
remove SRVPORT option, since it is set to the default
...
git-svn-id: file:///home/svn/framework3/trunk@10548 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 23:52:30 +00:00
Mario Ceballos
f921aca916
brightstor blah blah blah
...
git-svn-id: file:///home/svn/framework3/trunk@10547 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 22:00:22 +00:00
Joshua Drake
dd2d7d3864
fix fingerprint bug
...
git-svn-id: file:///home/svn/framework3/trunk@10546 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 20:53:51 +00:00
Joshua Drake
6f18c4a468
do not wait for WfsDelay if unable to bind
...
git-svn-id: file:///home/svn/framework3/trunk@10545 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 20:48:48 +00:00
Joshua Drake
7de96a710f
add trendmicro extsetowner exploit from Trancer
...
git-svn-id: file:///home/svn/framework3/trunk@10538 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 04:26:09 +00:00
Joshua Drake
c862fdd42b
add exploit module from Abhishek Lyall
...
git-svn-id: file:///home/svn/framework3/trunk@10537 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 03:42:58 +00:00
Joshua Drake
279c604015
missed a couple exe generater includes
...
git-svn-id: file:///home/svn/framework3/trunk@10504 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 16:19:50 +00:00
HD Moore
2f344fe7c8
Moving to ManualRanking since it requires user/pass
...
git-svn-id: file:///home/svn/framework3/trunk@10503 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 15:23:14 +00:00
Mario Ceballos
811eb99980
free up the handler
...
git-svn-id: file:///home/svn/framework3/trunk@10477 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 11:59:02 +00:00
HD Moore
3ee6117219
Default to english, in the end, this is still the most common language pack
...
git-svn-id: file:///home/svn/framework3/trunk@10471 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:18:08 +00:00
Joshua Drake
b8b21cd53c
handle dirs and index.html specially
...
git-svn-id: file:///home/svn/framework3/trunk@10454 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 01:11:05 +00:00
Joshua Drake
3acede0f3c
fix indent
...
git-svn-id: file:///home/svn/framework3/trunk@10442 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 02:15:40 +00:00
Joshua Drake
600ec0a848
add two exploits from Trancer! woot!
...
git-svn-id: file:///home/svn/framework3/trunk@10429 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 18:46:29 +00:00
HD Moore
d89004753c
Fixes #2450 by allowing any length extension
...
git-svn-id: file:///home/svn/framework3/trunk@10411 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:59:22 +00:00
Joshua Drake
a0b193f9d3
note psexec release date
...
git-svn-id: file:///home/svn/framework3/trunk@10405 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 01:50:50 +00:00
Joshua Drake
8e5cf31e9a
big exe/dll update, see #2017
...
NOTE: These changes specifically affect payload encoding via RPC, "use
payload", and msfencode
1. consolidate user-specified exe generation routine (now
Msf::Util::EXE.to_executable_fmt)
2. supported format types are now queried/checked using arrays
3. cleaned up and standardized exe option passing
4. rename data store options for EXE mixin
5. add generate_payload_exe_service for psexec/smb_relay
6. reworked default template handling in Msf::Util::EXE
a. added template search path option (not used if template includes
a path separator)
b. "fallback" flag to enable using default if specified file doesn't
exist
7. added Msf::Util::EXE.to_win64pe_dll
8. improved error messages from exe generation
git-svn-id: file:///home/svn/framework3/trunk@10404 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:13:30 +00:00
Joshua Drake
bd1eeb3722
rework to_jsp_war a bit, fix uses, default msfencode -t war to x86/win32
...
git-svn-id: file:///home/svn/framework3/trunk@10397 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 15:59:46 +00:00
Joshua Drake
4590844871
tons of indentation fixes, some other style tweaks
...
git-svn-id: file:///home/svn/framework3/trunk@10394 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:06:27 +00:00
Joshua Drake
0149ec0253
bump exe name to 14 chars to avoid randomly smashing existing bins
...
git-svn-id: file:///home/svn/framework3/trunk@10391 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 05:06:51 +00:00
Joshua Drake
19db412383
convert remaining EXE generation to use the mixin, fixes #2017
...
git-svn-id: file:///home/svn/framework3/trunk@10389 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:38:13 +00:00
Joshua Drake
21d88b36c1
rename generate_exe -> generate_payload_exe
...
git-svn-id: file:///home/svn/framework3/trunk@10388 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:37:25 +00:00
HD Moore
3dae16482f
Required admin creds == ManualRanking
...
git-svn-id: file:///home/svn/framework3/trunk@10384 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 02:56:29 +00:00
HD Moore
ad4bf32a45
Move to the SMB directory
...
git-svn-id: file:///home/svn/framework3/trunk@10370 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 17:56:22 +00:00
HD Moore
36444591b8
Fix tab indent and make exe name more unique (since its not a fully-qualified path)
...
git-svn-id: file:///home/svn/framework3/trunk@10369 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 15:08:23 +00:00
Joshua Drake
ff22e5212e
revert to backward compatible method of using utc+zone
...
git-svn-id: file:///home/svn/framework3/trunk@10367 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 05:09:47 +00:00
Joshua Drake
3cf8dea0c6
add exploit for cve-2010-2729, finally
...
git-svn-id: file:///home/svn/framework3/trunk@10363 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:17:59 +00:00
Joshua Drake
9dae361383
typo fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10332 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 16:23:46 +00:00
HD Moore
9d3bafce12
Do not automatically run the Lyris module
...
git-svn-id: file:///home/svn/framework3/trunk@10326 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-15 18:21:14 +00:00
Steve Tornio
bceca3832b
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10284 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 12:18:27 +00:00
Joshua Drake
7d3e892ad3
lol, how did those lines survive
...
git-svn-id: file:///home/svn/framework3/trunk@10283 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 06:37:41 +00:00
Joshua Drake
2d145aef6a
add exploit for Integard from the Corelan Team
...
git-svn-id: file:///home/svn/framework3/trunk@10281 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 23:33:28 +00:00
Joshua Drake
5250ff20bb
add svn:keywords, increase ranking, add browser version
...
git-svn-id: file:///home/svn/framework3/trunk@10280 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 23:23:40 +00:00
Joshua Drake
66c428988f
support exploit vista/7, still only 9.x tho
...
git-svn-id: file:///home/svn/framework3/trunk@10279 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 22:49:31 +00:00
Joshua Drake
5de3146533
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10273 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 15:47:35 +00:00
Joshua Drake
2769087435
redacted
...
git-svn-id: file:///home/svn/framework3/trunk@10270 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 03:39:29 +00:00
Steve Tornio
f61827b0bb
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10264 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-08 23:37:41 +00:00
Joshua Drake
eaf8ef00d0
add initial version of cve-2010-2883 exploit
...
git-svn-id: file:///home/svn/framework3/trunk@10263 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-08 23:05:18 +00:00
Joshua Drake
471ae29269
remove extra copy of the payload
...
git-svn-id: file:///home/svn/framework3/trunk@10227 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 00:43:44 +00:00
Joshua Drake
ace873a37a
update test notes
...
git-svn-id: file:///home/svn/framework3/trunk@10204 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 17:55:43 +00:00
Steve Tornio
3c704ec753
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10201 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 11:44:11 +00:00
Joshua Drake
3ab9a9b8d7
add Win7 IE8 target
...
git-svn-id: file:///home/svn/framework3/trunk@10199 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 23:31:01 +00:00
Joshua Drake
561c861a3a
add CVE reference
...
git-svn-id: file:///home/svn/framework3/trunk@10196 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 21:52:45 +00:00
Joshua Drake
2d6a956763
update description
...
git-svn-id: file:///home/svn/framework3/trunk@10194 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 20:50:52 +00:00
Joshua Drake
f68fd01772
nudge reliability up
...
git-svn-id: file:///home/svn/framework3/trunk@10193 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 20:44:43 +00:00
Joshua Drake
a39639c56f
add exploit for quicktime backdoor
...
git-svn-id: file:///home/svn/framework3/trunk@10192 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 20:42:51 +00:00
Joshua Drake
467861ceb7
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10190 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 20:40:05 +00:00
Joshua Drake
430878e3e9
improve reliability, add automatic cleanup functionality (if using meterpreter paylad)
...
git-svn-id: file:///home/svn/framework3/trunk@10170 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:24:19 +00:00
Joshua Drake
330281eadd
see #684 , adds checksum support, updates modules to use it, fixes some wfs_delay/WfsDelay issues
...
git-svn-id: file:///home/svn/framework3/trunk@10150 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:55:37 +00:00
James Lee
34eb75af73
overhaul smtp to add support for authentication and STARTTLS. can now send email through a gmail account
...
git-svn-id: file:///home/svn/framework3/trunk@10148 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:31:46 +00:00
Joshua Drake
bc56ae73a1
correct typo, thx jcran
...
git-svn-id: file:///home/svn/framework3/trunk@10142 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 16:18:02 +00:00
Joshua Drake
aac956db50
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10128 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 18:22:48 +00:00
Joshua Drake
2e4757f4ae
add no-js version of adobe_pdf_embedded_exe from Jeremy Conway
...
git-svn-id: file:///home/svn/framework3/trunk@10126 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 18:20:16 +00:00
Joshua Drake
bf60098257
add exploit from dookie, thx!
...
git-svn-id: file:///home/svn/framework3/trunk@10107 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 16:58:42 +00:00
HD Moore
65af96745f
Set manual ranking until we have a vulnerable extension list added by default
...
git-svn-id: file:///home/svn/framework3/trunk@10101 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 13:41:59 +00:00
HD Moore
cc3554601f
Tools for testing DLL hijack flaws
...
git-svn-id: file:///home/svn/framework3/trunk@10100 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 05:43:47 +00:00
Steve Tornio
0e1ed07e73
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@10078 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 11:36:50 +00:00
Joshua Drake
1cc13485ae
bring ranking down
...
git-svn-id: file:///home/svn/framework3/trunk@10070 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 23:55:59 +00:00
Joshua Drake
791af4b6c5
add exploit for sonicwall aventail activex format string
...
git-svn-id: file:///home/svn/framework3/trunk@10069 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 23:52:11 +00:00
Joshua Drake
9cc66b39dd
indicate not to attempt to read a resposne
...
git-svn-id: file:///home/svn/framework3/trunk@10039 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:21:56 +00:00
Joshua Drake
c551f8d2ee
add note about authentication to module description, see #2405
...
git-svn-id: file:///home/svn/framework3/trunk@10035 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 03:26:35 +00:00
Tod Beardsley
6d6a547b34
Fixes #2412 . Adds a creds table, modifies the db_report_auth API, adds the db_creds and db_add_cred commands.
...
git-svn-id: file:///home/svn/framework3/trunk@10034 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 00:58:20 +00:00
Joshua Drake
2aad6188d7
add ws2ord payload compat
...
git-svn-id: file:///home/svn/framework3/trunk@10024 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-17 01:35:03 +00:00
Joshua Drake
4f9ed0e4e9
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10022 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-16 17:12:16 +00:00
Joshua Drake
6243d8fe2a
change existing to_win*pe_service uses to pass a hash instead of a string, r10016+this fixes #2398
...
git-svn-id: file:///home/svn/framework3/trunk@10017 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:43:43 +00:00
Joshua Drake
5f0d68d883
add exploit for cve-2010-1799
...
git-svn-id: file:///home/svn/framework3/trunk@10011 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 23:11:23 +00:00
Joshua Drake
acb82fa857
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10010 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 23:11:14 +00:00
Joshua Drake
1b31a44b57
move riff support from ani_loadimage browser sploit to mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9984 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 16:56:41 +00:00
HD Moore
040a292181
Create a new mixin that changes SMBUser/SMBPass to normal options, include this mixin within SMB modules that more often than not require authentication
...
git-svn-id: file:///home/svn/framework3/trunk@9981 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 15:00:58 +00:00
Steve Tornio
cc81905c11
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@9968 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 00:51:52 +00:00
Mario Ceballos
b50f5fd0fe
update from dookie.
...
git-svn-id: file:///home/svn/framework3/trunk@9967 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 23:16:20 +00:00
Mario Ceballos
18f8624a47
fix from Brennon Thomas.
...
git-svn-id: file:///home/svn/framework3/trunk@9966 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 20:12:51 +00:00
Joshua Drake
92e9eb93f3
add wm downloader exploit from dookie
...
git-svn-id: file:///home/svn/framework3/trunk@9965 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 20:09:04 +00:00
Joshua Drake
b93462a27f
add msb and rename module
...
git-svn-id: file:///home/svn/framework3/trunk@9956 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-04 02:21:33 +00:00
Joshua Drake
459c046ac2
add msb and rename module
...
git-svn-id: file:///home/svn/framework3/trunk@9955 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-04 02:21:20 +00:00
Joshua Drake
b473cda7d9
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9953 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 16:17:43 +00:00
Steve Tornio
8ccc8a290e
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@9949 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 12:04:42 +00:00
Patrick Webster
6f5040412b
Added exploit module amlibweb_webquerydll_app.
...
git-svn-id: file:///home/svn/framework3/trunk@9948 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 09:07:09 +00:00
Steve Tornio
580eb5aaac
add osvdb ref
...
git-svn-id: file:///home/svn/framework3/trunk@9936 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-27 03:14:46 +00:00
Joshua Drake
a31e133e80
add 3 easy ftp server exploits, 1 chemview activex
...
git-svn-id: file:///home/svn/framework3/trunk@9935 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-27 02:25:15 +00:00
Joshua Drake
73ef3db468
fix statement order, lol
...
git-svn-id: file:///home/svn/framework3/trunk@9934 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-26 23:22:42 +00:00
Joshua Drake
f4103fd7f5
increase ranking
...
git-svn-id: file:///home/svn/framework3/trunk@9933 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-26 19:30:02 +00:00
Joshua Drake
2448f6b1a8
fix lnk file generation, tested OK on win7 x86
...
git-svn-id: file:///home/svn/framework3/trunk@9930 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-26 01:51:17 +00:00
Joshua Drake
f6033b9bd6
change some print_status to print_error, rename a few msft modules using msb convention
...
git-svn-id: file:///home/svn/framework3/trunk@9929 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 21:37:54 +00:00
HD Moore
12d8aad562
Fix the filename to bypass outlook filters (patch from Yorick).
...
git-svn-id: file:///home/svn/framework3/trunk@9926 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 17:31:04 +00:00
HD Moore
92ad463657
Make the title consistent
...
git-svn-id: file:///home/svn/framework3/trunk@9925 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 16:04:22 +00:00
HD Moore
3a8bbbd295
Match the browser module
...
git-svn-id: file:///home/svn/framework3/trunk@9924 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 16:02:51 +00:00
HD Moore
3c505a7b10
Rename ani to match msb
...
git-svn-id: file:///home/svn/framework3/trunk@9923 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 16:02:26 +00:00
HD Moore
8eab8d79e0
Adds two exploit modules for ms10-045 from Yorick Koster
...
git-svn-id: file:///home/svn/framework3/trunk@9922 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 16:00:52 +00:00
Joshua Drake
136c8d2ecc
change print_status to print_error
...
git-svn-id: file:///home/svn/framework3/trunk@9919 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-24 21:38:57 +00:00
Joshua Drake
2ccf0a0c81
add UNCHOST var, remove \r chars
...
git-svn-id: file:///home/svn/framework3/trunk@9897 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:02:47 +00:00
Joshua Drake
dd7a8178d7
actually use Msf::Exploit::EXE
...
git-svn-id: file:///home/svn/framework3/trunk@9896 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:02:04 +00:00
Joshua Drake
1ca054ba53
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9893 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 23:28:47 +00:00
HD Moore
99e2c9aa72
Looks like my initial testing was wrong - you can trigger this entirely through HTTP with a meta refresh, just not with a 301 (IE only).
...
git-svn-id: file:///home/svn/framework3/trunk@9888 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 19:54:56 +00:00
Joshua Drake
786ccb3d5f
add support for OWC11 (from DSR!)
...
git-svn-id: file:///home/svn/framework3/trunk@9883 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 06:24:19 +00:00
HD Moore
d388c1bc4f
Handle unknown requests in a cleaner way
...
git-svn-id: file:///home/svn/framework3/trunk@9879 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 03:08:43 +00:00
Joshua Drake
e30164e09e
possibly fix a bug
...
git-svn-id: file:///home/svn/framework3/trunk@9873 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:23:18 +00:00
Steve Tornio
3674a11fa5
add osvdb refs
...
git-svn-id: file:///home/svn/framework3/trunk@9870 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 23:02:22 +00:00
HD Moore
fcd23fbdce
Adds coverage for the Windows Shell LNK code execution flaw (CVE-2010-2568)
...
git-svn-id: file:///home/svn/framework3/trunk@9869 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 22:36:26 +00:00
Joshua Drake
d07e613504
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9842 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 02:33:25 +00:00
Joshua Drake
9e360f19e0
ignore timeout errors, see #2260
...
git-svn-id: file:///home/svn/framework3/trunk@9839 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 20:54:03 +00:00
Joshua Drake
b73e13bd62
add xpsp1-jp target from Masashi, fixes #2255
...
git-svn-id: file:///home/svn/framework3/trunk@9838 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 20:18:34 +00:00
Joshua Drake
ccd4416b5f
add another httpfingerprint, thx again mc
...
git-svn-id: file:///home/svn/framework3/trunk@9820 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 13:59:38 +00:00
Joshua Drake
edb593987a
add more http fingerprints, thx mc
...
git-svn-id: file:///home/svn/framework3/trunk@9818 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 00:02:21 +00:00
Mario Ceballos
21babc2bfa
updated due to reliability. all payloads work now.
...
git-svn-id: file:///home/svn/framework3/trunk@9814 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 22:38:44 +00:00
Joshua Drake
6d23204c6f
add more http fingerprints
...
git-svn-id: file:///home/svn/framework3/trunk@9812 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 22:11:40 +00:00
HD Moore
24800ca1ec
Add reference for the help center bug
...
git-svn-id: file:///home/svn/framework3/trunk@9810 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:31:40 +00:00
HD Moore
19f1583ba5
Change to match MSB
...
git-svn-id: file:///home/svn/framework3/trunk@9809 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:30:47 +00:00
HD Moore
edae6e2d02
Change to match MSB
...
git-svn-id: file:///home/svn/framework3/trunk@9808 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:30:36 +00:00
Joshua Drake
4b5f4b896a
add a note about why this module is not an HttpClient module
...
git-svn-id: file:///home/svn/framework3/trunk@9798 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 23:25:49 +00:00
Joshua Drake
16ff17c9d1
add more http fingerprints -- thx mc
...
git-svn-id: file:///home/svn/framework3/trunk@9797 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 23:25:31 +00:00
James Lee
a5786cdc64
stop using some older exploits in browser_autopwn in favor of ie_behaviors which works on more versions
...
git-svn-id: file:///home/svn/framework3/trunk@9787 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 02:51:50 +00:00
Joshua Drake
c1f74794eb
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9744 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 23:34:50 +00:00
Joshua Drake
663b863b6d
http fingerprint checking update
...
git-svn-id: file:///home/svn/framework3/trunk@9719 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 17:38:59 +00:00
Joshua Drake
389259c5d4
reworked module significantly, updated for latest installer from badblue.com, added http_fingerprint
...
git-svn-id: file:///home/svn/framework3/trunk@9705 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 06:54:20 +00:00
Joshua Drake
163d273dff
convert module to HttpClient, check fingerprint -- untested
...
git-svn-id: file:///home/svn/framework3/trunk@9704 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 01:43:12 +00:00
Joshua Drake
dfce4901fe
change error message
...
git-svn-id: file:///home/svn/framework3/trunk@9703 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 01:34:11 +00:00
Joshua Drake
a018149278
check fingerprint first
...
git-svn-id: file:///home/svn/framework3/trunk@9701 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 01:33:03 +00:00
Joshua Drake
81cce81969
convert modules to HttpClient, use http_fingerprint
...
git-svn-id: file:///home/svn/framework3/trunk@9700 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 01:22:26 +00:00
Joshua Drake
ac267c5856
minor tweaks
...
git-svn-id: file:///home/svn/framework3/trunk@9697 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 22:15:16 +00:00
Joshua Drake
8c0e5fdf73
fix references, whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@9696 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:59:16 +00:00
Joshua Drake
e5bf3301fb
note ORD recommendation
...
git-svn-id: file:///home/svn/framework3/trunk@9695 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:58:57 +00:00
Joshua Drake
11bb8dee28
convert to httpclient module, use fingerprint
...
git-svn-id: file:///home/svn/framework3/trunk@9694 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:54:58 +00:00
Joshua Drake
c7f5ba801c
add lots of disclosure dates from OSVDB (missed a few)
...
git-svn-id: file:///home/svn/framework3/trunk@9670 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 03:19:07 +00:00
Joshua Drake
7d945ed9dc
add lots of disclosure dates from OSVDB
...
git-svn-id: file:///home/svn/framework3/trunk@9669 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 03:13:45 +00:00
Joshua Drake
56ea22716e
oops, broke the tree
...
git-svn-id: file:///home/svn/framework3/trunk@9668 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:38:15 +00:00
Joshua Drake
9984b662e0
switch some URL references to US-CERT-VU type
...
git-svn-id: file:///home/svn/framework3/trunk@9666 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:09:32 +00:00
Joshua Drake
f6f954a18c
add missing CVE/OSVDB references, plenty still missing *wink wink*
...
git-svn-id: file:///home/svn/framework3/trunk@9659 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 00:10:51 +00:00
Joshua Drake
0882838491
ensure binary mode when opening files, whitespace fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9653 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:33:07 +00:00
Joshua Drake
b9a4105786
see #1000 , remove encoder in favor of auto-selection
...
git-svn-id: file:///home/svn/framework3/trunk@9648 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:35:10 +00:00
Joshua Drake
bfaa9a9a6f
modify badchars, minor cleanups, fixes #1000
...
git-svn-id: file:///home/svn/framework3/trunk@9647 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:31:51 +00:00
Joshua Drake
8676a88ce3
fix typo, thx chad
...
git-svn-id: file:///home/svn/framework3/trunk@9646 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 20:35:56 +00:00