Merge branch 'master' of github.com:MISP/misp-taxonomies

pull/148/head
Vincent-CIRCL 2019-06-17 08:25:37 +02:00
commit 224a4dd1d0
2 changed files with 5 additions and 5 deletions

View File

@ -456,7 +456,7 @@
"description": "Ransomware is used to define ransomware types and the elements that compose them." "description": "Ransomware is used to define ransomware types and the elements that compose them."
}, },
{ {
"version": 1, "version": 2,
"name": "dark-web", "name": "dark-web",
"description": "Criminal motivation on the dark web: A categorisation model for law enforcement. ref: Janis Dalins, Campbell Wilson, Mark Carman. Taxonomy updated by MISP Project." "description": "Criminal motivation on the dark web: A categorisation model for law enforcement. ref: Janis Dalins, Campbell Wilson, Mark Carman. Taxonomy updated by MISP Project."
}, },
@ -470,5 +470,5 @@
"url": "https://raw.githubusercontent.com/MISP/misp-taxonomies/master/", "url": "https://raw.githubusercontent.com/MISP/misp-taxonomies/master/",
"description": "Manifest file of MISP taxonomies available.", "description": "Manifest file of MISP taxonomies available.",
"license": "CC-0", "license": "CC-0",
"version": "20190521" "version": "20190614"
} }

View File

@ -2,7 +2,7 @@
"namespace": "dark-web", "namespace": "dark-web",
"expanded": "Dark Web", "expanded": "Dark Web",
"description": "Criminal motivation on the dark web: A categorisation model for law enforcement. ref: Janis Dalins, Campbell Wilson, Mark Carman. Taxonomy updated by MISP Project", "description": "Criminal motivation on the dark web: A categorisation model for law enforcement. ref: Janis Dalins, Campbell Wilson, Mark Carman. Taxonomy updated by MISP Project",
"version": 1.1, "version": 2,
"predicates": [ "predicates": [
{ {
"value": "topic", "value": "topic",
@ -241,5 +241,5 @@
} }
] ]
} }
] ]
} }