46 files changed, 1140 insertions, 224 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 925edf71a..34c47e8cb 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,7 +1,11 @@
-#       $OpenBSD: Makefile,v 1.100 2019/01/20 23:24:19 djm Exp $
+#       $OpenBSD: Makefile,v 1.104 2019/09/03 08:37:45 djm Exp $
 
-REGRESS_TARGETS=        unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
-tests:          prep $(REGRESS_TARGETS)
+tests:          prep file-tests t-exec unit
+
+REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12
+
+# File based tests
+file-tests: $(REGRESS_TARGETS)
 
 # Interop tests are not run by default
 interop interop-tests: t-exec-interop
@@ -26,6 +30,7 @@ LTESTS= 	connect \
                 transfer \
                 banner \
                 rekey \
+                dhgex \
                 stderr-data \
                 stderr-after-eof \
                 broken-pipe \
@@ -83,10 +88,10 @@ LTESTS= 	connect \
                 cert-file \
                 cfginclude \
                 allow-deny-users \
-                authinfo
+                authinfo \
+                sshsig
 
 
-#               dhgex \
 
 INTEROP_TESTS=  putty-transfer putty-ciphers putty-kex conch-ciphers
 #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
@@ -102,18 +107,19 @@ CLEANFILES=	*.core actual agent-key.* authorized_keys_${USERNAME} \
                 copy.1 copy.2 data ed25519-agent ed25519-agent* \
                 ed25519-agent.pub ed25519 ed25519.pub empty.in \
                 expect failed-regress.log failed-ssh.log failed-sshd.log \
-                hkr.* host.ed25519 host.rsa host.rsa1 host_* \
-                host_ca_key* host_krl_* host_revoked_* key.* \
+                hkr.* host.ecdsa-sha2-nistp256 host.ecdsa-sha2-nistp384 \
+                host.ecdsa-sha2-nistp521 host.ssh-dss host.ssh-ed25519 \
+                host.ssh-rsa host_ca_key* host_krl_* host_revoked_* key.* \
                 key.dsa-* key.ecdsa-* key.ed25519-512 \
                 key.ed25519-512.pub key.rsa-* keys-command-args kh.* \
                 known_hosts known_hosts-cert known_hosts.* krl-* ls.copy \
                 modpipe netcat no_identity_config \
-                pidfile putty.rsa2 ready regress.log \
-                remote_pid revoked-* rsa rsa-agent rsa-agent.pub rsa.pub \
-                rsa1 rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \
+                pidfile putty.rsa2 ready regress.log remote_pid \
+                revoked-* rsa rsa-agent rsa-agent.pub rsa.pub rsa_ssh2_cr.prv \
                 rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
                 scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
                 sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
+                ssh-rsa_oldfmt \
                 ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
                 ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \
                 sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \
@@ -204,8 +210,16 @@ t12: $(OBJ)/t12.out
 t-exec: ${LTESTS:=.sh}
         @if [ "x$?" = "x" ]; then exit 0; fi; \
         for TEST in ""$?; do \
-                echo "run test $${TEST}" ... 1>&2; \
-                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+                skip=no; \
+                for t in ""$${SKIP_LTESTS}; do \
+                        if [ "x$${t}.sh" = "x$${TEST}" ]; then skip=yes; fi; \
+                done; \
+                if [ "x$${skip}" = "xno" ]; then \
+                        echo "run test $${TEST}" ... 1>&2; \
+                        (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+                else \
+                        echo skip test $${TEST} 1>&2; \
+                fi; \
         done
 
 t-exec-interop: ${INTEROP_TESTS:=.sh}
diff --git a/regress/README.regress b/regress/README.regress
index 315fe149a..ac2e8487e 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -25,6 +25,7 @@ SUDO: path to sudo/doas command, if desired. Note that some systems
         (notably systems using PAM) require sudo to execute some tests.
 LTESTS: Whitespace separated list of tests (filenames without the .sh
         extension) to run.
+SKIP_LTESTS: Whitespace separated list of tests to skip.
 OBJ: used by test scripts to access build dir.
 TEST_SHELL: shell used for running the test scripts.
 TEST_SSH_FAIL_FATAL: set to "yes" to make any failure abort the test
@@ -63,28 +64,79 @@ test-exec.sh: the main test driver. Sets environment, creates config files
 and keys and runs the specified test.
 
 At the time of writing, the individual tests are:
-agent-timeout.sh:       agent timeout test
-agent.sh:               simple agent test
-broken-pipe.sh:         broken pipe test
-connect-privsep.sh:     proxy connect with privsep
 connect.sh:             simple connect
+proxy-connect.sh:       proxy connect
+connect-privsep.sh:     proxy connect with privsep
+connect-uri.sh:         uri connect
+proto-version.sh:       sshd version with different protocol combinations
+proto-mismatch.sh:      protocol version mismatch
 exit-status.sh:         remote exit status
-forwarding.sh:          local and remote forwarding
-keygen-change.sh:       change passphrase for key
+envpass.sh:             environment passing
+transfer.sh:            transfer data
+banner.sh:              banner
+rekey.sh:               rekey
+stderr-data.sh:         stderr data transfer
+stderr-after-eof.sh:    stderr data after eof
+broken-pipe.sh:         broken pipe test
+try-ciphers.sh:         try ciphers
+yes-head.sh:            yes pipe head
+login-timeout.sh:       connect after login grace timeout
+agent.sh:               simple connect via agent
+agent-getpeereid.sh:    disallow agent attach from other uid
+agent-timeout.sh:       agent timeout test
+agent-ptrace.sh:        disallow agent ptrace attach
 keyscan.sh:             keyscan
-proto-mismatch.sh:      protocol version mismatch
-proto-version.sh:       sshd version with different protocol combinations
-proxy-connect.sh:       proxy connect
+keygen-change.sh:       change passphrase for key
+keygen-convert.sh:      convert keys
+keygen-moduli.sh:       keygen moduli
+key-options.sh:         key options
+scp.sh:                 scp
+scp-uri.sh:             scp-uri
 sftp.sh:                basic sftp put/get
+sftp-chroot.sh:         sftp in chroot
+sftp-cmds.sh:           sftp command
+sftp-badcmds.sh:        sftp invalid commands
+sftp-batch.sh:          sftp batchfile
+sftp-glob.sh:           sftp glob
+sftp-perm.sh:           sftp permissions
+sftp-uri.sh:            sftp-uri
 ssh-com-client.sh:      connect with ssh.com client
 ssh-com-keygen.sh:      ssh.com key import
 ssh-com-sftp.sh:        basic sftp put/get with ssh.com server
 ssh-com.sh:             connect to ssh.com server
-stderr-after-eof.sh:    stderr data after eof
-stderr-data.sh:         stderr data transfer
-transfer.sh:            transfer data
-try-ciphers.sh:         try ciphers
-yes-head.sh:            yes pipe head
+reconfigure.sh:         simple connect after reconfigure
+dynamic-forward.sh:     dynamic forwarding
+forwarding.sh:          local and remote forwarding
+multiplex.sh:           connection multiplexing
+reexec.sh:              reexec tests
+brokenkeys.sh:          broken keys
+sshcfgparse.sh:         ssh config parse
+cfgparse.sh:            sshd config parse
+cfgmatch.sh:            sshd_config match
+cfgmatchlisten.sh:      sshd_config matchlisten
+addrmatch.sh:           address match
+localcommand.sh:        localcommand
+forcecommand.sh:        forced command
+portnum.sh:             port number parsing
+keytype.sh:             login with different key types
+kextype.sh:             login with different key exchange algorithms
+cert-hostkey.sh         certified host keys
+cert-userkey.sh:        certified user keys
+host-expand.sh:         expand %h and %n
+keys-command.sh:        authorized keys from command
+forward-control.sh:     sshd control of local and remote forwarding
+integrity.sh:           integrity
+krl.sh:                 key revocation lists
+multipubkey.sh:         multiple pubkey
+limit-keytype.sh:       restrict pubkey type
+hostkey-agent.sh:       hostkey agent
+keygen-knownhosts.sh:   ssh-keygen known_hosts
+hostkey-rotate.sh:      hostkey rotate
+principals-command.sh:  authorized principals command
+cert-file.sh:           ssh with certificates
+cfginclude.sh:          config include
+allow-deny-users.sh:    AllowUsers/DenyUsers
+authinfo.sh:            authinfo
 
 
 Problems?
diff --git a/regress/agent-timeout.sh b/regress/agent-timeout.sh
index 80012f80c..311c7bcba 100644
--- a/regress/agent-timeout.sh
+++ b/regress/agent-timeout.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: agent-timeout.sh,v 1.4 2019/01/28 00:08:26 dtucker Exp $
+#       $OpenBSD: agent-timeout.sh,v 1.5 2019/09/03 08:37:06 djm Exp $
 #       Placed in the Public Domain.
 
 tid="agent timeout test"
@@ -14,7 +14,7 @@ else
         trace "add keys with timeout"
         keys=0
         for t in ${SSH_KEYTYPES}; do
-                ${SSHADD} -t ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1
+                ${SSHADD} -kt ${SSHAGENT_TIMEOUT} $OBJ/$t > /dev/null 2>&1
                 if [ $? -ne 0 ]; then
                         fail "ssh-add did succeed exit code 0"
                 fi
diff --git a/regress/agent.sh b/regress/agent.sh
index 788b02064..48fa12b0e 100644
--- a/regress/agent.sh
+++ b/regress/agent.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: agent.sh,v 1.14 2019/01/28 00:12:36 dtucker Exp $
+#       $OpenBSD: agent.sh,v 1.15 2019/07/23 07:39:43 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="simple agent test"
@@ -27,9 +27,6 @@ ${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_ca_key \
 trace "overwrite authorized keys"
 printf '' > $OBJ/authorized_keys_$USER
 
-echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $OBJ/ssh_proxy
-echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $OBJ/sshd_proxy
-
 for t in ${SSH_KEYTYPES}; do
         # generate user key for agent
         rm -f $OBJ/$t-agent $OBJ/$t-agent.pub*
@@ -75,6 +72,10 @@ fi
 
 for t in ${SSH_KEYTYPES}; do
         trace "connect via agent using $t key"
+        if [ "$t" = "ssh-dss" ]; then
+                echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $OBJ/ssh_proxy
+                echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $OBJ/sshd_proxy
+        fi
         ${SSH} -F $OBJ/ssh_proxy -i $OBJ/$t-agent.pub -oIdentitiesOnly=yes \
                 somehost exit 52
         r=$?
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 3ce777967..86ea62504 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: cert-hostkey.sh,v 1.17 2018/10/31 11:09:27 dtucker Exp $
+#       $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="certified host keys"
@@ -7,6 +7,7 @@ rm -f $OBJ/known_hosts-cert* $OBJ/host_ca_key* $OBJ/host_revoked_*
 rm -f $OBJ/cert_host_key* $OBJ/host_krl_*
 
 # Allow all hostkey/pubkey types, prefer certs for the client
+rsa=0
 types=""
 for i in `$SSH -Q key`; do
         if [ -z "$types" ]; then
@@ -19,6 +20,7 @@ for i in `$SSH -Q key`; do
                 types="rsa-sha2-256-cert-v01@openssh.com,$i,$types"
                 types="rsa-sha2-512-cert-v01@openssh.com,$types";;
         *rsa*)
+                rsa=1
                 types="$types,rsa-sha2-512,rsa-sha2-256,$i";;
         # Prefer certificate to plain keys.
         *cert*) types="$i,$types";;
@@ -51,10 +53,12 @@ kh_revoke() {
 }
 
 # Create a CA key and add it to known hosts. Ed25519 chosen for speed.
-# RSA for testing RSA/SHA2 signatures.
+# RSA for testing RSA/SHA2 signatures if supported.
+ktype2=ed25519
+[ "x$rsa" = "x1" ] && ktype2=rsa
 ${SSHKEYGEN} -q -N '' -t ed25519  -f $OBJ/host_ca_key ||\
         fail "ssh-keygen of host_ca_key failed"
-${SSHKEYGEN} -q -N '' -t rsa  -f $OBJ/host_ca_key2 ||\
+${SSHKEYGEN} -q -N '' -t $ktype2  -f $OBJ/host_ca_key2 ||\
         fail "ssh-keygen of host_ca_key failed"
 
 kh_ca host_ca_key.pub host_ca_key2.pub > $OBJ/known_hosts-cert.orig
@@ -214,7 +218,7 @@ test_one() {
         result=$2
         sign_opts=$3
 
-        for kt in rsa ed25519 ; do
+        for kt in $PLAIN_TYPES; do
                 case $ktype in
                 rsa-sha2-*)     tflag="-t $ktype"; ca="$OBJ/host_ca_key2" ;;
                 *)              tflag=""; ca="$OBJ/host_ca_key" ;;
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index 6849e9922..38c14a698 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: cert-userkey.sh,v 1.20 2018/10/31 11:09:27 dtucker Exp $
+#       $OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="certified user keys"
@@ -9,8 +9,10 @@ cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 
 PLAIN_TYPES=`$SSH -Q key-plain | sed 's/^ssh-dss/ssh-dsa/;s/^ssh-//'`
 EXTRA_TYPES=""
+rsa=""
 
 if echo "$PLAIN_TYPES" | grep '^rsa$' >/dev/null 2>&1 ; then
+        rsa=rsa
         PLAIN_TYPES="$PLAIN_TYPES rsa-sha2-256 rsa-sha2-512"
 fi
 
@@ -20,11 +22,20 @@ kname() {
         # subshell because some seds will add a newline
         *) n=$(echo $1 | sed 's/^dsa/ssh-dss/;s/^rsa/ssh-rsa/;s/^ed/ssh-ed/') ;;
         esac
-        echo "$n*,ssh-rsa*,ssh-ed25519*"
+        if [ -z "$rsa" ]; then
+                echo "$n*,ssh-ed25519*"
+        else
+                echo "$n*,ssh-rsa*,ssh-ed25519*"
+        fi
 }
 
 # Create a CA key
-${SSHKEYGEN} -q -N '' -t rsa  -f $OBJ/user_ca_key ||\
+if [ ! -z "$rsa" ]; then
+        catype=rsa
+else
+        catype=ed25519
+fi
+${SSHKEYGEN} -q -N '' -t $catype  -f $OBJ/user_ca_key ||\
         fail "ssh-keygen of user_ca_key failed"
 
 # Generate and sign user keys
