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

pull/178/head
Raphaël Vinot 2019-04-18 11:15:56 +02:00
commit a6ed6df86a
3 changed files with 11 additions and 3 deletions

View File

@ -53,7 +53,8 @@
"disable_correlation": true, "disable_correlation": true,
"sane_default": [ "sane_default": [
"Remedy", "Remedy",
"Response" "Response",
"Further Analysis Required"
] ]
}, },
"cost": { "cost": {

View File

@ -26,7 +26,7 @@
"ui-priority": 99, "ui-priority": 99,
"misp-attribute": "text", "misp-attribute": "text",
"disable_correlation": true, "disable_correlation": true,
"categories": [ "sane_default": [
"PC", "PC",
"Mobile", "Mobile",
"Laptop", "Laptop",

View File

@ -1,5 +1,5 @@
{ {
"version": 14, "version": 15,
"values": [ "values": [
{ {
"name": "derived-from", "name": "derived-from",
@ -10,6 +10,13 @@
"alfred" "alfred"
] ]
}, },
{
"name": "executes",
"description": "This relationship describes an object which executes another object",
"format": [
"misp"
]
},
{ {
"name": "duplicate-of", "name": "duplicate-of",
"description": "The referenced source and target objects are semantically duplicates of each other.", "description": "The referenced source and target objects are semantically duplicates of each other.",