From 92295fd073db93d05635d89dc46d486d6e9611a9 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Fri, 22 Oct 2021 10:41:24 +0200 Subject: [PATCH 1/6] chg: [exercise] Locked Shields 2022 added as exercise --- exercise/machinetag.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/exercise/machinetag.json b/exercise/machinetag.json index 43b52d5..574cbbd 100644 --- a/exercise/machinetag.json +++ b/exercise/machinetag.json @@ -94,6 +94,11 @@ "value": "2021", "expanded": "2021", "description": "Locked Shields 2021" + }, + { + "value": "2022", + "expanded": "2022", + "description": "Locked Shields 2022" } ] }, @@ -183,7 +188,7 @@ ] } ], - "version": 8, + "version": 9, "description": "Exercise is a taxonomy to describe if the information is part of one or more cyber or crisis exercise.", "expanded": "Exercise", "namespace": "exercise" From 16214e18672d620a6fa1c2e371b662d5984df8e9 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Tue, 16 Nov 2021 19:49:20 +0100 Subject: [PATCH 2/6] chg: [fr-classif] updated following changes from July 2021 with 2 new levels. Thanks to ANSSI-FR for the contribution --- fr-classif/machinetag.json | 65 ++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/fr-classif/machinetag.json b/fr-classif/machinetag.json index 8172ec4..05056af 100755 --- a/fr-classif/machinetag.json +++ b/fr-classif/machinetag.json @@ -3,65 +3,62 @@ { "entry": [ { - "expanded": "TRES SECRET DEFENSE", - "value": "TRES_SECRET_DEFENSE" + "expanded": "TRES SECRET", + "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" - }, - { - "expanded": "CONFIDENTIEL", - "value": "CONFIDENTIEL" - }, - { - "expanded": "DIFFUSION RESTREINTE", - "value": "DIFFUSION_RESTREINTE" + "value": "SECRET", + "colour": "#f54a4a" } ], - "predicate": "non-classifiees-defense" + "predicate": "classifiees" }, { "entry": [ + { + "expanded": "DIFFUSION RESTREINTE", + "value": "DIFFUSION_RESTREINTE", + "colour": "#f87272" + }, { "expanded": "NON CLASSIFIEES", - "value": "NON-CLASSIFIEES" + "value": "NON-CLASSIFIEES", + "colour": "#f89595" } ], "predicate": "non-classifiees" + }, + { + "entry": [ + { + "expanded": "SPECIAL FRANCE", + "value": "SPECIAL_FRANCE", + "colour": "#0434cc" + } + ], + "predicate": "special-france" } ], "predicates": [ { - "expanded": "Informations classifiées défense", - "value": "classifiees-defense", - "exclusive": true - }, - { - "expanded": "Informations non classifiées defense", - "value": "non-classifiees-defense", + "expanded": "Informations classifiées", + "value": "classifiees", "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": 5, "description": "French gov information classification system", "namespace": "fr-classif" } From 6236db006a3954009485ab43b0d8310ce37f1953 Mon Sep 17 00:00:00 2001 From: lcpdn Date: Wed, 17 Nov 2021 21:38:45 +0100 Subject: [PATCH 3/6] =?UTF-8?q?Correction=20de=20"Non=20classifi=C3=A9e"?= =?UTF-8?q?=20vers=20"Non=20prot=C3=A9g=C3=A9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit L'IGI1300 décrit 2 niveaux de classification : Secret et Très Secret. Les informations ainsi protégées sont dites classifiées. L'IGI1300 (§1.3.2) précise également qu'il existe une mention de protection dite "Diffusion Restreinte" pour des informations non classifiées. Or, les informations non classifiées et non protégées par la mention Diffusion Restreinte sont dites "Non protégées". --- fr-classif/machinetag.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr-classif/machinetag.json b/fr-classif/machinetag.json index 05056af..ba49329 100755 --- a/fr-classif/machinetag.json +++ b/fr-classif/machinetag.json @@ -23,8 +23,8 @@ "colour": "#f87272" }, { - "expanded": "NON CLASSIFIEES", - "value": "NON-CLASSIFIEES", + "expanded": "NON PROTEGE", + "value": "NON-PROTEGE", "colour": "#f89595" } ], @@ -58,7 +58,7 @@ "exclusive": false } ], - "version": 5, + "version": 6, "description": "French gov information classification system", "namespace": "fr-classif" } From 5833db3095722d6a62d79b027ac78072753e2b89 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Fri, 19 Nov 2021 16:02:59 +0100 Subject: [PATCH 4/6] chg: [MANIFEST] updated --- MANIFEST.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/MANIFEST.json b/MANIFEST.json index 8169ccf..241b377 100644 --- a/MANIFEST.json +++ b/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)", @@ -640,5 +645,5 @@ } ], "url": "https://raw.githubusercontent.com/MISP/misp-taxonomies/main/", - "version": "20210920" + "version": "20211119" } From ce3470073a740f7da9c89d9efde3128ea31f1b26 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Mon, 29 Nov 2021 11:53:49 +0100 Subject: [PATCH 5/6] chg: [exercise] Cyber Europe 2022 (former CE2020) added --- exercise/machinetag.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/exercise/machinetag.json b/exercise/machinetag.json index 574cbbd..3fb9268 100644 --- a/exercise/machinetag.json +++ b/exercise/machinetag.json @@ -45,6 +45,11 @@ { "predicate": "cyber-europe", "entry": [ + { + "value": "2022", + "expanded": "2022", + "description": "6th pan European cyber crisis exercise: Cyber Europe 2020 (CE2020)" + }, { "value": "2018", "expanded": "2018", @@ -188,7 +193,7 @@ ] } ], - "version": 9, + "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" From 4afabe7319a35daebe44a97c6e5583e2012042c7 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Mon, 29 Nov 2021 14:07:19 +0100 Subject: [PATCH 6/6] chg: [exercise] fix description --- exercise/machinetag.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercise/machinetag.json b/exercise/machinetag.json index 3fb9268..ac88e77 100644 --- a/exercise/machinetag.json +++ b/exercise/machinetag.json @@ -48,7 +48,7 @@ { "value": "2022", "expanded": "2022", - "description": "6th pan European cyber crisis exercise: Cyber Europe 2020 (CE2020)" + "description": "6th pan European cyber crisis exercise: Cyber Europe 2022 (CE2022)" }, { "value": "2018",