mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-28 00:04:30 +02:00
upstream: Generate all key supported key types and enable for keyscan
test. OpenBSD-Regress-ID: 72f72ff49946c61bc949e1692dd9e3d71370891b
This commit is contained in:
parent
391ffc4b9d
commit
2a9b3a2ce4
@ -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.
|
# Placed in the Public Domain.
|
||||||
|
|
||||||
tid="keyscan"
|
tid="keyscan"
|
||||||
|
|
||||||
# remove DSA hostkey
|
KEYTYPES=`${SSH} -Q key-plain`
|
||||||
rm -f ${OBJ}/host.dsa
|
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
|
start_sshd
|
||||||
|
|
||||||
KEYTYPES=`${SSH} -Q key-plain`
|
|
||||||
for t in $KEYTYPES; do
|
for t in $KEYTYPES; do
|
||||||
trace "keyscan type $t"
|
trace "keyscan type $t"
|
||||||
${SSHKEYSCAN} -t $t -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \
|
${SSHKEYSCAN} -t $t -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \
|
||||||
|
@ -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.
|
# Placed in the Public Domain.
|
||||||
|
|
||||||
#SUDO=sudo
|
#SUDO=sudo
|
||||||
@ -469,11 +469,11 @@ fi
|
|||||||
|
|
||||||
rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER
|
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
|
for t in ${SSH_KEYTYPES}; do
|
||||||
# generate user key
|
# generate user key
|
||||||
|
trace "generating key type $t"
|
||||||
if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then
|
if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then
|
||||||
rm -f $OBJ/$t
|
rm -f $OBJ/$t
|
||||||
${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\
|
${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\
|
||||||
|
Loading…
x
Reference in New Issue
Block a user