Skip to content

Commit c9696d3

Browse files
author
HD Moore
committed
Merge in stageless/transport work, deconflict
2 parents 34ff94e + 57395de commit c9696d3

File tree

240 files changed

+3296
-1350
lines changed

Some content is hidden

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

240 files changed

+3296
-1350
lines changed

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PATH
2424
activerecord (>= 3.2.21, < 4.0.0)
2525
metasploit-credential (~> 0.14.3)
2626
metasploit-framework (= 4.11.0.pre.dev)
27-
metasploit_data_models (~> 0.23.0)
27+
metasploit_data_models (~> 0.23.2)
2828
pg (>= 0.11)
2929
metasploit-framework-pcap (4.11.0.pre.dev)
3030
metasploit-framework (= 4.11.0.pre.dev)
@@ -101,11 +101,11 @@ GEM
101101
gherkin (2.11.6)
102102
json (>= 1.7.6)
103103
hike (1.2.3)
104-
i18n (0.6.11)
104+
i18n (0.7.0)
105105
journey (1.0.4)
106106
jsobfu (0.2.1)
107107
rkelly-remix (= 0.0.6)
108-
json (1.8.1)
108+
json (1.8.2)
109109
mail (2.5.4)
110110
mime-types (~> 1.16)
111111
treetop (~> 1.4.8)
@@ -123,7 +123,7 @@ GEM
123123
metasploit-model (0.29.0)
124124
activesupport
125125
railties (< 4.0.0)
126-
metasploit_data_models (0.23.1)
126+
metasploit_data_models (0.23.2)
127127
activerecord (>= 3.2.13, < 4.0.0)
128128
activesupport
129129
arel-helpers
@@ -135,11 +135,11 @@ GEM
135135
meterpreter_bins (0.0.17)
136136
method_source (0.8.2)
137137
mime-types (1.25.1)
138-
mini_portile (0.6.1)
138+
mini_portile (0.6.2)
139139
msgpack (0.5.11)
140140
multi_json (1.0.4)
141141
network_interface (0.0.1)
142-
nokogiri (1.6.5)
142+
nokogiri (1.6.6.2)
143143
mini_portile (~> 0.6.0)
144144
packetfu (1.1.9)
145145
pcaprub (0.11.3)
@@ -154,7 +154,7 @@ GEM
154154
rack (>= 0.4)
155155
rack-ssl (1.3.4)
156156
rack
157-
rack-test (0.6.2)
157+
rack-test (0.6.3)
158158
rack (>= 1.0)
159159
rails (3.2.21)
160160
actionmailer (= 3.2.21)
@@ -175,7 +175,7 @@ GEM
175175
rb-readline-r7 (0.5.2.0)
176176
rdoc (3.12.2)
177177
json (~> 1.4)
178-
recog (1.0.16)
178+
recog (1.0.24)
179179
nokogiri
180180
redcarpet (3.1.2)
181181
rkelly-remix (0.0.6)
@@ -219,7 +219,7 @@ GEM
219219
treetop (1.4.15)
220220
polyglot
221221
polyglot (>= 0.3.1)
222-
tzinfo (0.3.42)
222+
tzinfo (0.3.43)
223223
xpath (2.0.0)
224224
nokogiri (~> 1.3)
225225
yard (0.8.7.4)

data/logos/pony-01.aftxt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
 _________________________________________________ 
2+
< This console just got 20% cooler >
3+
 ------------------------------------------------- 
4+
/
5+
/ 
6+
▀▄▄▄▄▄▄▄▄ / 
7+
▀▀▄▄▄▄▄█▄▄▄▄ / 
8+
▄███▄▄▄▄██▄██ / 
9+
▄██▄█▄▄█▄▄██▄███ / 
10+
▄██▄█████▄██▄▄█▄▄ / 
11+
▄███████▄██▄▀▀▄▄██ / 
12+
██████████▄▄▄ ██▄█ / 
13+
██▄███▄███ ▀▀ ████ / 
14+
▀███▄███▄▀ ███ / 
15+
▀ ████▄▀ █▄█ / 
16+
██▄▀█ ▄▄▄▄▄▄▄▄ / 
17+
▀▄█ ▀ ▄▄█▄██████▄▄ / 
18+
▀█ ███▄█████████ / 
19+
▄███▄▄█████████ / 
20+
███████▄██████▄▀ / 
21+
█████▄▄█████████ 
22+
▄▄███▄▀ █▄███████ ▄▄▄▄▄▄▄▄▄ 
23+
▄▄█████ ▄█▄██▄████▄█▄█▄▄██▄▄██▄█▀ 
24+
▀▄██▄▀▄▄▄███▄▄███▄██▄▄███▄▄███▄▄▄ 
25+
▀▀ ▄███████████████▄▄▄██▄▄███▀▄ 
26+
████▄█████████▄▄▄▄▄█▄▄▄▄▄███ 
27+
███████▄█████▄▄████▄▄██▄██▀▄██ 
28+
▀▀▄▄██████▄██████▄▄▄████▄▄ ▀▀▀ 
29+
▄▄██████████▄▄█▄▄▄▄▄██▄▄▄ 
30+
██▄█████████▄▄▄██████████ 
31+
▀▀ █▄████ ███▄█▄▄▄▄▄▄▄▀▀ 
32+
▄▄████ ████▄██ 
33+
▀▄████ ██▄███ 
34+
▀▄▄▀ ██▀█▀▀ 
35+
█ 

data/logos/pony-02.aftxt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
 __________________ 
2+
< Shells are cool. >
3+
 ------------------ 
4+
\ 
5+
\ 
6+
\ 
7+
\ 
8+
\ ▄▄▄▄▄▄▄▄▄ 
9+
███████████ 
10+
▄▄██████████ 
11+
▄▄███████████▄▄ 
12+
▄███████████▄▄▄█▄▄ 
13+
▄▄██▄▄▄▄▄▄▄▄▄███▄▄█▄▄ 
14+
▄▄████▄▄███████████████ 
15+
████████▄▄▄▄█████████▄▀ 
16+
███████▄███▄▄████████ 
17+
▄▄▄███████▄█▄█████████▄▀ ▄▄▄▄▄▄ 
18+
▀▄▄███████▄▄▄███████▄▀ ▄▄██████▄▄█▀ 
19+
▀▄▄▄██████▄█████▄▀ ▄▄███████████▄ 
20+
▀▀▀▀▀▀█▄███▄▄▄▄▄▄▄▄▄▄▄▄▄▀▀▀▄██████▄▄
21+
███▄▄█▄██████████▄▄ █████▄▄█
22+
▄███▄█████████▄█▄██ ▄▄████ ▀
23+
▀▀▄██████████▄▄▄▄▀ ▀▀ ██▄▀ 
24+
█████▄▄▄▄█▄███▄▄ █▄▀ 
25+
██████ ▀▄▄██████ ▀ 
26+
▄▄▄████ ████████ 
27+
███████ █████████ 
28+
▄█▄▄█████ █████████ 
29+
█▄███████ █▄▄███████ 
30+
█▄▄▄▄▄█ █▄▄▄▄▄█ 
31+


0 commit comments

Comments
 (0)