diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-05-03 12:15:49 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-05-03 23:05:32 +1000 |
commit | cca3b4395807bfb7aaeb83d2838f5c062ce30566 (patch) | |
tree | 1d443d4f4e42a8f982452e2196c1ad7ba6ea1dd7 /regress/cert-userkey.sh | |
parent | fa58208c6502dcce3e0daac0ca991ee657daf1f5 (diff) |
upstream commit
Use a subshell for constructing key types to work around
different sed behaviours for -portable.
Upstream-Regress-ID: 0f6eb673162df229eda9a134a0f10da16151552d
Diffstat (limited to 'regress/cert-userkey.sh')
-rw-r--r-- | regress/cert-userkey.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh index 096d9e47a..319746395 100644 --- a/regress/cert-userkey.sh +++ b/regress/cert-userkey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cert-userkey.sh,v 1.15 2016/05/02 09:52:00 djm Exp $ | 1 | # $OpenBSD: cert-userkey.sh,v 1.16 2016/05/03 12:15:49 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="certified user keys" | 4 | tid="certified user keys" |
@@ -16,9 +16,10 @@ fi | |||
16 | kname() { | 16 | kname() { |
17 | case $ktype in | 17 | case $ktype in |
18 | rsa-sha2-*) ;; | 18 | rsa-sha2-*) ;; |
19 | *) printf $1 | sed 's/^dsa/ssh-dss/;s/^rsa/ssh-rsa/;s/^ed/ssh-ed/' ;; | 19 | # subshell because some seds will add a newline |
20 | *) n=$(echo $1 | sed 's/^dsa/ssh-dss/;s/^rsa/ssh-rsa/;s/^ed/ssh-ed/') ;; | ||
20 | esac | 21 | esac |
21 | echo "*,ssh-rsa*,ssh-ed25519*" | 22 | echo "$n*,ssh-rsa*,ssh-ed25519*" |
22 | } | 23 | } |
23 | 24 | ||
24 | # Create a CA key | 25 | # Create a CA key |