Test certificate hostkeys held in ssh-agent too. Would have caught

regression fixed in sshd r1.575

ok markus@

diff --git a/regress/usr.bin/ssh/hostkey-agent.sh b/regress/usr.bin/ssh/hostkey-agent.sh
index d6736e2..9549b33 100644 (file)
--- a/regress/usr.bin/ssh/hostkey-agent.sh
+++ b/regress/usr.bin/ssh/hostkey-agent.sh
@@ -1,9 +1,9 @@
-#      $OpenBSD: hostkey-agent.sh,v 1.11 2019/12/16 02:39:05 djm Exp $
+#      $OpenBSD: hostkey-agent.sh,v 1.12 2021/09/29 01:32:21 djm Exp $
 #      Placed in the Public Domain.
 
 tid="hostkey agent"
 
-rm -f $OBJ/agent-key.* $OBJ/ssh_proxy.orig $OBJ/known_hosts.orig
+rm -f $OBJ/agent-key.* $OBJ/ssh_proxy.orig $OBJ/known_hosts.orig $OBJ/agent-ca*
 
 trace "start agent"
 eval `${SSHAGENT} ${EXTRA_AGENT_ARGS} -s` > /dev/null
@@ -13,39 +13,73 @@ r=$?
 grep -vi 'hostkey' $OBJ/sshd_proxy > $OBJ/sshd_proxy.orig
 echo "HostKeyAgent $SSH_AUTH_SOCK" >> $OBJ/sshd_proxy.orig
 
+trace "make CA key"
+
+${SSHKEYGEN} -qt ed25519 -f $OBJ/agent-ca -N '' || fatal "ssh-keygen CA"
+
 trace "load hostkeys"
 for k in $SSH_KEYTYPES ; do
        ${SSHKEYGEN} -qt $k -f $OBJ/agent-key.$k -N '' || fatal "ssh-keygen $k"
-       (
-               printf 'localhost-with-alias,127.0.0.1,::1 '
-               cat $OBJ/agent-key.$k.pub
-       ) >> $OBJ/known_hosts.orig
-       ${SSHADD} $OBJ/agent-key.$k >/dev/null 2>&1 || \
+       ${SSHKEYGEN} -s $OBJ/agent-ca -qh -n localhost-with-alias \
+               -I localhost-with-alias $OBJ/agent-key.$k.pub || \
+               fatal "sign $k"
+       ${SSHADD} -k $OBJ/agent-key.$k >/dev/null 2>&1 || \
                fatal "couldn't load key $OBJ/agent-key.$k"
-       echo "Hostkey $OBJ/agent-key.${k}" >> $OBJ/sshd_proxy.orig
        # Remove private key so the server can't use it.
        rm $OBJ/agent-key.$k || fatal "couldn't rm $OBJ/agent-key.$k"
 done
-cp $OBJ/known_hosts.orig $OBJ/known_hosts
+rm $OBJ/agent-ca # Don't need CA private any more either
 
 unset SSH_AUTH_SOCK
 
-for ps in yes; do
-       for k in $SSH_KEYTYPES ; do
-               verbose "key type $k privsep=$ps"
-               cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
-               echo "UsePrivilegeSeparation $ps" >> $OBJ/sshd_proxy
-               echo "HostKeyAlgorithms $k" >> $OBJ/sshd_proxy
-               opts="-oHostKeyAlgorithms=$k -F $OBJ/ssh_proxy"
-               cp $OBJ/known_hosts.orig $OBJ/known_hosts
-               SSH_CONNECTION=`${SSH} $opts host 'echo $SSH_CONNECTION'`
-               if [ $? -ne 0 ]; then
-                       fail "privsep=$ps failed"
-               fi
-               if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then
-                       fail "bad SSH_CONNECTION key type $k privsep=$ps"
-               fi
-       done
+for k in $SSH_KEYTYPES ; do
+       verbose "key type $k"
+       cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
+       echo "HostKeyAlgorithms $k" >> $OBJ/sshd_proxy
+       echo "Hostkey $OBJ/agent-key.${k}" >> $OBJ/sshd_proxy
+       opts="-oHostKeyAlgorithms=$k -F $OBJ/ssh_proxy"
+       ( printf 'localhost-with-alias,127.0.0.1,::1 ' ;
+         cat $OBJ/agent-key.$k.pub) > $OBJ/known_hosts
+       SSH_CONNECTION=`${SSH} $opts host 'echo $SSH_CONNECTION'`
+       if [ $? -ne 0 ]; then
+               fail "keytype $k failed"
+       fi
+       if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then
+               fail "bad SSH_CONNECTION key type $k privsep=$ps"
+       fi
+done
+
+SSH_CERTTYPES=`ssh -Q key-sig | grep 'cert-v01@openssh.com'`
+
+# Prepare sshd_proxy for certificates.
+cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
+HOSTKEYALGS=""
+for k in $SSH_CERTTYPES ; do
+       test -z "$HOSTKEYALGS" || HOSTKEYALGS="${HOSTKEYALGS},"
+       HOSTKEYALGS="${HOSTKEYALGS}${k}"
+done
+for k in $SSH_KEYTYPES ; do
+       echo "Hostkey $OBJ/agent-key.${k}.pub" >> $OBJ/sshd_proxy
+       echo "HostCertificate $OBJ/agent-key.${k}-cert.pub" >> $OBJ/sshd_proxy
+       test -f $OBJ/agent-key.${k}.pub || fatal "no $k key"
+       test -f $OBJ/agent-key.${k}-cert.pub || fatal "no $k cert"
+done
+echo "HostKeyAlgorithms $HOSTKEYALGS" >> $OBJ/sshd_proxy
+
+# Add only CA trust anchor to known_hosts.
+( printf '@cert-authority localhost-with-alias ' ;
+  cat $OBJ/agent-ca.pub) > $OBJ/known_hosts
+
+for k in $SSH_CERTTYPES ; do
+       verbose "cert type $k"
+       opts="-oHostKeyAlgorithms=$k -F $OBJ/ssh_proxy"
+       SSH_CONNECTION=`${SSH} $opts host 'echo $SSH_CONNECTION'`
+       if [ $? -ne 0 ]; then
+               fail "cert type $k failed"
+       fi
+       if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then
+               fail "bad SSH_CONNECTION key type $k privsep=$ps"
+       fi
 done
 
 trace "kill agent"