Skip to content

Commit 6a5ee5c

Browse files
authored
Merge pull request #14550 from mrkanon/remove_ssh_crypto_policy_ol
Remove ssh_crypto_policy for OL9 and OL10 profiles
2 parents 29461e5 + 75f3d19 commit 6a5ee5c

12 files changed

Lines changed: 12 additions & 3 deletions

File tree

controls/ccn_ol9.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ controls:
321321
- advanced
322322
status: automated
323323
rules:
324-
- configure_ssh_crypto_policy
324+
- configure_crypto_policy
325325

326326
- id: A.5.SEC-OL7
327327
title: Network Session Inactivity is Controlled
@@ -655,7 +655,7 @@ controls:
655655
notes: |-
656656
It overlaps the rule in A.5.SEC-OL6 requirement
657657
related_rules:
658-
- configure_ssh_crypto_policy
658+
- configure_crypto_policy
659659

660660
- id: A.11.SEC-OL7
661661
title: GUI Idle Time is Limited

products/ol10/profiles/e8.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ selections:
3333
# authselect is enabled by default
3434
- '!enable_authselect'
3535
- var_authselect_profile=local
36+
- '!configure_ssh_crypto_policy'

products/ol10/profiles/hipaa.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ selections:
6161
- '!sshd_disable_kerb_auth'
6262
- '!sshd_disable_gssapi_auth'
6363
- '!service_rlogin_disabled'
64+
- '!configure_ssh_crypto_policy'
6465

6566
# authselect is enabled by default
6667
- '!enable_authselect'

products/ol10/profiles/ism_o.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ selections:
7575
- '!accounts_password_all_shadowed'
7676
- '!usbguard_allow_hid_and_hub'
7777
- '!sshd_allow_only_protocol2'
78+
- '!configure_ssh_crypto_policy'
7879

7980
# Older rules, no longer needed
8081
- '!security_patches_up_to_date'

products/ol10/profiles/ism_o_secret.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ selections:
7676
- "!usbguard_allow_hid_and_hub"
7777
- "!sshd_allow_only_protocol2"
7878
- var_authselect_profile=local
79+
- "!configure_ssh_crypto_policy"
7980

8081
# Needed for references in other products
8182
- '!security_patches_up_to_date'

products/ol10/profiles/ism_o_top_secret.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ selections:
7676
- "!usbguard_allow_hid_and_hub"
7777
- "!sshd_allow_only_protocol2"
7878
- var_authselect_profile=local
79+
- "!configure_ssh_crypto_policy"
7980

8081
# Needed for references in other products
8182
- '!security_patches_up_to_date'

products/ol10/profiles/ospp.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ selections:
6565
- '!zipl_page_alloc_shuffle_argument'
6666
- '!zipl_systemd_debug-shell_argument_absent'
6767
- var_authselect_profile=local
68+
- '!configure_ssh_crypto_policy'

products/ol10/profiles/pci-dss.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,4 @@ selections:
7777
# Irrelevant for ol10
7878
- '!enable_dconf_user_profile'
7979
- var_authselect_profile=local
80+
- '!configure_ssh_crypto_policy'

products/ol9/profiles/e8.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ selections:
2727
- '!package_talk_removed'
2828
- '!package_talk-server_removed'
2929
- '!ensure_redhat_gpgkey_installed'
30+
- '!configure_ssh_crypto_policy'

products/ol9/profiles/hipaa.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@ selections:
8989
- "!sshd_use_approved_ciphers"
9090
- "!sshd_use_approved_macs"
9191
- "!sshd_use_priv_separation"
92+
- "!configure_ssh_crypto_policy"

0 commit comments

Comments
 (0)