diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-07-03 11:43:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-07-04 00:07:12 +1000 |
commit | 303af5803bd74bf05d375c04e1a83b40c30b2be5 (patch) | |
tree | 0732307145ef83c92280772879e53157d4d6f70e | |
parent | 7d68e262944c1fff1574600fe0e5e92ec8b398f5 (diff) |
upstream: some magic for RSA-SHA2 checks
OpenBSD-Regress-ID: e5a9b11368ff6d86e7b25ad10ebe43359b471cd4
-rw-r--r-- | regress/cert-hostkey.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh index 3d5732a5d..d2ecd318b 100644 --- a/regress/cert-hostkey.sh +++ b/regress/cert-hostkey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cert-hostkey.sh,v 1.15 2017/04/30 23:34:55 djm Exp $ | 1 | # $OpenBSD: cert-hostkey.sh,v 1.16 2018/07/03 11:43:49 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="certified host keys" | 4 | tid="certified host keys" |
@@ -14,6 +14,13 @@ for i in `$SSH -Q key`; do | |||
14 | continue | 14 | continue |
15 | fi | 15 | fi |
16 | case "$i" in | 16 | case "$i" in |
17 | # Special treatment for RSA keys. | ||
18 | *rsa*cert*) | ||
19 | types="rsa-sha2-256-cert-v01@openssh.com,$i,$types" | ||
20 | types="rsa-sha2-512-cert-v01@openssh.com,$types";; | ||
21 | *rsa*) | ||
22 | types="$types,rsa-sha2-512,rsa-sha2-256,$i";; | ||
23 | # Prefer certificate to plain keys. | ||
17 | *cert*) types="$i,$types";; | 24 | *cert*) types="$i,$types";; |
18 | *) types="$types,$i";; | 25 | *) types="$types,$i";; |
19 | esac | 26 | esac |