Skip to content

Commit d32432e

Browse files
marcusburghardtmarcusburghardt
authored
Merge pull request #108 from ComplianceAsCode/sync_cac_pr14243
Auto-generated PR from CAC 14243
2 parents 759fd92 + 3346ece commit d32432e

File tree

40 files changed

+21222
-21238
lines changed

40 files changed

+21222
-21238
lines changed

‎component-definitions/fedora/fedora-cis_fedora-l1_server/component-definition.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"uuid": "77a62ff1-d5eb-47f8-a08f-063352e9479f",
44
"metadata": {
55
"title": "Component definition for fedora",
6-
"last-modified": "2025-12-11T18:31:36.606568+00:00",
7-
"version": "1.5",
6+
"last-modified": "2025-12-17T11:20:02.273422+00:00",
7+
"version": "1.6",
88
"oscal-version": "1.1.3"
99
},
1010
"components": [
@@ -689,7 +689,7 @@
689689
{
690690
"name": "Parameter_Value_Alternatives_36",
691691
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
692-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
692+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
693693
"remarks": "rule_set_000"
694694
},
695695
{
@@ -707,7 +707,7 @@
707707
{
708708
"name": "Parameter_Value_Alternatives_37",
709709
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
710-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
710+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
711711
"remarks": "rule_set_000"
712712
},
713713
{
@@ -9921,7 +9921,7 @@
99219921
{
99229922
"name": "Parameter_Value_Alternatives_36",
99239923
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
9924-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
9924+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
99259925
"remarks": "rule_set_000"
99269926
},
99279927
{
@@ -9939,7 +9939,7 @@
99399939
{
99409940
"name": "Parameter_Value_Alternatives_37",
99419941
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
9942-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
9942+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
99439943
"remarks": "rule_set_000"
99449944
},
99459945
{

‎component-definitions/fedora/fedora-cis_fedora-l1_workstation/component-definition.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"uuid": "e4c9973a-dbda-48c4-8081-bf2dbfe65692",
44
"metadata": {
55
"title": "Component definition for fedora",
6-
"last-modified": "2025-12-11T18:32:22.407336+00:00",
7-
"version": "1.5",
6+
"last-modified": "2025-12-17T11:20:51.860810+00:00",
7+
"version": "1.6",
88
"oscal-version": "1.1.3"
99
},
1010
"components": [
@@ -689,7 +689,7 @@
689689
{
690690
"name": "Parameter_Value_Alternatives_36",
691691
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
692-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
692+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
693693
"remarks": "rule_set_000"
694694
},
695695
{
@@ -707,7 +707,7 @@
707707
{
708708
"name": "Parameter_Value_Alternatives_37",
709709
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
710-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
710+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
711711
"remarks": "rule_set_000"
712712
},
713713
{
@@ -9701,7 +9701,7 @@
97019701
{
97029702
"name": "Parameter_Value_Alternatives_36",
97039703
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
9704-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
9704+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
97059705
"remarks": "rule_set_000"
97069706
},
97079707
{
@@ -9719,7 +9719,7 @@
97199719
{
97209720
"name": "Parameter_Value_Alternatives_37",
97219721
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
9722-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
9722+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
97239723
"remarks": "rule_set_000"
97249724
},
97259725
{

‎component-definitions/fedora/fedora-cis_fedora-l2_server/component-definition.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"uuid": "76afcd42-7a9d-433c-b495-ef156395719c",
44
"metadata": {
55
"title": "Component definition for fedora",
6-
"last-modified": "2025-12-11T18:30:49.925024+00:00",
7-
"version": "1.7",
6+
"last-modified": "2025-12-17T11:19:11.439838+00:00",
7+
"version": "1.8",
88
"oscal-version": "1.1.3"
99
},
1010
"components": [
@@ -869,7 +869,7 @@
869869
{
870870
"name": "Parameter_Value_Alternatives_46",
871871
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
872-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
872+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
873873
"remarks": "rule_set_000"
874874
},
875875
{
@@ -887,7 +887,7 @@
887887
{
888888
"name": "Parameter_Value_Alternatives_47",
889889
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
890-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
890+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
891891
"remarks": "rule_set_000"
892892
},
893893
{
@@ -12963,7 +12963,7 @@
1296312963
{
1296412964
"name": "Parameter_Value_Alternatives_46",
1296512965
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
12966-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
12966+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
1296712967
"remarks": "rule_set_000"
1296812968
},
1296912969
{
@@ -12981,7 +12981,7 @@
1298112981
{
1298212982
"name": "Parameter_Value_Alternatives_47",
1298312983
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
12984-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
12984+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
1298512985
"remarks": "rule_set_000"
1298612986
},
1298712987
{

‎component-definitions/fedora/fedora-cis_fedora-l2_workstation/component-definition.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"uuid": "5c3c7cf2-7b25-40ff-b6fe-74a80316f83a",
44
"metadata": {
55
"title": "Component definition for fedora",
6-
"last-modified": "2025-12-11T18:33:12.953082+00:00",
7-
"version": "1.7",
6+
"last-modified": "2025-12-17T11:21:49.392170+00:00",
7+
"version": "1.8",
88
"oscal-version": "1.1.3"
99
},
1010
"components": [
@@ -869,7 +869,7 @@
869869
{
870870
"name": "Parameter_Value_Alternatives_46",
871871
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
872-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
872+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
873873
"remarks": "rule_set_000"
874874
},
875875
{
@@ -887,7 +887,7 @@
887887
{
888888
"name": "Parameter_Value_Alternatives_47",
889889
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
890-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
890+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
891891
"remarks": "rule_set_000"
892892
},
893893
{
@@ -12817,7 +12817,7 @@
1281712817
{
1281812818
"name": "Parameter_Value_Alternatives_46",
1281912819
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
12820-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
12820+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
1282112821
"remarks": "rule_set_000"
1282212822
},
1282312823
{
@@ -12835,7 +12835,7 @@
1283512835
{
1283612836
"name": "Parameter_Value_Alternatives_47",
1283712837
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
12838-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
12838+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
1283912839
"remarks": "rule_set_000"
1284012840
},
1284112841
{

‎component-definitions/fedora/fedora-cusp_fedora-default/component-definition.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"uuid": "2d7b24b2-1bb9-4f44-b6d1-9c6b27c84fe0",
44
"metadata": {
55
"title": "Component definition for fedora",
6-
"last-modified": "2025-12-11T18:33:57.584736+00:00",
7-
"version": "1.4",
6+
"last-modified": "2025-12-17T11:22:40.240960+00:00",
7+
"version": "1.5",
88
"oscal-version": "1.1.3"
99
},
1010
"components": [
@@ -473,7 +473,7 @@
473473
{
474474
"name": "Parameter_Value_Alternatives_24",
475475
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
476-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
476+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
477477
"remarks": "rule_set_000"
478478
},
479479
{
@@ -491,7 +491,7 @@
491491
{
492492
"name": "Parameter_Value_Alternatives_25",
493493
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
494-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
494+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
495495
"remarks": "rule_set_000"
496496
},
497497
{
@@ -6387,7 +6387,7 @@
63876387
{
63886388
"name": "Parameter_Value_Alternatives_24",
63896389
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
6390-
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT'}",
6390+
"value": "{'default': 'SHA512', 'SHA512': 'SHA512', 'SHA256': 'SHA256', 'yescrypt': 'YESCRYPT', 'cis_ubuntu2204': 'SHA512|YESCRYPT', 'cis_ubuntu2404': 'SHA512|YESCRYPT', 'cis_rhel10': 'YESCRYPT|SHA512'}",
63916391
"remarks": "rule_set_000"
63926392
},
63936393
{
@@ -6405,7 +6405,7 @@
64056405
{
64066406
"name": "Parameter_Value_Alternatives_25",
64076407
"ns": "https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd",
6408-
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt'}",
6408+
"value": "{'default': 'sha512', 'sha512': 'sha512', 'yescrypt': 'yescrypt', 'cis_rhel10': 'yescrypt|sha512'}",
64096409
"remarks": "rule_set_000"
64106410
},
64116411
{

0 commit comments

Comments
 (0)