upstream: Count the number of key types instead of assuming there

are only two.

OpenBSD-Regress-ID: 0998702c41235782cf0beee396ec49b5056eaed9

1 files changed, 5 insertions, 3 deletions

diff --git a/regress/agent-timeout.sh b/regress/agent-timeout.sh
index 9598c2032..80012f80c 100644
--- a/regress/agent-timeout.sh
+++ b/regress/agent-timeout.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: agent-timeout.sh,v 1.3 2015/03/03 22:35:19 markus Exp $
+#       $OpenBSD: agent-timeout.sh,v 1.4 2019/01/28 00:08:26 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="agent timeout test"
@@ -12,16 +12,18 @@ if [ $r -ne 0 ]; then
         fail "could not start ssh-agent: exit code $r"
 else
         trace "add keys with timeout"
+        keys=0
         for t in ${SSH_KEYTYPES}; do
                 ${SSHADD} -t ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1
                 if [ $? -ne 0 ]; then
                         fail "ssh-add did succeed exit code 0"
                 fi
+                keys=$((${keys} + 1))
         done
         n=`${SSHADD} -l 2> /dev/null | wc -l`
         trace "agent has $n keys"
-        if [ $n -ne 2 ]; then
-                fail "ssh-add -l did not return 2 keys: $n"
+        if [ $n -ne $keys ]; then
+                fail "ssh-add -l did not return $keys keys: $n"
         fi
         trace "sleeping 2*${SSHAGENT_TIMEOUT} seconds"
         sleep ${SSHAGENT_TIMEOUT}