@@ -283,7 +294,7 @@ test_one() {
         fi
 
         for auth in $auth_choice ; do
-                for ktype in rsa ed25519 ; do
+                for ktype in $rsa ed25519 ; do
                         cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
                         if test "x$auth" = "xauthorized_keys" ; then
                                 # Add CA to authorized_keys
diff --git a/regress/cfgmatch.sh b/regress/cfgmatch.sh
index dd11e404d..6620c84ed 100644
--- a/regress/cfgmatch.sh
+++ b/regress/cfgmatch.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: cfgmatch.sh,v 1.11 2017/10/04 18:50:23 djm Exp $
+#       $OpenBSD: cfgmatch.sh,v 1.12 2019/04/18 18:57:16 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="sshd_config match"
@@ -51,9 +51,10 @@ echo "AuthorizedKeysFile /dev/null $OBJ/authorized_keys_%u" >>$OBJ/sshd_proxy
 echo "Match Address 127.0.0.1" >>$OBJ/sshd_proxy
 echo "PermitOpen 127.0.0.1:2 127.0.0.1:3 127.0.0.1:$PORT" >>$OBJ/sshd_proxy
 
-start_sshd
+${SUDO} ${SSHD} -f $OBJ/sshd_config -T >/dev/null || \
+    fail "config w/match fails config test"
 
-#set -x
+start_sshd
 
 # Test Match + PermitOpen in sshd_config.  This should be permitted
 trace "match permitopen localhost"
@@ -113,3 +114,45 @@ start_client -F $OBJ/ssh_proxy
 ${SSH} -q -p $fwdport -F $OBJ/ssh_config somehost true || \
     fail "nomatch override permitopen"
 stop_client
+
+# Test parsing of available Match criteria (with the exception of Group which
+# requires knowledge of actual group memberships user running the test).
+params="user:user:u1 host:host:h1 address:addr:1.2.3.4 \
+    localaddress:laddr:5.6.7.8 rdomain:rdomain:rdom1"
+cp $OBJ/sshd_proxy_bak $OBJ/sshd_config
+echo 'Banner /nomatch' >>$OBJ/sshd_config
+for i in $params; do
+        config=`echo $i | cut -f1 -d:`
+        criteria=`echo $i | cut -f2 -d:`
+        value=`echo $i | cut -f3 -d:`
+        cat >>$OBJ/sshd_config <<EOD
+            Match $config $value
+              Banner /$value
+EOD
+done
+
+${SUDO} ${SSHD} -f $OBJ/sshd_config -T >/dev/null || \
+    fail "validate config for w/out spec"
+
+# Test matching each criteria.
+for i in $params; do
+        testcriteria=`echo $i | cut -f2 -d:`
+        expected=/`echo $i | cut -f3 -d:`
+        spec=""
+        for j in $params; do
+                config=`echo $j | cut -f1 -d:`
+                criteria=`echo $j | cut -f2 -d:`
+                value=`echo $j | cut -f3 -d:`
+                if [ "$criteria" = "$testcriteria" ]; then
+                        spec="$criteria=$value,$spec"
+                else
+                        spec="$criteria=1$value,$spec"
+                fi
+        done
+        trace "test spec $spec"
+        result=`${SUDO} ${SSHD} -f $OBJ/sshd_config -T -C "$spec" | \
+            awk '$1=="banner"{print $2}'`
+        if [ "$result" != "$expected" ]; then
+                fail "match $config expected $expected got $result"
+        fi
+done
diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
index 199d863a0..6678813a2 100644
--- a/regress/conch-ciphers.sh
+++ b/regress/conch-ciphers.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: conch-ciphers.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
+#       $OpenBSD: conch-ciphers.sh,v 1.4 2019/07/05 04:12:46 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="conch ciphers"
@@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \
         rm -f ${COPY}
         # XXX the 2nd "cat" seems to be needed because of buggy FD handling
         # in conch
-        ${CONCH} --identity $OBJ/rsa --port $PORT --user $USER  -e none \
+        ${CONCH} --identity $OBJ/ssh-rsa --port $PORT --user $USER -e none \
             --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \
             127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY}
         if [ $? -ne 0 ]; then
diff --git a/regress/dhgex.sh b/regress/dhgex.sh
index 61fc178e8..ae64a9fb6 100644
--- a/regress/dhgex.sh
+++ b/regress/dhgex.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: dhgex.sh,v 1.4 2017/05/08 01:52:49 djm Exp $
+#       $OpenBSD: dhgex.sh,v 1.6 2019/10/06 11:49:50 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="dhgex"
@@ -34,9 +34,11 @@ ssh_test_dhgex()
                 got=`egrep "SSH2_MSG_KEX_DH_GEX_REQUEST(.*) sent" ${LOG}`
                 fail "$tid unexpected GEX sizes, expected $groupsz, got $got"
         fi
