Merge https://github.com/MISP/misp-taxonomies into main

MANIFEST.json

@@ -173,6 +173,11 @@
       "name": "de-vs",
       "version": 1
     },
+    {
+      "description": "Deception is an important component of information operations, valuable for both offense and defense. ",
+      "name": "deception",
+      "version": 1
+    },
     {
       "description": "DHS critical sectors as in https://www.dhs.gov/critical-infrastructure-sectors",
       "name": "dhs-ciip-sectors",
@@ -256,7 +261,7 @@
     {
       "description": "Exercise is a taxonomy to describe if the information is part of one or more cyber or crisis exercise.",
       "name": "exercise",
-      "version": 8
+      "version": 9
     },
     {
       "description": "Reasons why an event has been extended. ",
@@ -291,7 +296,7 @@
     {
       "description": "French gov information classification system",
       "name": "fr-classif",
-      "version": 3
+      "version": 6
     },
     {
       "description": "Taxonomy related to the REGULATION (EU) 2016/679 OF THE EUROPEAN PARLIAMENT AND OF THE COUNCIL on the protection of natural persons with regard to the processing of personal data and on the free movement of such data, and repealing Directive 95/46/EC (General Data Protection Regulation)",
@@ -645,5 +650,5 @@
     }
   ],
   "url": "https://raw.githubusercontent.com/MISP/misp-taxonomies/main/",
-  "version": "20210920"
+  "version": "20211119"
 }

exercise/machinetag.json

@@ -45,6 +45,11 @@
     {
       "predicate": "cyber-europe",
       "entry": [
+        {
+          "value": "2022",
+          "expanded": "2022",
+          "description": "6th pan European cyber crisis exercise: Cyber Europe 2022 (CE2022)"
+        },
         {
           "value": "2018",
           "expanded": "2018",
@@ -94,6 +99,11 @@
           "value": "2021",
           "expanded": "2021",
           "description": "Locked Shields 2021"
+        },
+        {
+          "value": "2022",
+          "expanded": "2022",
+          "description": "Locked Shields 2022"
         }
       ]
     },
@@ -183,7 +193,7 @@
       ]
     }
   ],
-  "version": 8,
+  "version": 10,
   "description": "Exercise is a taxonomy to describe if the information is part of one or more cyber or crisis exercise.",
   "expanded": "Exercise",
   "namespace": "exercise"

fr-classif/machinetag.json

@@ -3,65 +3,62 @@
     {
       "entry": [
         {
-          "expanded": "TRES SECRET DEFENSE",
+          "expanded": "TRES SECRET",
-          "value": "TRES_SECRET_DEFENSE"
+          "value": "TRES_SECRET",
+          "colour": "#f54a4a"
         },
-        {
-          "expanded": "SECRET DEFENSE",
-          "value": "SECRET_DEFENSE"
-        },
-        {
-          "expanded": "CONFIDENTIEL DEFENSE",
-          "value": "CONFIDENTIEL_DEFENSE"
-        }
-      ],
-      "predicate": "classifiees-defense"
-    },
-    {
-      "entry": [
         {
           "expanded": "SECRET",
-          "value": "SECRET"
+          "value": "SECRET",
-        },
+          "colour": "#f54a4a"
-        {
-          "expanded": "CONFIDENTIEL",
-          "value": "CONFIDENTIEL"
-        },
-        {
-          "expanded": "DIFFUSION RESTREINTE",
-          "value": "DIFFUSION_RESTREINTE"
         }
       ],
-      "predicate": "non-classifiees-defense"
+      "predicate": "classifiees"
     },
     {
       "entry": [
         {
-          "expanded": "NON CLASSIFIEES",
+          "expanded": "DIFFUSION RESTREINTE",
-          "value": "NON-CLASSIFIEES"
+          "value": "DIFFUSION_RESTREINTE",
+          "colour": "#f87272"
+        },
+        {
+          "expanded": "NON PROTEGE",
+          "value": "NON-PROTEGE",
+          "colour": "#f89595"
         }
       ],
       "predicate": "non-classifiees"
+    },
+    {
+      "entry": [
+        {
+          "expanded": "SPECIAL FRANCE",
+          "value": "SPECIAL_FRANCE",
+          "colour": "#0434cc"
+        }
+      ],
+      "predicate": "special-france"
     }
   ],
   "predicates": [
     {
-      "expanded": "Informations classifiées défense",
+      "expanded": "Informations classifiées",
-      "value": "classifiees-defense",
+      "value": "classifiees",
-      "exclusive": true
-    },
-    {
-      "expanded": "Informations non classifiées defense",
-      "value": "non-classifiees-defense",
       "exclusive": true
     },
     {
       "expanded": "Informations non classifiées",
       "value": "non-classifiees",
       "exclusive": true
+    },
+    {
+      "expanded": "Mention Spécial France",
+      "value": "special-france",
+      "exclusive": false
     }
   ],
-  "version": 3,
+  "version": 6,
   "description": "French gov information classification system",
   "namespace": "fr-classif"
 }