Commit Graph

584 Commits (36416c20cb574a8d5b6e23f5faf2e1344e52b775)

Author SHA1 Message Date
Metasploit fd4a51cadb
Bump version of framework to 4.12.8 2016-06-10 10:01:27 -07:00
Metasploit 815685992a
Bump version of framework to 4.12.7 2016-06-07 13:14:34 -07:00
Metasploit c35322ec3f
Bump version of framework to 4.12.6 2016-05-30 22:34:13 -07:00
Metasploit 54f4389d31
Bump version of framework to 4.12.5 2016-05-24 08:54:14 -07:00
Louis Sato 77a81b2e78
bump metasploit credential version 2016-05-23 17:03:10 -05:00
Metasploit 100300c819
Bump version of framework to 4.12.4 2016-05-18 07:04:09 -07:00
Jenkins c9dd863085
Bump version of framework to 4.12.3 2016-05-17 10:18:08 -07:00
darkbushido 771171cbe1
adding tzinfo-data to the gemspec
this should fix windows.
2016-05-17 11:40:25 -05:00
Brent Cook 307e565859
Land rapid7/metasploit-payloads#98, Fix python meterpreter reverse_tcp reconnect. 2016-05-13 22:59:52 -05:00
Jenkins 621a908b2d
Bump version of framework to 4.12.2 2016-05-13 12:51:58 -07:00
Jenkins b6a83f734d
Bump version of framework to 4.12.1 2016-05-13 12:39:43 -07:00
David Maloney 31050a8da7
Rails upgrade to 4.2.6
lands all of the rails 4.2 upgrade work
Merge branch 'staging/rails-upgrade'
2016-05-13 14:34:50 -05:00
Jenkins 6c11054d5a
Bump version of framework to 4.12.0 2016-05-13 11:46:03 -07:00
David Maloney fd543f13af
fix deps 2016-05-13 13:34:18 -05:00
David Maloney 2fb3123ef2
fix migration crazieness
MS-1486
2016-05-11 14:05:34 -05:00
David Maloney 6142d2cef1
Merge branch 'master' into staging/rails-upgrade 2016-05-09 09:27:17 -05:00
Jenkins 805f98f599
Bump version of framework to 4.11.27 2016-05-06 11:32:46 -07:00
David Maloney 0b89277394
update deps 2016-05-06 11:49:07 -05:00
David Maloney 19af279ce9
Merge branch 'master' into staging/rails-upgrade 2016-05-05 10:46:12 -05:00
Jenkins e7ff4665e1
Bump version of framework to 4.11.26 2016-05-04 09:44:18 -07:00
Brent Cook 94c8b51a54 bump payloads gem 2016-05-04 10:56:41 -05:00
Jenkins 7490ab1c78
Bump version of framework to 4.11.25 2016-05-03 17:09:07 -07:00
David Maloney fb5b228984
Merge branch 'master' into staging/rails-upgrade 2016-05-02 11:33:35 -05:00
Jenkins d4f1c78c5c
Bump version of framework to 4.11.24 2016-04-29 13:38:06 -07:00
wchen-r7 bf34ceeb76 Update gem metasploit-payloads to 1.1.8 2016-04-27 15:24:44 -05:00
Jenkins d70dcbf4a4
Bump version of framework to 4.11.23 2016-04-22 09:34:10 -07:00
Metasploit d5085f6f0d
Bump version of framework to 4.11.22 2016-04-16 09:09:23 -07:00
David Maloney c52f3dcb0e
update to rails 4.2.6
fix lost dep unlocks and upgrade rails to 4.2.6

MS-1400
2016-04-15 11:45:43 -05:00
Metasploit 16c599866c
Bump version of framework to 4.11.21 2016-04-08 16:23:33 -07:00
William Vu 22d08fdf39 Revert #6748, premature Gemfile* changes 2016-04-06 14:52:22 -05:00
David Maloney c3452ab982
unlock gemspec deps
unlock version constraints on deps
defined inside the gemspec

MS-1330
2016-04-04 15:31:09 -05:00
David Maloney fea142dc6e
unlock gemfile deps first
unlock the gemfile deps