-        # check what we got (depends on contents of system moduli file)
-        gotbits="`awk '/bits set:/{print $4}' ${LOG} | head -1 | cut -f2 -d/`"
-        if [ "$gotbits" -lt "$bits" ]; then
+        # check what we got.
+        gotbits="`awk 'BEGIN{FS="/"}/bits set:/{print $2}' ${LOG} |
+            head -1 | tr -d '\r\n'`"
+        trace "expected '$bits' got '$gotbits'"
+        if [ -z "$gotbits" ] || [ "$gotbits" -lt "$bits" ]; then
                 fatal "$tid expected $bits bit group, got $gotbits"
         fi
 }
@@ -52,7 +54,7 @@ check()
         done
 }
 
-#check 2048 3des-cbc
+check 3072 3des-cbc  # 112 bits.
 check 3072 `${SSH} -Q cipher | grep 128`
 check 7680 `${SSH} -Q cipher | grep 192`
 check 8192 `${SSH} -Q cipher | grep 256`
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 7d0fae114..cd634f2f6 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: forwarding.sh,v 1.20 2017/04/30 23:34:55 djm Exp $
+#       $OpenBSD: forwarding.sh,v 1.23 2019/07/20 09:50:58 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="local and remote forwarding"
@@ -26,7 +26,7 @@ done
 
 trace "start forwarding, fork to background"
 rm -f $CTL
-${SSH} -S $CTL -M -F $OBJ/ssh_config -f $fwd somehost sleep 10
+${SSH} -S $CTL -N -M -F $OBJ/ssh_config -f $fwd somehost
 
 trace "transfer over forwarded channels and check result"
 ${SSH} -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
@@ -34,7 +34,7 @@ ${SSH} -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
 test -s ${COPY}         || fail "failed copy of ${DATA}"
 cmp ${DATA} ${COPY}     || fail "corrupted copy of ${DATA}"
 
-${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
+${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost 2>/dev/null
 
 for d in L R; do
         trace "exit on -$d forward failure"
@@ -69,8 +69,8 @@ ${SSH} -F $OBJ/ssh_config -oClearAllForwardings=yes somehost true
 
 trace "clear local forward"
 rm -f $CTL
-${SSH} -S $CTL -M -f -F $OBJ/ssh_config -L ${base}01:127.0.0.1:$PORT \
-    -oClearAllForwardings=yes somehost sleep 10
+${SSH} -S $CTL -N -M -f -F $OBJ/ssh_config -L ${base}01:127.0.0.1:$PORT \
+    -oClearAllForwardings=yes somehost
 if [ $? != 0 ]; then
         fail "connection failed with cleared local forwarding"
 else
@@ -79,12 +79,12 @@ else
              >>$TEST_REGRESS_LOGFILE 2>&1 && \
                 fail "local forwarding not cleared"
 fi
-${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
+${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost 2>/dev/null
 
 trace "clear remote forward"
 rm -f $CTL
-${SSH} -S $CTL -M -f -F $OBJ/ssh_config -R ${base}01:127.0.0.1:$PORT \
-    -oClearAllForwardings=yes somehost sleep 10
+${SSH} -S $CTL -N -M -f -F $OBJ/ssh_config -R ${base}01:127.0.0.1:$PORT \
+    -oClearAllForwardings=yes somehost
 if [ $? != 0 ]; then
         fail "connection failed with cleared remote forwarding"
 else
@@ -93,7 +93,7 @@ else
              >>$TEST_REGRESS_LOGFILE 2>&1 && \
                 fail "remote forwarding not cleared"
 fi
-${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
+${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost 2>/dev/null
 
 trace "stdio forwarding"
 cmd="${SSH} -F $OBJ/ssh_config"
@@ -107,7 +107,7 @@ echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> $OBJ/ssh_config
 
 trace "config file: start forwarding, fork to background"
 rm -f $CTL
-${SSH} -S $CTL -M -F $OBJ/ssh_config -f somehost sleep 10
+${SSH} -S $CTL -N -M -F $OBJ/ssh_config -f somehost
 
 trace "config file: transfer over forwarded channels and check result"
 ${SSH} -F $OBJ/ssh_config -p${base}02 -o 'ConnectionAttempts=4' \
@@ -115,22 +115,22 @@ ${SSH} -F $OBJ/ssh_config -p${base}02 -o 'ConnectionAttempts=4' \
 test -s ${COPY}         || fail "failed copy of ${DATA}"
 cmp ${DATA} ${COPY}     || fail "corrupted copy of ${DATA}"
 
-${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
+${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost 2>/dev/null
 
 trace "transfer over chained unix domain socket forwards and check result"
 rm -f $OBJ/unix-[123].fwd
 rm -f $CTL $CTL.[123]
-${SSH} -S $CTL -M -f -F $OBJ/ssh_config -R${base}01:[$OBJ/unix-1.fwd] somehost sleep 10
-${SSH} -S $CTL.1 -M -f -F $OBJ/ssh_config -L[$OBJ/unix-1.fwd]:[$OBJ/unix-2.fwd] somehost sleep 10
-${SSH} -S $CTL.2 -M -f -F $OBJ/ssh_config -R[$OBJ/unix-2.fwd]:[$OBJ/unix-3.fwd] somehost sleep 10
-${SSH} -S $CTL.3 -M -f -F $OBJ/ssh_config -L[$OBJ/unix-3.fwd]:127.0.0.1:$PORT somehost sleep 10
+${SSH} -S $CTL -N -M -f -F $OBJ/ssh_config -R${base}01:[$OBJ/unix-1.fwd] somehost
+${SSH} -S $CTL.1 -N -M -f -F $OBJ/ssh_config -L[$OBJ/unix-1.fwd]:[$OBJ/unix-2.fwd] somehost
+${SSH} -S $CTL.2 -N -M -f -F $OBJ/ssh_config -R[$OBJ/unix-2.fwd]:[$OBJ/unix-3.fwd] somehost
+${SSH} -S $CTL.3 -N -M -f -F $OBJ/ssh_config -L[$OBJ/unix-3.fwd]:127.0.0.1:$PORT somehost
 ${SSH} -F $OBJ/ssh_config -p${base}01 -o 'ConnectionAttempts=4' \
         somehost cat ${DATA} > ${COPY}
 test -s ${COPY}                 || fail "failed copy ${DATA}"
 cmp ${DATA} ${COPY}             || fail "corrupted copy of ${DATA}"
 
-${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
-${SSH} -F $OBJ/ssh_config -S $CTL.1 -O exit somehost
-${SSH} -F $OBJ/ssh_config -S $CTL.2 -O exit somehost
-${SSH} -F $OBJ/ssh_config -S $CTL.3 -O exit somehost
+${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost 2>/dev/null
+${SSH} -F $OBJ/ssh_config -S $CTL.1 -O exit somehost 2>/dev/null
+${SSH} -F $OBJ/ssh_config -S $CTL.2 -O exit somehost 2>/dev/null
+${SSH} -F $OBJ/ssh_config -S $CTL.3 -O exit somehost 2>/dev/null
 
diff --git a/regress/hostkey-rotate.sh b/regress/hostkey-rotate.sh
index d69de3255..cc6bd9cf6 100644
--- a/regress/hostkey-rotate.sh
+++ b/regress/hostkey-rotate.sh
@@ -1,10 +1,10 @@
-#       $OpenBSD: hostkey-rotate.sh,v 1.5 2015/09/04 04:23:10 djm Exp $
+#       $OpenBSD: hostkey-rotate.sh,v 1.6 2019/08/30 05:08:28 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="hostkey rotate"
 
 # Need full names here since they are used in HostKeyAlgorithms
-HOSTKEY_TYPES="ecdsa-sha2-nistp256 ssh-ed25519 ssh-rsa ssh-dss"
+HOSTKEY_TYPES="`${SSH} -Q key-plain`"
 
 rm -f $OBJ/hkr.* $OBJ/ssh_proxy.orig
 
@@ -12,15 +12,23 @@ grep -vi 'hostkey' $OBJ/sshd_proxy > $OBJ/sshd_proxy.orig
 echo "UpdateHostkeys=yes" >> $OBJ/ssh_proxy
 rm $OBJ/known_hosts
 
+# The "primary" key type is ed25519 since it's supported even when built
+# without OpenSSL.  The secondary is RSA if it's supported.
+primary="ssh-ed25519"
+secondary="$primary"
+
 trace "prepare hostkeys"
 nkeys=0
 all_algs=""
-for k in `${SSH} -Q key-plain` ; do
+for k in $HOSTKEY_TYPES; do
         ${SSHKEYGEN} -qt $k -f $OBJ/hkr.$k -N '' || fatal "ssh-keygen $k"
         echo "Hostkey $OBJ/hkr.${k}" >> $OBJ/sshd_proxy.orig
         nkeys=`expr $nkeys + 1`
         test "x$all_algs" = "x" || all_algs="${all_algs},"
         all_algs="${all_algs}$k"
+        case "$k" in
+                ssh-rsa)        secondary="ssh-rsa" ;;
+        esac
 done
 
 dossh() {
@@ -49,62 +57,68 @@ cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
 # Connect to sshd with StrictHostkeyChecking=no
 verbose "learn hostkey with StrictHostKeyChecking=no"
 >$OBJ/known_hosts
-dossh -oHostKeyAlgorithms=ssh-ed25519 -oStrictHostKeyChecking=no
+dossh -oHostKeyAlgorithms=$primary -oStrictHostKeyChecking=no
 # Verify no additional keys learned
 expect_nkeys 1 "unstrict connect keys"
-check_key_present ssh-ed25519 || fail "unstrict didn't learn key"
+check_key_present $primary || fail "unstrict didn't learn key"
 
 # Connect to sshd as usual
 verbose "learn additional hostkeys"
 dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$all_algs
 # Check that other keys learned
 expect_nkeys $nkeys "learn hostkeys"
-check_key_present ssh-rsa || fail "didn't learn keys"
+for k in $HOSTKEY_TYPES; do
+        check_key_present $k || fail "didn't learn keytype $k"
+done
 
 # Check each key type
-for k in `${SSH} -Q key-plain` ; do
+for k in $HOSTKEY_TYPES; do
         verbose "learn additional hostkeys, type=$k"
         dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs
         expect_nkeys $nkeys "learn hostkeys $k"
-        check_key_present $k || fail "didn't learn $k"
+        check_key_present $k || fail "didn't learn $k correctly"
 done
 
 # Change one hostkey (non primary) and relearn
-verbose "learn changed non-primary hostkey"
-mv $OBJ/hkr.ssh-rsa.pub $OBJ/hkr.ssh-rsa.pub.old
-rm -f $OBJ/hkr.ssh-rsa
-${SSHKEYGEN} -qt ssh-rsa -f $OBJ/hkr.ssh-rsa -N '' || fatal "ssh-keygen $k"
-dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$all_algs
-# Check that the key was replaced
-expect_nkeys $nkeys "learn hostkeys"
-check_key_present ssh-rsa $OBJ/hkr.ssh-rsa.pub.old && fail "old key present"
-check_key_present ssh-rsa || fail "didn't learn changed key"
+if [ "$primary" != "$secondary" ]; then
+        verbose "learn changed non-primary hostkey type=${secondary}"
+        mv $OBJ/hkr.${secondary}.pub $OBJ/hkr.${secondary}.pub.old
+        rm -f $OBJ/hkr.${secondary}
+        ${SSHKEYGEN} -qt ${secondary} -f $OBJ/hkr.${secondary} -N '' || \
+            fatal "ssh-keygen $secondary"
+        dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$all_algs
+        # Check that the key was replaced
+        expect_nkeys $nkeys "learn hostkeys"
+        check_key_present ${secondary} $OBJ/hkr.${secondary}.pub.old && \
+            fail "old key present"
+        check_key_present ${secondary} || fail "didn't learn changed key"
+fi
 
 # Add new hostkey (primary type) to sshd and connect
 verbose "learn new primary hostkey"
-${SSHKEYGEN} -qt ssh-rsa -f $OBJ/hkr.ssh-rsa-new -N '' || fatal "ssh-keygen $k"
-( cat $OBJ/sshd_proxy.orig ; echo HostKey $OBJ/hkr.ssh-rsa-new ) \
+${SSHKEYGEN} -qt ${primary} -f $OBJ/hkr.${primary}-new -N '' || fatal "ssh-keygen ed25519"
+( cat $OBJ/sshd_proxy.orig ; echo HostKey $OBJ/hkr.${primary}-new ) \
     > $OBJ/sshd_proxy
 # Check new hostkey added
-dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=ssh-rsa,$all_algs
+dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=${primary},$all_algs
 expect_nkeys `expr $nkeys + 1` "learn hostkeys"
-check_key_present ssh-rsa || fail "current key missing"
-check_key_present ssh-rsa $OBJ/hkr.ssh-rsa-new.pub || fail "new key missing"
+check_key_present ${primary} || fail "current key missing"
+check_key_present ${primary} $OBJ/hkr.${primary}-new.pub || fail "new key missing"
 
 # Remove old hostkey (primary type) from sshd
 verbose "rotate primary hostkey"
 cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
-mv $OBJ/hkr.ssh-rsa.pub $OBJ/hkr.ssh-rsa.pub.old
-mv $OBJ/hkr.ssh-rsa-new.pub $OBJ/hkr.ssh-rsa.pub
-mv $OBJ/hkr.ssh-rsa-new $OBJ/hkr.ssh-rsa
+mv $OBJ/hkr.${primary}.pub $OBJ/hkr.${primary}.pub.old
+mv $OBJ/hkr.${primary}-new.pub $OBJ/hkr.${primary}.pub
+mv $OBJ/hkr.${primary}-new $OBJ/hkr.${primary}
 # Check old hostkey removed
-dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=ssh-rsa,$all_algs
+dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=${primary},$all_algs
 expect_nkeys $nkeys "learn hostkeys"
-check_key_present ssh-rsa $OBJ/hkr.ssh-rsa.pub.old && fail "old key present"
-check_key_present ssh-rsa || fail "didn't learn changed key"
+check_key_present ${primary} $OBJ/hkr.${primary}.pub.old && fail "old key present"
+check_key_present ${primary} || fail "didn't learn changed key"
 
 # Connect again, forcing rotated key
 verbose "check rotate primary hostkey"
-dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=ssh-rsa
+dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=${primary}
 expect_nkeys 1 "learn hostkeys"
-check_key_present ssh-rsa || fail "didn't learn changed key"
+check_key_present ${primary} || fail "didn't learn changed key"
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 3eda40f0a..5ba6bf6ab 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -14,8 +14,8 @@ macs="$macs `${SSH} -Q cipher-auth`"
 
 # avoid DH group exchange as the extra traffic makes it harder to get the
 # offset into the stream right.
-echo "KexAlgorithms diffie-hellman-group14-sha1,diffie-hellman-group1-sha1" \
-        >> $OBJ/ssh_proxy
+#echo "KexAlgorithms -diffie-hellman-group*" \
+#       >> $OBJ/ssh_proxy
 
 # sshd-command for proxy (see test-exec.sh)
 cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy"
diff --git a/regress/keygen-convert.sh b/regress/keygen-convert.sh
index ad0e9c637..fce110ea1 100644
--- a/regress/keygen-convert.sh
+++ b/regress/keygen-convert.sh
@@ -1,9 +1,17 @@
-#       $OpenBSD: keygen-convert.sh,v 1.1 2009/11/09 04:20:04 dtucker Exp $
+#       $OpenBSD: keygen-convert.sh,v 1.2 2019/07/23 07:55:29 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="convert keys"
 
-for t in rsa dsa; do
+types=""
+for i in ${SSH_KEYTYPES}; do
+        case "$i" in
+                ssh-dss)        types="$types dsa" ;;
+                ssh-rsa)        types="$types rsa" ;;
+        esac
+done
+
+for t in $types; do
         # generate user key for agent
         trace "generating $t key"
         rm -f $OBJ/$t-key
diff --git a/regress/keygen-moduli.sh b/regress/keygen-moduli.sh
index d4e771383..a8eccfb69 100644
--- a/regress/keygen-moduli.sh
+++ b/regress/keygen-moduli.sh
@@ -1,18 +1,27 @@
-#       $OpenBSD: keygen-moduli.sh,v 1.2 2016/09/14 00:45:31 dtucker Exp $
+#       $OpenBSD: keygen-moduli.sh,v 1.3 2019/07/23 08:19:29 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="keygen moduli"
 
+dhgex=0
+for kex in `${SSH} -Q kex`; do
+        case $kex in
+                diffie-hellman-group*)  dhgex=1 ;;
+        esac
+done
+
 # Try "start at the beginning and stop after 1", "skip 1 then stop after 1"
 # and "skip 2 and run to the end with checkpointing".  Since our test data
 # file has 3 lines, these should always result in 1 line of output.
-for i in "-J1" "-j1 -J1" "-j2 -K $OBJ/moduli.ckpt"; do
+if [ "x$dhgex" = "x1" ]; then
+    for i in "-J1" "-j1 -J1" "-j2 -K $OBJ/moduli.ckpt"; do
         trace "keygen $i"
         rm -f $OBJ/moduli.out $OBJ/moduli.ckpt
         ${SSHKEYGEN} -T $OBJ/moduli.out -f ${SRC}/moduli.in $i 2>/dev/null || \
             fail "keygen screen failed $i"
         lines=`wc -l <$OBJ/moduli.out`
         test "$lines" -eq "1" || fail "expected 1 line, got $lines"
-done
+    done
+fi
 
 rm -f $OBJ/moduli.out $OBJ/moduli.ckpt
diff --git a/regress/keys-command.sh b/regress/keys-command.sh
index d166fc589..33b6e7b42 100644
--- a/regress/keys-command.sh
+++ b/regress/keys-command.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: keys-command.sh,v 1.5 2018/11/22 08:48:32 dtucker Exp $
+#       $OpenBSD: keys-command.sh,v 1.6 2019/07/25 08:48:11 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="authorized keys from command"
@@ -14,8 +14,8 @@ rm -f $OBJ/keys-command-args
 touch $OBJ/keys-command-args
 chmod a+rw $OBJ/keys-command-args
 
-expected_key_text=`awk '{ print $2 }' < $OBJ/rsa.pub`
-expected_key_fp=`$SSHKEYGEN -lf $OBJ/rsa.pub | awk '{ print $2 }'`
+expected_key_text=`awk '{ print $2 }' < $OBJ/ssh-ed25519.pub`
+expected_key_fp=`$SSHKEYGEN -lf $OBJ/ssh-ed25519.pub | awk '{ print $2 }'`
 
 # Establish a AuthorizedKeysCommand in /var/run where it will have
 # acceptable directory permissions.
diff --git a/regress/keytype.sh b/regress/keytype.sh
index f78a2c171..13095088e 100644
--- a/regress/keytype.sh
+++ b/regress/keytype.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: keytype.sh,v 1.7 2018/03/12 00:54:04 djm Exp $
+#       $OpenBSD: keytype.sh,v 1.8 2019/07/23 13:49:14 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="login with different key types"
@@ -6,11 +6,13 @@ tid="login with different key types"
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 
-# Traditional and builtin key types.
-ktypes="dsa-1024 rsa-2048 rsa-3072 ed25519-512"
-# Types not present in all OpenSSL versions.
-for i in `$SSH -Q key`; do
+# Construct list of key types based on what the built binaries support.
+ktypes=""
+for i in ${SSH_KEYTYPES}; do
         case "$i" in
+                ssh-dss)                ktypes="$ktypes dsa-1024" ;;
+                ssh-rsa)                ktypes="$ktypes rsa-2048 rsa-3072" ;;
+                ssh-ed25519)            ktypes="$ktypes ed25519-512" ;;
                 ecdsa-sha2-nistp256)    ktypes="$ktypes ecdsa-256" ;;
                 ecdsa-sha2-nistp384)    ktypes="$ktypes ecdsa-384" ;;
                 ecdsa-sha2-nistp521)    ktypes="$ktypes ecdsa-521" ;;
diff --git a/regress/krl.sh b/regress/krl.sh
index a70c79c66..e18d0ec7f 100644
--- a/regress/krl.sh
+++ b/regress/krl.sh
@@ -1,13 +1,18 @@
-#       $OpenBSD: krl.sh,v 1.7 2018/09/12 01:23:48 djm Exp $
+#       $OpenBSD: krl.sh,v 1.8 2019/07/25 09:17:35 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="key revocation lists"
 
-# If we don't support ecdsa keys then this tell will be much slower.
-ECDSA=ecdsa
-if test "x$TEST_SSH_ECC" != "xyes"; then
-        ECDSA=rsa
-fi
+# Use ed25519 by default since it's fast and it's supported when building
+# w/out OpenSSL.  Populate ktype[2-4] with the other types if supported.
+ktype1=ed25519; ktype2=ed25519; ktype3=ed25519; ktype4=ed25519
+for t in `${SSH} -Q key-plain`; do
+        case "$t" in
+                ecdsa*)         ktype2=ecdsa ;;
+                ssh-rsa)        ktype3=rsa ;;
+                ssh-dss)        ktype4=dsa ;;
+        esac
+done
 
 # Do most testing with ssh-keygen; it uses the same verification code as sshd.
 
@@ -15,9 +20,9 @@ fi
 rm -f $OBJ/revoked-* $OBJ/krl-*
 
 # Generate a CA key
-$SSHKEYGEN -t $ECDSA -f $OBJ/revoked-ca  -C "" -N "" > /dev/null ||
+$SSHKEYGEN -t $ktype1 -f $OBJ/revoked-ca  -C "" -N "" > /dev/null ||
         fatal "$SSHKEYGEN CA failed"
-$SSHKEYGEN -t ed25519 -f $OBJ/revoked-ca2  -C "" -N "" > /dev/null ||
+$SSHKEYGEN -t $ktype2 -f $OBJ/revoked-ca2  -C "" -N "" > /dev/null ||
         fatal "$SSHKEYGEN CA2 failed"
 
 # A specification that revokes some certificates by serial numbers
@@ -55,11 +60,13 @@ done
 keygen() {
         N=$1
         f=$OBJ/revoked-`printf "%04d" $N`
-        # Vary the keytype. We use mostly ECDSA since this is fastest by far.
-        keytype=$ECDSA
+        # Vary the keytype. We use mostly ed25519 since this is fast and well
+        # supported.
+        keytype=$ktype1
         case $N in
-        2 | 10 | 510 | 1001)    keytype=rsa;;
-        4 | 30 | 520 | 1002)    keytype=ed25519;;
+        2 | 10 | 510 | 1001)    keytype=$ktype2 ;;
+        4 | 30 | 520 | 1002)    keytype=$ktype3 ;;
+        8 | 50 | 530 | 1003)    keytype=$ktype4 ;;
         esac
         $SSHKEYGEN -t $keytype -f $f -C "" -N "" > /dev/null \
                 || fatal "$SSHKEYGEN failed"
diff --git a/regress/limit-keytype.sh b/regress/limit-keytype.sh
index 04f11977e..5c30af006 100644
--- a/regress/limit-keytype.sh
+++ b/regress/limit-keytype.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: limit-keytype.sh,v 1.5 2018/03/12 00:52:57 djm Exp $
+#       $OpenBSD: limit-keytype.sh,v 1.6 2019/07/26 04:22:21 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="restrict pubkey type"
@@ -9,18 +9,27 @@ rm -f $OBJ/authorized_principals_$USER $OBJ/cert_user_key*
 mv $OBJ/sshd_proxy $OBJ/sshd_proxy.orig
 mv $OBJ/ssh_proxy $OBJ/ssh_proxy.orig
 
+ktype1=ed25519; ktype2=$ktype1; ktype3=$ktype1; ktype4=$ktype1
+for t in `${SSH} -Q key-plain`; do
+        case "$t" in
+                ssh-rsa)        ktype2=rsa ;;
+                ecdsa*)         ktype3=ecdsa ;;  # unused
+                ssh-dss)        ktype4=dsa ;;
+        esac
+done
+
 # Create a CA key
-${SSHKEYGEN} -q -N '' -t ed25519  -f $OBJ/user_ca_key ||\
+${SSHKEYGEN} -q -N '' -t $ktype1 -f $OBJ/user_ca_key ||\
         fatal "ssh-keygen failed"
 
 # Make some keys and a certificate.
-${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_key1 || \
+${SSHKEYGEN} -q -N '' -t $ktype1 -f $OBJ/user_key1 || \
         fatal "ssh-keygen failed"
-${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/user_key2 || \
+${SSHKEYGEN} -q -N '' -t $ktype2 -f $OBJ/user_key2 || \
         fatal "ssh-keygen failed"
-${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/user_key3 || \
+${SSHKEYGEN} -q -N '' -t $ktype2 -f $OBJ/user_key3 || \
         fatal "ssh-keygen failed"
-${SSHKEYGEN} -q -N '' -t dsa -f $OBJ/user_key4 || \
+${SSHKEYGEN} -q -N '' -t $ktype4 -f $OBJ/user_key4 || \
         fatal "ssh-keygen failed"
 ${SSHKEYGEN} -q -s $OBJ/user_ca_key -I "regress user key for $USER" \
         -z $$ -n ${USER},mekmitasdigoat $OBJ/user_key3 ||
@@ -51,6 +60,17 @@ prepare_config() {
         ) > $OBJ/sshd_proxy
 }
 
+# Return the required parameter for PubkeyAcceptedKeyTypes corresponding to
+# the supplied key type.
+keytype() {
+        case "$1" in
+                ecdsa)          printf "ecdsa-sha2-*" ;;
+                ed25519)        printf "ssh-ed25519" ;;
+                dsa)            printf "ssh-dss" ;;
+                rsa)            printf "rsa-sha2-256,rsa-sha2-512,ssh-rsa" ;;
+        esac
+}
+
 prepare_config
 
 # Check we can log in with all key types.
@@ -59,19 +79,21 @@ ${SSH} $opts -i $OBJ/user_key1 proxy true || fatal "key1 failed"
 ${SSH} $opts -i $OBJ/user_key2 proxy true || fatal "key2 failed"
 
 # Allow plain Ed25519 and RSA. The certificate should fail.
-verbose "allow rsa,ed25519"
+verbose "allow $ktype2,$ktype1"
 prepare_config \
-        "PubkeyAcceptedKeyTypes rsa-sha2-256,rsa-sha2-512,ssh-rsa,ssh-ed25519"
+        "PubkeyAcceptedKeyTypes `keytype $ktype2`,`keytype $ktype1`"
 ${SSH} $certopts proxy true && fatal "cert succeeded"
 ${SSH} $opts -i $OBJ/user_key1 proxy true || fatal "key1 failed"
 ${SSH} $opts -i $OBJ/user_key2 proxy true || fatal "key2 failed"
 
 # Allow Ed25519 only.
-verbose "allow ed25519"
-prepare_config "PubkeyAcceptedKeyTypes ssh-ed25519"
+verbose "allow $ktype1"
+prepare_config "PubkeyAcceptedKeyTypes `keytype $ktype1`"
 ${SSH} $certopts proxy true && fatal "cert succeeded"
 ${SSH} $opts -i $OBJ/user_key1 proxy true || fatal "key1 failed"
-${SSH} $opts -i $OBJ/user_key2 proxy true && fatal "key2 succeeded"
+if [ "$ktype1" != "$ktype2" ]; then
+        ${SSH} $opts -i $OBJ/user_key2 proxy true && fatal "key2 succeeded"
+fi
 
 # Allow all certs. Plain keys should fail.
 verbose "allow cert only"
@@ -82,16 +104,18 @@ ${SSH} $opts -i $OBJ/user_key2 proxy true && fatal "key2 succeeded"
 
 # Allow RSA in main config, Ed25519 for non-existent user.
 verbose "match w/ no match"
-prepare_config "PubkeyAcceptedKeyTypes rsa-sha2-256,rsa-sha2-512,ssh-rsa" \
-        "Match user x$USER" "PubkeyAcceptedKeyTypes +ssh-ed25519"
+prepare_config "PubkeyAcceptedKeyTypes `keytype $ktype2`" \
+        "Match user x$USER" "PubkeyAcceptedKeyTypes +`keytype $ktype1`"
 ${SSH} $certopts proxy true && fatal "cert succeeded"
-${SSH} $opts -i $OBJ/user_key1 proxy true && fatal "key1 succeeded"
+if [ "$ktype1" != "$ktype2" ]; then
+        ${SSH} $opts -i $OBJ/user_key1 proxy true && fatal "key1 succeeded"
+fi
 ${SSH} $opts -i $OBJ/user_key2 proxy true || fatal "key2 failed"
 
 # Allow only DSA in main config, Ed25519 for user.
 verbose "match w/ matching"
-prepare_config "PubkeyAcceptedKeyTypes ssh-dss" \
-        "Match user $USER" "PubkeyAcceptedKeyTypes +ssh-ed25519"
+prepare_config "PubkeyAcceptedKeyTypes `keytype $ktype4`" \
+        "Match user $USER" "PubkeyAcceptedKeyTypes +`keytype $ktype1`"
 ${SSH} $certopts proxy true || fatal "cert failed"
 ${SSH} $opts -i $OBJ/user_key1 proxy true || fatal "key1 failed"
 ${SSH} $opts -i $OBJ/user_key4 proxy true && fatal "key4 succeeded"
diff --git a/regress/misc/fuzz-harness/Makefile b/regress/misc/fuzz-harness/Makefile
index a2aa4441f..85179ac4e 100644
--- a/regress/misc/fuzz-harness/Makefile
+++ b/regress/misc/fuzz-harness/Makefile
@@ -1,13 +1,15 @@
 # NB. libssh and libopenbsd-compat should be built with the same sanitizer opts.
-CXX=clang++-3.9
-FUZZ_FLAGS=-fsanitize=address,undefined -fsanitize-coverage=edge
+CXX=clang++-6.0
+FUZZ_FLAGS=-fsanitize=address,undefined -fsanitize-coverage=edge,trace-pc
 FUZZ_LIBS=-lFuzzer
 
 CXXFLAGS=-O2 -g -Wall -Wextra -I ../../.. $(FUZZ_FLAGS)
 LDFLAGS=-L ../../.. -L ../../../openbsd-compat -g $(FUZZ_FLAGS)
 LIBS=-lssh -lopenbsd-compat -lcrypto $(FUZZ_LIBS)
 
-all: pubkey_fuzz sig_fuzz authopt_fuzz
+TARGETS=pubkey_fuzz sig_fuzz authopt_fuzz sshsig_fuzz sshsigopt_fuzz
+
+all: $(TARGETS)
 
 .cc.o:
         $(CXX) $(CXXFLAGS) -c $< -o $@
@@ -21,5 +23,11 @@ sig_fuzz: sig_fuzz.o
 authopt_fuzz: authopt_fuzz.o
         $(CXX) -o $@ authopt_fuzz.o ../../../auth-options.o $(LDFLAGS) $(LIBS)
 
+sshsig_fuzz: sshsig_fuzz.o
+        $(CXX) -o $@ sshsig_fuzz.o ../../../sshsig.o $(LDFLAGS) $(LIBS)
+
+sshsigopt_fuzz: sshsigopt_fuzz.o
+        $(CXX) -o $@ sshsigopt_fuzz.o ../../../sshsig.o $(LDFLAGS) $(LIBS)
+
 clean:
-        -rm -f *.o pubkey_fuzz sig_fuzz authopt_fuzz
+        -rm -f *.o $(TARGETS)
diff --git a/regress/misc/fuzz-harness/sshsig_fuzz.cc b/regress/misc/fuzz-harness/sshsig_fuzz.cc
new file mode 100644
index 000000000..fe09ccb87
--- /dev/null
+++ b/regress/misc/fuzz-harness/sshsig_fuzz.cc
@@ -0,0 +1,35 @@
+// cc_fuzz_target test for sshsig verification.
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+extern "C" {
+
+#include "includes.h"
+#include "sshkey.h"
+#include "ssherr.h"
+#include "sshbuf.h"
+#include "sshsig.h"
+#include "log.h"
+
+int LLVMFuzzerTestOneInput(const uint8_t* sig, size_t slen)
+{
+  static const char *data = "If everyone started announcing his nose had "
+      "run away, I don’t know how it would all end";
+  struct sshbuf *signature = sshbuf_from(sig, slen);
+  struct sshbuf *message = sshbuf_from(data, strlen(data));
+  struct sshkey *k = NULL;
+  extern char *__progname;
+
+  log_init(__progname, SYSLOG_LEVEL_QUIET, SYSLOG_FACILITY_USER, 1);
+  sshsig_verifyb(signature, message, "castle", &k);
+  sshkey_free(k);
+  sshbuf_free(signature);
+  sshbuf_free(message);
+  return 0;
+}
+
+} // extern
diff --git a/regress/misc/fuzz-harness/sshsigopt_fuzz.cc b/regress/misc/fuzz-harness/sshsigopt_fuzz.cc
new file mode 100644
index 000000000..7424fcbe3
--- /dev/null
+++ b/regress/misc/fuzz-harness/sshsigopt_fuzz.cc
@@ -0,0 +1,29 @@
+#include <stddef.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+
+extern "C" {
+
+#include "sshsig.h"
+
+int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+        char *cp = (char *)malloc(size + 1);
+        struct sshsigopt *opts = NULL;
+
+        if (cp == NULL)
+                goto out;
+        memcpy(cp, data, size);
+        cp[size] = '\0';
+        if ((opts = sshsigopt_parse(cp, "libfuzzer", 0, NULL)) == NULL)
+                goto out;
+
+ out:
+        free(cp);
+        sshsigopt_free(opts);
+        return 0;
+}
+
+} // extern "C"
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index de357c4d5..b5e604dba 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: multiplex.sh,v 1.29 2019/01/01 22:20:16 djm Exp $
+#       $OpenBSD: multiplex.sh,v 1.30 2019/07/05 04:03:13 dtucker Exp $
 #       Placed in the Public Domain.
 
 make_tmpdir
@@ -81,6 +81,7 @@ trace "forward over TCP/IP and check result"
 $NC -N -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} > /dev/null &
 netcat_pid=$!
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L127.0.0.1:$((${PORT} + 2)):127.0.0.1:$((${PORT} + 1)) otherhost >>$TEST_SSH_LOGFILE 2>&1
+sleep 1  # XXX remove once race fixed
 $NC 127.0.0.1 $((${PORT} + 2)) < /dev/null > ${COPY}
 cmp ${DATA} ${COPY}             || fail "ssh: corrupted copy of ${DATA}"
 kill $netcat_pid 2>/dev/null
@@ -91,7 +92,8 @@ $NC -N -Ul $OBJ/unix-1.fwd < ${DATA} > /dev/null &
 netcat_pid=$!
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L$OBJ/unix-2.fwd:$OBJ/unix-1.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R$OBJ/unix-3.fwd:$OBJ/unix-2.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1
-$NC -U $OBJ/unix-3.fwd < /dev/null > ${COPY} 2>/dev/null
+sleep 1  # XXX remove once race fixed
+$NC -U $OBJ/unix-3.fwd < /dev/null > ${COPY}
 cmp ${DATA} ${COPY}             || fail "ssh: corrupted copy of ${DATA}"
 kill $netcat_pid 2>/dev/null
 rm -f ${COPY} $OBJ/unix-[123].fwd
@@ -122,6 +124,7 @@ ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost >>$TEST_REGRESS_LOGFILE 2>&1
 verbose "test $tid: cmd forward local (TCP)"
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L $P:localhost:$PORT otherhost \
      || fail "request local forward failed"
+sleep 1  # XXX remove once race fixed
 ${SSH} -F $OBJ/ssh_config -p$P otherhost true \
      || fail "connect to local forward port failed"
 ${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -L $P:localhost:$PORT otherhost \
@@ -132,6 +135,7 @@ ${SSH} -F $OBJ/ssh_config -p$P otherhost true \
 verbose "test $tid: cmd forward remote (TCP)"
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R $P:localhost:$PORT otherhost \
      || fail "request remote forward failed"
+sleep 1  # XXX remove once race fixed
 ${SSH} -F $OBJ/ssh_config -p$P otherhost true \
      || fail "connect to remote forwarded port failed"
 ${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -R $P:localhost:$PORT otherhost \
@@ -142,6 +146,7 @@ ${SSH} -F $OBJ/ssh_config -p$P otherhost true \
 verbose "test $tid: cmd forward local (UNIX)"
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L $OBJ/unix-1.fwd:localhost:$PORT otherhost \
      || fail "request local forward failed"
+sleep 1  # XXX remove once race fixed
 echo "" | $NC -U $OBJ/unix-1.fwd | \
     grep "Invalid SSH identification string" >/dev/null 2>&1 \
      || fail "connect to local forward path failed"
@@ -154,6 +159,7 @@ rm -f $OBJ/unix-1.fwd
 verbose "test $tid: cmd forward remote (UNIX)"
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R $OBJ/unix-1.fwd:localhost:$PORT otherhost \
      || fail "request remote forward failed"
+sleep 1  # XXX remove once race fixed
 echo "" | $NC -U $OBJ/unix-1.fwd | \
     grep "Invalid SSH identification string" >/dev/null 2>&1 \
      || fail "connect to remote forwarded path failed"
diff --git a/regress/principals-command.sh b/regress/principals-command.sh
index 197c00021..7d380325b 100644
--- a/regress/principals-command.sh
+++ b/regress/principals-command.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: principals-command.sh,v 1.6 2018/11/22 08:48:32 dtucker Exp $
+#       $OpenBSD: principals-command.sh,v 1.7 2019/09/06 04:24:06 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="authorized principals command"
@@ -12,12 +12,17 @@ if [ -z "$SUDO" -a ! -w /var/run ]; then
         exit 0
 fi
 
+case "`${SSH} -Q key-plain`" in
+        *ssh-rsa*)      userkeytype=rsa ;;
+        *)              userkeytype=ed25519 ;;
+esac
+
 SERIAL=$$
 
 # Create a CA key and a user certificate.
 ${SSHKEYGEN} -q -N '' -t ed25519  -f $OBJ/user_ca_key || \
         fatal "ssh-keygen of user_ca_key failed"
-${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/cert_user_key || \
+${SSHKEYGEN} -q -N '' -t ${userkeytype} -f $OBJ/cert_user_key || \
         fatal "ssh-keygen of cert_user_key failed"
 ${SSHKEYGEN} -q -s $OBJ/user_ca_key -I "Joanne User" \
     -z $$ -n ${USER},mekmitasdigoat $OBJ/cert_user_key || \
@@ -35,7 +40,7 @@ trap "$SUDO rm -f ${PRINCIPALS_COMMAND}" 0
 cat << _EOF | $SUDO sh -c "cat > '$PRINCIPALS_COMMAND'"
 #!/bin/sh
 test "x\$1" != "x${LOGNAME}" && exit 1
-test "x\$2" != "xssh-rsa-cert-v01@openssh.com" && exit 1
+test "x\$2" != "xssh-${userkeytype}-cert-v01@openssh.com" && exit 1
 test "x\$3" != "xssh-ed25519" && exit 1
 test "x\$4" != "xJoanne User" && exit 1
 test "x\$5" != "x${SERIAL}" && exit 1
diff --git a/regress/scp-ssh-wrapper.sh b/regress/scp-ssh-wrapper.sh
index 59f1ff63e..7fb21f424 100644
--- a/regress/scp-ssh-wrapper.sh
+++ b/regress/scp-ssh-wrapper.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#       $OpenBSD: scp-ssh-wrapper.sh,v 1.3 2014/01/26 10:49:17 djm Exp $
+#       $OpenBSD: scp-ssh-wrapper.sh,v 1.4 2019/07/19 03:45:44 djm Exp $
 #       Placed in the Public Domain.
 
 printname () {
@@ -51,6 +51,18 @@ badserver_4)
         echo "C755 2 file"
         echo "X"
         ;;
+badserver_5)
+        echo "D0555 0 "
+        echo "X"
+        ;;
+badserver_6)
+        echo "D0555 0 ."
+        echo "X"
+        ;;
+badserver_7)
+        echo "C0755 2 extrafile"
+        echo "X"
+        ;;
 *)
         set -- $arg
         shift
diff --git a/regress/scp.sh b/regress/scp.sh
index 57cc77066..62400efad 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: scp.sh,v 1.10 2014/01/26 10:49:17 djm Exp $
+#       $OpenBSD: scp.sh,v 1.11 2019/07/19 03:45:44 djm Exp $
 #       Placed in the Public Domain.
 
 tid="scp"
@@ -25,6 +25,7 @@ export SCP # used in scp-ssh-wrapper.scp
 scpclean() {
         rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
         mkdir ${DIR} ${DIR2}
+        chmod 755 ${DIR} ${DIR2}
 }
 
 verbose "$tid: simple copy local file to local file"
@@ -101,7 +102,7 @@ if [ ! -z "$SUDO" ]; then
         $SUDO rm ${DIR2}/copy
 fi
 
-for i in 0 1 2 3 4; do
+for i in 0 1 2 3 4 5 6 7; do
         verbose "$tid: disallow bad server #$i"
         SCPTESTMODE=badserver_$i
         export DIR SCPTESTMODE
@@ -113,6 +114,15 @@ for i in 0 1 2 3 4; do
         scpclean
         $SCP -r $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null
         [ -d ${DIR}/dotpathdir ] && fail "allows dir creation outside of subdir"
+
+        scpclean
+        $SCP -pr $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null
+        [ ! -w ${DIR2} ] && fail "allows target root attribute change"
+
+        scpclean
+        $SCP $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null
+        [ -e ${DIR2}/extrafile ] && fail "allows unauth object creation"
+        rm -f ${DIR2}/extrafile
 done
 
 verbose "$tid: detect non-directory target"
diff --git a/regress/sshcfgparse.sh b/regress/sshcfgparse.sh
index e0ce568d7..2c00b64ef 100644
--- a/regress/sshcfgparse.sh
+++ b/regress/sshcfgparse.sh
@@ -1,8 +1,15 @@
-#       $OpenBSD: sshcfgparse.sh,v 1.4 2018/07/04 13:51:12 djm Exp $
+#       $OpenBSD: sshcfgparse.sh,v 1.5 2019/07/23 13:32:48 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="ssh config parse"
 
+dsa=0
+for t in $SSH_KEYTYPES; do
+        case "$t" in
+                ssh-dss)        dsa=1 ;;
+        esac
+done
+
 expect_result_present() {
         _str="$1" ; shift
         for _expect in "$@" ; do
@@ -75,15 +82,17 @@ f=`${SSH} -GF none -opubkeyacceptedkeytypes=-ssh-ed25519 host | \
 expect_result_present "$f" "ssh-ed25519-cert-v01.*"
 expect_result_absent "$f" "ssh-ed25519" "ssh-dss"
 # Append to default set.
