diff options
Diffstat (limited to 'regress/agent.sh')
| -rw-r--r-- | regress/agent.sh | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/regress/agent.sh b/regress/agent.sh index be7d91334..cf1a45fe0 100644 --- a/regress/agent.sh +++ b/regress/agent.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: agent.sh,v 1.8 2013/05/17 00:37:40 dtucker Exp $ | 1 | # $OpenBSD: agent.sh,v 1.9 2013/12/06 13:52:46 markus Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="simple agent test" | 4 | tid="simple agent test" |
| @@ -20,7 +20,7 @@ else | |||
| 20 | fi | 20 | fi |
| 21 | trace "overwrite authorized keys" | 21 | trace "overwrite authorized keys" |
| 22 | printf '' > $OBJ/authorized_keys_$USER | 22 | printf '' > $OBJ/authorized_keys_$USER |
| 23 | for t in rsa rsa1; do | 23 | for t in ed25519 rsa rsa1; do |
| 24 | # generate user key for agent | 24 | # generate user key for agent |
| 25 | rm -f $OBJ/$t-agent | 25 | rm -f $OBJ/$t-agent |
| 26 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t-agent ||\ | 26 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t-agent ||\ |
| @@ -34,40 +34,46 @@ else | |||
| 34 | fi | 34 | fi |
| 35 | done | 35 | done |
| 36 | ${SSHADD} -l > /dev/null 2>&1 | 36 | ${SSHADD} -l > /dev/null 2>&1 |
| 37 | if [ $? -ne 0 ]; then | 37 | r=$? |
| 38 | fail "ssh-add -l failed: exit code $?" | 38 | if [ $r -ne 0 ]; then |
| 39 | fail "ssh-add -l failed: exit code $r" | ||
| 39 | fi | 40 | fi |
| 40 | # the same for full pubkey output | 41 | # the same for full pubkey output |
| 41 | ${SSHADD} -L > /dev/null 2>&1 | 42 | ${SSHADD} -L > /dev/null 2>&1 |
| 42 | if [ $? -ne 0 ]; then | 43 | r=$? |
| 43 | fail "ssh-add -L failed: exit code $?" | 44 | if [ $r -ne 0 ]; then |
| 45 | fail "ssh-add -L failed: exit code $r" | ||
| 44 | fi | 46 | fi |
| 45 | 47 | ||
| 46 | trace "simple connect via agent" | 48 | trace "simple connect via agent" |
| 47 | for p in 1 2; do | 49 | for p in 1 2; do |
| 48 | ${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p | 50 | ${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p |
| 49 | if [ $? -ne 5$p ]; then | 51 | r=$? |
| 50 | fail "ssh connect with protocol $p failed (exit code $?)" | 52 | if [ $r -ne 5$p ]; then |
| 53 | fail "ssh connect with protocol $p failed (exit code $r)" | ||
| 51 | fi | 54 | fi |
| 52 | done | 55 | done |
| 53 | 56 | ||
| 54 | trace "agent forwarding" | 57 | trace "agent forwarding" |
| 55 | for p in 1 2; do | 58 | for p in 1 2; do |
| 56 | ${SSH} -A -$p -F $OBJ/ssh_proxy somehost ${SSHADD} -l > /dev/null 2>&1 | 59 | ${SSH} -A -$p -F $OBJ/ssh_proxy somehost ${SSHADD} -l > /dev/null 2>&1 |
| 57 | if [ $? -ne 0 ]; then | 60 | r=$? |
| 58 | fail "ssh-add -l via agent fwd proto $p failed (exit code $?)" | 61 | if [ $r -ne 0 ]; then |
| 62 | fail "ssh-add -l via agent fwd proto $p failed (exit code $r)" | ||
| 59 | fi | 63 | fi |
| 60 | ${SSH} -A -$p -F $OBJ/ssh_proxy somehost \ | 64 | ${SSH} -A -$p -F $OBJ/ssh_proxy somehost \ |
| 61 | "${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p" | 65 | "${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p" |
| 62 | if [ $? -ne 5$p ]; then | 66 | r=$? |
| 63 | fail "agent fwd proto $p failed (exit code $?)" | 67 | if [ $r -ne 5$p ]; then |
| 68 | fail "agent fwd proto $p failed (exit code $r)" | ||
| 64 | fi | 69 | fi |
| 65 | done | 70 | done |
| 66 | 71 | ||
| 67 | trace "delete all agent keys" | 72 | trace "delete all agent keys" |
| 68 | ${SSHADD} -D > /dev/null 2>&1 | 73 | ${SSHADD} -D > /dev/null 2>&1 |
| 69 | if [ $? -ne 0 ]; then | 74 | r=$? |
| 70 | fail "ssh-add -D failed: exit code $?" | 75 | if [ $r -ne 0 ]; then |
| 76 | fail "ssh-add -D failed: exit code $r" | ||
| 71 | fi | 77 | fi |
| 72 | 78 | ||
| 73 | trace "kill agent" | 79 | trace "kill agent" |