From f2ad63c0718b93ac1d1e85f53fee33b06eef86b5 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org@openbsd.org" <djm@openbsd.org@openbsd.org>
Date: Mon, 30 Oct 2017 22:01:52 +0000
Subject: upstream commit

whitespace at EOL

OpenBSD-Regress-ID: f4b5df99b28c6f63478deb916c6ed0e794685f07
---
 regress/keytype.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'regress/keytype.sh')

diff --git a/regress/keytype.sh b/regress/keytype.sh
index 88b022de4..8f16aa01b 100644
--- a/regress/keytype.sh
+++ b/regress/keytype.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: keytype.sh,v 1.5 2017/03/20 22:08:06 djm Exp $
+#	$OpenBSD: keytype.sh,v 1.6 2017/10/30 22:01:52 djm Exp $
 #	Placed in the Public Domain.
 
 tid="login with different key types"
@@ -17,7 +17,7 @@ for i in `$SSH -Q key`; do
 	esac
 done
 
-for kt in $ktypes; do 
+for kt in $ktypes; do
 	rm -f $OBJ/key.$kt
 	bits=`echo ${kt} | awk -F- '{print $2}'`
 	type=`echo ${kt}  | awk -F- '{print $1}'`
@@ -27,10 +27,10 @@ for kt in $ktypes; do
 done
 
 tries="1 2 3"
-for ut in $ktypes; do 
+for ut in $ktypes; do
 	htypes=$ut
 	#htypes=$ktypes
-	for ht in $htypes; do 
+	for ht in $htypes; do
 		case $ht in
 		dsa-1024)	t=ssh-dss;;
 		ecdsa-256)	t=ecdsa-sha2-nistp256;;
@@ -42,13 +42,13 @@ for ut in $ktypes; do
 		trace "ssh connect, userkey $ut, hostkey $ht"
 		(
 			grep -v HostKey $OBJ/sshd_proxy_bak
-			echo HostKey $OBJ/key.$ht 
+			echo HostKey $OBJ/key.$ht
 			echo PubkeyAcceptedKeyTypes $t
 			echo HostKeyAlgorithms $t
 		) > $OBJ/sshd_proxy
 		(
 			grep -v IdentityFile $OBJ/ssh_proxy_bak
-			echo IdentityFile $OBJ/key.$ut 
+			echo IdentityFile $OBJ/key.$ut
 			echo PubkeyAcceptedKeyTypes $t
 			echo HostKeyAlgorithms $t
 		) > $OBJ/ssh_proxy
-- 
cgit v1.2.3


From a76b5d26c2a51d7dd7a5164e683ab3f4419be215 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Mon, 12 Mar 2018 00:54:04 +0000
Subject: upstream: explicitly specify RSA/SHA-2 keytype here too

OpenBSD-Regress-ID: 74d7b24e8c72c27af6b481198344eb077e993a62
---
 regress/cert-userkey.sh | 5 +++--
 regress/keytype.sh      | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'regress/keytype.sh')

diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index 6a23fe300..30c2c156d 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: cert-userkey.sh,v 1.18 2017/04/30 23:34:55 djm Exp $
+#	$OpenBSD: cert-userkey.sh,v 1.19 2018/03/12 00:54:04 djm Exp $
 #	Placed in the Public Domain.
 
 tid="certified user keys"
@@ -8,6 +8,7 @@ cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 
 PLAIN_TYPES=`$SSH -Q key-plain | sed 's/^ssh-dss/ssh-dsa/;s/^ssh-//'`
+EXTRA_TYPES=""
 
 if echo "$PLAIN_TYPES" | grep '^rsa$' >/dev/null 2>&1 ; then
 	PLAIN_TYPES="$PLAIN_TYPES rsa-sha2-256 rsa-sha2-512"
@@ -15,7 +16,7 @@ fi
 
 kname() {
 	case $ktype in
-	rsa-sha2-*) ;;
+	rsa-sha2-*) n="$ktype" ;;
 	# 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
diff --git a/regress/keytype.sh b/regress/keytype.sh
index 8f16aa01b..f78a2c171 100644
--- a/regress/keytype.sh
+++ b/regress/keytype.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: keytype.sh,v 1.6 2017/10/30 22:01:52 djm Exp $
+#	$OpenBSD: keytype.sh,v 1.7 2018/03/12 00:54:04 djm Exp $
 #	Placed in the Public Domain.
 
 tid="login with different key types"
@@ -37,7 +37,7 @@ for ut in $ktypes; do
 		ecdsa-384)	t=ecdsa-sha2-nistp384;;
 		ecdsa-521)	t=ecdsa-sha2-nistp521;;
 		ed25519-512)	t=ssh-ed25519;;
-		rsa-*)		t=ssh-rsa;;
+		rsa-*)		t=rsa-sha2-512,rsa-sha2-256,ssh-rsa;;
 		esac
 		trace "ssh connect, userkey $ut, hostkey $ht"
 		(
-- 
cgit v1.2.3