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

pull/209/head
Alexandre Dulaunoy 2019-10-01 20:15:19 +02:00
commit b1d6847f3d
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
3 changed files with 6 additions and 5 deletions

View File

@ -67,9 +67,9 @@
"disable_correlation": true "disable_correlation": true
} }
}, },
"version": 1, "version": 2,
"description": "An object which describes an organization.", "description": "An object which describes an organization.",
"meta-category": "misc", "meta-category": "misc",
"uuid": "f750e12b-127a-432c-b022-b3f9153c4e2a", "uuid": "f750e12b-127a-432c-b022-b3f9153c4e2a",
"name": "misc" "name": "organization"
} }

View File

@ -61,7 +61,7 @@
"misp-attribute": "datetime" "misp-attribute": "datetime"
} }
}, },
"version": 4, "version": 5,
"description": "Paste or similar post from a website allowing to share privately or publicly posts.", "description": "Paste or similar post from a website allowing to share privately or publicly posts.",
"meta-category": "misc", "meta-category": "misc",
"uuid": "cedc055c-78aa-49a4-bfd7-4cc30cecef12", "uuid": "cedc055c-78aa-49a4-bfd7-4cc30cecef12",

View File

@ -32,7 +32,8 @@
"Ruby", "Ruby",
"Winbatch", "Winbatch",
"AutoIt", "AutoIt",
"PHP" "PHP",
"Nim"
] ]
}, },
"filename": { "filename": {
@ -56,7 +57,7 @@
] ]
} }
}, },
"version": 4, "version": 5,
"description": "Object describing a computer program written to be run in a special run-time environment. The script or shell script can be used for malicious activities but also as support tools for threat analysts.", "description": "Object describing a computer program written to be run in a special run-time environment. The script or shell script can be used for malicious activities but also as support tools for threat analysts.",
"meta-category": "misc", "meta-category": "misc",
"uuid": "6bce7d01-dbec-4054-b3c2-3655a19382e2", "uuid": "6bce7d01-dbec-4054-b3c2-3655a19382e2",