diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-03-12 00:54:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-03-14 18:55:47 +1100 |
| commit | a76b5d26c2a51d7dd7a5164e683ab3f4419be215 (patch) | |
| tree | 9148c6a559082a15e0280e223b0587b46ecb3eb5 | |
| parent | 3a43297ce29d37c64e37c7e21282cb219e28d3d1 (diff) | |
upstream: explicitly specify RSA/SHA-2 keytype here too
OpenBSD-Regress-ID: 74d7b24e8c72c27af6b481198344eb077e993a62
| -rw-r--r-- | regress/cert-userkey.sh | 5 | ||||
| -rw-r--r-- | regress/keytype.sh | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh index 6a23fe30..30c2c156 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 8f16aa01..f78a2c17 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" ( |