merging in master

CHANGELOG.md

@@ -13,12 +13,25 @@
 <!--    ### New Features                                                -->
 <!--    ### Improvements                                                -->
 <!--    ### Fixes                                                       -->
+
 # 5 April 2021
+## nist800-53-r5 v1.3
 ### Fixes
-- Fixed a bug where subcontrol-of relationships were not being created between controls and enhancements in nist-800-53-r5.
+- Fixed a bug where subcontrol-of relationships were not being created between controls and enhancements in nist-800-53-r5. See issue [#61](https://github.com/center-for-threat-informed-defense/attack-control-framework-mappings/issues/61).
 - Updates to mappings in nist-800-53-r5 to address withdrawn controls (SA family) and to remove policy control (XX-1) mappings.
 
-# 12 January 2021
+# 3 February 2021
+## nist800-53-r4 v1.2 and nist800-53-r5 v1.2
+### Fixes
+- Fixes parse_mappings.py for nist800-53-r4 and nist800-53-r5 to remove duplicate mappings. See issue [#58](https://github.com/center-for-threat-informed-defense/attack-control-framework-mappings/issues/58).
+
+# 7 January 2021
+## nist800-53-r4 v1.1 and nist800-53-r5 v1.1
 ### Fixes
-- Fixes parse_mappings.py for nist800-53-r4 and nist800-53-r5 to remove duplicate entries in "mitigates"
-- Rerun make.py to update all content based on the fix
+- Fixed broken regex which was leading to erroneous mappings, in particular mappings to control enhancements. See issue [#56](https://github.com/center-for-threat-informed-defense/attack-control-framework-mappings/issues/56).
+
+# 15 December 2020
+## nist800-53-r4 v1.0 and nist800-53-r5 v1.0
+- Initial release of security control framework mapping methodology and tools. 
+- Initial release of NIST 800-53 R4 mappings to ATT&CK version 8.1.
+- Initial release of NIST 800-53 R5 mappings to ATT&CK version 8.1.

frameworks/nist800-53-r4/README.md

@@ -4,7 +4,7 @@ This folder contains mappings of NIST Special Publication (SP) 800-53 Revision 4
 
 | Mappings Version | Last Updated      | ATT&CK Version | ATT&CK Domain |
 |------------------|-------------------|----------------|---------------|
-| 1.1              | 7 January 2021  | [ATT&CK v8](https://attack.mitre.org/resources/versions/) | Enterprise |
+| 1.2              | 3 February 2021  | [ATT&CK v8.1](https://attack.mitre.org/resources/versions/) | Enterprise |
 
 | Data ||
 |------|------|

frameworks/nist800-53-r4/input/config.json

@@ -2,5 +2,5 @@
     "framework_id": "NIST 800-53 Revision 4",
     "attack_domain": "enterprise-attack",
     "attack_version": "v8.1",
-    "mappings_version": "v1.1"
+    "mappings_version": "v1.2"
 }

frameworks/nist800-53-r5/README.md

@@ -5,7 +5,7 @@ This folder contains mappings of NIST Special Publication (SP) 800-53 Revision 5
 
 | Mappings Version | Last Updated      | ATT&CK Version | ATT&CK Domain |
 |------------------|-------------------|----------------|---------------|
-| 1.1              | 7 January 2021 | [ATT&CK v8](https://attack.mitre.org/resources/versions/) | Enterprise |
+| 1.2              | 3 February 2021   | [ATT&CK v8.1](https://attack.mitre.org/resources/versions/) | Enterprise |
 
 
 | Data ||

frameworks/nist800-53-r5/input/config.json

@@ -2,5 +2,5 @@
     "framework_id": "NIST 800-53 Revision 5",
     "attack_domain": "enterprise-attack",
     "attack_version": "v8.1",
-    "mappings_version": "v1.1"
+    "mappings_version": "v1.2"
 }