From f910841f6db79e45f3a28cadbe84993ca53977b2 Mon Sep 17 00:00:00 2001
From: Alan Moore <alan.moore@canonical.com>
Date: Tue, 7 Jan 2025 22:08:16 +0000
Subject: [PATCH] Minor typo fix

---
 .../services/ssh/ssh_server/sshd_rekey_limit/oval/shared.xml    | 2 +-
 .../tests/correct_value.pass.sh                                 | 2 +-
 .../tests/rhel7_correct_value_cis_l2.pass.sh                    | 2 +-
 .../tests/wrong_control.fail.sh                                 | 2 +-
 .../tests/wrong_value.fail.sh                                   | 2 +-
 .../tests/correct_value.pass.sh                                 | 2 +-
 .../tests/rhel7_correct_value_cis_l2.pass.sh                    | 2 +-
 .../tests/wrong_control.fail.sh                                 | 2 +-
 .../tests/wrong_value.fail.sh                                   | 2 +-
 .../tests/correct_value.pass.sh                                 | 2 +-
 .../tests/wrong_value.fail.sh                                   | 2 +-
 tests/unit/ssg-module/data/controls_dir/abcd-levels.yml         | 2 +-
 .../data/minimal_oval_of_oval_ssg-sshd_rekey_limit_def.xml      | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/oval/shared.xml b/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/oval/shared.xml
index 38c8a84aa3f..0c205488a5a 100644
--- a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/oval/shared.xml
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/oval/shared.xml
@@ -12,7 +12,7 @@
   <criteria comment="sshd is configured correctly or is not installed" operator="OR">
     {{{- application_not_required_or_requirement_unset() }}}
     {{{- application_required_or_requirement_unset() }}}
-      <criteria comment="sshd is configured corectly" operator="OR">
+      <criteria comment="sshd is configured correctly" operator="OR">
         {{{- oval_line_in_file_criterion(sshd_config_path, parameter) }}}
         {{%- if sshd_distributed_config == "true" %}}
         {{{- oval_line_in_directory_criterion(sshd_config_dir, parameter) | indent(8) }}}
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/correct_value.pass.sh
index ba9383b9482..b2754062210 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/correct_value.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/correct_value.pass.sh
@@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
 		# option is set, replace value
 		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 	fi
-	# ensure corect control is being used per os requirement
+	# ensure correct control is being used per os requirement
 	if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
 		#replace incorrect value
 		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$control_flag\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/rhel7_correct_value_cis_l2.pass.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/rhel7_correct_value_cis_l2.pass.sh
index 88e3edeccc1..24d3543b50c 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/rhel7_correct_value_cis_l2.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/rhel7_correct_value_cis_l2.pass.sh
@@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
 		# option is set, replace value
 		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 	fi
-	# ensure corect control is being used per os requirement
+	# ensure correct control is being used per os requirement
 	if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
 		#replace incorrect value
 		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$control_flag\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_control.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_control.fail.sh
index 30ce0fa19f3..f3df30f09c7 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_control.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_control.fail.sh
@@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
 		# option is set, replace value
 		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 	fi
-	# ensure corect control is being used per os requirement
+	# ensure correct control is being used per os requirement
 	if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
 		#replace incorrect value
 		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\$1control_flag\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_value.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_value.fail.sh
index f49be032474..c967c331d98 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_value.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_value.fail.sh
@@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
 		# option is set, replace value
 		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 	fi
-	# ensure corect control is being used per os requirement
+	# ensure correct control is being used per os requirement
 	if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
 		#replace incorrect value
 		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\$1control_flag\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/correct_value.pass.sh
index 7114616941d..da0571bfe41 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/correct_value.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/correct_value.pass.sh
@@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
 		# option is set, replace value
 		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 	fi
-	# ensure corect control is being used per os requirement
+	# ensure correct control is being used per os requirement
 	if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
 		#replace incorrect value
 		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$control_flag\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/rhel7_correct_value_cis_l2.pass.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/rhel7_correct_value_cis_l2.pass.sh
index 833e9fd5915..e71fb0209a5 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/rhel7_correct_value_cis_l2.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/rhel7_correct_value_cis_l2.pass.sh
@@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
 		# option is set, replace value
 		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 	fi
