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

objects/crypto-material/definition.json

@@ -1,5 +1,6 @@
 {
   "requiredOneOf": [
+    "generic-symmetric-key",
     "text",
     "private",
     "p",
@@ -96,6 +97,11 @@
       "ui-priority": 1,
       "misp-attribute": "text"
     },
+    "generic-symmetric-key": {
+      "description": "Generic symmetric key (please precise the type)",
+      "ui-priority": 1,
+      "misp-attribute": "text"
+    },
     "type": {
       "description": "Type of crytographic materials",
       "ui-priority": 1,
@@ -105,6 +111,8 @@
         "RSA",
         "DSA",
         "ECDSA",
+        "RC4",
+        "XOR",
         "unknown"
       ]
     },

objects/intelmq_event/definition.json

@@ -11,7 +11,7 @@
       "ui-priority": 1
     },
     "classification.type": {
-      "description": "The abuse type IOC is one of the most crucial pieces of information for any given abuse event. The main idea of dynamic typing is to keep our ontology flexible, since we need to evolve with the evolving threatscape of abuse data. In contrast with the static taxonomy below, the dynamic typing is used to perform business decisions in the abuse handling pipeline. Furthermore, the value data set should be kept as minimal as possible to avoid “type explosion”, which in turn dilutes the business value of the dynamic typing. In general, we normally have two types of abuse type IOC: ones referring to a compromised resource or ones referring to pieces of the criminal infrastructure, such as a command and control servers for example.",
+      "description": "The abuse type IOC is one of the most crucial pieces of information for any given abuse event. The main idea of dynamic typing is to keep our ontology flexible, since we need to evolve with the evolving threatscape of abuse data. In contrast with the static taxonomy below, the dynamic typing is used to perform business decisions in the abuse handling pipeline. Furthermore, the value data set should be kept as minimal as possible to avoid 'type explosion', which in turn dilutes the business value of the dynamic typing. In general, we normally have two types of abuse type IOC: ones referring to a compromised resource or ones referring to pieces of the criminal infrastructure, such as a command and control servers for example.",
       "misp-attribute": "text",
       "ui-priority": 1
     },