-# XXX this will break for !WITH_OPENSSL
-f=`${SSH} -GF none -opubkeyacceptedkeytypes=+ssh-dss-cert* host | \
-    awk '/^pubkeyacceptedkeytypes /{print $2}'`
-expect_result_present "$f" "ssh-ed25519" "ssh-dss-cert-v01.*"
-expect_result_absent "$f" "ssh-dss"
-f=`${SSH} -GF none -opubkeyacceptedkeytypes=+ssh-dss host | \
-    awk '/^pubkeyacceptedkeytypes /{print $2}'`
-expect_result_present "$f" "ssh-ed25519" "ssh-ed25519-cert-v01.*" "ssh-dss"
-expect_result_absent "$f" "ssh-dss-cert-v01.*"
+# This is not tested when built !WITH_OPENSSL
+if [ "$dsa" = "1" ]; then
+        f=`${SSH} -GF none -opubkeyacceptedkeytypes=+ssh-dss-cert* host | \
+            awk '/^pubkeyacceptedkeytypes /{print $2}'`
+        expect_result_present "$f" "ssh-ed25519" "ssh-dss-cert-v01.*"
+        expect_result_absent "$f" "ssh-dss"
+        f=`${SSH} -GF none -opubkeyacceptedkeytypes=+ssh-dss host | \
+            awk '/^pubkeyacceptedkeytypes /{print $2}'`
+        expect_result_present "$f" "ssh-ed25519" "ssh-ed25519-cert-v01.*" "ssh-dss"
+        expect_result_absent "$f" "ssh-dss-cert-v01.*"
+fi
 
 # cleanup
 rm -f $OBJ/ssh_config.[012]
