From 4234a646ed5ecf10b4ac639d98586278194a112d Mon Sep 17 00:00:00 2001 From: asiebelt Date: Sat, 2 Jan 2016 17:39:25 +0100 Subject: [PATCH 1/5] Update tests_ssh --- include/tests_ssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_ssh b/include/tests_ssh index 16354a7d..c35514f4 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -150,7 +150,7 @@ elif [ "${TESTTYPE}" = "<" ]; then if [ "${FOUNDVALUE}" -ge "${WEAKVALUE}" ]; then RESULT="WEAK" - elif [ "${FOUNDVALUE}" -ge "${MEDIUMSCOREDVALUE}" -o "${FOUNDVALUE}" -le "${MEDIUMSCOREDVALUE}" ]; then + elif [ "${FOUNDVALUE}" -ge "${WEAKVALUE}" -a "${FOUNDVALUE}" -le "${MEDIUMSCOREDVALUE}" ]; then RESULT="MIDSCORED" elif [ "${FOUNDVALUE}" -le "${EXPECTEDVALUE}" ]; then RESULT="GOOD" From 99fd20aae06d357cbf0a1fd854b6b954401aeb1f Mon Sep 17 00:00:00 2001 From: asiebelt Date: Sat, 2 Jan 2016 17:49:01 +0100 Subject: [PATCH 2/5] Fix Test Definition --- include/tests_ssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_ssh b/include/tests_ssh index c35514f4..6a4d340c 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -116,7 +116,7 @@ Port:,,22:!\ LoginGraceTime:120,240,480:<\ MaxStartups:4,8,16:<\ - MaxSessions:2,4,8:< + MaxSessions:2,4,8:<\ PermitUserEnvironment:NO,,YES:=\ GatewayPorts:NO,,YES:=\ PermitTunnel:NO,,YES:=\ From 81bac124ee713d0f6dccde4826a87ebd0b989862 Mon Sep 17 00:00:00 2001 From: asiebelt Date: Sat, 2 Jan 2016 18:03:11 +0100 Subject: [PATCH 3/5] Fix Scoring for "<" --- include/tests_ssh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_ssh b/include/tests_ssh index 6a4d340c..84c5c9fc 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -148,9 +148,9 @@ fi elif [ "${TESTTYPE}" = "<" ]; then - if [ "${FOUNDVALUE}" -ge "${WEAKVALUE}" ]; then + if [ "${FOUNDVALUE}" -ge "${WEAKVALUE}" -o "${FOUNDVALUE}" -gt "${MEDIUMSCOREDVALUE}"]; then RESULT="WEAK" - elif [ "${FOUNDVALUE}" -ge "${WEAKVALUE}" -a "${FOUNDVALUE}" -le "${MEDIUMSCOREDVALUE}" ]; then + elif [ "${FOUNDVALUE}" -le "${MEDIUMSCOREDVALUE}" ]; then RESULT="MIDSCORED" elif [ "${FOUNDVALUE}" -le "${EXPECTEDVALUE}" ]; then RESULT="GOOD" From 7f462d0a4136134f493ad98a5e00e9f333d4f3c0 Mon Sep 17 00:00:00 2001 From: asiebelt Date: Sat, 2 Jan 2016 18:07:02 +0100 Subject: [PATCH 4/5] Fix typo --- include/tests_ssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_ssh b/include/tests_ssh index 84c5c9fc..bb754bd6 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -148,7 +148,7 @@ fi elif [ "${TESTTYPE}" = "<" ]; then - if [ "${FOUNDVALUE}" -ge "${WEAKVALUE}" -o "${FOUNDVALUE}" -gt "${MEDIUMSCOREDVALUE}"]; then + if [ "${FOUNDVALUE}" -ge "${WEAKVALUE}" -o "${FOUNDVALUE}" -gt "${MEDIUMSCOREDVALUE}" ]; then RESULT="WEAK" elif [ "${FOUNDVALUE}" -le "${MEDIUMSCOREDVALUE}" ]; then RESULT="MIDSCORED" From a095ba64a0b2530b563562b6b0138709f02d719b Mon Sep 17 00:00:00 2001 From: asiebelt Date: Sat, 2 Jan 2016 18:13:07 +0100 Subject: [PATCH 5/5] Fix scoring logic for "<" --- include/tests_ssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_ssh b/include/tests_ssh index bb754bd6..39e13eea 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -150,7 +150,7 @@ elif [ "${TESTTYPE}" = "<" ]; then if [ "${FOUNDVALUE}" -ge "${WEAKVALUE}" -o "${FOUNDVALUE}" -gt "${MEDIUMSCOREDVALUE}" ]; then RESULT="WEAK" - elif [ "${FOUNDVALUE}" -le "${MEDIUMSCOREDVALUE}" ]; then + elif [ "${FOUNDVALUE}" -le "${MEDIUMSCOREDVALUE}" -a "${FOUNDVALUE}" -gt "${EXPECTEDVALUE}" ]; then RESULT="MIDSCORED" elif [ "${FOUNDVALUE}" -le "${EXPECTEDVALUE}" ]; then RESULT="GOOD"