Commit Graph

599 Commits

Author SHA1 Message Date
Herman Slatman
0bd9c458d1 ignore fireeye link 2016-04-24 00:45:36 +02:00
Herman Slatman
7bb0d52364 Updated to 2nd draft 2016-04-24 00:41:04 +02:00
Herman Slatman
11915ff771 Merge pull request #40 from hslatman/hs_rastrea2r
Rastrea2r added
2016-04-19 14:36:29 +02:00
Herman Slatman
152e28b7eb Rastrea2r added 2016-04-19 14:31:28 +02:00
Herman Slatman
9c9b3ccdfe Merge pull request #39 from hslatman/hs_abusehelper
Added AbuseHelper
2016-04-18 10:04:11 +02:00
Herman Slatman
33589643e6 Added AbuseHelper 2016-04-17 00:52:38 +02:00
Herman Slatman
5cf7d8fca3 Merge pull request #38 from hslatman/hs_ipb
Intelligence Preparation of the Battlefield (IPB) added
2016-04-16 22:29:11 +02:00
Herman Slatman
8b66b02a7a Intelligence Preparation of the Battlefield (IPB) added 2016-04-16 22:26:22 +02:00
Herman Slatman
9d07ef18d5 Merge pull request #37 from hslatman/hs_big
Bro-intel-generator added
2016-04-15 11:51:18 +02:00
Herman Slatman
6a0c803eb9 Bro-intel-generator added 2016-04-15 11:49:14 +02:00
Herman Slatman
59335c815e Merge pull request #36 from hslatman/hs_stoq
stoQ platform added
2016-04-14 17:21:35 +02:00
Herman Slatman
465beb9962 Change of website for ENISA (IntelMQ) 2016-04-14 17:07:57 +02:00
Herman Slatman
0d1d65a454 stoQ platform added 2016-04-14 17:03:47 +02:00
Herman Slatman
082ff299a0 Merge pull request #35 from hslatman/hs_f3ead
F3EAD added
2016-04-11 11:52:04 +02:00
Herman Slatman
5f17c0b81f Merge branch 'hs_jp20' into hs_f3ead 2016-04-11 11:50:18 +02:00
Herman Slatman
2931a3226b F3EAD added 2016-04-11 11:47:38 +02:00
Herman Slatman
d344b2d687 Merge pull request #34 from hslatman/hs_pyramid
Pyramid of Pain slides added
2016-04-10 20:02:06 +02:00
Herman Slatman
12870cff29 Pyramid of Pain slides added 2016-04-10 19:59:55 +02:00
Herman Slatman
d0ba6a1108 Merge pull request #33 from hslatman/hs_jp20
Added Joint Publication 2-0: Joint Intelligence
2016-04-09 08:50:37 +02:00
Herman Slatman
4601397fcb Fix https links 2016-04-08 11:21:37 +02:00
Herman Slatman
20a2eb43c9 Fix link for cabby 2016-04-08 11:18:49 +02:00
Herman Slatman
6414a619e8 Fix link for OpenTAXII 2016-04-08 11:18:21 +02:00
Herman Slatman
f5260b56f4 Added Joint Publication 2-0: Joint Intelligence 2016-04-08 11:16:03 +02:00
Herman Slatman
d95a552687 Merge pull request #32 from hslatman/hs_tlp
Traffic Light Protocol (TLP) added
2016-04-05 15:54:32 +02:00
Herman Slatman
577325864d Traffic Light Protocol (TLP) added 2016-04-05 15:45:58 +02:00
Herman Slatman
5877c46793 Merge pull request #31 from hslatman/hs_inigma_patch
Fixing the conflict...
2016-04-04 19:49:14 +02:00
Herman Slatman
411046f6d5 Fix conflict in sources 2016-04-04 19:44:40 +02:00
Herman Slatman
0adaffd135 Merge pull request #30 from hslatman/hs_interflow
Microsoft Interflow added
2016-04-03 12:51:13 +02:00
Herman Slatman
ec25da70d7 Changed to the deeplink 2016-04-03 12:50:04 +02:00
Herman Slatman
afa54bec56 change link for travis 2016-04-03 12:47:54 +02:00
Herman Slatman
e38a467443 Microsoft Interflow added 2016-04-03 12:45:39 +02:00
Herman Slatman
429b3ba9c8 Merge pull request #29 from hslatman/hs_chain
Kill Chain paper by Lockheed Martin added
2016-03-28 16:38:34 +02:00
Herman Slatman
1ada060602 Kill Chain paper by Lockheed Martin added 2016-03-28 16:34:27 +02:00
Herman Slatman
6ca0943121 Merge pull request #28 from hslatman/hs_diamond
Diamond Model for Intrusion Analysis added
2016-03-27 19:00:01 +02:00
Herman Slatman
9ad52c6b0a Diamond Model for Intrusion Analysis added 2016-03-27 18:57:43 +02:00
Herman Slatman
12e560f4c0 Merge pull request #27 from hslatman/hs_attack
ATT&CK model added
2016-03-26 15:59:11 +01:00
Herman Slatman
d9c13234d9 ATT&CK model added 2016-03-26 15:57:36 +01:00
Herman Slatman
894b88201a Merge pull request #26 from hslatman/hs_firehol
FireHOL IP Lists added
2016-03-25 19:38:23 +01:00
Herman Slatman
55f9ee916a FireHOL IP Lists added 2016-03-25 19:31:38 +01:00
Herman Slatman
f8bfc9538f Reorder on alphabet 2016-03-19 09:52:31 +01:00
Herman Slatman
8871b219b5 Merge pull request #24 from percipient/strongarm
Add Strongarm to sources.
2016-03-19 09:51:01 +01:00
inigma117
60c5fa8647 Update README.md
added virusshare to list of sources
2016-03-18 14:46:18 -05:00
Stephen DiCato
66b01659a2 Add Strongarm to sources. 2016-03-18 10:31:26 -04:00
Herman Slatman
4d4f2305ca Merge pull request #23 from krmaxwell/qa
Fixes to grammar and spelling
2016-03-15 09:42:14 +01:00
Kyle Maxwell
6a6632b61a Fixes to grammar and spelling 2016-03-15 00:56:32 -04:00
Herman Slatman
058ef37d7f Merge pull request #22 from hslatman/hs_20160313
Malstrom, Threatcmd, some cleanup
2016-03-13 11:23:39 +01:00
Herman Slatman
a51c9a4a4e Add Malstrom 2016-03-13 11:13:04 +01:00
Herman Slatman
3bc7f613d5 Alphabeticalize 2016-03-13 11:10:08 +01:00
Herman Slatman
02cdf862b5 threatcmd added 2016-03-13 11:09:28 +01:00
Herman Slatman
db3fb1c52d Merge pull request #21 from sroberts/patch-1
Added Threat Note
2016-03-10 12:49:12 +01:00