diff --git a/bin/hardening/2.2.1.2_configure_ntp.sh b/bin/hardening/2.2.1.4_configure_ntp.sh similarity index 100% rename from bin/hardening/2.2.1.2_configure_ntp.sh rename to bin/hardening/2.2.1.4_configure_ntp.sh diff --git a/bin/hardening/3.7_disable_ipv6.sh b/bin/hardening/3.1.1_disable_ipv6.sh similarity index 98% rename from bin/hardening/3.7_disable_ipv6.sh rename to bin/hardening/3.1.1_disable_ipv6.sh index f25b555..7c3b3b3 100755 --- a/bin/hardening/3.7_disable_ipv6.sh +++ b/bin/hardening/3.1.1_disable_ipv6.sh @@ -6,7 +6,7 @@ # # -# 3.7 Disable IPv6 (Not Scored) +# 3.1.1 Disable IPv6 (Not Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.6_disable_wireless.sh b/bin/hardening/3.1.2_disable_wireless.sh similarity index 96% rename from bin/hardening/3.6_disable_wireless.sh rename to bin/hardening/3.1.2_disable_wireless.sh index f11b039..3dfa777 100755 --- a/bin/hardening/3.6_disable_wireless.sh +++ b/bin/hardening/3.1.2_disable_wireless.sh @@ -6,7 +6,7 @@ # # -# 3.6 Ensure wireless interfaces are disabled (Not Scored) +# 3.1.2 Ensure wireless interfaces are disabled (Not Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.1.2_disable_send_packet_redirects.sh b/bin/hardening/3.2.1_disable_send_packet_redirects.sh similarity index 97% rename from bin/hardening/3.1.2_disable_send_packet_redirects.sh rename to bin/hardening/3.2.1_disable_send_packet_redirects.sh index 1807d7b..077a102 100755 --- a/bin/hardening/3.1.2_disable_send_packet_redirects.sh +++ b/bin/hardening/3.2.1_disable_send_packet_redirects.sh @@ -6,7 +6,7 @@ # # -# 3.1.2 Ensure packet redirect sending is disabled (Scored) +# 3.2.1 Ensure packet redirect sending is disabled (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.1.1_disable_ip_forwarding.sh b/bin/hardening/3.2.2_disable_ip_forwarding.sh similarity index 98% rename from bin/hardening/3.1.1_disable_ip_forwarding.sh rename to bin/hardening/3.2.2_disable_ip_forwarding.sh index deb5551..46a2fb3 100755 --- a/bin/hardening/3.1.1_disable_ip_forwarding.sh +++ b/bin/hardening/3.2.2_disable_ip_forwarding.sh @@ -6,7 +6,7 @@ # # -# 3.1.1 Ensure IP forwarding is disabled (Scored) +# 3.2.2 Ensure IP forwarding is disabled (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.1_disable_source_routed_packets.sh b/bin/hardening/3.3.1_disable_source_routed_packets.sh similarity index 98% rename from bin/hardening/3.2.1_disable_source_routed_packets.sh rename to bin/hardening/3.3.1_disable_source_routed_packets.sh index 5c82463..7d4b702 100755 --- a/bin/hardening/3.2.1_disable_source_routed_packets.sh +++ b/bin/hardening/3.3.1_disable_source_routed_packets.sh @@ -6,7 +6,7 @@ # # -# 3.2.1 Ensure source routed packets are not accepted (Scored) +# 3.3.1 Ensure source routed packets are not accepted (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.2_disable_icmp_redirect.sh b/bin/hardening/3.3.2_disable_icmp_redirect.sh similarity index 98% rename from bin/hardening/3.2.2_disable_icmp_redirect.sh rename to bin/hardening/3.3.2_disable_icmp_redirect.sh index e6dcc17..69a351d 100755 --- a/bin/hardening/3.2.2_disable_icmp_redirect.sh +++ b/bin/hardening/3.3.2_disable_icmp_redirect.sh @@ -6,7 +6,7 @@ # # -# 3.2.2 Ensure ICMP redirects are not accepted (Scored) +# 3.3.2 Ensure ICMP redirects are not accepted (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.3_disable_secure_icmp_redirect.sh b/bin/hardening/3.3.3_disable_secure_icmp_redirect.sh similarity index 97% rename from bin/hardening/3.2.3_disable_secure_icmp_redirect.sh rename to bin/hardening/3.3.3_disable_secure_icmp_redirect.sh index f733d42..037470a 100755 --- a/bin/hardening/3.2.3_disable_secure_icmp_redirect.sh +++ b/bin/hardening/3.3.3_disable_secure_icmp_redirect.sh @@ -6,7 +6,7 @@ # # -# 3.2.3 Ensure secure ICMP redirects are not accepted (Scored) +# 3.3.3 Ensure secure ICMP redirects are not accepted (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.4_log_martian_packets.sh b/bin/hardening/3.3.4_log_martian_packets.sh similarity index 98% rename from bin/hardening/3.2.4_log_martian_packets.sh rename to bin/hardening/3.3.4_log_martian_packets.sh index 170966f..2e2a869 100755 --- a/bin/hardening/3.2.4_log_martian_packets.sh +++ b/bin/hardening/3.3.4_log_martian_packets.sh @@ -6,7 +6,7 @@ # # -# 3.2.4 Ensure suspicious packets are logged (Scored) +# 3.3.4 Ensure suspicious packets are logged (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.5_ignore_broadcast_requests.sh b/bin/hardening/3.3.5_ignore_broadcast_requests.sh similarity index 97% rename from bin/hardening/3.2.5_ignore_broadcast_requests.sh rename to bin/hardening/3.3.5_ignore_broadcast_requests.sh index 397ed2d..b2a2841 100755 --- a/bin/hardening/3.2.5_ignore_broadcast_requests.sh +++ b/bin/hardening/3.3.5_ignore_broadcast_requests.sh @@ -6,7 +6,7 @@ # # -# 3.2.5 Ensure broadcast ICMP requests are ignored (Scored) +# 3.3.5 Ensure broadcast ICMP requests are ignored (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.6_enable_bad_error_message_protection.sh b/bin/hardening/3.3.6_enable_bad_error_message_protection.sh similarity index 97% rename from bin/hardening/3.2.6_enable_bad_error_message_protection.sh rename to bin/hardening/3.3.6_enable_bad_error_message_protection.sh index 8f451a2..8ceb274 100755 --- a/bin/hardening/3.2.6_enable_bad_error_message_protection.sh +++ b/bin/hardening/3.3.6_enable_bad_error_message_protection.sh @@ -6,7 +6,7 @@ # # -# 3.2.6 Ensure bogus ICMP responses are ignored (Scored) +# 3.3.6 Ensure bogus ICMP responses are ignored (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.7_enable_source_route_validation.sh b/bin/hardening/3.3.7_enable_source_route_validation.sh similarity index 97% rename from bin/hardening/3.2.7_enable_source_route_validation.sh rename to bin/hardening/3.3.7_enable_source_route_validation.sh index b3d0635..a03cc11 100755 --- a/bin/hardening/3.2.7_enable_source_route_validation.sh +++ b/bin/hardening/3.3.7_enable_source_route_validation.sh @@ -6,7 +6,7 @@ # # -# 3.2.7 Ensure Reverse Path Filtering is enabled (Scored) +# 3.3.7 Ensure Reverse Path Filtering is enabled (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.8_enable_tcp_syn_cookies.sh b/bin/hardening/3.3.8_enable_tcp_syn_cookies.sh similarity index 98% rename from bin/hardening/3.2.8_enable_tcp_syn_cookies.sh rename to bin/hardening/3.3.8_enable_tcp_syn_cookies.sh index 37db31c..9d54caf 100755 --- a/bin/hardening/3.2.8_enable_tcp_syn_cookies.sh +++ b/bin/hardening/3.3.8_enable_tcp_syn_cookies.sh @@ -6,7 +6,7 @@ # # -# 3.2.8 Ensure TCP SYN Cookies is enabled (Scored) +# 3.3.8 Ensure TCP SYN Cookies is enabled (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.2.9_disable_ipv6_router_advertisement.sh b/bin/hardening/3.3.9_disable_ipv6_router_advertisement.sh similarity index 97% rename from bin/hardening/3.2.9_disable_ipv6_router_advertisement.sh rename to bin/hardening/3.3.9_disable_ipv6_router_advertisement.sh index bcd99ab..887c56b 100755 --- a/bin/hardening/3.2.9_disable_ipv6_router_advertisement.sh +++ b/bin/hardening/3.3.9_disable_ipv6_router_advertisement.sh @@ -6,7 +6,7 @@ # # -# 3.2.9 Ensure IPv6 router advertisements are not accepted (Scored) +# 3.3.9 Ensure IPv6 router advertisements are not accepted (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.5_enable_firewall.sh b/bin/hardening/3.5.1.1_enable_firewall.sh similarity index 97% rename from bin/hardening/3.5_enable_firewall.sh rename to bin/hardening/3.5.1.1_enable_firewall.sh index 9e7ec1c..fcbf066 100755 --- a/bin/hardening/3.5_enable_firewall.sh +++ b/bin/hardening/3.5.1.1_enable_firewall.sh @@ -6,7 +6,7 @@ # # -# 3.5 Ensure Firewall is active (Scored) +# 3.5.1.1 Ensure Firewall is active (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.5.1.1_net_fw_default_policy_drop.sh b/bin/hardening/3.5.4.1.1_net_fw_default_policy_drop.sh similarity index 97% rename from bin/hardening/3.5.1.1_net_fw_default_policy_drop.sh rename to bin/hardening/3.5.4.1.1_net_fw_default_policy_drop.sh index 692ea10..1373682 100755 --- a/bin/hardening/3.5.1.1_net_fw_default_policy_drop.sh +++ b/bin/hardening/3.5.4.1.1_net_fw_default_policy_drop.sh @@ -6,7 +6,7 @@ # # -# 3.5.1.1 Ensure default deny firewall policy (Scored) +# 3.5.4.1.1 Ensure default deny firewall policy (Scored) # set -e # One error, it's over diff --git a/bin/hardening/2.2.18_disable_telnet_server.sh b/bin/hardening/99.2.2_disable_telnet_server.sh similarity index 100% rename from bin/hardening/2.2.18_disable_telnet_server.sh rename to bin/hardening/99.2.2_disable_telnet_server.sh diff --git a/bin/hardening/3.3.1_install_tcp_wrapper.sh b/bin/hardening/99.3.3.1_install_tcp_wrapper.sh similarity index 96% rename from bin/hardening/3.3.1_install_tcp_wrapper.sh rename to bin/hardening/99.3.3.1_install_tcp_wrapper.sh index b923327..4d50569 100755 --- a/bin/hardening/3.3.1_install_tcp_wrapper.sh +++ b/bin/hardening/99.3.3.1_install_tcp_wrapper.sh @@ -6,7 +6,7 @@ # # -# 3.3.1 Ensure TCP Wrappers is installed (Scored) +# 99.3.3.1 Ensure TCP Wrappers is installed (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.3.2_hosts_allow.sh b/bin/hardening/99.3.3.2_hosts_allow.sh similarity index 96% rename from bin/hardening/3.3.2_hosts_allow.sh rename to bin/hardening/99.3.3.2_hosts_allow.sh index 60291d9..9a56c8f 100755 --- a/bin/hardening/3.3.2_hosts_allow.sh +++ b/bin/hardening/99.3.3.2_hosts_allow.sh @@ -6,7 +6,7 @@ # # -# 3.3.2 Ensure /etc/hosts.allow is configured (Not Scored) +# 99.3.3.2 Ensure /etc/hosts.allow is configured (Not Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.3.3_hosts_deny.sh b/bin/hardening/99.3.3.3_hosts_deny.sh similarity index 97% rename from bin/hardening/3.3.3_hosts_deny.sh rename to bin/hardening/99.3.3.3_hosts_deny.sh index 4e7cca9..157661b 100755 --- a/bin/hardening/3.3.3_hosts_deny.sh +++ b/bin/hardening/99.3.3.3_hosts_deny.sh @@ -6,7 +6,7 @@ # # -# 3.3.3 Ensure /etc/hosts.deny is configured (Not Scored) +# 99.3.3.3 Ensure /etc/hosts.deny is configured (Not Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.3.4_hosts_allow_permissions.sh b/bin/hardening/99.3.3.4_hosts_allow_permissions.sh similarity index 96% rename from bin/hardening/3.3.4_hosts_allow_permissions.sh rename to bin/hardening/99.3.3.4_hosts_allow_permissions.sh index 47fb315..4600150 100755 --- a/bin/hardening/3.3.4_hosts_allow_permissions.sh +++ b/bin/hardening/99.3.3.4_hosts_allow_permissions.sh @@ -6,7 +6,7 @@ # # -# 3.3.4 Ensure permissions on /etc/hosts.allow are configured (Scored) +# 99.3.3.4 Ensure permissions on /etc/hosts.allow are configured (Scored) # set -e # One error, it's over diff --git a/bin/hardening/3.3.5_hosts_deny_permissions.sh b/bin/hardening/99.3.3.5_hosts_deny_permissions.sh similarity index 97% rename from bin/hardening/3.3.5_hosts_deny_permissions.sh rename to bin/hardening/99.3.3.5_hosts_deny_permissions.sh index 51b4cda..5c2be1e 100755 --- a/bin/hardening/3.3.5_hosts_deny_permissions.sh +++ b/bin/hardening/99.3.3.5_hosts_deny_permissions.sh @@ -6,7 +6,7 @@ # # -# 3.3.5 Verify Permissions on /etc/hosts.deny (Scored) +# 99.3.3.5 Verify Permissions on /etc/hosts.deny (Scored) # set -e # One error, it's over diff --git a/tests/hardening/2.2.1.2_configure_ntp.sh b/tests/hardening/2.2.1.4_configure_ntp.sh similarity index 100% rename from tests/hardening/2.2.1.2_configure_ntp.sh rename to tests/hardening/2.2.1.4_configure_ntp.sh diff --git a/tests/hardening/2.2.18_disable_telnet_server.sh b/tests/hardening/3.1.1_disable_ipv6.sh similarity index 100% rename from tests/hardening/2.2.18_disable_telnet_server.sh rename to tests/hardening/3.1.1_disable_ipv6.sh diff --git a/tests/hardening/3.1.2_disable_send_packet_redirects.sh b/tests/hardening/3.1.2_disable_wireless.sh similarity index 100% rename from tests/hardening/3.1.2_disable_send_packet_redirects.sh rename to tests/hardening/3.1.2_disable_wireless.sh diff --git a/tests/hardening/3.2.1_disable_source_routed_packets.sh b/tests/hardening/3.2.1_disable_send_packet_redirects.sh similarity index 100% rename from tests/hardening/3.2.1_disable_source_routed_packets.sh rename to tests/hardening/3.2.1_disable_send_packet_redirects.sh diff --git a/tests/hardening/3.1.1_disable_ip_forwarding.sh b/tests/hardening/3.2.2_disable_ip_forwarding.sh similarity index 100% rename from tests/hardening/3.1.1_disable_ip_forwarding.sh rename to tests/hardening/3.2.2_disable_ip_forwarding.sh diff --git a/tests/hardening/3.2.2_disable_icmp_redirect.sh b/tests/hardening/3.3.1_disable_source_routed_packets.sh similarity index 100% rename from tests/hardening/3.2.2_disable_icmp_redirect.sh rename to tests/hardening/3.3.1_disable_source_routed_packets.sh diff --git a/tests/hardening/3.2.3_disable_secure_icmp_redirect.sh b/tests/hardening/3.3.2_disable_icmp_redirect.sh similarity index 100% rename from tests/hardening/3.2.3_disable_secure_icmp_redirect.sh rename to tests/hardening/3.3.2_disable_icmp_redirect.sh diff --git a/tests/hardening/3.2.4_log_martian_packets.sh b/tests/hardening/3.3.3_disable_secure_icmp_redirect.sh similarity index 100% rename from tests/hardening/3.2.4_log_martian_packets.sh rename to tests/hardening/3.3.3_disable_secure_icmp_redirect.sh diff --git a/tests/hardening/3.2.5_ignore_broadcast_requests.sh b/tests/hardening/3.3.4_log_martian_packets.sh similarity index 100% rename from tests/hardening/3.2.5_ignore_broadcast_requests.sh rename to tests/hardening/3.3.4_log_martian_packets.sh diff --git a/tests/hardening/3.2.6_enable_bad_error_message_protection.sh b/tests/hardening/3.3.5_ignore_broadcast_requests.sh similarity index 100% rename from tests/hardening/3.2.6_enable_bad_error_message_protection.sh rename to tests/hardening/3.3.5_ignore_broadcast_requests.sh diff --git a/tests/hardening/3.2.7_enable_source_route_validation.sh b/tests/hardening/3.3.6_enable_bad_error_message_protection.sh similarity index 100% rename from tests/hardening/3.2.7_enable_source_route_validation.sh rename to tests/hardening/3.3.6_enable_bad_error_message_protection.sh diff --git a/tests/hardening/3.2.8_enable_tcp_syn_cookies.sh b/tests/hardening/3.3.7_enable_source_route_validation.sh similarity index 100% rename from tests/hardening/3.2.8_enable_tcp_syn_cookies.sh rename to tests/hardening/3.3.7_enable_source_route_validation.sh diff --git a/tests/hardening/3.2.9_disable_ipv6_router_advertisement.sh b/tests/hardening/3.3.8_enable_tcp_syn_cookies.sh similarity index 100% rename from tests/hardening/3.2.9_disable_ipv6_router_advertisement.sh rename to tests/hardening/3.3.8_enable_tcp_syn_cookies.sh diff --git a/tests/hardening/3.3.1_install_tcp_wrapper.sh b/tests/hardening/3.3.9_disable_ipv6_router_advertisement.sh similarity index 100% rename from tests/hardening/3.3.1_install_tcp_wrapper.sh rename to tests/hardening/3.3.9_disable_ipv6_router_advertisement.sh diff --git a/tests/hardening/3.3.2_hosts_allow.sh b/tests/hardening/3.5.1.1_enable_firewall.sh similarity index 100% rename from tests/hardening/3.3.2_hosts_allow.sh rename to tests/hardening/3.5.1.1_enable_firewall.sh diff --git a/tests/hardening/3.3.3_hosts_deny.sh b/tests/hardening/3.5.4.1.1_net_fw_default_policy_drop.sh similarity index 100% rename from tests/hardening/3.3.3_hosts_deny.sh rename to tests/hardening/3.5.4.1.1_net_fw_default_policy_drop.sh diff --git a/tests/hardening/3.3.4_hosts_allow_permissions.sh b/tests/hardening/99.2.2_disable_telnet_server.sh similarity index 100% rename from tests/hardening/3.3.4_hosts_allow_permissions.sh rename to tests/hardening/99.2.2_disable_telnet_server.sh diff --git a/tests/hardening/3.3.5_hosts_deny_permissions.sh b/tests/hardening/99.3.3.1_install_tcp_wrapper.sh similarity index 100% rename from tests/hardening/3.3.5_hosts_deny_permissions.sh rename to tests/hardening/99.3.3.1_install_tcp_wrapper.sh diff --git a/tests/hardening/3.5.1.1_net_fw_default_policy_drop.sh b/tests/hardening/99.3.3.2_hosts_allow.sh similarity index 100% rename from tests/hardening/3.5.1.1_net_fw_default_policy_drop.sh rename to tests/hardening/99.3.3.2_hosts_allow.sh diff --git a/tests/hardening/3.5_enable_firewall.sh b/tests/hardening/99.3.3.3_hosts_deny.sh similarity index 100% rename from tests/hardening/3.5_enable_firewall.sh rename to tests/hardening/99.3.3.3_hosts_deny.sh diff --git a/tests/hardening/3.6_disable_wireless.sh b/tests/hardening/99.3.3.4_hosts_allow_permissions.sh similarity index 100% rename from tests/hardening/3.6_disable_wireless.sh rename to tests/hardening/99.3.3.4_hosts_allow_permissions.sh diff --git a/tests/hardening/3.7_disable_ipv6.sh b/tests/hardening/99.3.3.5_hosts_deny_permissions.sh similarity index 100% rename from tests/hardening/3.7_disable_ipv6.sh rename to tests/hardening/99.3.3.5_hosts_deny_permissions.sh