Skip to content

Commit 9c1ae39

Browse files
authored
Merge pull request #2 from rapid7/master
Merging
2 parents 91c7a1b + 98ffa4d commit 9c1ae39

File tree

135 files changed

+12916
-695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+12916
-695
lines changed

Gemfile.lock

+20-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
metasploit-framework (4.14.3)
4+
metasploit-framework (4.14.8)
55
actionpack (~> 4.2.6)
66
activerecord (~> 4.2.6)
77
activesupport (~> 4.2.6)
@@ -16,7 +16,7 @@ PATH
1616
metasploit-model
1717
metasploit-payloads (= 1.2.19)
1818
metasploit_data_models
19-
metasploit_payloads-mettle (= 0.1.7)
19+
metasploit_payloads-mettle (= 0.1.8)
2020
msgpack
2121
nessus_rest
2222
net-ssh
@@ -53,6 +53,7 @@ PATH
5353
rex-text
5454
rex-zip
5555
robots
56+
ruby_smb
5657
rubyntlm
5758
rubyzip
5859
sqlite3
@@ -89,7 +90,7 @@ GEM
8990
minitest (~> 5.1)
9091
thread_safe (~> 0.3, >= 0.3.4)
9192
tzinfo (~> 1.1)
92-
addressable (2.5.0)
93+
addressable (2.5.1)
9394
public_suffix (~> 2.0, >= 2.0.2)
9495
arel (6.0.4)
9596
arel-helpers (2.3.0)
@@ -102,6 +103,7 @@ GEM
102103
rspec-expectations (>= 2.99)
103104
thor (~> 0.19)
104105
bcrypt (3.1.11)
106+
bindata (2.3.5)
105107
bit-struct (0.15.0)
106108
builder (3.2.3)
107109
capybara (2.13.0)
@@ -144,7 +146,7 @@ GEM
144146
multipart-post (>= 1.2, < 3)
145147
ffi (1.9.18)
146148
filesize (0.1.1)
147-
fivemat (1.3.2)
149+
fivemat (1.3.3)
148150
gherkin (4.1.1)
149151
google-protobuf (3.2.0.2)
150152
googleauth (0.5.1)
@@ -155,7 +157,7 @@ GEM
155157
multi_json (~> 1.11)
156158
os (~> 0.9)
157159
signet (~> 0.7)
158-
grpc (1.1.2)
160+
grpc (1.2.0)
159161
google-protobuf (~> 3.1)
160162
googleauth (~> 0.5.1)
161163
i18n (0.8.1)
@@ -201,7 +203,7 @@ GEM
201203
postgres_ext
202204
railties (~> 4.2.6)
203205
recog (~> 2.0)
204-
metasploit_payloads-mettle (0.1.7)
206+
metasploit_payloads-mettle (0.1.8)
205207
method_source (0.8.2)
206208
mime-types (3.1)
207209
mime-types-data (~> 3.2015)
@@ -215,8 +217,8 @@ GEM
215217
nessus_rest (0.1.6)
216218
net-ssh (4.1.0)
217219
network_interface (0.0.1)
218-
nexpose (5.3.1)
219-
nokogiri (1.7.0.1)
220+
nexpose (5.3.2)
221+
nokogiri (1.7.1)
220222
mini_portile2 (~> 2.1.0)
221223
octokit (4.6.2)
222224
sawyer (~> 0.8.0, >= 0.5.3)
@@ -267,7 +269,7 @@ GEM
267269
rex-core
268270
rex-struct2
269271
rex-text
270-
rex-core (0.1.7)
272+
rex-core (0.1.8)
271273
rex-encoder (0.1.2)
272274
metasm
273275
rex-arch
@@ -301,7 +303,7 @@ GEM
301303
rex-socket
302304
rex-text
303305
rex-struct2 (0.1.0)
304-
rex-text (0.2.12)
306+
rex-text (0.2.13)
305307
rex-zip (0.1.1)
306308
rex-text
307309
rkelly-remix (0.0.7)
@@ -323,6 +325,11 @@ GEM
323325
rspec-mocks (~> 3.5.0)
324326
rspec-support (~> 3.5.0)
325327
rspec-support (3.5.0)
328+
ruby_smb (0.0.8)
329+
bindata
330+
bit-struct
331+
rubyntlm (~> 0.5)
332+
windows_error
326333
rubyntlm (0.6.1)
327334
rubyzip (1.2.1)
328335
sawyer (0.8.1)
@@ -335,7 +342,7 @@ GEM
335342
faraday (~> 0.9)
336343
jwt (~> 1.5)
337344
multi_json (~> 1.10)
338-
simplecov (0.14.0)
345+
simplecov (0.14.1)
339346
docile (~> 1.1.0)
340347
json (>= 1.8, < 3)
341348
simplecov-html (~> 0.10.0)
@@ -346,9 +353,9 @@ GEM
346353
thor (0.19.4)
347354
thread_safe (0.3.6)
348355
timecop (0.8.1)
349-
tzinfo (1.2.2)
356+
tzinfo (1.2.3)
350357
thread_safe (~> 0.1)
351-
tzinfo-data (1.2017.1)
358+
tzinfo-data (1.2017.2)
352359
tzinfo (>= 1.0.0)
353360
windows_error (0.1.1)
354361
xpath (2.0.0)

0 commit comments

Comments
 (0)