diff options
-rw-r--r-- | regress/cert-hostkey.sh | 6 | ||||
-rw-r--r-- | regress/cert-userkey.sh | 4 | ||||
-rw-r--r-- | regress/multipubkey.sh | 4 | ||||
-rw-r--r-- | regress/principals-command.sh | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh index d2ecd318b..3ce777967 100644 --- a/regress/cert-hostkey.sh +++ b/regress/cert-hostkey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cert-hostkey.sh,v 1.16 2018/07/03 11:43:49 djm Exp $ | 1 | # $OpenBSD: cert-hostkey.sh,v 1.17 2018/10/31 11:09:27 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="certified host keys" | 4 | tid="certified host keys" |
@@ -127,7 +127,7 @@ attempt_connect() { | |||
127 | } | 127 | } |
128 | 128 | ||
129 | # Basic connect and revocation tests. | 129 | # Basic connect and revocation tests. |
130 | for privsep in yes no ; do | 130 | for privsep in yes sandbox ; do |
131 | for ktype in $PLAIN_TYPES ; do | 131 | for ktype in $PLAIN_TYPES ; do |
132 | verbose "$tid: host ${ktype} cert connect privsep $privsep" | 132 | verbose "$tid: host ${ktype} cert connect privsep $privsep" |
133 | ( | 133 | ( |
@@ -165,7 +165,7 @@ for ktype in $PLAIN_TYPES ; do | |||
165 | kh_revoke cert_host_key_${ktype}.pub >> $OBJ/known_hosts-cert.orig | 165 | kh_revoke cert_host_key_${ktype}.pub >> $OBJ/known_hosts-cert.orig |
166 | done | 166 | done |
167 | cp $OBJ/known_hosts-cert.orig $OBJ/known_hosts-cert | 167 | cp $OBJ/known_hosts-cert.orig $OBJ/known_hosts-cert |
168 | for privsep in yes no ; do | 168 | for privsep in yes sandbox ; do |
169 | for ktype in $PLAIN_TYPES ; do | 169 | for ktype in $PLAIN_TYPES ; do |
170 | verbose "$tid: host ${ktype} revoked cert privsep $privsep" | 170 | verbose "$tid: host ${ktype} revoked cert privsep $privsep" |
171 | ( | 171 | ( |
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh index 30c2c156d..6849e9922 100644 --- a/regress/cert-userkey.sh +++ b/regress/cert-userkey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cert-userkey.sh,v 1.19 2018/03/12 00:54:04 djm Exp $ | 1 | # $OpenBSD: cert-userkey.sh,v 1.20 2018/10/31 11:09:27 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="certified user keys" | 4 | tid="certified user keys" |
@@ -47,7 +47,7 @@ done | |||
47 | # Test explicitly-specified principals | 47 | # Test explicitly-specified principals |
48 | for ktype in $EXTRA_TYPES $PLAIN_TYPES ; do | 48 | for ktype in $EXTRA_TYPES $PLAIN_TYPES ; do |
49 | t=$(kname $ktype) | 49 | t=$(kname $ktype) |
50 | for privsep in yes no ; do | 50 | for privsep in yes sandbox ; do |
51 | _prefix="${ktype} privsep $privsep" | 51 | _prefix="${ktype} privsep $privsep" |
52 | 52 | ||
53 | # Setup for AuthorizedPrincipalsFile | 53 | # Setup for AuthorizedPrincipalsFile |
diff --git a/regress/multipubkey.sh b/regress/multipubkey.sh index e9d15306f..4d443ec45 100644 --- a/regress/multipubkey.sh +++ b/regress/multipubkey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multipubkey.sh,v 1.1 2014/12/22 08:06:03 djm Exp $ | 1 | # $OpenBSD: multipubkey.sh,v 1.2 2018/10/31 11:09:27 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="multiple pubkey" | 4 | tid="multiple pubkey" |
@@ -31,7 +31,7 @@ grep -v IdentityFile $OBJ/ssh_proxy.orig > $OBJ/ssh_proxy | |||
31 | opts="-oProtocol=2 -F $OBJ/ssh_proxy -oIdentitiesOnly=yes" | 31 | opts="-oProtocol=2 -F $OBJ/ssh_proxy -oIdentitiesOnly=yes" |
32 | opts="$opts -i $OBJ/cert_user_key1 -i $OBJ/user_key1 -i $OBJ/user_key2" | 32 | opts="$opts -i $OBJ/cert_user_key1 -i $OBJ/user_key1 -i $OBJ/user_key2" |
33 | 33 | ||
34 | for privsep in no yes; do | 34 | for privsep in yes sandbox ; 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 bcc68e80b..66b5b5bde 100644 --- a/regress/principals-command.sh +++ b/regress/principals-command.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: principals-command.sh,v 1.4 2017/04/30 23:34:55 djm Exp $ | 1 | # $OpenBSD: principals-command.sh,v 1.5 2018/10/31 11:09:27 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="authorized principals command" | 4 | tid="authorized principals command" |
@@ -57,7 +57,7 @@ fi | |||
57 | 57 | ||
58 | if [ -x $PRINCIPALS_COMMAND ]; then | 58 | if [ -x $PRINCIPALS_COMMAND ]; then |
59 | # Test explicitly-specified principals | 59 | # Test explicitly-specified principals |
60 | for privsep in yes no ; do | 60 | for privsep in yes sandbox ; do |
61 | _prefix="privsep $privsep" | 61 | _prefix="privsep $privsep" |
62 | 62 | ||
63 | # Setup for AuthorizedPrincipalsCommand | 63 | # Setup for AuthorizedPrincipalsCommand |