diff options
| author |   djm <djm@openbsd.org> | 2018-03-12 00:54:04 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2018-03-12 00:54:04 +0000 |
| commit | 6a2bc71b1c5e50fac60b436b3996212425db4809 (patch) | |
| tree | dfc1a1546c3949ad95bd445fe2855e0b45bf57f4 | |
| parent | exlicitly include RSA/SHA-2 keytypes in PubkeyAcceptedKeyTypes here (diff) | |
| download | wireguard-openbsd-6a2bc71b1c5e50fac60b436b3996212425db4809.tar.xz wireguard-openbsd-6a2bc71b1c5e50fac60b436b3996212425db4809.zip | |
explicitly specify RSA/SHA-2 keytype here too
| -rw-r--r-- | regress/usr.bin/ssh/cert-userkey.sh | 5 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/keytype.sh | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/regress/usr.bin/ssh/cert-userkey.sh b/regress/usr.bin/ssh/cert-userkey.sh index 6a23fe300bf..30c2c156d2f 100644 --- a/regress/usr.bin/ssh/cert-userkey.sh +++ b/regress/usr.bin/ssh/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/usr.bin/ssh/keytype.sh b/regress/usr.bin/ssh/keytype.sh index 49c4c5e8e53..7ec2b3ea419 100644 --- a/regress/usr.bin/ssh/keytype.sh +++ b/regress/usr.bin/ssh/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" @@ -28,7 +28,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" ( |