diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-05-01 03:58:02 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-05-04 18:42:13 +1000 |
commit | 7882d2eda6ad3eb82220a85294de545d20ef82db (patch) | |
tree | a58bf22ea0b455c617c40386943eb7eda215a05f | |
parent | 8074f9499e454df0acdacea33598858a1453a357 (diff) |
upstream: portability fix for sed that always emil a newline even
if the input does not contain one; from Michael Forney
OpenBSD-Regress-ID: 9190c3ddf0d2562ccc02c4a95fce0e392196bfc7
-rwxr-xr-x | regress/unittests/sshkey/mktestdata.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/unittests/sshkey/mktestdata.sh b/regress/unittests/sshkey/mktestdata.sh index 93da34c64..20c359568 100755 --- a/regress/unittests/sshkey/mktestdata.sh +++ b/regress/unittests/sshkey/mktestdata.sh | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # $OpenBSD: mktestdata.sh,v 1.7 2018/09/12 01:36:45 djm Exp $ | 2 | # $OpenBSD: mktestdata.sh,v 1.8 2020/05/01 03:58:02 djm Exp $ |
3 | 3 | ||
4 | PW=mekmitasdigoat | 4 | PW=mekmitasdigoat |
5 | 5 | ||
@@ -56,8 +56,8 @@ ecdsa_params() { | |||
56 | awk '/^pub:/,/^ASN1 OID:/' | #\ | 56 | awk '/^pub:/,/^ASN1 OID:/' | #\ |
57 | grep -v '^[a-zA-Z]' | tr -d ' \n:' > ${_outbase}.pub | 57 | grep -v '^[a-zA-Z]' | tr -d ' \n:' > ${_outbase}.pub |
58 | openssl ec -noout -text -in $_in | \ | 58 | openssl ec -noout -text -in $_in | \ |
59 | grep "ASN1 OID:" | tr -d '\n' | \ | 59 | grep "ASN1 OID:" | \ |
60 | sed 's/.*: //;s/ *$//' > ${_outbase}.curve | 60 | sed 's/.*: //;s/ *$//' | tr -d '\n' > ${_outbase}.curve |
61 | for x in priv pub curve ; do | 61 | for x in priv pub curve ; do |
62 | echo "" >> ${_outbase}.$x | 62 | echo "" >> ${_outbase}.$x |
63 | echo ============ ${_outbase}.$x | 63 | echo ============ ${_outbase}.$x |