diff --git a/regress/sshsig.sh b/regress/sshsig.sh
new file mode 100644
index 000000000..eb99486ae
--- /dev/null
+++ b/regress/sshsig.sh
@@ -0,0 +1,196 @@
+#       $OpenBSD: sshsig.sh,v 1.2 2019/10/04 03:39:19 djm Exp $
+#       Placed in the Public Domain.
+
+tid="sshsig"
+
+DATA2=$OBJ/${DATANAME}.2
+cat ${DATA} ${DATA} > ${DATA2}
+
+rm -f $OBJ/sshsig-*.sig $OBJ/wrong-key* $OBJ/sigca-key*
+
+sig_namespace="test-$$"
+sig_principal="user-$$@example.com"
+
+# Make a "wrong key"
+${SSHKEYGEN} -t ed25519 -f $OBJ/wrong-key -C "wrong trousers, Grommit" -N '' \
+        || fatal "couldn't generate key"
+WRONG=$OBJ/wrong-key.pub
+
+# Make a CA key.
+${SSHKEYGEN} -t ed25519 -f $OBJ/sigca-key -C "CA" -N '' \
+        || fatal "couldn't generate key"
+CA_PRIV=$OBJ/sigca-key
+CA_PUB=$OBJ/sigca-key.pub
+
+trace "start agent"
+eval `${SSHAGENT} -s` > /dev/null
+r=$?
+if [ $r -ne 0 ]; then
+        fatal "could not start ssh-agent: exit code $r"
+fi
+
+SIGNKEYS="$SSH_KEYTYPES"
+verbose "$tid: make certificates"
+for t in $SSH_KEYTYPES ; do
+        ${SSHKEYGEN} -q -s $CA_PRIV -z $$ \
+            -I "regress signature key for $USER" \
+            -n $sig_principal $OBJ/${t} || \
+                fatal "couldn't sign ${t}"
+        SIGNKEYS="$SIGNKEYS ${t}-cert.pub"
+done
+
+for t in $SIGNKEYS; do
+        verbose "$tid: check signature for $t"
+        keybase=`basename $t .pub`
+        privkey=${OBJ}/`basename $t -cert.pub`
+        sigfile=${OBJ}/sshsig-${keybase}.sig
+        sigfile_agent=${OBJ}/sshsig-agent-${keybase}.sig
+        pubkey=${OBJ}/${keybase}.pub
+
+        ${SSHKEYGEN} -vvv -Y sign -f ${OBJ}/$t -n $sig_namespace \
+                < $DATA > $sigfile 2>/dev/null || fail "sign using $t failed"
+
+        (printf "$sig_principal " ; cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 || \
+                fail "failed signature for $t key"
+
+        (printf "$sig_principal namespaces=\"$sig_namespace,whatever\" ";
+         cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 || \
+                fail "failed signature for $t key w/ limited namespace"
+
+        # Invalid option
+        (printf "$sig_principal octopus " ; cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature for $t key with bad signers option"
+
+        # Wrong key trusted.
+        (printf "$sig_principal " ; cat $WRONG) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature for $t key with wrong key trusted"
+
+        # incorrect data
+        (printf "$sig_principal " ; cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA2 >/dev/null 2>&1 && \
+                fail "passed signature for wrong data with $t key"
+
+        # wrong principal in signers
+        (printf "josef.k@example.com " ; cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature for $t key with wrong principal"
+
+        # wrong namespace
+        (printf "$sig_principal " ; cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n COWS_COWS_COWS \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature for $t key with wrong namespace"
+
+        # namespace excluded by option
+        (printf "$sig_principal namespaces=\"whatever\" " ;
+         cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature for $t key with excluded namespace"
+
+        # public key in revoked keys file
+        cat $pubkey > $OBJ/revoked_keys
+        (printf "$sig_principal namespaces=\"whatever\" " ;
+         cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                -r $OBJ/revoked_keys \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature for $t key, but key is in revoked_keys"
+
+        # public key not revoked, but other are present in revoked_keysfile
+        cat $WRONG > $OBJ/revoked_keys
+        (printf "$sig_principal " ; cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                -r $OBJ/revoked_keys \
+                < $DATA >/dev/null 2>&1 || \
+                fail "couldn't verify signature for $t key, but key not in revoked_keys"
+
+        # check-novalidate with valid data
+        ${SSHKEYGEN} -vvv -Y check-novalidate -s $sigfile -n $sig_namespace \
+                < $DATA >/dev/null 2>&1 || \
+                fail "failed to check valid signature for $t key"
+
+        # check-novalidate with invalid data
+        ${SSHKEYGEN} -vvv -Y check-novalidate -s $sigfile -n $sig_namespace \
+                < $DATA2 >/dev/null 2>&1 && \
+                fail "sucessfully checked signature for $t key with invalid data"
+
+        # Check signing keys using ssh-agent.
+        ${SSHADD} -D >/dev/null 2>&1 # Remove all previously-loaded keys.
+        ${SSHADD} ${privkey} > /dev/null 2>&1 || fail "ssh-add failed"
+
+        # Move private key to ensure agent key is used
+        mv ${privkey} ${privkey}.tmp
+
+        ${SSHKEYGEN} -vvv -Y sign -f $pubkey -n $sig_namespace \
+                < $DATA > $sigfile_agent 2>/dev/null || \
+                fail "ssh-agent based sign using $pubkey failed"
+        ${SSHKEYGEN} -vvv -Y check-novalidate -s $sigfile_agent \
+                -n $sig_namespace < $DATA >/dev/null 2>&1 || \
+                fail "failed to check valid signature for $t key"
+
+        # Move private key back
+        mv ${privkey}.tmp ${privkey}
+
+        # Remaining tests are for certificates only.
+        case "$keybase" in
+                *-cert) ;;
+                *) continue ;;
+        esac
+
+
+        # correct CA key
+        (printf "$sig_principal cert-authority " ;
+         cat $CA_PUB) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 || \
+                fail "failed signature for $t cert"
+
+        # signing key listed as cert-authority
+        (printf "$sig_principal cert-authority" ;
+         cat $pubkey) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature with $t key listed as CA"
+
+        # CA key not flagged cert-authority
+        (printf "$sig_principal " ; cat $CA_PUB) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature for $t cert with CA not marked"
+
+        # mismatch between cert principal and file
+        (printf "josef.k@example.com cert-authority" ;
+         cat $CA_PUB) > $OBJ/allowed_signers
+        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
+                -I $sig_principal -f $OBJ/allowed_signers \
+                < $DATA >/dev/null 2>&1 && \
+                fail "accepted signature for $t cert with wrong principal"
+done
+
+trace "kill agent"
+${SSHAGENT} -k > /dev/null
+
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b8e2009de..508b93284 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.65 2019/01/27 06:30:53 dtucker Exp $
+#       $OpenBSD: test-exec.sh,v 1.66 2019/07/05 04:12:46 dtucker Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -152,13 +152,22 @@ SFTPSERVER_BIN=${SFTPSERVER}
 SCP_BIN=${SCP}
 
 if [ "x$USE_VALGRIND" != "x" ]; then
-        mkdir -p $OBJ/valgrind-out
+        rm -rf $OBJ/valgrind-out $OBJ/valgrind-vgdb
+        mkdir -p $OBJ/valgrind-out $OBJ/valgrind-vgdb
+        # When using sudo ensure low-priv tests can write pipes and logs.
+        if [ "x$SUDO" != "x" ]; then
+                chmod 777 $OBJ/valgrind-out $OBJ/valgrind-vgdb
+        fi
         VG_TEST=`basename $SCRIPT .sh`
 
         # Some tests are difficult to fix.
         case "$VG_TEST" in
-        connect-privsep|reexec)
+        reexec)
                 VG_SKIP=1 ;;
+        sftp-chroot)
+                if [ "x${SUDO}" != "x" ]; then
+                        VG_SKIP=1
+                fi ;;
         esac
 
         if [ x"$VG_SKIP" = "x" ]; then
@@ -171,6 +180,7 @@ if [ "x$USE_VALGRIND" != "x" ]; then
                 VG_OPTS="--track-origins=yes $VG_LEAK"
                 VG_OPTS="$VG_OPTS --trace-children=yes"
                 VG_OPTS="$VG_OPTS --trace-children-skip=${VG_IGNORE}"
+                VG_OPTS="$VG_OPTS --vgdb-prefix=$OBJ/valgrind-vgdb/"
                 VG_PATH="valgrind"
                 if [ "x$VALGRIND_PATH" != "x" ]; then
                         VG_PATH="$VALGRIND_PATH"
@@ -527,13 +537,13 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
             >> $OBJ/authorized_keys_$USER
 
         # Convert rsa2 host key to PuTTY format
-        cp $OBJ/rsa $OBJ/rsa_oldfmt
-        ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/rsa_oldfmt >/dev/null
-        ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/rsa_oldfmt > \
+        cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt
+        ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null
+        ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/ssh-rsa_oldfmt > \
             ${OBJ}/.putty/sshhostkeys
-        ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/rsa_oldfmt >> \
+        ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/ssh-rsa_oldfmt >> \
             ${OBJ}/.putty/sshhostkeys
-        rm -f $OBJ/rsa_oldfmt
+        rm -f $OBJ/ssh-rsa_oldfmt
 
         # Setup proxied session
         mkdir -p ${OBJ}/.putty/sessions
@@ -581,6 +591,31 @@ start_sshd ()
 
 # kill sshd
 cleanup
+
+if [ "x$USE_VALGRIND" != "x" ]; then
+        # wait for any running process to complete
+        wait; sleep 1
+        VG_RESULTS=$(find $OBJ/valgrind-out -type f -print)
+        VG_RESULT_COUNT=0
+        VG_FAIL_COUNT=0
+        for i in $VG_RESULTS; do
+                if grep "ERROR SUMMARY" $i >/dev/null; then
+                        VG_RESULT_COUNT=$(($VG_RESULT_COUNT + 1))
+                        if ! grep "ERROR SUMMARY: 0 errors" $i >/dev/null; then
+                                VG_FAIL_COUNT=$(($VG_FAIL_COUNT + 1))
+                                RESULT=1
+                                verbose valgrind failure $i
+                                cat $i
+                        fi
+                fi
+        done
+        if [ x"$VG_SKIP" != "x" ]; then
+                verbose valgrind skipped
+        else
+                verbose valgrind results $VG_RESULT_COUNT failures $VG_FAIL_COUNT
+        fi
+fi
+
 if [ $RESULT -eq 0 ]; then
         verbose ok $tid
 else
diff --git a/regress/unittests/Makefile b/regress/unittests/Makefile
index e464b085a..4e56e1104 100644
--- a/regress/unittests/Makefile
+++ b/regress/unittests/Makefile
@@ -1,7 +1,7 @@
-#       $OpenBSD: Makefile,v 1.10 2018/03/03 03:16:17 djm Exp $
+#       $OpenBSD: Makefile,v 1.11 2019/04/28 22:53:26 dtucker Exp $
 
 REGRESS_FAIL_EARLY?=    yes
 SUBDIR= test_helper sshbuf sshkey bitmap kex hostkeys utf8 match conversion
-SUBDIR+=authopt
+SUBDIR+=authopt misc
 
 .include <bsd.subdir.mk>
diff --git a/regress/unittests/bitmap/tests.c b/regress/unittests/bitmap/tests.c
index 23025f90a..f66a4ce46 100644
--- a/regress/unittests/bitmap/tests.c
+++ b/regress/unittests/bitmap/tests.c
@@ -16,7 +16,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
+#endif
 
 #include "../test_helper/test_helper.h"
 
@@ -27,6 +29,7 @@
 void
 tests(void)
 {
+#ifdef WITH_OPENSSL
         struct bitmap *b;
         BIGNUM *bn;
         size_t len;
@@ -131,5 +134,6 @@ tests(void)
         bitmap_free(b);
         BN_free(bn);
         TEST_DONE();
+#endif
 }
 
diff --git a/regress/unittests/conversion/tests.c b/regress/unittests/conversion/tests.c
index 6dd77ef42..ae1154d42 100644
--- a/regress/unittests/conversion/tests.c
+++ b/regress/unittests/conversion/tests.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: tests.c,v 1.1 2017/03/14 01:20:29 dtucker Exp $ */
+/*      $OpenBSD: tests.c,v 1.2 2019/06/14 04:03:48 djm Exp $ */
 /*
  * Regress test for conversions
  *
@@ -40,6 +40,8 @@ tests(void)
         ASSERT_LONG_EQ(convtime("-9d"), -1);
         
         /* overflow */
+        snprintf(buf, sizeof buf, "%llu", (unsigned long long)LONG_MAX);
+        ASSERT_LONG_EQ(convtime(buf), -1);
         snprintf(buf, sizeof buf, "%llu", (unsigned long long)LONG_MAX + 1);
         ASSERT_LONG_EQ(convtime(buf), -1);
 
diff --git a/regress/unittests/hostkeys/test_iterate.c b/regress/unittests/hostkeys/test_iterate.c
index d6963bd2a..5904121ef 100644
--- a/regress/unittests/hostkeys/test_iterate.c
+++ b/regress/unittests/hostkeys/test_iterate.c
@@ -57,7 +57,7 @@ check(struct hostkey_foreach_line *l, void *_ctx)
         int parse_key = (ctx->flags & HKF_WANT_PARSE_KEY) != 0;
         const int matching = (ctx->flags & HKF_WANT_MATCH) != 0;
         u_int expected_status, expected_match;
-        int expected_keytype;
+        int expected_keytype, skip = 0;
 
         test_subtest_info("entry %zu/%zu, file line %ld",
             ctx->i + 1, ctx->nexpected, l->linenum);
@@ -92,13 +92,23 @@ check(struct hostkey_foreach_line *l, void *_ctx)
 
 #ifndef OPENSSL_HAS_ECC
         if (expected->l.keytype == KEY_ECDSA ||
-            expected->no_parse_keytype == KEY_ECDSA) {
+            expected->no_parse_keytype == KEY_ECDSA)
+                skip = 1;
+#endif /* OPENSSL_HAS_ECC */
+#ifndef WITH_OPENSSL
+        if (expected->l.keytype == KEY_DSA ||
+            expected->no_parse_keytype == KEY_DSA ||
+            expected->l.keytype == KEY_RSA ||
+            expected->no_parse_keytype == KEY_RSA ||
+            expected->l.keytype == KEY_ECDSA ||
+            expected->no_parse_keytype == KEY_ECDSA)
+                skip = 1;
+#endif /* WITH_OPENSSL */
+        if (skip) {
                 expected_status = HKF_STATUS_INVALID;
                 expected_keytype = KEY_UNSPEC;
                 parse_key = 0;
         }
-#endif
-
         UPDATE_MATCH_STATUS(match_host_p);
         UPDATE_MATCH_STATUS(match_host_s);
         UPDATE_MATCH_STATUS(match_ipv4);
@@ -145,7 +155,15 @@ prepare_expected(struct expected *expected, size_t n)
 #ifndef OPENSSL_HAS_ECC
                 if (expected[i].l.keytype == KEY_ECDSA)
                         continue;
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#ifndef WITH_OPENSSL
+                switch (expected[i].l.keytype) {
+                case KEY_RSA:
+                case KEY_DSA:
+                case KEY_ECDSA:
+                        continue;
+                }
+#endif /* WITH_OPENSSL */
                 ASSERT_INT_EQ(sshkey_load_public(
                     test_data_file(expected[i].key_file), &expected[i].l.key,
                     NULL), 0);
diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c
index a860efc02..0e7cd9e07 100644
--- a/regress/unittests/kex/test_kex.c
+++ b/regress/unittests/kex/test_kex.c
@@ -142,13 +142,15 @@ do_kex_with_key(char *kex, int keytype, int bits)
         sshbuf_free(state);
         ASSERT_PTR_NE(server2->kex, NULL);
         /* XXX we need to set the callbacks */
+#ifdef WITH_OPENSSL
         server2->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
         server2->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
         server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
         server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
 #ifdef OPENSSL_HAS_ECC
         server2->kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
         server2->kex->kex[KEX_C25519_SHA256] = kex_gen_server;
         server2->kex->load_host_public_key = server->kex->load_host_public_key;
         server2->kex->load_host_private_key = server->kex->load_host_private_key;
@@ -175,11 +177,13 @@ do_kex_with_key(char *kex, int keytype, int bits)
 static void
 do_kex(char *kex)
 {
+#ifdef WITH_OPENSSL
         do_kex_with_key(kex, KEY_RSA, 2048);
         do_kex_with_key(kex, KEY_DSA, 1024);
 #ifdef OPENSSL_HAS_ECC
         do_kex_with_key(kex, KEY_ECDSA, 256);
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
         do_kex_with_key(kex, KEY_ED25519, 256);
 }
 
@@ -187,13 +191,15 @@ void
 kex_tests(void)
 {
         do_kex("curve25519-sha256@libssh.org");
+#ifdef WITH_OPENSSL
 #ifdef OPENSSL_HAS_ECC
         do_kex("ecdh-sha2-nistp256");
         do_kex("ecdh-sha2-nistp384");
         do_kex("ecdh-sha2-nistp521");
-#endif
+#endif /* OPENSSL_HAS_ECC */
         do_kex("diffie-hellman-group-exchange-sha256");
         do_kex("diffie-hellman-group-exchange-sha1");
         do_kex("diffie-hellman-group14-sha1");
         do_kex("diffie-hellman-group1-sha1");
+#endif /* WITH_OPENSSL */
 }
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_basic.c b/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
index 966e8432b..bea89881a 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_sshbuf_getput_basic.c,v 1.1 2014/04/30 05:32:00 djm Exp $ */
+/*      $OpenBSD: test_sshbuf_getput_basic.c,v 1.2 2019/07/14 23:33:19 djm Exp $ */
 /*
  * Regress test for sshbuf.h buffer API
  *
@@ -481,4 +481,233 @@ sshbuf_getput_basic_tests(void)
         ASSERT_MEM_EQ(sshbuf_ptr(p1), bn_exp3, sizeof(bn_exp3));
         sshbuf_free(p1);
         TEST_DONE();
+
+        TEST_START("sshbuf_peek_u64");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_put(p1, x, sizeof(x)), 0);
+        ASSERT_INT_EQ(sshbuf_peek_u64(p1, 0, &v64), 0);
+        ASSERT_U64_EQ(v64, 0x1122334455667788ULL);
+        ASSERT_INT_EQ(sshbuf_peek_u64(p1, 2, &v64), 0);
+        ASSERT_U64_EQ(v64, 0x3344556677880099ULL);
+        ASSERT_INT_EQ(sshbuf_peek_u64(p1, 3, &v64), SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_peek_u64(p1, sizeof(x), &v64),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_peek_u64(p1, 1000, &v64),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        sshbuf_free(p1);
+        TEST_DONE();
+
+        TEST_START("sshbuf_peek_u32");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_put(p1, x, sizeof(x)), 0);
+        ASSERT_INT_EQ(sshbuf_peek_u32(p1, 0, &v32), 0);
+        ASSERT_U32_EQ(v32, 0x11223344);
+        ASSERT_INT_EQ(sshbuf_peek_u32(p1, 6, &v32), 0);
+        ASSERT_U32_EQ(v32, 0x77880099);
+        ASSERT_INT_EQ(sshbuf_peek_u32(p1, 7, &v32), SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_peek_u32(p1, sizeof(x), &v32),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_peek_u32(p1, 1000, &v32),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        sshbuf_free(p1);
+        TEST_DONE();
+
+        TEST_START("sshbuf_peek_u16");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_put(p1, x, sizeof(x)), 0);
+        ASSERT_INT_EQ(sshbuf_peek_u16(p1, 0, &v16), 0);
+        ASSERT_U16_EQ(v16, 0x1122);
+        ASSERT_INT_EQ(sshbuf_peek_u16(p1, 8, &v16), 0);
+        ASSERT_U16_EQ(v16, 0x99);
+        ASSERT_INT_EQ(sshbuf_peek_u16(p1, 9, &v16), SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_peek_u16(p1, sizeof(x), &v16),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_peek_u16(p1, 1000, &v16),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        sshbuf_free(p1);
+        TEST_DONE();
+
+        TEST_START("sshbuf_peek_u8");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_put(p1, x, sizeof(x)), 0);
+        ASSERT_INT_EQ(sshbuf_peek_u8(p1, 0, &v8), 0);
+        ASSERT_U8_EQ(v8, 0x11);
+        ASSERT_INT_EQ(sshbuf_peek_u8(p1, 9, &v8), 0);
+        ASSERT_U8_EQ(v8, 0x99);
+        ASSERT_INT_EQ(sshbuf_peek_u8(p1, sizeof(x), &v8),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_peek_u8(p1, 1000, &v8),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        sshbuf_free(p1);
+        TEST_DONE();
+
+        TEST_START("sshbuf_poke_u64");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke at start of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u64(p1, 0, 0xa1b2c3d4e5f60718ULL), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "a1b2c3d4e5f607180000");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke aligned with end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u64(p1, 2, 0xa1b2c3d4e5f60718ULL), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "0000a1b2c3d4e5f60718");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke past end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u64(p1, 3, 0xa1b2c3d4e5f60718ULL),
+            SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke_u64(p1, 10, 0xa1b2c3d4e5f60718ULL),
+            SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke_u64(p1, 1000, 0xa1b2c3d4e5f60718ULL),
+            SSH_ERR_NO_BUFFER_SPACE);
+        /* ensure failed pokes do not modify buffer */
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "00000000000000000000");
+        sshbuf_free(p1);
+        TEST_DONE();
+
+        TEST_START("sshbuf_poke_u32");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke at start of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u32(p1, 0, 0xa1b2c3d4), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "a1b2c3d4000000000000");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke aligned with end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u32(p1, 6, 0xa1b2c3d4), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "000000000000a1b2c3d4");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke past end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u32(p1, 7, 0xa1b2c3d4),
+            SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke_u32(p1, 10, 0xa1b2c3d4),
+            SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke_u32(p1, 1000, 0xa1b2c3d4),
+            SSH_ERR_NO_BUFFER_SPACE);
+        /* ensure failed pokes do not modify buffer */
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "00000000000000000000");
+        sshbuf_free(p1);
+        TEST_DONE();
+
+        TEST_START("sshbuf_poke_u16");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke at start of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u16(p1, 0, 0xa1b2), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "a1b20000000000000000");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke aligned with end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u16(p1, 8, 0xa1b2), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "0000000000000000a1b2");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke past end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u16(p1, 9, 0xa1b2),
+            SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke_u16(p1, 10, 0xa1b2),
+            SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke_u16(p1, 1000, 0xa1b2),
+            SSH_ERR_NO_BUFFER_SPACE);
+        /* ensure failed pokes do not modify buffer */
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "00000000000000000000");
+        sshbuf_free(p1);
+        TEST_DONE();
+
+        TEST_START("sshbuf_poke_u8");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke at start of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u8(p1, 0, 0xa1), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "a1000000000000000000");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke aligned with end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u8(p1, 9, 0xa1), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "000000000000000000a1");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke past end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke_u8(p1, 10, 0xa1), SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke_u8(p1, 1000, 0xa1), SSH_ERR_NO_BUFFER_SPACE);
+        /* ensure failed pokes do not modify buffer */
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "00000000000000000000");
+        sshbuf_free(p1);
+        TEST_DONE();
+
+        TEST_START("sshbuf_poke");
+        p1 = sshbuf_new();
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke at start of buffer */
+        ASSERT_INT_EQ(sshbuf_poke(p1, 0, "hello!", 6), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "68656c6c6f2100000000");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke aligned with end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke(p1, 4, "hello!", 6), 0);
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "0000000068656c6c6f21");
+        free(s2);
+        sshbuf_reset(p1);
+        ASSERT_INT_EQ(sshbuf_reserve(p1, 10, NULL), 0);
+        /* poke past end of buffer */
+        ASSERT_INT_EQ(sshbuf_poke(p1, 7, "hello!", 6),
+            SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke(p1, 10, "hello!", 6),
+            SSH_ERR_NO_BUFFER_SPACE);
+        ASSERT_INT_EQ(sshbuf_poke(p1, 1000, "hello!", 6),
+            SSH_ERR_NO_BUFFER_SPACE);
+        /* ensure failed pokes do not modify buffer */
+        s2 = sshbuf_dtob16(p1);
+        ASSERT_PTR_NE(s2, NULL);
+        ASSERT_STRING_EQ(s2, "00000000000000000000");
+        sshbuf_free(p1);
+        TEST_DONE();
 }
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
index 5d39e63e1..492b3bdf0 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
@@ -7,6 +7,8 @@
 
 #include "includes.h"
 
