Commit Graph

77 Commits (73a0ef8b6472b481c186e7b038eb21e07b11dc25)

Author SHA1 Message Date
HD Moore 075b8c5fa4 Fixes #434. Always use Timeout.timeout() -- on Ruby 1.9 this results in the Timeout::TimeoutError exception vs RuntimeError
git-svn-id: file:///home/svn/framework3/trunk@7323 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:14:57 +00:00
kris b75ef037c3 more tabs vs spaces, and fix a few mismatched indentation levels (def/end, etc)
git-svn-id: file:///home/svn/framework3/trunk@7211 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 17:24:33 +00:00
HD Moore b14a4ddf0b Lots of shiny new NTLM goodness from Ryan Linn
git-svn-id: file:///home/svn/framework3/trunk@6958 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-17 20:00:05 +00:00
HD Moore 58fb65d4ef Another ruby 1.9.1 compatibility fix
git-svn-id: file:///home/svn/framework3/trunk@6674 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 02:42:00 +00:00
HD Moore 147a292825 Minor fixes for ruby 1.9.1 compatibility, still quite a bit more to go
git-svn-id: file:///home/svn/framework3/trunk@6612 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:36:58 +00:00
HD Moore 26b9903b0d Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00
HD Moore 95f6aa0d02 Revert last commit temporarily
git-svn-id: file:///home/svn/framework3/trunk@6313 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:00:17 +00:00
HD Moore aa4274a3bb Upgrading metasm...
git-svn-id: file:///home/svn/framework3/trunk@6312 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 22:58:19 +00:00
kris e05b74a00c Don't use old OpenSSL::Digest::Digest
git-svn-id: file:///home/svn/framework3/trunk@6239 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 17:48:36 +00:00
HD Moore 616491a552 Play nice with ruby implementations without readline and openssl
git-svn-id: file:///home/svn/framework3/trunk@5895 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 22:47:21 +00:00
HD Moore f5374fe2d2 Syntax fixups
git-svn-id: file:///home/svn/framework3/trunk@5894 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 19:31:11 +00:00
HD Moore 71448fd876 Typo for hashes
git-svn-id: file:///home/svn/framework3/trunk@5891 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 22:57:18 +00:00
kris aba3f95026 an empty string is better than a nil type-error (found by playing around, not
from a faulty module or whathaveyou)


git-svn-id: file:///home/svn/framework3/trunk@5878 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 04:01:21 +00:00
HD Moore 65419ad206 Adds routines/tools for cracking the NTLM hash from the plaintext case-insensive LANMAN password
git-svn-id: file:///home/svn/framework3/trunk@5779 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:42:52 +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
HD Moore 9c7f5d7130 Simple fix for bad calls to negotiate, remove useless disconnect call in the relay daemon
git-svn-id: file:///home/svn/framework3/trunk@5460 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-26 22:36:42 +00:00
HD Moore 509fc09382 Lots of updates related to <secret project X>.
git-svn-id: file:///home/svn/framework3/trunk@5424 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 04:46:13 +00:00
HD Moore ad43a641f8 Patch from grutz (see #169). Added constants for SMB2
git-svn-id: file:///home/svn/framework3/trunk@5226 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-27 17:42:32 +00:00
HD Moore 21d971139b New HTTP NTLM code from Kurt Grutzmacher <grutz@jingojango.net>
git-svn-id: file:///home/svn/framework3/trunk@5143 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-12 01:24:57 +00:00
HD Moore bff51b5578 Typo fix
git-svn-id: file:///home/svn/framework3/trunk@5067 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-30 05:21:02 +00:00
HD Moore b4fab66d40 Fixes #128. Applying a one-line typo fix from antoine. Thanks!
git-svn-id: file:///home/svn/framework3/trunk@5052 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 13:43:52 +00:00
HD Moore 24aac8b5ae Fixes #127. Applying patch from Alex that solves ASN.1 encoding issues.
git-svn-id: file:///home/svn/framework3/trunk@5049 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 01:13:25 +00:00
HD Moore d0b15d3d72 Lots of SMB fun, all preparation for Black Hat talk :-) More to come...
git-svn-id: file:///home/svn/framework3/trunk@5015 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:20:50 +00:00
HD Moore ddfe651bc8 This adds support for smb_pipeio=trans
git-svn-id: file:///home/svn/framework3/trunk@4915 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-15 16:48:15 +00:00
HD Moore 58a804e510 Small bug fix to allow pipeio on Novell
git-svn-id: file:///home/svn/framework3/trunk@4914 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-15 15:44:39 +00:00
HD Moore e8c5c53e4b This adds pass-the-hash support from grutz.
git-svn-id: file:///home/svn/framework3/trunk@4890 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-09 12:39:29 +00:00
HD Moore ab6f961ea4 Removed the buggy errors.txt loader, embedded the error messages into the files
git-svn-id: file:///home/svn/framework3/trunk@4584 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-27 02:44:05 +00:00
HD Moore a4b06e1653 fixes a file descriptor leak in the SMB and DCERPC exception translation code
git-svn-id: file:///home/svn/framework3/trunk@4423 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 03:07:40 +00:00
HD Moore 2980467f1b Formatting updates
git-svn-id: file:///home/svn/framework3/trunk@4315 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 01:54:10 +00:00
HD Moore 0b71dc5d04 A few updates to add NT Trans2 secondary requests, fix an authentication issue, and support a new denial of service module
git-svn-id: file:///home/svn/framework3/trunk@3885 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-14 05:41:54 +00:00
HD Moore 7a0c8d2c8d Cleanup
git-svn-id: file:///home/svn/framework3/trunk@3846 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-28 00:24:34 +00:00
HD Moore 651a1a7965 Bug fix to support NT 4.0
git-svn-id: file:///home/svn/framework3/trunk@3822 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-12 23:07:25 +00:00
HD Moore 775183661d Split trans into two routines, one of which sets maxparm/maxdata to zero, which is required to trigger the mailslot bug. Thanks Nico!
git-svn-id: file:///home/svn/framework3/trunk@3741 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-13 03:04:53 +00:00
HD Moore 35568b570a Demo code added for MS06-035, mailslot write added to client.rb
git-svn-id: file:///home/svn/framework3/trunk@3740 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-11 20:02:45 +00:00
HD Moore d1efbad1e7 Minor updates
git-svn-id: file:///home/svn/framework3/trunk@3722 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-23 06:20:52 +00:00
HD Moore b2895bec0d Minor sanity checks added
git-svn-id: file:///home/svn/framework3/trunk@3697 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-17 17:36:19 +00:00
bmc 049b71e236 move username & password to the test suite config thingie
git-svn-id: file:///home/svn/incoming/trunk@3652 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-01 15:30:26 +00:00
bmc c9a3258f81 removing dup trans function with a no_response argument to trans
git-svn-id: file:///home/svn/incoming/trunk@3650 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-01 15:18:53 +00:00
bmc 09786d3eaa tiny cleanups
git-svn-id: file:///home/svn/incoming/trunk@3649 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-31 21:49:46 +00:00
bmc 2f33ece43b * cleanup extra whitespaces at the end of the line
* collect = good


