533 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Scott J. Roberts	445ce52247	Added Threat Note ... Threat_Note is an awesome Threat Intelligence Platform written by @brianwarehime. Great list/resource BTW. We needed this!	2016-03-09 14:20:44 -05:00
Herman Slatman	bb28ea7088	Merge pull request #20 from hslatman/hs_qradio ... QRadio added	2016-03-09 15:15:00 +01:00
Herman Slatman	1a9588a655	QRadio added	2016-03-09 15:05:15 +01:00
Herman Slatman	b987812e7e	some typos fixed	2016-03-08 00:36:49 +01:00
Herman Slatman	a7af299f0a	Alphabeticalize	2016-03-08 00:35:13 +01:00
Herman Slatman	ef926a22a8	Merge pull request #19 from exp0se/master ... Added Cymon and Harbinger	2016-03-06 21:26:42 +01:00
Herman Slatman	4cdf59aef3	Jager added	2016-03-06 16:49:00 +01:00
Herman Slatman	7fc1d91534	Cacador added	2016-03-06 16:48:46 +01:00
CSIRT hackery, Incident Response & Forensics	e5c2ba0ad5	Added Cymon and Harbinger	2016-03-05 23:03:20 +03:00
Herman Slatman	4a40b531dd	Merge pull request #18 from hslatman/hs_threatminer ... ThreatMiner added	2016-03-03 10:29:07 +01:00
Herman Slatman	3f5e424335	ThreatMiner added	2016-03-03 10:24:25 +01:00
Herman Slatman	6169ba56c4	Merge pull request #17 from hslatman/hs_20160227 ... Threatetelligence, Poortego and Nyx added	2016-02-27 23:08:47 +01:00
Herman Slatman	fe3f8ddc73	Nyx added	2016-02-27 23:01:29 +01:00
Herman Slatman	7051671d93	Poortego added	2016-02-27 22:59:45 +01:00
Herman Slatman	c1697fbebe	Threatetelligence added	2016-02-27 22:54:48 +01:00
Herman Slatman	36ee58342a	Merge pull request #16 from hslatman/hs_hiryu ... Hiryu added	2016-02-25 18:07:27 +01:00