+#ifdef WITH_OPENSSL
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <stdio.h>
@@ -276,3 +278,4 @@ sshbuf_getput_crypto_tests(void)
 #endif
 }
 
+#endif /* WITH_OPENSSL */
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
index ca06bfb00..1ca30be97 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
@@ -32,10 +32,12 @@ static void
 attempt_parse_blob(u_char *blob, size_t len)
 {
         struct sshbuf *p1;
+#ifdef WITH_OPENSSL
         BIGNUM *bn;
 #if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256)
         EC_KEY *eck;
-#endif
+#endif /* defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) */
+#endif /* WITH_OPENSSL */
         u_char *s;
         size_t l;
         u_int8_t u8;
@@ -54,6 +56,7 @@ attempt_parse_blob(u_char *blob, size_t len)
                 bzero(s, l);
                 free(s);
         }
+#ifdef WITH_OPENSSL
         bn = NULL;
         sshbuf_get_bignum2(p1, &bn);
         BN_clear_free(bn);
@@ -62,7 +65,8 @@ attempt_parse_blob(u_char *blob, size_t len)
         ASSERT_PTR_NE(eck, NULL);
         sshbuf_get_eckey(p1, eck);
         EC_KEY_free(eck);
-#endif
+#endif /* defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) */
+#endif /* WITH_OPENSSL */
         sshbuf_free(p1);
 }
 
