diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2019-01-27 06:30:54 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2019-01-27 06:30:54 +0000 |
| commit | 7969ff061148f87be48087c95120f9231b55256c (patch) | |
| tree | 0d9eecab432f8b59a0bbab8c722da0169853cb3c /regress/usr.bin | |
| parent | 8313255e499b3f76374a3fb1f7d66212ce0a8c1c (diff) | |
Generate all key supported key types and enable for keyscan test.
Diffstat (limited to 'regress/usr.bin')
| -rw-r--r-- | regress/usr.bin/ssh/keyscan.sh | 16 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 6 |
2 files changed, 15 insertions, 7 deletions
diff --git a/regress/usr.bin/ssh/keyscan.sh b/regress/usr.bin/ssh/keyscan.sh index 3bde1219a60..80e7f972a79 100644 --- a/regress/usr.bin/ssh/keyscan.sh +++ b/regress/usr.bin/ssh/keyscan.sh @@ -1,14 +1,22 @@ -# $OpenBSD: keyscan.sh,v 1.6 2017/04/30 23:34:55 djm Exp $ +# $OpenBSD: keyscan.sh,v 1.7 2019/01/27 06:30:53 dtucker Exp $ # Placed in the Public Domain. tid="keyscan" -# remove DSA hostkey -rm -f ${OBJ}/host.dsa +KEYTYPES=`${SSH} -Q key-plain` +for i in $KEYTYPES; do + if [ -z "$algs" ]; then + algs="$i" + else + algs="$algs,$i" + fi +done +echo "HostKeyAlgorithms $algs" >> sshd_config + +cat sshd_config start_sshd -KEYTYPES=`${SSH} -Q key-plain` for t in $KEYTYPES; do trace "keyscan type $t" ${SSHKEYSCAN} -t $t -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \ diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index 6865007674d..8e5c078bae0 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.64 2018/08/10 01:35:49 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.65 2019/01/27 06:30:53 dtucker Exp $ # Placed in the Public Domain. USER=`id -un` @@ -312,11 +312,11 @@ fi rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER -SSH_KEYTYPES="rsa ed25519" +SSH_KEYTYPES=`$SSH -Q key-plain` -trace "generate keys" for t in ${SSH_KEYTYPES}; do # generate user key + trace "generating key type $t" if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN} -nt $OBJ/$t ]; then rm -f $OBJ/$t ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ |