]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: portability fix for sed that always emil a newline even
authordjm@openbsd.org <djm@openbsd.org>
Fri, 1 May 2020 03:58:02 +0000 (03:58 +0000)
committerDamien Miller <djm@mindrot.org>
Mon, 4 May 2020 08:42:13 +0000 (18:42 +1000)
if the input does not contain one; from Michael Forney

OpenBSD-Regress-ID: 9190c3ddf0d2562ccc02c4a95fce0e392196bfc7

regress/unittests/sshkey/mktestdata.sh

index 93da34c64671d3d5217de2475965174815812da5..20c35956867146324310eab1fd2a18a2425876ba 100755 (executable)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: mktestdata.sh,v 1.7 2018/09/12 01:36:45 djm Exp $
+# $OpenBSD: mktestdata.sh,v 1.8 2020/05/01 03:58:02 djm Exp $
 
 PW=mekmitasdigoat
 
@@ -56,8 +56,8 @@ ecdsa_params() {
            awk '/^pub:/,/^ASN1 OID:/' | #\
            grep -v '^[a-zA-Z]' | tr -d ' \n:' > ${_outbase}.pub
        openssl ec -noout -text -in $_in | \
-           grep "ASN1 OID:" | tr -d '\n' | \
-           sed 's/.*: //;s/ *$//' > ${_outbase}.curve
+           grep "ASN1 OID:" | \
+           sed 's/.*: //;s/ *$//' | tr -d '\n' > ${_outbase}.curve
        for x in priv pub curve ; do
                echo "" >> ${_outbase}.$x
                echo ============ ${_outbase}.$x