diff --git a/regress/unittests/sshbuf/test_sshbuf_misc.c b/regress/unittests/sshbuf/test_sshbuf_misc.c
index 762a6c31c..c53db937f 100644
--- a/regress/unittests/sshbuf/test_sshbuf_misc.c
+++ b/regress/unittests/sshbuf/test_sshbuf_misc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_sshbuf_misc.c,v 1.2 2016/05/03 13:48:33 djm Exp $ */
+/*      $OpenBSD: test_sshbuf_misc.c,v 1.4 2019/07/16 22:16:49 djm Exp $ */
 /*
  * Regress test for sshbuf.h buffer API
  *
@@ -19,6 +19,7 @@
 #include "../test_helper/test_helper.h"
 
 #include "sshbuf.h"
+#include "ssherr.h"
 
 void sshbuf_misc_tests(void);
 
@@ -26,7 +27,7 @@ void
 sshbuf_misc_tests(void)
 {
         struct sshbuf *p1;
-        char tmp[512], *p;
+        char tmp[512], msg[] = "imploring ping silence ping over", *p;
         FILE *out;
         size_t sz;
 
@@ -60,48 +61,48 @@ sshbuf_misc_tests(void)
         sshbuf_free(p1);
         TEST_DONE();
 
-        TEST_START("sshbuf_dtob64 len 1");
+        TEST_START("sshbuf_dtob64_string len 1");
         p1 = sshbuf_new();
         ASSERT_PTR_NE(p1, NULL);
         ASSERT_INT_EQ(sshbuf_put_u8(p1, 0x11), 0);
-        p = sshbuf_dtob64(p1);
+        p = sshbuf_dtob64_string(p1, 0);
         ASSERT_PTR_NE(p, NULL);
         ASSERT_STRING_EQ(p, "EQ==");
         free(p);
         sshbuf_free(p1);
         TEST_DONE();
 
-        TEST_START("sshbuf_dtob64 len 2");
+        TEST_START("sshbuf_dtob64_string len 2");
         p1 = sshbuf_new();
         ASSERT_PTR_NE(p1, NULL);
         ASSERT_INT_EQ(sshbuf_put_u8(p1, 0x11), 0);
         ASSERT_INT_EQ(sshbuf_put_u8(p1, 0x22), 0);
-        p = sshbuf_dtob64(p1);
+        p = sshbuf_dtob64_string(p1, 0);
         ASSERT_PTR_NE(p, NULL);
         ASSERT_STRING_EQ(p, "ESI=");
         free(p);
         sshbuf_free(p1);
         TEST_DONE();
 
-        TEST_START("sshbuf_dtob64 len 3");
+        TEST_START("sshbuf_dtob64_string len 3");
         p1 = sshbuf_new();
         ASSERT_PTR_NE(p1, NULL);
         ASSERT_INT_EQ(sshbuf_put_u8(p1, 0x11), 0);
         ASSERT_INT_EQ(sshbuf_put_u8(p1, 0x22), 0);
         ASSERT_INT_EQ(sshbuf_put_u8(p1, 0x33), 0);
-        p = sshbuf_dtob64(p1);
+        p = sshbuf_dtob64_string(p1, 0);
         ASSERT_PTR_NE(p, NULL);
         ASSERT_STRING_EQ(p, "ESIz");
         free(p);
         sshbuf_free(p1);
         TEST_DONE();
 
-        TEST_START("sshbuf_dtob64 len 8191");
+        TEST_START("sshbuf_dtob64_string len 8191");
         p1 = sshbuf_new();
         ASSERT_PTR_NE(p1, NULL);
         ASSERT_INT_EQ(sshbuf_reserve(p1, 8192, NULL), 0);
         bzero(sshbuf_mutable_ptr(p1), 8192);
-        p = sshbuf_dtob64(p1);
+        p = sshbuf_dtob64_string(p1, 0);
         ASSERT_PTR_NE(p, NULL);
         ASSERT_SIZE_T_EQ(strlen(p), ((8191 + 2) / 3) * 4);
         free(p);
@@ -163,5 +164,55 @@ sshbuf_misc_tests(void)
         ASSERT_PTR_EQ(p, NULL);
         sshbuf_free(p1);
         TEST_DONE();
+
+        TEST_START("sshbuf_cmp");
+        p1 = sshbuf_from(msg, sizeof(msg) - 1);
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 0, "i", 1), 0);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 0, "j", 1), SSH_ERR_INVALID_FORMAT);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 0, "imploring", 9), 0);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 0, "implored", 9), SSH_ERR_INVALID_FORMAT);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 10, "ping", 4), 0);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 10, "ring", 4), SSH_ERR_INVALID_FORMAT);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 28, "over", 4), 0);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 28, "rove", 4), SSH_ERR_INVALID_FORMAT);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 28, "overt", 5),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 32, "ping", 4),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 1000, "silence", 7),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_cmp(p1, 0, msg, sizeof(msg) - 1), 0);
+        TEST_DONE();
+
+        TEST_START("sshbuf_find");
+        p1 = sshbuf_from(msg, sizeof(msg) - 1);
+        ASSERT_PTR_NE(p1, NULL);
+        ASSERT_INT_EQ(sshbuf_find(p1, 0, "i", 1, &sz), 0);
+        ASSERT_SIZE_T_EQ(sz, 0);
+        ASSERT_INT_EQ(sshbuf_find(p1, 0, "j", 1, &sz), SSH_ERR_INVALID_FORMAT);
+        ASSERT_INT_EQ(sshbuf_find(p1, 0, "imploring", 9, &sz), 0);
+        ASSERT_SIZE_T_EQ(sz, 0);
+        ASSERT_INT_EQ(sshbuf_find(p1, 0, "implored", 9, &sz),
+            SSH_ERR_INVALID_FORMAT);
+        ASSERT_INT_EQ(sshbuf_find(p1, 3, "ping", 4, &sz), 0);
+        ASSERT_SIZE_T_EQ(sz, 10);
+        ASSERT_INT_EQ(sshbuf_find(p1, 11, "ping", 4, &sz), 0);
+        ASSERT_SIZE_T_EQ(sz, 23);
+        ASSERT_INT_EQ(sshbuf_find(p1, 20, "over", 4, &sz), 0);
+        ASSERT_SIZE_T_EQ(sz, 28);
+        ASSERT_INT_EQ(sshbuf_find(p1, 28, "over", 4, &sz), 0);
+        ASSERT_SIZE_T_EQ(sz, 28);
+        ASSERT_INT_EQ(sshbuf_find(p1, 28, "rove", 4, &sz),
+            SSH_ERR_INVALID_FORMAT);
+        ASSERT_INT_EQ(sshbuf_find(p1, 28, "overt", 5, &sz),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_find(p1, 32, "ping", 4, &sz),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_find(p1, 1000, "silence", 7, &sz),
+            SSH_ERR_MESSAGE_INCOMPLETE);
+        ASSERT_INT_EQ(sshbuf_find(p1, 0, msg + 1, sizeof(msg) - 2, &sz), 0);
+        ASSERT_SIZE_T_EQ(sz, 1);
+        TEST_DONE();
 }
 
diff --git a/regress/unittests/sshbuf/tests.c b/regress/unittests/sshbuf/tests.c
index 1557e4342..29916a10b 100644
--- a/regress/unittests/sshbuf/tests.c
+++ b/regress/unittests/sshbuf/tests.c
@@ -20,7 +20,9 @@ tests(void)
 {
         sshbuf_tests();
         sshbuf_getput_basic_tests();
+#ifdef WITH_OPENSSL
         sshbuf_getput_crypto_tests();
+#endif
         sshbuf_misc_tests();
         sshbuf_fuzz_tests();
         sshbuf_getput_fuzz_tests();
diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c
index e63465c47..e21638093 100644
--- a/regress/unittests/sshkey/common.c
+++ b/regress/unittests/sshkey/common.c
@@ -19,13 +19,15 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/objects.h>
 #ifdef OPENSSL_HAS_NISTP256
 # include <openssl/ec.h>
-#endif
+#endif /* OPENSSL_HAS_NISTP256 */
+#endif /* WITH_OPENSSL */
 
 #include "openbsd-compat/openssl-compat.h"
 
@@ -72,6 +74,7 @@ load_text_file(const char *name)
         return ret;
 }
 
+#ifdef WITH_OPENSSL
 BIGNUM *
 load_bignum(const char *name)
 {
@@ -160,4 +163,5 @@ dsa_priv_key(struct sshkey *k)
         DSA_get0_key(k->dsa, NULL, &priv_key);
         return priv_key;
 }
+#endif /* WITH_OPENSSL */
 
diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c
index 65610dacc..55627bc12 100644
--- a/regress/unittests/sshkey/test_file.c
+++ b/regress/unittests/sshkey/test_file.c
@@ -19,13 +19,15 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/objects.h>
 #ifdef OPENSSL_HAS_NISTP256
 # include <openssl/ec.h>
-#endif
+#endif /* OPENSSL_HAS_NISTP256 */
+#endif /* WITH_OPENSSL */
 
 #include "../test_helper/test_helper.h"
 