MS-1330
2016-04-04 13:55:53 -05:00
David Maloney 8de58e4b80
Merge branch 'master' into staging/rails-upgrade 2016-04-04 09:30:01 -05:00
Brent Cook 627615d47b update to payloads 1.1.6 2016-04-01 21:30:34 -05:00
OJ 6c602dae90 Bump payloads to 1.1.5 2016-03-31 14:03:59 +10:00
wchen-r7 bc48ebd43b Use patch_finder for msu_finder 2016-03-29 23:21:01 -05:00
Brent Cook b8d53dde4a Merge branch 'upstream-master' into staging/rails-upgrade 2016-03-29 15:56:50 -05:00
Metasploit b41ac10fe8
Bump version of framework to 4.11.20 2016-03-29 12:43:20 -07:00
thao doan 587f1ee7b3 Land #6708, module documentation for msfconsole 2016-03-29 11:30:55 -07:00
Metasploit 72bde63397
Bump version of framework to 4.11.19 2016-03-25 13:03:35 -07:00
Brent Cook 1fe40d9f2d update to metasploit-payloads 1.1.4 2016-03-24 22:32:55 -05:00
wchen-r7 c3ce621d04 Fix gemfile 2016-03-24 20:43:51 -05:00
wchen-r7 57984706b8 Resolve merge conflict with Gemfile 2016-03-24 18:13:31 -05:00
Metasploit e7b0c60e5c
Bump version of framework to 4.11.18 2016-03-23 07:55:29 -07:00
Metasploit 6e12e74e02
Bump version of framework to 4.11.17 2016-03-18 14:12:18 -07:00
Brent Cook 87074c0638
Land #6651, add android sqlite_query option, update metasploit-payloads 2016-03-15 18:27:49 -05:00
Brent Cook a06236baa6 update to metasploit-payloads 1.1.3 2016-03-14 10:43:41 -05:00
Metasploit e059f42094
Bump version of framework to 4.11.16 2016-03-11 14:17:28 -08:00
David Maloney b878e762c0
pin rake version to 1.x line
rake 11 remvoes the last_comment method which
causes a error when trying to run rake jobs
current guidance is to pin the version back to
before the change

MS-1230
2016-03-10 15:39:06 -06:00
David Maloney 1911d0cd17
missed credential 2016-03-09 15:39:06 -06:00
David Maloney ca18996272
setup rails staging branch
rails 4.1 baby!
2016-03-09 15:35:00 -06:00
David Maloney 88697a5d3f
Merge branch 'master' into staging/rails-upgrade 2016-03-08 15:22:04 -06:00
Metasploit a5cdd7e17f
Bump version of framework to 4.11.15 2016-03-04 16:56:02 -08:00
Metasploit ce675330c0
Bump version of framework to 4.11.14 2016-03-04 14:49:55 -08:00
Brent Cook 851e8b610e
Land metasploit-payloads#80, update to fix #6593 2016-03-02 13:44:02 -06:00
wchen-r7 9f147a54a1 Update Gemfile for Sawyer (because Octokit needs it) 2016-03-02 10:53:13 -06:00
wchen-r7 5f510df2ab Resolve merge conflict with upstream's Gemfile.lock 2016-03-01 22:06:17 -06:00
David Maloney 368af93cfe
Merge branch 'master' of github.com:rapid7/metasploit-framework 2016-03-01 10:52:00 -06:00
Fernando Arias cbcd431772
Updated Gemfile.lock 2016-02-26 15:41:39 -06:00
Fernando Arias c4c5944b25
Merge branch 'staging/rails-upgrade' into staging/MS-888/engines-is-deprecated
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
2016-02-26 15:35:34 -06:00
David Maloney b7ba38a4c6
update mdm version 2016-02-26 14:32:03 -06:00
Brent Cook 7acba69e37
Land #6577, add controls for Android ringer 2016-02-26 07:02:49 -06:00
Brent Cook 1427887efe update payloads 2016-02-26 06:10:02 -06:00
Gregory Mikeska 2277a97065
Modify gemfile to point to topic branch on metasploit-concern 2016-02-25 11:12:49 -06:00
Gregory Mikeska cbc5b296e4
implement engines method locally instead of adding refinement 2016-02-25 11:05:17 -06:00
Metasploit b32f474e99
Bump version of framework to 4.11.13 2016-02-24 11:37:42 -08:00
David Maloney c0c6dc7a18
point to other staging brnaches for gems
the gem dependencies that have been modified
so far are being pulled in from their staging branches
on github instead of rubygems for this branch
2016-02-22 11:31:58 -06:00
Metasploit b868f7cc89
Bump version of framework to 4.11.12 2016-02-19 20:19:43 -08:00
wchen-r7 b0cfb4aacf Add info -d to show module documentation in .md 2016-02-16 22:44:03 -06:00
Metasploit 93cc7d58ba
Bump version of framework to 4.11.11 2016-02-12 15:38:50 -08:00
Brent Cook ed5cf821b2 bump payloads to 1.1.0 2016-02-10 23:21:20 -06:00
Brent Cook 27ec6a861c update gemfile.lock 2016-02-10 22:41:41 -06:00
wchen-r7 d5c3fcae04
Land #6511, Bump Jsobfu version to support preserved_identifiers 2016-02-05 15:57:53 -06:00
Metasploit 3c1ada46dd
Bump version of framework to 4.11.10 2016-02-05 13:40:02 -08:00
Adam Cammack 37490a7b6b
Bump metasploit-payloads version
Fix how Android meterpreter handles the timeout config generated by
android/shell/reverse_tcp.

