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

objects/file/definition.json

@@ -440,9 +440,14 @@
         "Windows-31J",
         "windows-874"
       ]
+    },
+    "imphash": {
+      "description": "Hash (md5) calculated from the import table",
+      "ui-priority": 0,
+      "misp-attribute": "imphash"
     }
   },
-  "version": 17,
+  "version": 18,
   "description": "File object describing a file with meta-information",
   "meta-category": "file",
   "uuid": "688c46fb-5edb-40a3-8273-1af7923e2215",

objects/shell-commands/definition.json

@@ -1,5 +1,5 @@
 {
-  "requiredOneOf": [
+  "required": [
     "shell-command"
   ],
   "attributes": {
@@ -54,7 +54,7 @@
       ]
     }
   },
-  "version": 1,
+  "version": 2,
   "description": "Object describing a series of shell commands executed. This object can be linked with malicious files in order to describe a specific execution of shell commands.",
   "meta-category": "misc",
   "uuid": "fee65efa-eb64-4516-8611-1db76c589f79",