git-svn-id: file:///home/svn/incoming/trunk@3648 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 17:18:27 +00:00
HD Moore c3e0146443 Cleanups to SMB tests, minor fixes.
git-svn-id: file:///home/svn/incoming/trunk@3646 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 16:11:00 +00:00
HD Moore 18bb4f9e6d Fixed spaces before paranethesis issues in dcerpc/packet.rb
Fixed comment in smb/client.rb
Fixed ReadAndX in smb/client.rb
Updated ReadAndX struct in constants.rb


git-svn-id: file:///home/svn/incoming/trunk@3643 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-15 16:44:44 +00:00
HD Moore 71ac31446f SupportWords for a tree connect response are arbitrary new words that increment the WordCount, hopefully this wont break response parsing for the actual payload/bytecount. The current struct2 system can't take abitrary WordCount responses into account yet :-/
git-svn-id: file:///home/svn/incoming/trunk@3635 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-05 13:53:16 +00:00
HD Moore 64827d1238 New evasion options for controlling how many fake uuids to place before and after the real uid when eexploiting DCERPC bugs
Added a new evasion option for picking readAndX/writeAndX or transNamedPipe methods for DCERPC delivery, however a struct2 issue seems to be breaking this (will investigate tomorrow).

Fixed a typo in the initialize method of the OpenPipe class


git-svn-id: file:///home/svn/incoming/trunk@3634 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 05:53:37 +00:00
HD Moore 1fd5d698a2 Migrated client.rb to new smb time api (missed one)
Removed debugging print from the SMB mixin


git-svn-id: file:///home/svn/incoming/trunk@3632 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 04:49:47 +00:00
HD Moore 44f578bf41 Changed 'boolean' flags to true/false from 0/1 in client.rb
Updated constants.rb to more accurately reflect packet structure in SMB responses
Updated client.rb to match the changes to constants
Updated utils.rb to include smb to unix conversation routines for time fields
Updated utils.rb to create security blobs for both client and server packets


git-svn-id: file:///home/svn/incoming/trunk@3631 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 04:43:19 +00:00
HD Moore 1a54cc810a Fixed numerous issues involving smb/dcerpc interaction
Fixed 'bad' use of method definition (space after method name, will be depreciated soon)


git-svn-id: file:///home/svn/incoming/trunk@3626 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-30 19:49:27 +00:00
HD Moore 42bc7496cf All sorts of fun changes to smb/dcerpc, the basics are:
1) Clean up SMB constants, add new ones, define which ones are supported by dialect
2) DCERPC over SMB uses a 'OpenPipe' class, not an 'OpenFile'
3) A new DCERPC option called 'smb_pipeio' allows the user to switch between Read/Write and TransactNamedPipe()


git-svn-id: file:///home/svn/incoming/trunk@3622 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 16:59:44 +00:00
HD Moore f4736c3eae Minor improvements
git-svn-id: file:///home/svn/incoming/trunk@3593 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-08 06:35:35 +00:00
bmc 93870878fe * no self wrapper to unicode
* update tests to make more sense when they fail


git-svn-id: file:///home/svn/incoming/trunk@3557 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-07 20:19:30 +00:00