Change Java meterpreters to return MAC address in `ifconfig` if the
platform supports it.
2016-02-03 18:16:20 -06:00
Metasploit 7079110964
Bump version of framework to 4.11.9 2016-01-29 10:51:46 -08:00
Gregory Mikeska 3b829e5173
update redcarpet gem to latest version 2016-01-28 14:30:12 -06:00
wchen-r7 2fe40a0e04 Bump jsobfu version to 0.4.1 2016-01-28 11:27:56 -06:00
Brent Cook 017d0d2719 update to nokogiri 1.6.7.2 2016-01-23 02:20:12 -06:00
wchen-r7 67c35d5177 Bump metasploit-payloads to 1.0.22 2016-01-22 14:07:40 -06:00
Metasploit a030179577
Bump version of framework to 4.11.8 2016-01-15 15:17:13 -08:00
Brent Cook 1e54b00016
bump Gemfile.lock for latest framework version
The release automation did not update this automatically with the last release,
so this is a one-time manual update to match the current framework version.rb.
2016-01-08 09:44:47 -06:00
Brent Cook 6062d991ec
Land #6410, update to metasploit-framework 4.11.6 2016-01-06 14:41:59 -06:00
Brent Cook 6d157aafdb update for metasploit-framework 4.11.6 2016-01-06 14:41:24 -06:00
Brent Cook 4e4c3115f4 update to nokogiri 1.6.7.1 2016-01-03 22:56:14 -06:00
Brent Cook 5bd1c11d74 update to metasploit-payloads 1.0.21 2015-12-24 10:14:46 -06:00
Brent Cook 9bbf2af86c update to metasploit_data_models 1.2.10 (remove 127.0.0.1 filter) 2015-12-22 14:53:21 -06:00
Brent Cook ee208570a2 remove bundler 1.10 fingerprint from Gemfile.lock 2015-12-14 13:22:38 -06:00
David Maloney 08acac6c25
Lands #6326, Rspec 3 upgrade
lands the work to upgrade framework
to RSpec 3

