Skip to content

Revert "[rc-4.10] PE-9697: stop kairos-init overriding the FIPS/STIG sshd crypto (#901)" #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dr-N00B merged 1 commit into from
Oct 6, 2026
Merged

Revert "[rc-4.10] PE-9697: stop kairos-init overriding the FIPS/STIG sshd crypto (#901)" #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions rhel-fips/overlay/rhel10/etc/ssh/sshd_config.d/04_fips_hardening.conf
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions rhel-fips/overlay/rhel10/etc/ssh/sshd_config.d/100_fips_crypto.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Default algorithms favoring higher-performance FIPS algorithms
# in most cases.
Ciphers ^aes256-gcm@openssh.com,aes256-ctr,aes128-gcm@openssh.com,aes128-ctr
KexAlgorithms ^ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521
MACs ^hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512
HostKeyAlgorithms ^ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-256,rsa-sha2-512
13 changes: 0 additions & 13 deletions rhel-fips/overlay/rhel9/etc/ssh/sshd_config.d/04_fips_hardening.conf
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions rhel-fips/overlay/rhel9/etc/ssh/sshd_config.d/100_fips_crypto.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Default algorithms favoring higher-performance FIPS algorithms
# in most cases.
Ciphers ^aes256-gcm@openssh.com,aes256-ctr,aes128-gcm@openssh.com,aes128-ctr
KexAlgorithms ^ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521
MACs ^hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512
HostKeyAlgorithms ^ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-256,rsa-sha2-512
13 changes: 0 additions & 13 deletions rhel-stig/overlay/rhel9/etc/ssh/sshd_config.d/04_stig_hardening.conf
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions rhel-stig/overlay/rhel9/etc/ssh/sshd_config.d/100_stig_crypto.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# STIG-compliant SSH cryptographic settings for RHEL 9
# These settings align with DISA STIG requirements

# Approved ciphers (STIG compliant)
Ciphers aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes128-ctr

# Approved key exchange algorithms (STIG compliant)
KexAlgorithms ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256

# Approved MAC algorithms (STIG compliant)
MACs hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512

# Approved host key algorithms (STIG compliant)
HostKeyAlgorithms ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-256,rsa-sha2-512