vishalmishra434 / rpms / openssh

Forked from rpms/openssh a month ago
Clone
Dmitry Belyavskiy 9fd698
diff -up openssh-8.8p1/regress/hostkey-agent.sh.redhat openssh-8.8p1/regress/hostkey-agent.sh
Dmitry Belyavskiy 9fd698
--- openssh-8.8p1/regress/hostkey-agent.sh.redhat	2022-08-10 15:54:42.084777662 +0200
Dmitry Belyavskiy 9fd698
+++ openssh-8.8p1/regress/hostkey-agent.sh	2022-08-10 17:01:25.651269994 +0200
Dmitry Belyavskiy 9fd698
@@ -36,6 +36,8 @@ unset SSH_AUTH_SOCK
Dmitry Belyavskiy 03150f
 unset SSH_AUTH_SOCK
Dmitry Belyavskiy 9fd698
 
Dmitry Belyavskiy 03150f
 for k in $SSH_ACCEPTED_KEYTYPES ; do
Dmitry Belyavskiy 03150f
+	[ "$k" == "ssh-rsa" ] && continue
Dmitry Belyavskiy 03150f
+	[ "$k" == "ssh-dss" ] && continue
Dmitry Belyavskiy 03150f
	verbose "key type $k"
Dmitry Belyavskiy 03150f
	cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
Dmitry Belyavskiy 03150f
	echo "HostKeyAlgorithms $k" >> $OBJ/sshd_proxy
Dmitry Belyavskiy 9fd698
diff -up openssh-8.8p1/regress/hostkey-rotate.sh.redhat openssh-8.8p1/regress/hostkey-rotate.sh
Dmitry Belyavskiy 9fd698
--- openssh-8.8p1/regress/hostkey-rotate.sh.redhat	2022-08-10 16:57:12.720029146 +0200
Dmitry Belyavskiy 9fd698
+++ openssh-8.8p1/regress/hostkey-rotate.sh	2022-08-10 17:15:48.274923865 +0200
Dmitry Belyavskiy 9fd698
@@ -40,6 +40,8 @@ trace "prepare hostkeys"
Dmitry Belyavskiy 9fd698
 nkeys=0
Dmitry Belyavskiy 9fd698
 all_algs=""
Dmitry Belyavskiy 9fd698
 for k in $SSH_HOSTKEY_TYPES; do
Dmitry Belyavskiy 9fd698
+	[ "$k" == "ssh-rsa" ] && continue
Dmitry Belyavskiy 9fd698
+	[ "$k" == "ssh-dss" ] && continue
Dmitry Belyavskiy 9fd698
 	${SSHKEYGEN} -qt $k -f $OBJ/hkr.$k -N '' || fatal "ssh-keygen $k"
Dmitry Belyavskiy 9fd698
 	echo "Hostkey $OBJ/hkr.${k}" >> $OBJ/sshd_proxy.orig
Dmitry Belyavskiy 9fd698
 	nkeys=`expr $nkeys + 1`
Dmitry Belyavskiy 9fd698
@@ -87,11 +89,15 @@ dossh -oStrictHostKeyChecking=yes -oHost
Dmitry Belyavskiy 9fd698
 # Check that other keys learned
Dmitry Belyavskiy 9fd698
 expect_nkeys $nkeys "learn hostkeys"
Dmitry Belyavskiy 9fd698
 for k in $SSH_HOSTKEY_TYPES; do
Dmitry Belyavskiy 9fd698
+	[ "$k" == "ssh-rsa" ] && continue
Dmitry Belyavskiy 9fd698
+	[ "$k" == "ssh-dss" ] && continue
Dmitry Belyavskiy 9fd698
 	check_key_present $k || fail "didn't learn keytype $k"
Dmitry Belyavskiy 9fd698
 done
Dmitry Belyavskiy 9fd698
 
Dmitry Belyavskiy 9fd698
 # Check each key type
Dmitry Belyavskiy 9fd698
 for k in $SSH_HOSTKEY_TYPES; do
Dmitry Belyavskiy 9fd698
+	[ "$k" == "ssh-rsa" ] && continue
Dmitry Belyavskiy 9fd698
+	[ "$k" == "ssh-dss" ] && continue
Dmitry Belyavskiy 9fd698
 	verbose "learn additional hostkeys, type=$k"
Dmitry Belyavskiy 9fd698
 	dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs
Dmitry Belyavskiy 9fd698
 	expect_nkeys $nkeys "learn hostkeys $k"
Dmitry Belyavskiy 9fd698