diff --git a/scripts/generate_scap.py b/scripts/generate_scap.py index 3d1415ba..1dbfc802 100755 --- a/scripts/generate_scap.py +++ b/scripts/generate_scap.py @@ -1654,7 +1654,7 @@ def generate_scap(all_rules, all_baselines, args): - '''.format(x,rule_yaml['title'],cce,rule_yaml['id'] + "_" + odv_label,rule_yaml['discussion'],rule_yaml['id'] + "_" + odv_label,x,rule_yaml['id'] + "_" + odv_label, x+5000, rule_yaml['id'] + "_" + odv_label,x+5001) + '''.format(x,rule_yaml['title'],cce,rule_yaml['id'] + "_" + odv_label,rule_yaml['discussion'],rule_yaml['id'] + "_" + odv_label,x,rule_yaml['id'] + "_" + odv_label, x+6000, rule_yaml['id'] + "_" + odv_label,x+6001) oval_test = oval_test + ''' @@ -1666,7 +1666,7 @@ def generate_scap(all_rules, all_baselines, args): - '''.format(x+5000, rule_yaml['id'] + "_" + odv_label, x+5000) + '''.format(x+6000, rule_yaml['id'] + "_" + odv_label, x+6000) oval_object = oval_object + ''' @@ -1684,7 +1684,7 @@ def generate_scap(all_rules, all_baselines, args): * {} 1 - '''.format(x+5000, rule_yaml['id'] + "_" + odv_label, fipslist) + '''.format(x+6000, rule_yaml['id'] + "_" + odv_label, fipslist) x = x + 1 @@ -1702,7 +1702,7 @@ def generate_scap(all_rules, all_baselines, args): - '''.format(x,rule_yaml['title'],cce,rule_yaml['id'] + "_" + odv_label,rule_yaml['discussion'],rule_yaml['id'] + "_" + odv_label,x,rule_yaml['id'] + "_" + odv_label, x+5000, rule_yaml['id'] + "_" + odv_label,x+5001) + '''.format(x,rule_yaml['title'],cce,rule_yaml['id'] + "_" + odv_label,rule_yaml['discussion'],rule_yaml['id'] + "_" + odv_label,x,rule_yaml['id'] + "_" + odv_label, x+6000, rule_yaml['id'] + "_" + odv_label,x+6001) oval_test = oval_test + ''' @@ -1714,7 +1714,7 @@ def generate_scap(all_rules, all_baselines, args): - '''.format(x+5000, rule_yaml['id'] + "_" + odv_label, x+5000) + '''.format(x+6000, rule_yaml['id'] + "_" + odv_label, x+6000) sshd_config_pattern = "" if "grep" in rule_yaml['check']: regex = r"(?<=grep).*$" @@ -1749,7 +1749,7 @@ def generate_scap(all_rules, all_baselines, args): * {} 1 - '''.format(x+5000, rule_yaml['id'] + "_" + odv_label, sshd_config_pattern) + '''.format(x+6000, rule_yaml['id'] + "_" + odv_label, sshd_config_pattern) x = x + 1