@@ -44,7 +46,9 @@ sshkey_file_tests(void)
 {
         struct sshkey *k1, *k2;
         struct sshbuf *buf, *pw;
+#ifdef WITH_OPENSSL
         BIGNUM *a, *b, *c;
+#endif
         char *cp;
 
         TEST_START("load passphrase");
@@ -52,6 +56,7 @@ sshkey_file_tests(void)
         TEST_DONE();
 
 
+#ifdef WITH_OPENSSL
         TEST_START("parse RSA from private");
         buf = load_file("rsa_1");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
@@ -350,6 +355,7 @@ sshkey_file_tests(void)
 
         sshkey_free(k1);
 #endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("parse Ed25519 from private");
         buf = load_file("ed25519_1");
diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c
index 5953de595..1323f8997 100644
--- a/regress/unittests/sshkey/test_fuzz.c
+++ b/regress/unittests/sshkey/test_fuzz.c
@@ -113,7 +113,7 @@ sshkey_fuzz_tests(void)
         struct fuzz *fuzz;
         int r, i;
 
-
+#ifdef WITH_OPENSSL
         TEST_START("fuzz RSA private");
         buf = load_file("rsa_1");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
@@ -246,7 +246,8 @@ sshkey_fuzz_tests(void)
         sshbuf_free(fuzzed);
         fuzz_cleanup(fuzz);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("fuzz Ed25519 private");
         buf = load_file("ed25519_1");
@@ -270,6 +271,7 @@ sshkey_fuzz_tests(void)
         fuzz_cleanup(fuzz);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("fuzz RSA public");
         buf = load_file("rsa_1");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
@@ -312,7 +314,8 @@ sshkey_fuzz_tests(void)
         public_fuzz(k1);
         sshkey_free(k1);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("fuzz Ed25519 public");
         buf = load_file("ed25519_1");
@@ -328,6 +331,7 @@ sshkey_fuzz_tests(void)
         sshkey_free(k1);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("fuzz RSA sig");
         buf = load_file("rsa_1");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
@@ -368,7 +372,8 @@ sshkey_fuzz_tests(void)
         sig_fuzz(k1, NULL);
         sshkey_free(k1);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("fuzz Ed25519 sig");
         buf = load_file("ed25519_1");
@@ -379,5 +384,6 @@ sshkey_fuzz_tests(void)
         TEST_DONE();
 
 /* XXX fuzz decoded new-format blobs too */
+/* XXX fuzz XMSS too */
 
 }
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 47a03fad4..42395b8db 100644
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_sshkey.c,v 1.17 2018/09/13 09:03:20 djm Exp $ */
+/*      $OpenBSD: test_sshkey.c,v 1.18 2019/06/21 04:21:45 djm Exp $ */
 /*
  * Regress test for sshkey.h key management API
  *
@@ -50,9 +50,10 @@ put_opt(struct sshbuf *b, const char *name, const char *value)
         sshbuf_free(sect);
 }
 
+#ifdef WITH_OPENSSL
 static void
-build_cert(struct sshbuf *b, const struct sshkey *k, const char *type,
-    const struct sshkey *sign_key, const struct sshkey *ca_key,
+build_cert(struct sshbuf *b, struct sshkey *k, const char *type,
+    struct sshkey *sign_key, struct sshkey *ca_key,
     const char *sig_alg)
 {
         struct sshbuf *ca_buf, *pk, *principals, *critopts, *exts;
@@ -110,6 +111,7 @@ build_cert(struct sshbuf *b, const struct sshkey *k, const char *type,
         sshbuf_free(principals);
         sshbuf_free(pk);
 }
+#endif /* WITH_OPENSSL */
 
 static void
 signature_test(struct sshkey *k, struct sshkey *bad, const char *sig_alg,
@@ -176,10 +178,13 @@ get_private(const char *n)
 void
 sshkey_tests(void)
 {
-        struct sshkey *k1, *k2, *k3, *k4, *kr, *kd, *kf;
+        struct sshkey *k1, *k2, *k3, *kf;
+#ifdef WITH_OPENSSL
+        struct sshkey *k4, *kr, *kd;
 #ifdef OPENSSL_HAS_ECC
         struct sshkey *ke;
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
         struct sshbuf *b;
 
         TEST_START("new invalid");
@@ -193,6 +198,7 @@ sshkey_tests(void)
         sshkey_free(k1);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("new/free KEY_RSA");
         k1 = sshkey_new(KEY_RSA);
         ASSERT_PTR_NE(k1, NULL);
@@ -281,7 +287,8 @@ sshkey_tests(void)
         ASSERT_PTR_NE(EC_KEY_get0_public_key(ke->ecdsa), NULL);
         ASSERT_PTR_NE(EC_KEY_get0_private_key(ke->ecdsa), NULL);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("generate KEY_ED25519");
         ASSERT_INT_EQ(sshkey_generate(KEY_ED25519, 256, &kf), 0);
@@ -291,6 +298,7 @@ sshkey_tests(void)
         ASSERT_PTR_NE(kf->ed25519_sk, NULL);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("demote KEY_RSA");
         ASSERT_INT_EQ(sshkey_from_private(kr, &k1), 0);
         ASSERT_PTR_NE(k1, NULL);
@@ -338,7 +346,8 @@ sshkey_tests(void)
         ASSERT_INT_EQ(sshkey_equal(ke, k1), 1);
         sshkey_free(k1);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("demote KEY_ED25519");
         ASSERT_INT_EQ(sshkey_from_private(kf, &k1), 0);
@@ -354,17 +363,20 @@ sshkey_tests(void)
         sshkey_free(k1);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("equal mismatched key types");
         ASSERT_INT_EQ(sshkey_equal(kd, kr), 0);
 #ifdef OPENSSL_HAS_ECC
         ASSERT_INT_EQ(sshkey_equal(kd, ke), 0);
         ASSERT_INT_EQ(sshkey_equal(kr, ke), 0);
         ASSERT_INT_EQ(sshkey_equal(ke, kf), 0);
-#endif
+#endif /* OPENSSL_HAS_ECC */
         ASSERT_INT_EQ(sshkey_equal(kd, kf), 0);
         TEST_DONE();
+#endif /* WITH_OPENSSL */
 
         TEST_START("equal different keys");
+#ifdef WITH_OPENSSL
         ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &k1), 0);
         ASSERT_INT_EQ(sshkey_equal(kr, k1), 0);
         sshkey_free(k1);
@@ -375,17 +387,20 @@ sshkey_tests(void)
         ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &k1), 0);
         ASSERT_INT_EQ(sshkey_equal(ke, k1), 0);
         sshkey_free(k1);
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
         ASSERT_INT_EQ(sshkey_generate(KEY_ED25519, 256, &k1), 0);
         ASSERT_INT_EQ(sshkey_equal(kf, k1), 0);
         sshkey_free(k1);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         sshkey_free(kr);
         sshkey_free(kd);
 #ifdef OPENSSL_HAS_ECC
         sshkey_free(ke);
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
         sshkey_free(kf);
 
         TEST_START("certify key");
@@ -434,6 +449,7 @@ sshkey_tests(void)
         sshbuf_reset(b);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("sign and verify RSA");
         k1 = get_private("rsa_1");
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_2.pub"), &k2,
@@ -479,7 +495,8 @@ sshkey_tests(void)
         sshkey_free(k1);
         sshkey_free(k2);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("sign and verify ED25519");
         k1 = get_private("ed25519_1");
@@ -490,6 +507,7 @@ sshkey_tests(void)
         sshkey_free(k2);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("nested certificate");
         ASSERT_INT_EQ(sshkey_load_cert(test_data_file("rsa_1"), &k1), 0);
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_1.pub"), &k2,
@@ -504,5 +522,5 @@ sshkey_tests(void)
         sshkey_free(k3);
         sshbuf_free(b);
         TEST_DONE();
-
+#endif /* WITH_OPENSSL */
 }
diff --git a/regress/unittests/sshkey/testdata/ed25519_1_pw b/regress/unittests/sshkey/testdata/ed25519_1_pw
index c3b7ae7f8..da94d2b8e 100644
--- a/regress/unittests/sshkey/testdata/ed25519_1_pw
+++ b/regress/unittests/sshkey/testdata/ed25519_1_pw
@@ -1,8 +1,8 @@
 -----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABCus+kaow
-AUjHphacvRp98dAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIFOG6kY7Rf4UtCFv
-PwKgo/BztXck2xC4a2WyA34XtIwZAAAAoJaqqgiYQuElraJAmYOm7Tb4nJ3eI4oj9mQ52M
-/Yd+ION2Ur1v8BDewpDX+LHEYgKHo3Mlmcn2UyF+QJ+7xUCW7QCtk/4szrJzw74DlEl6mH
-T8PT/f/av7PpECBD/YD3NoDlB9OWm/Q4sHcxfBEKfTGD7s2Onn71HgrdEOPqd4Sj/IQigR
-drfjtXEMlD32k9n3dd2eS9x7AHWYaGFEMkOcY=
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABDKT56mBA
+tXIMsWqmuuA2gdAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIFOG6kY7Rf4UtCFv
+PwKgo/BztXck2xC4a2WyA34XtIwZAAAAoC13U47yfUOSZJePNUAwWXuFOk3aOKwPM5PMvK
+0zwRnMZZjgn+tsMAYPwhsT3Mx3h5QzvVGFyFEqsiK7j4vAotD+LVQeBN5TwWbUBx4lnoGs
+3iAfYVDakO/gNvVBDDGOqv5kdCc4cgn5HacjHQLKOAx6KzHe7JFn7uCywMdVVQjlpI6LHb
+mHkaKiVX/C2oiRnsoe17HZ8Fxyt3vd1qNM8BE=
 -----END OPENSSH PRIVATE KEY-----
diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c
index e7a47b265..9014ce8e4 100644
--- a/regress/unittests/test_helper/test_helper.c
+++ b/regress/unittests/test_helper/test_helper.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_helper.c,v 1.11 2018/11/23 02:53:57 dtucker Exp $        */
+/*      $OpenBSD: test_helper.c,v 1.12 2019/08/02 01:41:24 djm Exp $    */
 /*
  * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
  *
@@ -23,6 +23,7 @@
 #include <sys/param.h>
 #include <sys/uio.h>
 
+#include <stdarg.h>
 #include <fcntl.h>
 #include <stdio.h>
 #ifdef HAVE_STDINT_H
@@ -34,8 +35,10 @@
 #include <unistd.h>
 #include <signal.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
 #include <openssl/err.h>
+#endif
 
 #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
 # include <vis.h>
@@ -126,7 +129,9 @@ main(int argc, char **argv)
         int ch;
 
         seed_rng();
+#ifdef WITH_OPENSSL
         ERR_load_CRYPTO_strings();
+#endif
 
         /* Handle systems without __progname */
         if (__progname == NULL) {
@@ -287,6 +292,7 @@ test_subtest_info(const char *fmt, ...)
 void
 ssl_err_check(const char *file, int line)
 {
+#ifdef WITH_OPENSSL
         long openssl_error = ERR_get_error();
 
         if (openssl_error == 0)
@@ -294,6 +300,10 @@ ssl_err_check(const char *file, int line)
 
         fprintf(stderr, "\n%s:%d: uncaught OpenSSL error: %s",
             file, line, ERR_error_string(openssl_error, NULL));
+#else /* WITH_OPENSSL */
+        fprintf(stderr, "\n%s:%d: uncaught OpenSSL error ",
+            file, line);
+#endif /* WITH_OPENSSL */
         abort();
 }
 
@@ -338,6 +348,7 @@ test_header(const char *file, int line, const char *a1, const char *a2,
             a2 != NULL ? ", " : "", a2 != NULL ? a2 : "");
 }
 
+#ifdef WITH_OPENSSL
 void
 assert_bignum(const char *file, int line, const char *a1, const char *a2,
     const BIGNUM *aa1, const BIGNUM *aa2, enum test_predicate pred)
@@ -350,6 +361,7 @@ assert_bignum(const char *file, int line, const char *a1, const char *a2,
         fprintf(stderr, "%12s = 0x%s\n", a2, BN_bn2hex(aa2));
         test_die();
 }
+#endif
 
 void
 assert_string(const char *file, int line, const char *a1, const char *a2,
@@ -391,6 +403,8 @@ assert_mem(const char *file, int line, const char *a1, const char *a2,
     const void *aa1, const void *aa2, size_t l, enum test_predicate pred)
 {
         int r;
+        char *aa1_tohex = NULL;
+        char *aa2_tohex = NULL;
 
         if (l == 0)
                 return;
@@ -401,8 +415,12 @@ assert_mem(const char *file, int line, const char *a1, const char *a2,
         r = memcmp(aa1, aa2, l);
         TEST_CHECK_INT(r, pred);
         test_header(file, line, a1, a2, "STRING", pred);
-        fprintf(stderr, "%12s = %s (len %zu)\n", a1, tohex(aa1, MIN(l, 256)), l);
-        fprintf(stderr, "%12s = %s (len %zu)\n", a2, tohex(aa2, MIN(l, 256)), l);
+        aa1_tohex = tohex(aa1, MIN(l, 256));
+        aa2_tohex = tohex(aa2, MIN(l, 256));
+        fprintf(stderr, "%12s = %s (len %zu)\n", a1, aa1_tohex, l);
+        fprintf(stderr, "%12s = %s (len %zu)\n", a2, aa2_tohex, l);
+        free(aa1_tohex);
+        free(aa2_tohex);
         test_die();
 }
 
@@ -427,6 +445,7 @@ assert_mem_filled(const char *file, int line, const char *a1,
         size_t where = -1;
         int r;
         char tmp[64];
+        char *aa1_tohex = NULL;
 
         if (l == 0)
                 return;
@@ -436,8 +455,10 @@ assert_mem_filled(const char *file, int line, const char *a1,
         r = memvalcmp(aa1, v, l, &where);
         TEST_CHECK_INT(r, pred);
         test_header(file, line, a1, NULL, "MEM_ZERO", pred);
+        aa1_tohex = tohex(aa1, MIN(l, 20));
         fprintf(stderr, "%20s = %s%s (len %zu)\n", a1,
-            tohex(aa1, MIN(l, 20)), l > 20 ? "..." : "", l);
+            aa1_tohex, l > 20 ? "..." : "", l);
+        free(aa1_tohex);
         snprintf(tmp, sizeof(tmp), "(%s)[%zu]", a1, where);
         fprintf(stderr, "%20s = 0x%02x (expected 0x%02x)\n", tmp,
             ((u_char *)aa1)[where], v);
diff --git a/regress/unittests/test_helper/test_helper.h b/regress/unittests/test_helper/test_helper.h
index 1f893c8dd..66302201c 100644
--- a/regress/unittests/test_helper/test_helper.h
+++ b/regress/unittests/test_helper/test_helper.h
@@ -27,8 +27,10 @@
 # include <stdint.h>
 #endif
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
 #include <openssl/err.h>
+#endif
 
 enum test_predicate {
         TEST_EQ, TEST_NE, TEST_LT, TEST_LE, TEST_GT, TEST_GE
@@ -50,9 +52,11 @@ int test_is_slow(void);
 void test_subtest_info(const char *fmt, ...)
     __attribute__((format(printf, 1, 2)));
 void ssl_err_check(const char *file, int line);
+#ifdef WITH_OPENSSL
 void assert_bignum(const char *file, int line,
     const char *a1, const char *a2,
     const BIGNUM *aa1, const BIGNUM *aa2, enum test_predicate pred);
+#endif
 void assert_string(const char *file, int line,
     const char *a1, const char *a2,
     const char *aa1, const char *aa2, enum test_predicate pred);
diff --git a/regress/unittests/utf8/tests.c b/regress/unittests/utf8/tests.c
index f0bbca509..8cf524ddb 100644
--- a/regress/unittests/utf8/tests.c
+++ b/regress/unittests/utf8/tests.c
@@ -9,7 +9,9 @@
 #include "includes.h"
 
 #include <locale.h>
+#include <stdarg.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "../test_helper/test_helper.h"