diff options
-rw-r--r-- | regress/cert-file.sh | 6 | ||||
-rw-r--r-- | regress/rekey.sh | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/regress/cert-file.sh b/regress/cert-file.sh index 8fd62c773..1157a3582 100644 --- a/regress/cert-file.sh +++ b/regress/cert-file.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cert-file.sh,v 1.6 2017/04/30 23:34:55 djm Exp $ | 1 | # $OpenBSD: cert-file.sh,v 1.7 2018/04/10 00:14:10 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="ssh with certificates" | 4 | tid="ssh with certificates" |
@@ -52,7 +52,7 @@ echo "cert-authority $(cat $OBJ/user_ca_key1.pub)" > $OBJ/authorized_keys_$USER | |||
52 | cat $OBJ/ssh_proxy | grep -v IdentityFile > $OBJ/no_identity_config | 52 | cat $OBJ/ssh_proxy | grep -v IdentityFile > $OBJ/no_identity_config |
53 | 53 | ||
54 | # XXX: verify that certificate used was what we expect. Needs exposure of | 54 | # XXX: verify that certificate used was what we expect. Needs exposure of |
55 | # keys via enviornment variable or similar. | 55 | # keys via environment variable or similar. |
56 | 56 | ||
57 | # Key with no .pub should work - finding the equivalent *-cert.pub. | 57 | # Key with no .pub should work - finding the equivalent *-cert.pub. |
58 | verbose "identity cert with no plain public file" | 58 | verbose "identity cert with no plain public file" |
@@ -138,7 +138,7 @@ fi | |||
138 | 138 | ||
139 | # try ssh with the agent and certificates | 139 | # try ssh with the agent and certificates |
140 | opts="-F $OBJ/ssh_proxy" | 140 | opts="-F $OBJ/ssh_proxy" |
141 | # with no certificates, shoud fail | 141 | # with no certificates, should fail |
142 | ${SSH} $opts somehost exit 52 | 142 | ${SSH} $opts somehost exit 52 |
143 | if [ $? -eq 52 ]; then | 143 | if [ $? -eq 52 ]; then |
144 | fail "ssh connect with agent in succeeded with no cert" | 144 | fail "ssh connect with agent in succeeded with no cert" |
diff --git a/regress/rekey.sh b/regress/rekey.sh index ae145bc8b..fd6a02cc7 100644 --- a/regress/rekey.sh +++ b/regress/rekey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: rekey.sh,v 1.17 2016/01/29 05:18:15 dtucker Exp $ | 1 | # $OpenBSD: rekey.sh,v 1.18 2018/04/10 00:14:10 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="rekey" | 4 | tid="rekey" |
@@ -30,7 +30,7 @@ ssh_data_rekeying() | |||
30 | n=`expr $n - 1` | 30 | n=`expr $n - 1` |
31 | trace "$n rekeying(s)" | 31 | trace "$n rekeying(s)" |
32 | if [ $n -lt 1 ]; then | 32 | if [ $n -lt 1 ]; then |
33 | fail "no rekeying occured ($@)" | 33 | fail "no rekeying occurred ($@)" |
34 | fi | 34 | fi |
35 | } | 35 | } |
36 | 36 | ||
@@ -80,7 +80,7 @@ for s in 5 10; do | |||
80 | n=`expr $n - 1` | 80 | n=`expr $n - 1` |
81 | trace "$n rekeying(s)" | 81 | trace "$n rekeying(s)" |
82 | if [ $n -lt 1 ]; then | 82 | if [ $n -lt 1 ]; then |
83 | fail "no rekeying occured" | 83 | fail "no rekeying occurred" |
84 | fi | 84 | fi |
85 | done | 85 | done |
86 | 86 | ||
@@ -96,7 +96,7 @@ for s in 5 10; do | |||
96 | n=`expr $n - 1` | 96 | n=`expr $n - 1` |
97 | trace "$n rekeying(s)" | 97 | trace "$n rekeying(s)" |
98 | if [ $n -lt 1 ]; then | 98 | if [ $n -lt 1 ]; then |
99 | fail "no rekeying occured" | 99 | fail "no rekeying occurred" |
100 | fi | 100 | fi |
101 | done | 101 | done |
102 | 102 | ||
@@ -115,7 +115,7 @@ for s in 16 1k 128k 256k; do | |||
115 | n=`expr $n - 1` | 115 | n=`expr $n - 1` |
116 | trace "$n rekeying(s)" | 116 | trace "$n rekeying(s)" |
117 | if [ $n -lt 1 ]; then | 117 | if [ $n -lt 1 ]; then |
118 | fail "no rekeying occured" | 118 | fail "no rekeying occurred" |
119 | fi | 119 | fi |
120 | done | 120 | done |
121 | 121 | ||
@@ -132,7 +132,7 @@ for s in 5 10; do | |||
132 | n=`expr $n - 1` | 132 | n=`expr $n - 1` |
133 | trace "$n rekeying(s)" | 133 | trace "$n rekeying(s)" |
134 | if [ $n -lt 1 ]; then | 134 | if [ $n -lt 1 ]; then |
135 | fail "no rekeying occured" | 135 | fail "no rekeying occurred" |
136 | fi | 136 | fi |
137 | done | 137 | done |
138 | 138 | ||