Skip to content

Commit 54d64cd

Browse files
author
Brent Cook
committed
Land rapid7#9064, add aggregator >= 1.0.0 with cryptTLV packet format
2 parents 60a7a80 + 5458b58 commit 54d64cd

File tree

2 files changed

+36
-2
lines changed

2 files changed

+36
-2
lines changed

Gemfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ group :development do
1919
# module documentation
2020
gem 'octokit'
2121
# Metasploit::Aggregator external session proxy
22-
# Disabled for now for crypttlv updates
23-
# gem 'metasploit-aggregator'
22+
gem 'metasploit-aggregator' if [
23+
'x86-mingw32', 'x64-mingw32',
24+
'x86_64-linux', 'x86-linux',
25+
'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
2426
end
2527

2628
group :development, :test do

Gemfile.lock

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,39 @@ GEM
126126
ffi (1.9.18)
127127
filesize (0.1.1)
128128
fivemat (1.3.5)
129+
google-protobuf (3.4.1.1)
130+
googleapis-common-protos-types (1.0.0)
131+
google-protobuf (~> 3.0)
132+
googleauth (0.5.3)
133+
faraday (~> 0.12)
134+
jwt (~> 1.4)
135+
logging (~> 2.0)
136+
memoist (~> 0.12)
137+
multi_json (~> 1.11)
138+
os (~> 0.9)
139+
signet (~> 0.7)
140+
grpc (1.6.6)
141+
google-protobuf (~> 3.1)
142+
googleapis-common-protos-types (~> 1.0.0)
143+
googleauth (~> 0.5.1)
129144
hashery (2.1.2)
130145
i18n (0.8.6)
131146
jsobfu (0.4.2)
132147
rkelly-remix
133148
json (2.1.0)
149+
jwt (1.5.6)
150+
little-plugger (1.1.4)
151+
logging (2.2.2)
152+
little-plugger (~> 1.1)
153+
multi_json (~> 1.10)
134154
loofah (2.1.1)
135155
crass (~> 1.0.2)
136156
nokogiri (>= 1.5.9)
157+
memoist (0.16.0)
137158
metasm (1.0.3)
159+
metasploit-aggregator (1.0.0)
160+
grpc
161+
rex-arch
138162
metasploit-concern (2.0.5)
139163
activemodel (~> 4.2.6)
140164
activesupport (~> 4.2.6)
@@ -168,6 +192,7 @@ GEM
168192
mini_portile2 (2.3.0)
169193
minitest (5.10.3)
170194
msgpack (1.1.0)
195+
multi_json (1.12.2)
171196
multipart-post (2.0.0)
172197
nessus_rest (0.1.6)
173198
net-ssh (4.2.0)
@@ -179,6 +204,7 @@ GEM
179204
sawyer (~> 0.8.0, >= 0.5.3)
180205
openssl-ccm (1.2.1)
181206
openvas-omp (0.0.4)
207+
os (0.9.6)
182208
packetfu (1.1.13)
183209
pcaprub
184210
patch_finder (1.0.2)
@@ -304,6 +330,11 @@ GEM
304330
sawyer (0.8.1)
305331
addressable (>= 2.3.5, < 2.6)
306332
faraday (~> 0.8, < 1.0)
333+
signet (0.7.3)
334+
addressable (~> 2.3)
335+
faraday (~> 0.9)
336+
jwt (~> 1.5)
337+
multi_json (~> 1.10)
307338
simplecov (0.15.1)
308339
docile (~> 1.1.0)
309340
json (>= 1.8, < 3)
@@ -332,6 +363,7 @@ PLATFORMS
332363
DEPENDENCIES
333364
factory_girl_rails
334365
fivemat
366+
metasploit-aggregator
335367
metasploit-framework!
336368
octokit
337369
pry

0 commit comments

Comments
 (0)