MS-673
2015-12-14 11:27:17 -06:00
Gregory Mikeska b620e0d1c9 bump nokogiri to 1.6.7 2015-12-14 09:23:06 -06:00
Luke Imhoff 4f2ed69daa Update fivemat to rspec 3 compatible version
MS-673
2015-12-10 21:47:22 -06:00
Luke Imhoff d38ed931a5 Update to rspec 3.3 in Gemfile
MSP-13484
2015-12-10 21:47:22 -06:00
Jon Hart 39da306b1d
Land #6057, @danilbaz's module for dumping Bitlocker master key (FVEK) 2015-12-08 18:16:39 -08:00
Brent Cook da58dd2c71 update to metasploit-payloads 1.0.19 2015-12-07 15:37:58 -06:00
wchen-r7 f141cf0e56 Bump metsploit-payloads to 1.0.18 2015-12-04 16:12:23 -06:00
Brent Cook a7a89adfac
Land #6264, meterpreter per-extension init string support, update payloads to 1.0.17
This brings in the following changes:
	Changes to support maven 3.3+
	Don't fall back to 0.0.0.0
	Remove all debug builds from the Windows projects
	Add show_mount, ps_list, and some core tweaks
	Refactor TLV layout, add more debug output, token stealing
	Add incognito binding, code tidies
	Update packaged libs
	Add transport list binding
	Add transport add command to python binding
	Update python core lib archive
	change source perms back to non-executable
	First pass of stageless initialisation script
	Finalise stageless initialisation scripts
	add BOOT_COMPLETED receiver that starts the Payload
	Improve the implementation of the getuid command
	Switch to Utils.runCommand per timwr's suggestion
	Updated init script method