-	# ensure corect control is being used per os requirement
+	# ensure correct control is being used per os requirement
 	if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
 		#replace incorrect value
 		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$control_flag\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_control.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_control.fail.sh
index 6d06e51e6e2..0f92f91cce2 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_control.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_control.fail.sh
@@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
 		# option is set, replace value
 		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 	fi
-	# ensure corect control is being used per os requirement
+	# ensure correct control is being used per os requirement
 	if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
 		#replace incorrect value
 		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\$1control_flag\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_value.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_value.fail.sh
index 358999ac422..e21cc8daa52 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_value.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_value.fail.sh
@@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
 		# option is set, replace value
 		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 	fi
-	# ensure corect control is being used per os requirement
+	# ensure correct control is being used per os requirement
 	if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
 		#replace incorrect value
 		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\$1control_flag\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_unix_remember/tests/correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_unix_remember/tests/correct_value.pass.sh
index b19e09e67e1..47066e85c06 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_unix_remember/tests/correct_value.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_unix_remember/tests/correct_value.pass.sh
@@ -22,7 +22,7 @@ do
 			# option is set, replace value
 			sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 		fi
-		# ensure corect control is being used per os requirement
+		# ensure correct control is being used per os requirement
 		if ! grep -q "^password.*requisite.*pam_pwhistory\.so.*" $config_file; then
 			#replace incorrect value
 			sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1requisite\3/" $config_file
diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_unix_remember/tests/wrong_value.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_unix_remember/tests/wrong_value.fail.sh
index b50a7081438..a81e21550ab 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_unix_remember/tests/wrong_value.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_unix_remember/tests/wrong_value.fail.sh
@@ -22,7 +22,7 @@ do
 			# option is set, replace value
 			sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
 		fi
-		# ensure corect control is being used per os requirement
+		# ensure correct control is being used per os requirement
 		if ! grep -q "^password.*requisite.*pam_pwhistory\.so.*" $config_file; then
 			#replace incorrect value
 			sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1requisite\3/" $config_file
diff --git a/tests/unit/ssg-module/data/controls_dir/abcd-levels.yml b/tests/unit/ssg-module/data/controls_dir/abcd-levels.yml
index b201c495b8d..6c607863c8f 100644
--- a/tests/unit/ssg-module/data/controls_dir/abcd-levels.yml
+++ b/tests/unit/ssg-module/data/controls_dir/abcd-levels.yml
@@ -43,7 +43,7 @@ controls:
           - var_password_pam_minlen=2
           - var_some_variable=3
 
-  # S5, S6 and S7 are used to test if level inheritance is working corectly
+  # S5, S6 and S7 are used to test if level inheritance is working correctly
   # when multiple levels select the same rule
   - id: S5
     title: Default Crypto Policy
diff --git a/tests/unit/ssg-module/data/minimal_oval_of_oval_ssg-sshd_rekey_limit_def.xml b/tests/unit/ssg-module/data/minimal_oval_of_oval_ssg-sshd_rekey_limit_def.xml
index 7062ee262c4..ed33ddc92c0 100644
--- a/tests/unit/ssg-module/data/minimal_oval_of_oval_ssg-sshd_rekey_limit_def.xml
+++ b/tests/unit/ssg-module/data/minimal_oval_of_oval_ssg-sshd_rekey_limit_def.xml
@@ -27,7 +27,7 @@
     <oval-def:criteria comment="sshd is installed and configured" operator="AND">
      <oval-def:extend_definition comment="sshd is required or requirement is unset" definition_ref="oval:ssg-sshd_required_or_unset:def:1" />
      <oval-def:extend_definition comment="rpm package openssh-server installed" definition_ref="oval:ssg-package_openssh-server_installed:def:1" />
-     <oval-def:criteria comment="sshd is configured corectly" operator="OR">
+     <oval-def:criteria comment="sshd is configured correctly" operator="OR">
       <oval-def:criterion comment="Check the RekeyLimit in /etc/ssh/sshd_config" test_ref="oval:ssg-test_sshd_rekey_limit:tst:1" />
       <oval-def:criterion comment="Check the RekeyLimit in /etc/ssh/sshd_config.d" test_ref="oval:ssg-test_sshd_rekey_limit_config_dir:tst:1" />
      </oval-def:criteria>