forked from rpms/openssh
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
|
diff -up openssh-8.8p1/regress/hostkey-agent.sh.redhat openssh-8.8p1/regress/hostkey-agent.sh
|
||
|
|
--- openssh-8.8p1/regress/hostkey-agent.sh.redhat 2022-08-10 15:54:42.084777662 +0200
|
||
|
|
+++ openssh-8.8p1/regress/hostkey-agent.sh 2022-08-10 17:01:25.651269994 +0200
|
||
|
|
@@ -36,6 +36,8 @@ unset SSH_AUTH_SOCK
|
||
|
|
|
||
|
|
for ps in yes; do
|
||
|
|
for k in $SSH_ACCEPTED_KEYTYPES ; do
|
||
|
|
+ [ "$k" == "ssh-rsa" ] && continue
|
||
|
|
+ [ "$k" == "ssh-dss" ] && continue
|
||
|
|
verbose "key type $k privsep=$ps"
|
||
|
|
cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
|
||
|
|
echo "UsePrivilegeSeparation $ps" >> $OBJ/sshd_proxy
|
||
|
|
diff -up openssh-8.8p1/regress/hostkey-rotate.sh.redhat openssh-8.8p1/regress/hostkey-rotate.sh
|
||
|
|
--- openssh-8.8p1/regress/hostkey-rotate.sh.redhat 2022-08-10 16:57:12.720029146 +0200
|
||
|
|
+++ openssh-8.8p1/regress/hostkey-rotate.sh 2022-08-10 17:15:48.274923865 +0200
|
||
|
|
@@ -40,6 +40,8 @@ trace "prepare hostkeys"
|
||
|
|
nkeys=0
|
||
|
|
all_algs=""
|
||
|
|
for k in $SSH_HOSTKEY_TYPES; do
|
||
|
|
+ [ "$k" == "ssh-rsa" ] && continue
|
||
|
|
+ [ "$k" == "ssh-dss" ] && continue
|
||
|
|
${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`
|
||
|
|
@@ -87,11 +89,15 @@ dossh -oStrictHostKeyChecking=yes -oHost
|
||
|
|
# Check that other keys learned
|
||
|
|
expect_nkeys $nkeys "learn hostkeys"
|
||
|
|
for k in $SSH_HOSTKEY_TYPES; do
|
||
|
|
+ [ "$k" == "ssh-rsa" ] && continue
|
||
|
|
+ [ "$k" == "ssh-dss" ] && continue
|
||
|
|
check_key_present $k || fail "didn't learn keytype $k"
|
||
|
|
done
|
||
|
|
|
||
|
|
# Check each key type
|
||
|
|
for k in $SSH_HOSTKEY_TYPES; do
|
||
|
|
+ [ "$k" == "ssh-rsa" ] && continue
|
||
|
|
+ [ "$k" == "ssh-dss" ] && continue
|
||
|
|
verbose "learn additional hostkeys, type=$k"
|
||
|
|
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs
|
||
|
|
expect_nkeys $nkeys "learn hostkeys $k"
|
||
|
|
|