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

pull/227/head
Alexandre Dulaunoy 2020-01-21 09:47:30 +01:00
commit 395a4c33a4
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
2 changed files with 11 additions and 4 deletions

View File

@ -445,9 +445,14 @@
"description": "Hash (md5) calculated from the import table", "description": "Hash (md5) calculated from the import table",
"ui-priority": 0, "ui-priority": 0,
"misp-attribute": "imphash" "misp-attribute": "imphash"
},
"compilation-timestamp": {
"description": "Compilation timestamp",
"ui-priority": 0,
"misp-attribute": "datetime"
} }
}, },
"version": 18, "version": 19,
"description": "File object describing a file with meta-information", "description": "File object describing a file with meta-information",
"meta-category": "file", "meta-category": "file",
"uuid": "688c46fb-5edb-40a3-8273-1af7923e2215", "uuid": "688c46fb-5edb-40a3-8273-1af7923e2215",

View File

@ -16,7 +16,8 @@
"link": { "link": {
"description": "Original link into the microblog post (Supposed harmless)", "description": "Original link into the microblog post (Supposed harmless)",
"ui-priority": 1, "ui-priority": 1,
"misp-attribute": "link" "misp-attribute": "link",
"to_ids": false
}, },
"type": { "type": {
"description": "Type of the microblog post", "description": "Type of the microblog post",
@ -81,7 +82,8 @@
"description": "Safe link into the microblog post", "description": "Safe link into the microblog post",
"ui-priority": 0, "ui-priority": 0,
"misp-attribute": "link", "misp-attribute": "link",
"multiple": true "multiple": true,
"to_ids": false
}, },
"removal-date": { "removal-date": {
"description": "When the microblog post was removed", "description": "When the microblog post was removed",
@ -101,7 +103,7 @@
"multiple": true "multiple": true
} }
}, },
"version": 11, "version": 12,
"description": "Microblog post like a Twitter tweet or a post on a Facebook wall.", "description": "Microblog post like a Twitter tweet or a post on a Facebook wall.",
"meta-category": "misc", "meta-category": "misc",
"uuid": "8ec8c911-ddbe-4f5b-895b-fbff70c42a60", "uuid": "8ec8c911-ddbe-4f5b-895b-fbff70c42a60",