upstream commit

Use a subshell for constructing key types to work around
 different sed behaviours for -portable.

Upstream-Regress-ID: 0f6eb673162df229eda9a134a0f10da16151552d
This commit is contained in:
dtucker@openbsd.org 2016-05-03 12:15:49 +00:00 committed by Darren Tucker
parent fa58208c65
commit cca3b43958
1 changed files with 4 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: cert-userkey.sh,v 1.15 2016/05/02 09:52:00 djm Exp $ # $OpenBSD: cert-userkey.sh,v 1.16 2016/05/03 12:15:49 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="certified user keys" tid="certified user keys"
@ -16,9 +16,10 @@ fi
kname() { kname() {
case $ktype in case $ktype in
rsa-sha2-*) ;; rsa-sha2-*) ;;
*) printf $1 | sed 's/^dsa/ssh-dss/;s/^rsa/ssh-rsa/;s/^ed/ssh-ed/' ;; # 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 esac
echo "*,ssh-rsa*,ssh-ed25519*" echo "$n*,ssh-rsa*,ssh-ed25519*"
} }
# Create a CA key # Create a CA key