Skip to content

Commit e638d85

Browse files
committed
Merge branch 'upstream-master' into bapv2
2 parents a7424c9 + 8bb7496 commit e638d85

Some content is hidden

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

47 files changed

+2498
-44
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PATH
99
json
1010
metasploit-concern (= 1.0.0)
1111
metasploit-model (= 1.0.0)
12-
metasploit-payloads (= 1.0.4)
12+
metasploit-payloads (= 1.0.6)
1313
msgpack
1414
nokogiri
1515
packetfu (= 1.1.9)
@@ -123,7 +123,7 @@ GEM
123123
activemodel (>= 4.0.9, < 4.1.0)
124124
activesupport (>= 4.0.9, < 4.1.0)
125125
railties (>= 4.0.9, < 4.1.0)
126-
metasploit-payloads (1.0.4)
126+
metasploit-payloads (1.0.6)
127127
metasploit_data_models (1.2.5)
128128
activerecord (>= 4.0.9, < 4.1.0)
129129
activesupport (>= 4.0.9, < 4.1.0)

data/exploits/CVE-2015-5122/msf.swf

42.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)