1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-10-29 18:07:27 +01:00
Commit Graph

268 Commits

Author SHA1 Message Date
Matt Buck
478dbd32f2
Bump to newly-released versions of gems
MSP-11412
2014-10-03 12:07:23 -05:00
Matt Buck
f748256e47
Use the prerelease versions of the gems
MSP-11412
2014-10-03 10:29:10 -05:00
Matt Buck
04dbfb9ad6
Bump metasploit gem dependencies
MSP-11412
2014-10-02 18:11:13 -05:00
HD Moore
24eec0e2a6 Swap to recog ~> 1.0 pre Luke's comment 2014-10-02 09:51:41 -05:00
HD Moore
5f4098f650 Bump recog to ~> 1.0.0 2014-10-02 00:51:37 -05:00
darkbushido
701291e029
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2014-09-29 15:48:12 -05:00
Joe Vennix
b96a7ed1d0
Install a global object in firefox payloads, bump jsobfu. 2014-09-24 16:05:00 -05:00
darkbushido
d6dcd887d7
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
	metasploit-framework.gemspec
2014-09-23 13:40:34 -05:00
sinn3r
d52236fe05
Land #3835 - JSObfu to a gem 2014-09-20 01:38:45 -05:00
Joe Vennix
8e1b00ce95
Adds JSObfu.disabled for spec stubbing, fixes BES specs. 2014-09-19 20:42:05 -05:00
Joe Vennix
0f4be63903
Move JSObfu a gem then pull it into the Rex namespace. 2014-09-19 19:10:39 -05:00
Luke Imhoff
0f854ce5ed
Update to released metasploit-model
MSP-11359
2014-09-18 11:33:41 -05:00
Luke Imhoff
03cc69d902
Update gems
MSP-11359
2014-09-18 11:33:22 -05:00
Luke Imhoff
21d6e4afb3
Move metasploit-concern to gemspec
MSP-11359

The dependency on `metasploit-concern` should not have been in the db
group as `Metasploit::Concern.run` is called for
`Msf::Exploit:Remote::HttpServer`, which works without the db group
installed.  This is a fix for a bug from #3781.
2014-09-18 09:33:57 -05:00
darkbushido
3b75b98148
updating to rails 4 2014-09-03 12:20:51 -05:00
HD Moore
73e4ec709f Fix smb_port and require 'recog' when no DB/MDM 2014-08-25 15:42:18 -05:00
OJ
a6b7262611 Updated to meterpreter_bins version 0.0.7
This has been a long time coming! Kiwi has been broken for a while and
this updated fixes that problem.

Details of the binaries build date/commits are in the gemspec in the
main meterpreter_bins repo.
2014-08-20 12:30:34 +10:00
Samuel Huckins
149c3ecc63
Various merge resolutions from master <- staging
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
2014-08-15 11:33:31 -05:00