1c71952529
Update Gemfile.lock because I forgot to in PR#8014
2017-02-27 11:09:14 -06:00
5383900a54
Merge branch 'master' into feature/aggregator
2017-02-24 23:59:02 -06:00
f9e4fd54fe
Bump version of framework to 4.14.1
2017-02-24 13:31:17 -08:00
2631259919
Land #7973 , Enable cert validation for Nexpose
...
This PR enables connection to a Nexpose console using the
nexpose client gem.
It also allows you to connect using a trusted certificate
instead of simply overriding the SSL validation.
2017-02-24 14:27:24 -06:00
0f4e03be7b
Bump version of framework to 4.13.27
2017-02-24 10:03:33 -08:00
1ca0a24177
Up rex-exploitation
2017-02-23 15:58:19 -06:00
9186b3298a
Merge branch 'master' into feature/aggregator
2017-02-22 10:08:11 -06:00
01558d3d51
Bump version of framework to 4.13.26
2017-02-21 14:01:15 -08:00
b2ed082c75
Merge branch 'master' into feature/aggregator
2017-02-21 15:11:08 -06:00
8469323519
update metasploit-aggregator in Gemfile.lock
2017-02-21 15:04:29 -06:00
647020289f
Bump version of framework to 4.13.25
2017-02-17 17:03:42 -08:00
86c04cd9f4
update metasploit payloads with Python fixes
2017-02-17 18:52:14 -06:00
6e62899e1c
Bump version of framework to 4.13.24
2017-02-17 10:02:51 -08:00
9f5582a4e4
update Gemfile.lock for master merge
2017-02-16 15:31:40 -06:00
cbfe18e4d7
use certificates in nexpose
2017-02-16 14:34:02 -06:00
184707c6fc
Bump version of framework to 4.13.23
2017-02-13 16:04:35 -08:00
44d229ad49
Bump version of framework to 4.13.22
2017-02-10 10:02:43 -08:00
d81bdc1c02
Bump version of framework to 4.13.21
2017-02-07 17:27:47 -08:00
2d1989ef16
bump rex-core, fix path normalization
...
Brings in fixes from https://github.com/rapid7/rex-core/pull/4
2017-02-07 19:17:44 -06:00
40c86567aa
import packetfu fix for https://github.com/packetfu/packetfu/pull/163
2017-02-06 15:51:01 -06:00
9a5d5eec2e
Bump version of framework to 4.13.20
2017-02-03 10:04:05 -08:00
f8c2bd4f52
expand remote sessions list detail retrieval
2017-02-02 15:21:09 -06:00
321fa91c75
Bump version of framework to 4.13.19
2017-02-01 11:28:53 -08:00
be170ab8b2
Bump version of framework to 4.13.18
2017-01-31 14:20:40 -08:00
95449a846b
Bump version of framework to 4.13.17
2017-01-27 10:02:17 -08:00
9dbcaf7227
bump Gemfile.lock
2017-01-26 11:20:17 -06:00
4af1b595cd
update Gemfile.lock
2017-01-25 10:32:23 -06:00
2e1d381e2e
bump gem
2017-01-24 09:48:40 -06:00
d9602f49a2
bump payloads
2017-01-22 15:45:45 -06:00
77e596263b
update lock
2017-01-22 10:43:06 -06:00
6a2d036ea8
depend on regular rb-readline, bugs fixed upstream
2017-01-22 10:20:05 -06:00
28211c3b73
bump payloads
2017-01-22 10:02:41 -06:00
c2e4a50924
Bump version of framework to 4.13.16
2017-01-20 10:02:29 -08:00
56ed8bc021
Bump version of framework to 4.13.15
2017-01-13 10:05:02 -08:00
f11cf92040
bump mettle gem to include pivoting support
2017-01-10 16:43:49 -06:00
f311511e6d
Bump version of framework to 4.13.14
2017-01-10 14:03:16 -08:00
b074042b99
Bump version of framework to 4.13.13
2017-01-06 12:00:26 -08:00
1ef2e54539
Bump version of framework to 4.13.12
2017-01-06 10:03:13 -08:00
7ef4db1465
Bump version of framework to 4.13.11
2017-01-04 14:53:33 -08:00
f25ced04af
Update rex-exploitation to 0.1.8
2017-01-03 12:04:18 -06:00
36e0bad421
Update rex-exploitation to 0.1.7
2016-12-30 00:56:02 -06:00
fae4751771
Land #7744 , update kiwi extension to Mimikatz 2.1
2016-12-29 16:22:45 -06:00
cd950e91a9
bump payloads gem
2016-12-29 15:59:07 -06:00
f50fa516f4
Bump version of framework to 4.13.10
2016-12-23 10:01:58 -08:00
5702bd6745
Land #7674 , Move migration stub generation code into msf
2016-12-22 17:53:00 -06:00
ea704211ca
incorporate payload stub generation changes
2016-12-22 17:50:43 -06:00
3a998fada2
Bump version of framework to 4.13.9
2016-12-18 13:22:52 -08:00
c5c710f837
Bump version of framework to 4.13.8
2016-12-16 10:02:02 -08:00
12af07d8cb
Bump version of framework to 4.13.7
2016-12-09 10:03:22 -08:00
50f95f9940
Land #7681 , Get ready for stageless mettle
2016-12-09 09:31:47 -06:00
6dcdf74850
bump mettle gem
2016-12-09 09:27:56 -06:00
eeef8fa6ad
Add new arches to UUIDs
2016-12-08 16:29:43 -06:00
a54c0c4e1f
Bump version of framework to 4.13.6
2016-12-07 09:00:16 -08:00
a99042a54d
Update Gemfile.lock
2016-12-07 14:58:27 +10:00
7346223a65
update payloads
2016-12-06 07:16:44 -06:00
7edb5e19e2
Bump version of framework to 4.13.5
2016-12-05 15:09:06 -08:00
76db530a86
Bump version of framework to 4.13.4
2016-12-02 10:02:53 -08:00
f46ca66858
Bump version of framework to 4.13.3
2016-11-28 06:35:44 -08:00
79e8ffd983
Bump version of framework to 4.13.2
2016-11-25 10:03:24 -08:00
d7dce28018
bump mettle to get fix for UUID encoding
2016-11-21 00:57:50 -06:00
05cb5edaac
update payload gems
2016-11-20 19:10:27 -06:00
f313389be4
Merge remote-tracking branch 'upstream/master' into land-7507-uuid-arch
2016-11-20 19:08:56 -06:00
643a5511cf
Bump version of framework to 4.13.1
2016-11-18 10:01:48 -08:00
383314530a
Bump version of framework to 4.13.0
2016-11-16 07:48:26 -08:00
8d1d017188
Land #7562 , fix rex-text column padding for unicode values
2016-11-15 07:12:37 -06:00
fafc749447
update metasploit payloads
2016-11-14 16:51:38 -06:00
203c8132c5
Update the Gemfile to pull in the new rex-text Gem
2016-11-14 14:16:36 -06:00
422ff57335
update metasploit-payloads
2016-11-14 02:53:18 -06:00
f116ad2c59
Bump version of framework to 4.12.42
2016-11-11 10:02:14 -08:00
77bacacb9c
Land rapid7/rex-exploitation#2 , Fix heap_spray method's return value type
...
This fixes #7520
2016-11-09 20:39:01 -06:00
5d5a4baaf7
back out rex-arch to avoid conflict with arch fixup PR
2016-11-08 17:42:42 -06:00
aeeefc46da
update gems
2016-11-08 17:31:33 -06:00
2c39a14ada
Bump version of framework to 4.12.41
2016-11-04 10:02:13 -07:00
57eabda5dc
Merge upstream/master
2016-10-29 13:54:31 +10:00
e936a6d7ce
Update Gemfile to include rex-arch update
2016-10-29 08:19:29 +10:00
ffc62964d6
Bump version of framework to 4.12.40
2016-10-28 10:02:36 -07:00
1a1841d441
rebuilt metasploit-payloads without debug info
2016-10-26 05:43:36 -05:00
6a23168800
Bump version of framework to 4.12.39
2016-10-25 12:22:52 -07:00
e29567f390
Bump version of framework to 4.12.38
2016-10-24 14:25:47 -07:00
bf59ba526a
Bump version of framework to 4.12.37
2016-10-24 07:35:41 -07:00
672e275877
update gems
2016-10-23 16:43:02 -05:00
8e0d866976
Bump version of framework to 4.12.36
2016-10-21 10:02:09 -07:00
85c26c64e2
Bump rex-exploitation gem version, see #7452 .
2016-10-19 08:04:10 -05:00
43fd0a8813
Land #7436 , Put Rex-exploitation Gem Back
2016-10-18 16:03:54 -05:00
c5faffddbd
bump gems
2016-10-17 04:48:12 -05:00
74340e9eb7
Bump version of framework to 4.12.35
2016-10-14 15:13:45 -07:00
b3666ff7ab
Bump version of framework to 4.12.34
2016-10-14 10:04:05 -07:00
741c4b8916
updated android payload gem, removed unused extension jar
2016-10-14 09:59:06 -05:00
933dc1df84
updated gems
2016-10-14 09:17:27 -05:00
aa748ecc83
update to working mettle gem 0.0.8
2016-10-11 21:12:00 -05:00
7894d5b2c1
Revert "Revert "use the new rex-exploitation gem""
...
This reverts commit f3166070ba
2016-10-11 17:40:43 -05:00
8f8a54bf8c
update to really-working payloads 1.1.21
2016-10-11 07:00:01 -05:00
deaa4047df
bump payloads (and sqlite too)
2016-10-10 23:58:19 -05:00
adb6f31e36
Bump version of framework to 4.12.33
2016-10-08 20:57:08 -07:00
f3166070ba
Revert "use the new rex-exploitation gem"
...
This reverts commit 52f6265d2e
2016-10-08 21:55:16 -05:00
8a6426df48
Bump version of framework to 4.12.32
2016-10-07 10:04:32 -07:00
a0ebf5ea2d
Bump version of framework to 4.12.31
2016-10-06 11:23:08 -07:00
a41281034a
Bump to latest rex-powershell gem...
2016-10-05 18:10:13 -05:00
52f6265d2e
use the new rex-exploitation gem
...
use the new rex-exploitation gem instead of the packaged in lbirary code
cleans up a huge ammount of space in framework
MS-1709
2016-10-05 09:05:27 -05:00
a68e9d33e1
Bump rex-powershell gem to latest.
2016-10-04 14:25:10 -05:00
55d267730e
bump metasploit-payloads
2016-10-04 07:16:39 -05:00
f6b2a3a173
bump gems
2016-10-02 21:23:34 -05:00
73c11a63b4
Bump version of framework to 4.12.30
2016-09-30 10:03:42 -07:00
e0cd4d082a
Bump MDM ver to get pro and msf back in sync.
...
Per discussion with @dmaloney-r7
2016-09-29 13:42:13 -05:00
a457f64e2a
update to latest release payload gem
2016-09-28 16:14:29 -05:00
cdf544be9e
Land #7364 , update to latest metasploit-payloads
2016-09-27 11:26:16 -05:00
8f9be92b1b
update to latest metasploit-payloads
2016-09-27 11:06:34 -05:00
5ea1e7b379
Bump version of framework to 4.12.29
2016-09-26 12:06:21 -07:00
3ddf80dd7a
Bump version of framework to 4.12.28
2016-09-23 10:02:37 -07:00
11e2de4756
Bump to lastest metasploit_data_models gem.
...
Fixes MS-1598.
2016-09-21 13:06:41 -05:00
27018b421c
Land #7316 , use new rex-encoder gem
2016-09-19 11:59:21 -05:00
5acc17a800
Bump version of framework to 4.12.27
2016-09-16 10:02:52 -07:00
7e10b5c482
use new rex-encoder gem
...
remove all the encoidng lbiraries and use the new gem
rex-encoder that contains them now.
MS-1708
2016-09-14 12:07:26 -05:00
e005a3f49b
Land #7300 replace msfrop with the rex-rop_builder gem
...
MS-1722
2016-09-14 11:21:54 -05:00
32998d938f
Bump version of framework to 4.12.26
2016-09-13 16:59:37 -07:00
8eb2c926f3
Bump version of framework to 4.12.25
2016-09-13 13:37:08 -07:00
0d6242aa4f
yank bad rex-text version
2016-09-13 14:14:45 -05:00
fd3b885d83
replace msfrop with the rex-rop_builder gem
...
moved all of this code into the new gem
MS-1722
2016-09-12 16:06:53 -05:00
4495b27e67
Land #7254 , Rex::SSLScan Gemification
2016-09-08 13:20:56 -05:00
1b9c37ff78
Merge branch 'master' into feature/MS-1711/rex-nop
2016-09-08 10:48:07 -05:00
1b69d163cc
push rex-text back to previous version
2016-09-08 10:41:33 -05:00
a30711ddcd
Land #7279 , Use the rubyntlm gem (again)
2016-09-07 16:33:35 -05:00
cd90ff7c24
pull in rex-socket gem
...
pull rex-socket gem in as a dep
MS-1715
2016-09-07 11:38:26 -05:00
1a913da08c
pull in rex-core as a dep
2016-09-07 11:38:26 -05:00
405c59b8b8
move bidirectional pipe into rex/ui/text
...
this didn't really fit with the rest of rex::io and it inherits
from inside rex/ui/text so just put it there
MS-1715
2016-09-07 11:34:04 -05:00
0f30d3a720
Land #7208 , use new rex-bin_tools gem
2016-09-06 13:19:35 -05:00
9d5a276e91
Fix recent metasploit-framework.gemspec conflict.
2016-09-06 13:10:28 -05:00
881effbae9
use the new rex-nop gem
...
transfer the opty2 library to rex-nop
MS-1711
2016-09-06 11:27:06 -05:00
58112d7b4d
Bump version of framework to 4.12.24
2016-09-02 10:02:44 -07:00
e36cfa54b1
Use rex-mime gem
...
MS-1710
2016-09-01 11:38:07 -05:00
219f643af2
Per #7205 , update Gemfile.lock.
2016-08-31 11:18:23 -05:00
029a28c95b
use the new rex-sslscan gem
...
remove old integerated code and replace it
with the gem. done.
MS-1693
2016-08-30 10:43:47 -05:00
45ab061a88
pull in rex-socket gem
...
pull rex-socket gem in as a dep
MS-1715
2016-08-26 14:12:16 -05:00
fed1016430
pull in rex-core as a dep
2016-08-26 14:00:13 -05:00
c6b0c0b598
move bidirectional pipe into rex/ui/text
...
this didn't really fit with the rest of rex::io and it inherits
from inside rex/ui/text so just put it there
MS-1715
2016-08-26 13:51:26 -05:00
ea32c313d3
Bump version of framework to 4.12.23
2016-08-26 10:06:44 -07:00
4478136065
Unvendor openvas-omp gem
...
MS-1718
2016-08-19 15:14:32 -05:00
87d34cfbba
Bump version of framework to 4.12.22
2016-08-19 10:02:28 -07:00
d2a6c2e9ca
move rex bintools into new gem
...
move all the *scan *parsey code out into
the new rex-bin_tools gem
MS-1691
2016-08-15 14:01:43 -05:00
1e7663c704
Land #7200 , Rex::Ui::Text cleanup
2016-08-12 16:22:55 -05:00
1384c0480d
update rex-text to fix a bug
2016-08-12 13:15:47 -05:00
a6ba386728
Bump version of framework to 4.12.21
2016-08-12 10:02:36 -07:00
6160ff8cb2
bump rex-text version for ipaddr fix
...
rex-text version of table had a slight issue
with sorting IPAddr objects, 0.2.0 fixes this issue
MS-1875
2016-08-11 11:24:44 -05:00
d57e4d6349
Bump version of framework to 4.12.20
2016-08-10 15:30:37 -07:00
3f530f1896
remove rex::ui::text:table
...
remove the class from msf, and update the rex-text
gem to pull the code in under the new version at Rex::Text::Table
modify all requires appropriately
MS-1875
2016-08-10 13:24:25 -05:00
b027176799
Land #7156 , use windows_error gem for constants
2016-08-10 11:47:37 -05:00
280216d74d
Bump version of framework to 4.12.19
2016-08-09 14:49:58 -07:00
e7aa658893
Bump version of framework to 4.12.18
2016-08-05 10:05:03 -07:00
190bac6e0a
Bump version of framework to 4.12.17
2016-07-29 10:02:06 -07:00
bdf073516b
Switch errors over to windows_error gem...
2016-07-27 17:43:00 -05:00
288b39e37f
update to mettle 0.0.6
2016-07-27 08:59:21 -05:00
1b6bd927d0
Rex::OLE is now rex-ole gem, fixes MS-1712
2016-07-25 14:05:48 -05:00
dbbe6a831a
Land #7111 , rex-arch gem
2016-07-22 14:55:51 -05:00
4cbb3bb9b6
Bump version of framework to 4.12.16
2016-07-22 10:02:00 -07:00
01f08da345
Use rex-arch gem
...
MS-1703
2016-07-20 16:42:41 -05:00
ff63e6e05a
Land #7018 , unvendor net-ssh
2016-07-19 17:06:35 -05:00
8d8e1f80f5
Land #7102 , remove struct2 code in favor of rex-struct2
2016-07-18 11:44:17 -05:00
c8d009209f
Bring rex-powershell version to master's version
2016-07-18 11:42:07 -05:00
b954b6d5c1
Bump version of framework to 4.12.15
2016-07-18 08:42:20 -07:00
20d7e9a7a7
remove old struct2 code in favour of gem
...
use the new rex-struct2 gem and remove the code form it's old location
MS-1782
2016-07-15 16:01:21 -05:00
b13d0f879a
Bump version of framework to 4.12.14
2016-07-15 10:03:28 -07:00
01d0d1702b
Merge branch 'master' into feature/MS-1688/net-ssh-cleanup
2016-07-14 09:48:28 -05:00
ea94e9752a
bump to metasploit-payloads 1.1.13
...
Includes these PRs:
https://github.com/rapid7/metasploit-payloads/pull/106
https://github.com/rapid7/metasploit-payloads/pull/104
https://github.com/rapid7/metasploit-payloads/pull/103
2016-07-13 00:50:09 -05:00
5e993a6823
sync gem versions (already using these on Pro)
2016-07-13 00:44:35 -05:00
7b1d9596c7
Land #7068 , Introduce 'mettle' - new POSIX meterpreter
2016-07-11 22:38:40 -05:00
48410f3ab2
Bump version of framework to 4.12.13
2016-07-08 10:01:58 -07:00
cfb56211e7
Revert "Revert "Land #7009 , egypt's rubyntlm cleanup""
...
This reverts commit 1164c025a2
2016-07-07 15:00:41 -05:00
82e092c2df
Bump version of framework to 4.12.12
2016-07-05 14:57:43 -07:00
1164c025a2
Revert "Land #7009 , egypt's rubyntlm cleanup"
...
This reverts commit d90f0779f8e3e360cc83
2016-07-05 15:22:44 -05:00
e404dfeaea
update to gem 0.0.5 (with libev/eio support)
2016-07-05 11:24:54 -05:00
8490a3b775
Remove hard-float requirement for MIPS O32
2016-07-05 11:24:54 -05:00
2f3f655352
Add gem for mettle
...
This adds the gem for the mettle binaries, which contains reflective
payloads for a variety of Linux architectures (and more OSs in the
future)
2016-07-05 11:24:54 -05:00
8b430826c6
merge screwed up gesmepc
...
add net-ssh back into the gemspec
2016-07-05 11:08:57 -05:00
054ac5ac19
Bump version of framework to 4.12.11
2016-07-05 07:49:37 -07:00
c45f30a7a9
Update nokogiri to v1.6.8, fixes #7051 .
2016-07-01 14:53:25 -05:00
f0cd25dcee
Land #7035 , lib/sshkey* swap to gem
2016-06-30 16:25:27 -05:00
d6c7ac51d6
Fix interactive shell with Windows Meterpreter
...
see https://github.com/rapid7/metasploit-payloads/pull/105
2016-06-30 15:34:40 -05:00
80563b2c0f
Merge branch 'master' into feature/MS-1700/sshkey-gem
2016-06-29 09:44:57 -05:00
2dba09a9ce
unvendor sshkey gem
...
use the actual maintained gem rather than our vendored
copy
MS-1700
2016-06-28 16:10:48 -05:00
dcddd2d671
use the bit-struct gem
...
removed vendored copy of bit-struct and use the gem
instead
MS-1699
2016-06-28 15:58:47 -05:00
0a83b34a85
Land #7025 , dev's PR for rex-java
...
lands the pr for moving Rex::Java into it's own gem
2016-06-28 14:40:02 -05:00
d90f0779f8
Land #7009 , egypt's rubyntlm cleanup
...
Land egypt's PR to replace all of our NTLM code with
the rubyntlm gem
2016-06-28 14:15:34 -05:00
97f9ca4028
Merge branch 'master' into egypt/ruby-ntlm
2016-06-28 14:14:56 -05:00
e3e360cc83
Bump version of framework to 4.12.10
2016-06-28 12:13:26 -07:00
c2f3d411c3
Replace rex/java with rex-java gem
2016-06-27 14:52:49 -05:00
fd07da3519
Bump version of framework to 4.12.9
2016-06-27 11:54:04 -07:00
c2a063c8ae
Start using rubyntlm for ssp auth
2016-06-22 10:15:16 -05:00
69e2d05a5d
rip out old rex code and replace with gems
...
rex-text, rex-random_identifier, rex-powershell, rex-zip, and rex-registry
are now being pulled in as gems instead of part of the spgehtti code that is lib/rex
2016-06-21 13:56:36 -05:00
fd4a51cadb
Bump version of framework to 4.12.8
2016-06-10 10:01:27 -07:00
815685992a
Bump version of framework to 4.12.7
2016-06-07 13:14:34 -07:00
c35322ec3f
Bump version of framework to 4.12.6
2016-05-30 22:34:13 -07:00
54f4389d31
Bump version of framework to 4.12.5
2016-05-24 08:54:14 -07:00
77a81b2e78
bump metasploit credential version
2016-05-23 17:03:10 -05:00
100300c819
Bump version of framework to 4.12.4
2016-05-18 07:04:09 -07:00
c9dd863085
Bump version of framework to 4.12.3
2016-05-17 10:18:08 -07:00
771171cbe1
adding tzinfo-data to the gemspec
...
this should fix windows.
2016-05-17 11:40:25 -05:00
307e565859
Land rapid7/metasploit-payloads#98 , Fix python meterpreter reverse_tcp reconnect.
2016-05-13 22:59:52 -05:00
621a908b2d
Bump version of framework to 4.12.2
2016-05-13 12:51:58 -07:00
b6a83f734d
Bump version of framework to 4.12.1
2016-05-13 12:39:43 -07:00
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
6c11054d5a
Bump version of framework to 4.12.0
2016-05-13 11:46:03 -07:00
fd543f13af
fix deps
2016-05-13 13:34:18 -05:00
2fb3123ef2
fix migration crazieness
...
MS-1486
2016-05-11 14:05:34 -05:00
6142d2cef1
Merge branch 'master' into staging/rails-upgrade
2016-05-09 09:27:17 -05:00
805f98f599
Bump version of framework to 4.11.27
2016-05-06 11:32:46 -07:00
0b89277394
update deps
2016-05-06 11:49:07 -05:00
19af279ce9
Merge branch 'master' into staging/rails-upgrade
2016-05-05 10:46:12 -05:00
e7ff4665e1
Bump version of framework to 4.11.26
2016-05-04 09:44:18 -07:00
94c8b51a54
bump payloads gem
2016-05-04 10:56:41 -05:00
7490ab1c78
Bump version of framework to 4.11.25
2016-05-03 17:09:07 -07:00
fb5b228984
Merge branch 'master' into staging/rails-upgrade
2016-05-02 11:33:35 -05:00
d4f1c78c5c
Bump version of framework to 4.11.24
2016-04-29 13:38:06 -07:00
bf34ceeb76
Update gem metasploit-payloads to 1.1.8
2016-04-27 15:24:44 -05:00
d70dcbf4a4
Bump version of framework to 4.11.23
2016-04-22 09:34:10 -07:00
d5085f6f0d
Bump version of framework to 4.11.22
2016-04-16 09:09:23 -07:00
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
16c599866c
Bump version of framework to 4.11.21
2016-04-08 16:23:33 -07:00
22d08fdf39
Revert #6748 , premature Gemfile* changes
2016-04-06 14:52:22 -05:00
c3452ab982
unlock gemspec deps
...
unlock version constraints on deps
defined inside the gemspec
MS-1330
2016-04-04 15:31:09 -05:00
fea142dc6e
unlock gemfile deps first
...
unlock the gemfile deps
MS-1330
2016-04-04 13:55:53 -05:00
8de58e4b80
Merge branch 'master' into staging/rails-upgrade
2016-04-04 09:30:01 -05:00
627615d47b
update to payloads 1.1.6
2016-04-01 21:30:34 -05:00
6c602dae90
Bump payloads to 1.1.5
2016-03-31 14:03:59 +10:00
bc48ebd43b
Use patch_finder for msu_finder
2016-03-29 23:21:01 -05:00
b8d53dde4a
Merge branch 'upstream-master' into staging/rails-upgrade
2016-03-29 15:56:50 -05:00
b41ac10fe8
Bump version of framework to 4.11.20
2016-03-29 12:43:20 -07:00
587f1ee7b3
Land #6708 , module documentation for msfconsole
2016-03-29 11:30:55 -07:00
72bde63397
Bump version of framework to 4.11.19
2016-03-25 13:03:35 -07:00
1fe40d9f2d
update to metasploit-payloads 1.1.4
2016-03-24 22:32:55 -05:00
c3ce621d04
Fix gemfile
2016-03-24 20:43:51 -05:00
57984706b8
Resolve merge conflict with Gemfile
2016-03-24 18:13:31 -05:00
e7b0c60e5c
Bump version of framework to 4.11.18
2016-03-23 07:55:29 -07:00
6e12e74e02
Bump version of framework to 4.11.17
2016-03-18 14:12:18 -07:00
87074c0638
Land #6651 , add android sqlite_query option, update metasploit-payloads
2016-03-15 18:27:49 -05:00
a06236baa6
update to metasploit-payloads 1.1.3
2016-03-14 10:43:41 -05:00
e059f42094
Bump version of framework to 4.11.16
2016-03-11 14:17:28 -08:00
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
1911d0cd17
missed credential
2016-03-09 15:39:06 -06:00
ca18996272
setup rails staging branch
...
rails 4.1 baby!
2016-03-09 15:35:00 -06:00
88697a5d3f
Merge branch 'master' into staging/rails-upgrade
2016-03-08 15:22:04 -06:00
a5cdd7e17f
Bump version of framework to 4.11.15
2016-03-04 16:56:02 -08:00
ce675330c0
Bump version of framework to 4.11.14
2016-03-04 14:49:55 -08:00
851e8b610e
Land metasploit-payloads#80, update to fix #6593
2016-03-02 13:44:02 -06:00
9f147a54a1
Update Gemfile for Sawyer (because Octokit needs it)
2016-03-02 10:53:13 -06:00
5f510df2ab
Resolve merge conflict with upstream's Gemfile.lock
2016-03-01 22:06:17 -06:00
368af93cfe
Merge branch 'master' of github.com:rapid7/metasploit-framework
2016-03-01 10:52:00 -06:00
cbcd431772
Updated Gemfile.lock
2016-02-26 15:41:39 -06:00
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
b7ba38a4c6
update mdm version
2016-02-26 14:32:03 -06:00
7acba69e37
Land #6577 , add controls for Android ringer
2016-02-26 07:02:49 -06:00
bwatters-r7
Jeffrey Martin
Metasploit
James Barnett
wchen-r7
Brent Cook
Brent Cook
William Vu
William Webb
Adam Cammack
OJ
Pearce Barry
David Maloney
dmohanty-r7
James Lee
Louis Sato
Jenkins
darkbushido
thao doan
Fernando Arias