summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/cert-hostkey.sh6
-rw-r--r--regress/cert-userkey.sh6
-rw-r--r--regress/hostkey-agent.sh4
-rw-r--r--regress/multipubkey.sh4
-rw-r--r--regress/principals-command.sh4
5 files changed, 12 insertions, 12 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index dc40b782a..67a9795d0 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: cert-hostkey.sh,v 1.20 2019/11/26 23:43:10 djm Exp $ 1# $OpenBSD: cert-hostkey.sh,v 1.21 2019/12/11 18:47:14 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="certified host keys" 4tid="certified host keys"
@@ -131,7 +131,7 @@ attempt_connect() {
131} 131}
132 132
133# Basic connect and revocation tests. 133# Basic connect and revocation tests.
134for privsep in yes sandbox ; do 134for privsep in yes ; do
135 for ktype in $PLAIN_TYPES ; do 135 for ktype in $PLAIN_TYPES ; do
136 verbose "$tid: host ${ktype} cert connect privsep $privsep" 136 verbose "$tid: host ${ktype} cert connect privsep $privsep"
137 ( 137 (
@@ -169,7 +169,7 @@ for ktype in $PLAIN_TYPES ; do
169 kh_revoke cert_host_key_${ktype}.pub >> $OBJ/known_hosts-cert.orig 169 kh_revoke cert_host_key_${ktype}.pub >> $OBJ/known_hosts-cert.orig
170done 170done
171cp $OBJ/known_hosts-cert.orig $OBJ/known_hosts-cert 171cp $OBJ/known_hosts-cert.orig $OBJ/known_hosts-cert
172for privsep in yes sandbox ; do 172for privsep in yes ; do
173 for ktype in $PLAIN_TYPES ; do 173 for ktype in $PLAIN_TYPES ; do
174 verbose "$tid: host ${ktype} revoked cert privsep $privsep" 174 verbose "$tid: host ${ktype} revoked cert privsep $privsep"
175 ( 175 (
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index d6e293d57..87d30d27b 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: cert-userkey.sh,v 1.23 2019/11/26 23:43:10 djm Exp $ 1# $OpenBSD: cert-userkey.sh,v 1.24 2019/12/11 18:47:14 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="certified user keys" 4tid="certified user keys"
@@ -60,7 +60,7 @@ done
60# Test explicitly-specified principals 60# Test explicitly-specified principals
61for ktype in $EXTRA_TYPES $PLAIN_TYPES ; do 61for ktype in $EXTRA_TYPES $PLAIN_TYPES ; do
62 t=$(kname $ktype) 62 t=$(kname $ktype)
63 for privsep in yes sandbox ; do 63 for privsep in yes ; do
64 _prefix="${ktype} privsep $privsep" 64 _prefix="${ktype} privsep $privsep"
65 65
66 # Setup for AuthorizedPrincipalsFile 66 # Setup for AuthorizedPrincipalsFile
@@ -197,7 +197,7 @@ basic_tests() {
197 197
198 for ktype in $PLAIN_TYPES ; do 198 for ktype in $PLAIN_TYPES ; do
199 t=$(kname $ktype) 199 t=$(kname $ktype)
200 for privsep in yes no ; do 200 for privsep in yes ; do
201 _prefix="${ktype} privsep $privsep $auth" 201 _prefix="${ktype} privsep $privsep $auth"
202 # Simple connect 202 # Simple connect
203 verbose "$tid: ${_prefix} connect" 203 verbose "$tid: ${_prefix} connect"
diff --git a/regress/hostkey-agent.sh b/regress/hostkey-agent.sh
index af2ed7806..7f490e013 100644
--- a/regress/hostkey-agent.sh
+++ b/regress/hostkey-agent.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: hostkey-agent.sh,v 1.9 2019/11/26 23:43:10 djm Exp $ 1# $OpenBSD: hostkey-agent.sh,v 1.10 2019/12/11 18:47:14 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="hostkey agent" 4tid="hostkey agent"
@@ -30,7 +30,7 @@ cp $OBJ/known_hosts.orig $OBJ/known_hosts
30 30
31unset SSH_AUTH_SOCK 31unset SSH_AUTH_SOCK
32 32
33for ps in no yes; do 33for ps in yes; do
34 for k in `${SSH} -Q key-plain | filter_sk` ; do 34 for k in `${SSH} -Q key-plain | filter_sk` ; do
35 verbose "key type $k privsep=$ps" 35 verbose "key type $k privsep=$ps"
36 cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy 36 cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
diff --git a/regress/multipubkey.sh b/regress/multipubkey.sh
index 4d443ec45..9b2273353 100644
--- a/regress/multipubkey.sh
+++ b/regress/multipubkey.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multipubkey.sh,v 1.2 2018/10/31 11:09:27 dtucker Exp $ 1# $OpenBSD: multipubkey.sh,v 1.3 2019/12/11 18:47:14 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="multiple pubkey" 4tid="multiple pubkey"
@@ -31,7 +31,7 @@ grep -v IdentityFile $OBJ/ssh_proxy.orig > $OBJ/ssh_proxy
31opts="-oProtocol=2 -F $OBJ/ssh_proxy -oIdentitiesOnly=yes" 31opts="-oProtocol=2 -F $OBJ/ssh_proxy -oIdentitiesOnly=yes"
32opts="$opts -i $OBJ/cert_user_key1 -i $OBJ/user_key1 -i $OBJ/user_key2" 32opts="$opts -i $OBJ/cert_user_key1 -i $OBJ/user_key1 -i $OBJ/user_key2"
33 33
34for privsep in yes sandbox ; do 34for privsep in yes ; do
35 ( 35 (
36 grep -v "Protocol" $OBJ/sshd_proxy.orig 36 grep -v "Protocol" $OBJ/sshd_proxy.orig
37 echo "Protocol 2" 37 echo "Protocol 2"
diff --git a/regress/principals-command.sh b/regress/principals-command.sh
index a91858cbb..9e85e8e75 100644
--- a/regress/principals-command.sh
+++ b/regress/principals-command.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: principals-command.sh,v 1.8 2019/11/01 01:55:41 djm Exp $ 1# $OpenBSD: principals-command.sh,v 1.10 2019/12/11 18:47:14 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="authorized principals command" 4tid="authorized principals command"
@@ -63,7 +63,7 @@ fi
63 63
64if [ -x $PRINCIPALS_COMMAND ]; then 64if [ -x $PRINCIPALS_COMMAND ]; then
65 # Test explicitly-specified principals 65 # Test explicitly-specified principals
66 for privsep in yes sandbox ; do 66 for privsep in yes ; do
67 _prefix="privsep $privsep" 67 _prefix="privsep $privsep"
68 68
69 # Setup for AuthorizedPrincipalsCommand 69 # Setup for AuthorizedPrincipalsCommand