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

pull/107/head
Alexandre Dulaunoy 2018-07-04 11:11:47 +02:00
commit eff3a5f3f5
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
1 changed files with 18 additions and 2 deletions

View File

@ -33,9 +33,25 @@
"stix-1.1" "stix-1.1"
] ]
}, },
{
"name": "connected-from",
"description": "The referenced source is connected from the target object.",
"format": [
"misp",
"stix-1.1"
]
},
{ {
"name": "contains", "name": "contains",
"description": "The references source is containing the target object.", "description": "The referenced source is containing the target object.",
"format": [
"misp",
"stix-1.1"
]
},
{
"name": "contained-within",
"description": "The referenced source is contained within the target object.",
"format": [ "format": [
"misp", "misp",
"stix-1.1" "stix-1.1"
@ -99,7 +115,7 @@
}, },
{ {
"name": "impersonates", "name": "impersonates",
"description": "This relationship describe a source object which impersonates the target object", "description": "This relationship describes a source object which impersonates the target object",
"format": [ "format": [
"misp", "misp",
"stix-2.0" "stix-2.0"