summaryrefslogtreecommitdiff
path: root/regress/cert-hostkey.sh
diff options
context:
space:
mode:
Diffstat (limited to 'regress/cert-hostkey.sh')
-rw-r--r--regress/cert-hostkey.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 3ce777967..86ea62504 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: cert-hostkey.sh,v 1.17 2018/10/31 11:09:27 dtucker Exp $ 1# $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="certified host keys" 4tid="certified host keys"
@@ -7,6 +7,7 @@ rm -f $OBJ/known_hosts-cert* $OBJ/host_ca_key* $OBJ/host_revoked_*
7rm -f $OBJ/cert_host_key* $OBJ/host_krl_* 7rm -f $OBJ/cert_host_key* $OBJ/host_krl_*
8 8
9# Allow all hostkey/pubkey types, prefer certs for the client 9# Allow all hostkey/pubkey types, prefer certs for the client
10rsa=0
10types="" 11types=""
11for i in `$SSH -Q key`; do 12for i in `$SSH -Q key`; do
12 if [ -z "$types" ]; then 13 if [ -z "$types" ]; then
@@ -19,6 +20,7 @@ for i in `$SSH -Q key`; do
19 types="rsa-sha2-256-cert-v01@openssh.com,$i,$types" 20 types="rsa-sha2-256-cert-v01@openssh.com,$i,$types"
20 types="rsa-sha2-512-cert-v01@openssh.com,$types";; 21 types="rsa-sha2-512-cert-v01@openssh.com,$types";;
21 *rsa*) 22 *rsa*)
23 rsa=1
22 types="$types,rsa-sha2-512,rsa-sha2-256,$i";; 24 types="$types,rsa-sha2-512,rsa-sha2-256,$i";;
23 # Prefer certificate to plain keys. 25 # Prefer certificate to plain keys.
24 *cert*) types="$i,$types";; 26 *cert*) types="$i,$types";;
@@ -51,10 +53,12 @@ kh_revoke() {
51} 53}
52 54
53# Create a CA key and add it to known hosts. Ed25519 chosen for speed. 55# Create a CA key and add it to known hosts. Ed25519 chosen for speed.
54# RSA for testing RSA/SHA2 signatures. 56# RSA for testing RSA/SHA2 signatures if supported.
57ktype2=ed25519
58[ "x$rsa" = "x1" ] && ktype2=rsa
55${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/host_ca_key ||\ 59${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/host_ca_key ||\
56 fail "ssh-keygen of host_ca_key failed" 60 fail "ssh-keygen of host_ca_key failed"
57${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/host_ca_key2 ||\ 61${SSHKEYGEN} -q -N '' -t $ktype2 -f $OBJ/host_ca_key2 ||\
58 fail "ssh-keygen of host_ca_key failed" 62 fail "ssh-keygen of host_ca_key failed"
59 63
60kh_ca host_ca_key.pub host_ca_key2.pub > $OBJ/known_hosts-cert.orig 64kh_ca host_ca_key.pub host_ca_key2.pub > $OBJ/known_hosts-cert.orig
@@ -214,7 +218,7 @@ test_one() {
214 result=$2 218 result=$2
215 sign_opts=$3 219 sign_opts=$3
216 220
217 for kt in rsa ed25519 ; do 221 for kt in $PLAIN_TYPES; do
218 case $ktype in 222 case $ktype in
219 rsa-sha2-*) tflag="-t $ktype"; ca="$OBJ/host_ca_key2" ;; 223 rsa-sha2-*) tflag="-t $ktype"; ca="$OBJ/host_ca_key2" ;;
220 *) tflag=""; ca="$OBJ/host_ca_key" ;; 224 *) tflag=""; ca="$OBJ/host_ca_key" ;;