Renum 99.x files to comply with debian10 CIS

tests/hardening/5.4.5_default_timeout.sh

@@ -7,5 +7,14 @@ test_audit() {
     # shellcheck disable=2154
     run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
 
+    echo "TMOUT=600" >/etc/profile.d/CIS_99.1_timeout.sh
+
+    describe compliant
+    register_test retvalshouldbe 0
+    run compliant /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
+
     # TODO fill comprehensive tests
+
+    # Cleanup
+    rm /etc/profile.d/CIS_99.1_timeout.sh
 }

tests/hardening/99.1_timeout_tty.sh

@@ -1,20 +0,0 @@
-# shellcheck shell=bash
-# run-shellcheck
-test_audit() {
-    describe Running on blank host
-    register_test retvalshouldbe 0
-    dismiss_count_for_test
-    # shellcheck disable=2154
-    run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
-
-    echo "TMOUT=600" >/etc/profile.d/CIS_99.1_timeout.sh
-
-    describe compliant
-    register_test retvalshouldbe 0
-    run compliant /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
-
-    # TODO fill comprehensive tests
-
-    # Cleanup
-    rm /etc/profile.d/CIS_99.1_timeout.sh
-}

tests/hardening/99.5.9_ssh_loglevel.sh

@@ -1,22 +0,0 @@
-# shellcheck shell=bash
-# run-shellcheck
-test_audit() {
-    describe Running on blank host
-    register_test retvalshouldbe 1
-    register_test contain "openssh-server is installed"
-    # shellcheck disable=2154
-    run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
-
-    describe Correcting situation
-    # `apply` performs a service reload after each change in the config file
-    # the service needs to be started for the reload to succeed
-    service ssh start
-    # if the audit script provides "apply" option, enable and run it
-    sed -i 's/audit/enabled/' /opt/debian-cis/etc/conf.d/"${script}".cfg
-    /opt/debian-cis/bin/hardening/"${script}".sh || true
-
-    describe Checking resolved state
-    register_test retvalshouldbe 0
-    register_test contain "[ OK ] ^LogLevel[[:space:]]*VERBOSE is present in /etc/ssh/sshd_config"
-    run resolved /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
-}