From cca3b4395807bfb7aaeb83d2838f5c062ce30566 Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Tue, 3 May 2016 12:15:49 +0000 Subject: upstream commit Use a subshell for constructing key types to work around different sed behaviours for -portable. Upstream-Regress-ID: 0f6eb673162df229eda9a134a0f10da16151552d --- regress/cert-userkey.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'regress/cert-userkey.sh') 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 @@ -# $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. tid="certified user keys" @@ -16,9 +16,10 @@ fi kname() { case $ktype in 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 - echo "*,ssh-rsa*,ssh-ed25519*" + echo "$n*,ssh-rsa*,ssh-ed25519*" } # Create a CA key -- cgit v1.2.3