also bumps msgpack 0.7.1, which fixes a failure packing messages > 256k
2015-11-25 22:27:27 -06:00
Brent Cook c8461bfb24 update to metasploit-payloads 1.0.17 2015-11-25 22:03:28 -06:00
BAZIN-HSC c8847182d7 Add module to dump Bitlocker master key (FVEK) 2015-11-20 18:30:48 +01:00
Brent Cook 1b951b36fe remove -db / -pcap / -all gemspecs, merge into one 2015-11-11 15:01:50 -06:00
William Vu e6202e3eda Revert "Land #6060, Gemfile/gemspec updates"
This reverts commit 8f4046da40, reversing
changes made to 2df149b0a5.
2015-11-08 19:32:15 -06:00
Brent Cook 725d61d6e4 remove -db / -pcap / -all gemspecs, merge into one 2015-11-04 08:34:56 -06:00
Brent Cook 4320097025
Land #6172, fix problem encoding unicode strings with jsobfu 2015-11-02 17:30:06 -06:00
Brent Cook 7f19d95ad8
Land #6146, add show_mount command (initially for windows meterpreter sessions) 2015-10-30 17:37:30 -05:00
Brent Cook fb7d5e569a update to metasploit-payloads 1.0.16 2015-10-30 17:27:09 -05:00
Brent Cook 4a52b62275 bump to 4.11.5, update a few other gems 2015-10-30 17:08:29 -05:00
wchen-r7 db0518dd3c Bump jsobfu to 0.3.0 2015-10-30 13:06:53 -05:00
OJ c5643e52ff Add support for the show_mount command (windows) 2015-10-29 07:28:33 +10:00
Brent Cook 065fe57ad7 bundler 1.10 :( 2015-10-23 15:30:04 -07:00
Louis Sato 84e8708900
bump mdm to 1.2.9
MS-120

* search scope for vulns now queries host name
2015-10-23 11:07:17 -05:00
Brent Cook 7596f13407 remove bundled-with message 2015-10-21 17:08:54 -05:00
Louis Sato 867bf340ab
bump mdm to 1.2.8
MSP-13273
2015-10-21 16:58:27 -05:00
Brent Cook cbe02f042a
Land #6005, update recog to 2.0.14 2015-10-01 16:37:09 -05:00
Fernando Arias 393a71cf46 Merge branch 'master' of github.com:rapid7/metasploit-framework into bug/MSP-13119/rework-match-result-creation
Conflicts:
	Gemfile.lock
2015-09-29 15:00:22 -05:00
Fernando Arias 2ead218a01
Bump Mdm to 1.2.7
MSP-13119
2015-09-29 14:57:57 -05:00
Brent Cook 866636b59c
Land rapid7/metasploit-payloads#33, fix running android meterpreter without a context 2015-09-26 11:31:27 -04:00
Brent Cook 46ed129966 update to metasploit-payloads 1.0.14 2015-09-26 10:50:20 -04:00
Jon Hart 49bd43701f
Update to recog 2.0.14 2015-09-25 08:21:02 -07:00
Brent Cook 36c1339ad3
update payloads to 1.0.13, fixes older php meterpreters 2015-09-16 17:04:39 -05:00
jvazquez-r7 c8b27e0563
Land #5889, @jlee-r7's favors metasm as a gem 2015-09-16 17:01:01 -05:00
jvazquez-r7 e22f6e79d8
Update Gemfile.lock 2015-09-16 16:52:26 -05:00
Louis Sato 438ff9b667
MSP-13025
Upgrading metasploit-credential version to 1.0.1
2015-09-08 12:01:20 -05:00
Brent Cook d7887b59aa
Land #5892, update pcaprub to the latest version 2015-09-04 17:26:29 -05:00
Brent Cook 3334e94f80 update to metasploit-payloads 1.0.12 2015-09-03 09:59:56 -05:00
Brent Cook 6ea25a465b update to metasploit-payloads 1.0.11 2015-09-01 17:35:23 -05:00
Brent Cook 593f501571 finish move of php / python meterpreters to metasploit-payloads 2015-08-27 11:34:22 -05:00
HD Moore cdd1c6381c
Land #5894, bumps mime-types to 2.6.1 2015-08-26 17:17:01 -05:00
Tod Beardsley 328191aa51
Bump mime-types to 2.6.1
Currently, we're stuck on mime-types 2.4.3. Doesn't seem to be any
reason for this, and incidentally, 2.4.3 is signed with a mystery cert.
We should bump to 2.6.1 to get out of gem signing purgatory.

Diffs:

https://github.com/todb-r7/ruby-mime-types/compare/v2.4.3...v2.6.1
2015-08-26 09:57:47 -05:00
Brent Cook ca8353e1aa update to metasploit-payloads 1.0.9 2015-08-25 17:44:01 -05:00
Tod Beardsley 45eb55f975
Bump PacketFu to latest 2015-08-25 11:45:30 -05:00
James Lee d372a6a16d
Gemify metasm 2015-08-24 15:53:24 -05:00
Brent Cook 5dd015150c
Land #5748, refactor google geolocate, add wlan_geolocate and send_sms to android meterpreter 2015-08-16 10:58:17 -05:00
Brent Cook 82e1181ccb update to metasploit-payloads 1.0.8 2015-08-14 17:38:54 -05:00
Brent Cook 0b6a52e162
bump metasploit-framework gemspec version to match pro 2015-08-04 14:25:44 -05:00
Samuel Huckins 60444c208b
Land #5658, MSF version includes git hash now 2015-07-14 09:21:25 -05:00
Brent Cook b782e3fc0f update to metasploit-payloads 1.0.7
This includes a couple of transport fixes for posix meterpreter and some
robustness fixes when flushing reverse_tcp sockets.
2015-07-13 00:13:02 -05:00
Brent Cook 8349a274ea use and include git hash of Framework as part of the version
Because we do not always update the version number, multiple releases have
shown version string, which is not useful for helping debug issues, or for
knowing what features are enabled.

This adds the git hash or reads from a file a copy of the git hash (useful for
doing packaged builds without git) so that it is clear the origin of a
particular metasploit-framework version.
2015-07-10 18:03:37 -05:00
OJ 85769808cc Update metasploit payloads to 1.0.6 2015-07-10 16:28:20 +10:00
Brent Cook 653c4808b2 update framework version spec 2015-07-06 10:42:48 -05:00
darkbushido 7bdfcf2bce locking the r7 managed gems to specific versions
this will force pro to use the same version of the gems
2015-07-02 14:16:02 -05:00
Brent Cook 52086308b3 bump to metasploit-payloads 1.0.4 2015-07-01 00:22:54 -05:00
Trevor Rosen 4e3a2b2b35
Upstream merge 2015-06-23 14:11:28 -05:00
Trevor Rosen a9ab5b7bb8
Handle content-type weirdness from Anemone
Fixes #5515
 MSP-12834
2015-06-23 14:08:23 -05:00
Brent Cook 9fea3d7a9c update to metasploit-payloads 1.0.3 2015-06-22 16:56:54 -05:00
Trevor Rosen ee9830e2e9
Point MDM to branch for community verification
MSP-12834
2015-06-19 17:10:02 -05:00
Samuel Huckins 9dde32f523
Updating to MDM 1.2.3
MSP-12700

* Fixes issue with web_* data being loaded into memory unnecessarily
2015-06-12 16:48:54 -05:00
Trevor Rosen 7baebeea89
Update MDM dependency
MSP-12813
2015-06-12 14:00:54 -05:00
Samuel Huckins 9713fe7f99
Updating to MDM 1.2.1
* Fixes bug with Pro Vuln Validation validation pushes
2015-06-02 13:26:10 -05:00
Samuel Huckins 22a1b0ab44
Land #5399, latest recog and MDM 2015-06-02 13:23:25 -05:00
Brent Cook 64e86165ef remove android meterpreter bins, update to payloads 1.0.2
This switches us to using the Android payload files from the
metasploit-payloads gem
2015-06-01 09:14:31 -05:00
Brent Cook d39d4ff6de bump to metasploit-payloads 1.0.1 2015-05-29 15:15:49 -05:00
Brent Cook 16bc08861a update to metasploit-payloads 1.0.0 2015-05-29 13:01:26 -05:00
HD Moore 2934dcbf35 Bump Gemfile.lock w/Recog/MDM 2015-05-26 10:40:27 -05:00
Sonny Gonzalez 7d46f428e8
Add polymorphic relationship to Mdm::Vuln
and :origin

MSP-12395

* Update Gemfile.lock to use metasploit_data_models 1.1.0,
  which support the polymorphic relationship
2015-05-21 13:18:38 -05:00
Brent Cook d804f5fe49 update to metasploit-payloads 0.0.7 2015-05-17 10:06:38 -05:00
Brent Cook f3c22e4168 update metasploit-payloads to 0.0.6
This includes:
  - support for the 'sleep' command (metasploit-framework #5339)
  - support for Unicode file names with Java (metasploit-javapayloads #29)
  - proxy support with winhttp (meterpreter #159)
  - support for showing domain and logged in users (meterpreter #161)
2015-05-15 18:04:04 -05:00
Brent Cook 181c770a4e revert unintentional gem upgrades 2015-05-14 00:05:10 -05:00
OJ 83fbd41970 Merge branch 'upstream/master' into multi-transport-support
Conflicts:
	Gemfile.lock
	modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
2015-05-14 14:50:25 +10:00
OJ e9e3d9c1e4 Update payloads gem, and updated payload sizes 2015-05-13 15:37:09 +10:00
darkbushido d5cfeb7711
updating the metasploit gems to ~> 1.0 2015-05-12 14:49:33 -05:00
Matt Buck e95c908ca8
Update metasploit-credential 2015-05-06 11:08:48 -05:00
darkbushido 26e7fe15f9
Merge branch 'upstream' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-05-05 11:00:38 -05:00
Brent Cook 3771a78564 update to metasploit-payloads 0.0.3 2015-05-04 16:17:57 -05:00
Brent Cook e6ea5511ca update linux and windows meterpreters to use metasploit-payloads 2015-05-04 09:44:36 -05:00
darkbushido 3e9c2a6c09
bumping mdm and creds 2015-04-30 15:51:19 -05:00
Matt Buck 6157bc137a
Upgrade Redcarpet 2015-04-30 11:51:40 -05:00
darkbushido 542937415b updating the gemspecs to use the pre-release versions of the other metasploit gems 2015-04-29 14:07:50 -05:00
Matt Buck 8163c3cdda Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	plugins/nessus.rb
2015-04-28 15:33:46 -05:00
Matt Buck 83baf7039b
Update metasploit gem deps 2015-04-28 15:27:24 -05:00
Matt Buck 33b142d71c
Update mdm 2015-04-27 15:39:47 -05:00
Matt Buck 35a50dfc0d
Upgrade mdm 2015-04-27 15:27:32 -05:00
Matt Buck 6a4d63ca4f Drop explicit IPAddr to String coercion
MSP-12611
2015-04-27 10:48:13 -05:00
Matt Buck 81b8a91774
Update metasploit-credential 2015-04-22 15:00:52 -05:00
darkbushido 13f19601d5
updatingg metasploit-gems 2015-04-21 15:42:15 -05:00
Brent Cook 1d5a054cb0
Land #5166, update redcarpet for XSS vuln 2015-04-20 22:09:16 -05:00
Matt Buck 563c1a7192
Revert not null constraints on timestamps
MSP-12184
2015-04-17 14:17:41 -05:00
Brent Cook 2ee28916f7 bump meterpreter_bins to 0.0.22 2015-04-16 22:21:12 -05:00
Luke Imhoff 4629b1551c
Update to redcarpet 3.2.3
MSP-12565

Version 3.2.3 fixes a XSS via parse_line (OSVDB-120415).
2015-04-16 08:28:31 -05:00
Matt Buck cf2be4bf33
Update metasploit gem deps 2015-04-15 14:10:23 -05:00
Matt Buck e82fb5f836
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	lib/msf/ui/console/command_dispatcher/db.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
2015-04-15 14:04:35 -05:00
Matt Buck 1e7a6bf3e9
Update metasploit gem dependencies to released versions 2015-04-15 13:06:33 -05:00
Luke Imhoff b9bce90759
Update to metasploit-concern 0.4.0 prerelease
MSP-12550

Properly shows Metasploit::Credential::Core::ToCredential is not loaded.
2015-04-14 15:03:20 -05:00
Brent Cook 0e864e1631 update bins to 0.0.21 2015-04-14 10:45:49 -05:00
Matt Buck 9f15824e2a
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-04-10 15:35:27 -05:00
Matt Buck 2b02670d38
Update mdm 2015-04-07 11:19:41 -05:00
Luke Imhoff f038fc5466
Update revision of metasploit_data_models/staging/rails-4.0 2015-04-07 10:55:18 -05:00
Matt Buck f29434b9ac
Update deps 2015-04-06 11:59:10 -05:00
Matt Buck 5e2d6c27c3
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	db/schema.rb
	lib/msf/core/db_manager/session.rb
	metasploit-framework-db.gemspec
2015-04-06 11:27:00 -05:00
Fernando Arias 6455862484 Merge branch 'staging/rails-4.0' of github.com:rapid7/metasploit-framework into staging/rails-4.0
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
2015-04-03 13:56:38 -05:00
Brent Cook 0d78834083 update meterpreter binaries 2015-04-03 05:47:18 -05:00
James Lee bf2d37c511
Axe superfluous line in Gemfile
Covered by the gemspec
2015-03-30 14:57:12 -05:00
James Lee d3dd7ecfc5
Update to latest schema 2015-03-30 14:10:06 -05:00
James Lee 2ab4584079
Merge remote-tracking branch 'upstream/master' into staging/single-vuln-push 2015-03-30 13:50:52 -05:00
Samuel Huckins 18e3a78285
Using latest released MDM 2015-03-30 12:51:12 -05:00
Trevor Rosen 2815462375
Update Mdm to staging hash 2015-03-27 15:16:33 -05:00
Trevor Rosen 27e05d7d73
Update Gemfile 2015-03-27 15:10:37 -05:00
Matt Buck 2fb4877870
Update deps 2015-03-24 16:28:13 -05:00
Brent Cook afe17e1f33 bump meterpreter bins to 0.0.17 2015-03-23 17:15:49 -05:00
James Lee 96195f317e
Use staging branch of mdm 2015-03-20 16:35:46 -05:00
OJ 830f328aba Bump meterpreter_bins version 2015-03-20 06:23:10 +10:00
Matt Buck bd47a1533b Update mdm 2015-03-18 16:37:54 -05:00