diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-09-30 05:20:08 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-10-01 14:55:12 +1000 |
| commit | ddcb53b7a7b29be65d57562302b2d5f41733e8dd (patch) | |
| tree | 3be7c54adfd7746814f44bd8356f1b955ec4a463 /regress/cert-hostkey.sh | |
| parent | ece2fbe486164860de8df3f8b943cccca3085eff (diff) | |
| download | openssh-git-ddcb53b7a7b29be65d57562302b2d5f41733e8dd.tar.gz | |
upstream: Remove references to privsep.
This removes several do..while loops but does not change the
indentation of the now-shallower loops, which will be done in a separate
whitespace-only commit to keep changes of style and substance separate.
OpenBSD-Regress-ID: 4bed1a0249df7b4a87c965066ce689e79472a8f7
Diffstat (limited to 'regress/cert-hostkey.sh')
| -rw-r--r-- | regress/cert-hostkey.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh index de8652b0..904dd693 100644 --- a/regress/cert-hostkey.sh +++ b/regress/cert-hostkey.sh @@ -1,4 +1,4 @@ -# $OpenBSD: cert-hostkey.sh,v 1.25 2021/06/08 22:30:27 djm Exp $ +# $OpenBSD: cert-hostkey.sh,v 1.26 2021/09/30 05:20:08 dtucker Exp $ # Placed in the Public Domain. tid="certified host keys" @@ -131,14 +131,12 @@ attempt_connect() { } # Basic connect and revocation tests. -for privsep in yes ; do for ktype in $PLAIN_TYPES ; do - verbose "$tid: host ${ktype} cert connect privsep $privsep" + verbose "$tid: host ${ktype} cert connect" ( cat $OBJ/sshd_proxy_bak echo HostKey $OBJ/cert_host_key_${ktype} echo HostCertificate $OBJ/cert_host_key_${ktype}-cert.pub - echo UsePrivilegeSeparation $privsep ) > $OBJ/sshd_proxy # test name expect success @@ -160,7 +158,6 @@ for privsep in yes ; do attempt_connect "$ktype CA plaintext revocation" "no" \ -oRevokedHostKeys=$OBJ/host_revoked_ca done -done # Revoked certificates with key present kh_ca host_ca_key.pub host_ca_key2.pub > $OBJ/known_hosts-cert.orig @@ -169,14 +166,12 @@ for ktype in $PLAIN_TYPES ; do kh_revoke cert_host_key_${ktype}.pub >> $OBJ/known_hosts-cert.orig done cp $OBJ/known_hosts-cert.orig $OBJ/known_hosts-cert -for privsep in yes ; do for ktype in $PLAIN_TYPES ; do - verbose "$tid: host ${ktype} revoked cert privsep $privsep" + verbose "$tid: host ${ktype} revoked cert" ( cat $OBJ/sshd_proxy_bak echo HostKey $OBJ/cert_host_key_${ktype} echo HostCertificate $OBJ/cert_host_key_${ktype}-cert.pub - echo UsePrivilegeSeparation $privsep ) > $OBJ/sshd_proxy cp $OBJ/known_hosts-cert.orig $OBJ/known_hosts-cert @@ -187,7 +182,6 @@ for privsep in yes ; do fail "ssh cert connect succeeded unexpectedly" fi done -done # Revoked CA kh_ca host_ca_key.pub host_ca_key2.pub > $OBJ/known_hosts-cert.orig |