diff --git a/scripts/generate_guidance.py b/scripts/generate_guidance.py index 048d390e..b2b92536 100755 --- a/scripts/generate_guidance.py +++ b/scripts/generate_guidance.py @@ -1893,7 +1893,7 @@ def create_rules(baseline_yaml): 'cci', 'cce', '800-53r5', - '800-171r2', + '800-171r3', 'cis', 'cmmc', 'srg', @@ -1939,7 +1939,7 @@ def create_rules(baseline_yaml): rule_yaml['references']['cci'], rule_yaml['references']['cce'], rule_yaml['references']['800-53r5'], - rule_yaml['references']['800-171r2'], + rule_yaml['references']['800-171r3'], rule_yaml['references']['disa_stig'], rule_yaml['references']['srg'], rule_yaml['references']['sfr'], @@ -2414,11 +2414,11 @@ def main(): nist_80053r5 = rule_yaml["references"]["800-53r5"] try: - rule_yaml["references"]["800-171r2"] + rule_yaml["references"]["800-171r3"] except KeyError: nist_800171 = "- N/A" else: - nist_800171 = ulify(rule_yaml["references"]["800-171r2"]) + nist_800171 = ulify(rule_yaml["references"]["800-171r3"]) try: rule_yaml["references"]["disa_stig"] diff --git a/scripts/generate_scap.py b/scripts/generate_scap.py index d24bd30b..e86d0c75 100755 --- a/scripts/generate_scap.py +++ b/scripts/generate_scap.py @@ -388,9 +388,9 @@ def generate_scap(all_rules, all_baselines, args): for nist80053 in rule_yaml['references']['800-53r4']: references = references + nist80053 + ", " references = references[:-2] + "" - if "800-171r2" in rule_yaml['references'] and rule_yaml['references']['800-171r2'][0] != "N/A": - references = references + "NIST SP 800-171r2: " - for nist800171 in rule_yaml['references']['800-171r2']: + if "800-171r3" in rule_yaml['references'] and rule_yaml['references']['800-171r3'][0] != "N/A": + references = references + "NIST SP 800-171r3: " + for nist800171 in rule_yaml['references']['800-171r3']: references = references + nist800171 + ", " references = references[:-2] + "" if "disa_stig" in rule_yaml['references'] and rule_yaml['references']['disa_stig'][0] != "N/A": diff --git a/templates/adoc_rule.adoc b/templates/adoc_rule.adoc index 805ed3f0..3123770b 100644 --- a/templates/adoc_rule.adoc +++ b/templates/adoc_rule.adoc @@ -38,7 +38,7 @@ $severity !$rule_80053r5 ifdef::show_171[] -!800-171r2 +!800-171r3 !$rule_800171 endif::[] diff --git a/templates/adoc_rule_custom_refs.adoc b/templates/adoc_rule_custom_refs.adoc index 5a8b4582..0a5edd67 100644 --- a/templates/adoc_rule_custom_refs.adoc +++ b/templates/adoc_rule_custom_refs.adoc @@ -36,7 +36,7 @@ $rule_fix !$rule_80053r5 ifdef::show_171[] -!800-171r2 +!800-171r3 !$rule_800171 endif::[] diff --git a/templates/adoc_rule_ios.adoc b/templates/adoc_rule_ios.adoc index 6eebe231..a3291354 100644 --- a/templates/adoc_rule_ios.adoc +++ b/templates/adoc_rule_ios.adoc @@ -32,7 +32,7 @@ $severity !$rule_80053r5 ifdef::show_171[] -!800-171r2 +!800-171r3 !$rule_800171 endif::[] diff --git a/templates/adoc_rule_no_setting.adoc b/templates/adoc_rule_no_setting.adoc index 5505b2cd..921356b9 100644 --- a/templates/adoc_rule_no_setting.adoc +++ b/templates/adoc_rule_no_setting.adoc @@ -22,7 +22,7 @@ $rule_check !$rule_80053r5 ifdef::show_171[] -!800-171r2 +!800-171r3 !$rule_800171 endif::[]