thr3ads.net - openssh unix dev - [PATCH 0/4] sshkey mktestdata.sh fixes [Apr 2020]

If this information is useful, please help other people find it:
Share via:

Michael Forney

2020-Apr-25 23:24 UTC

[PATCH 0/4] sshkey mktestdata.sh fixes

Hello,

I noticed that the rsa_n, dsa_n, and ecdsa_n keys in sshkey testdata
are not actually in the new format. They get copied from the
PEM-format keys, but are never converted.

When updating mktestdata.sh, I found a few other issues, so I fixed
those as well.

Michael Forney (4):
  Remove obsolete SSH1 testdata
  Update mktestdata.sh for new ssh-keygen defaults
  Delete newline after processing with sed
  Fix new-format sshkey testdata

 regress/unittests/sshkey/mktestdata.sh        |  32 +++++++++--------
 regress/unittests/sshkey/testdata/dsa_n       |  33 +++++++++++-------
 regress/unittests/sshkey/testdata/ecdsa_n     |  13 ++++---
 regress/unittests/sshkey/testdata/rsa1_1      | Bin 533 -> 0 bytes
 regress/unittests/sshkey/testdata/rsa1_1.fp   |   1 -
 .../unittests/sshkey/testdata/rsa1_1.fp.bb    |   1 -
 .../unittests/sshkey/testdata/rsa1_1.param.n  |   1 -
 regress/unittests/sshkey/testdata/rsa1_1.pub  |   1 -
 regress/unittests/sshkey/testdata/rsa1_1_pw   | Bin 533 -> 0 bytes
 regress/unittests/sshkey/testdata/rsa1_2      | Bin 981 -> 0 bytes
 regress/unittests/sshkey/testdata/rsa1_2.fp   |   1 -
 .../unittests/sshkey/testdata/rsa1_2.fp.bb    |   1 -
 .../unittests/sshkey/testdata/rsa1_2.param.n  |   1 -
 regress/unittests/sshkey/testdata/rsa1_2.pub  |   1 -
 regress/unittests/sshkey/testdata/rsa_n       |  31 ++++++++--------
 15 files changed, 63 insertions(+), 54 deletions(-)
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.fp
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.fp.bb
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.param.n
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.pub
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1_pw
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.fp
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.fp.bb
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.param.n
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.pub

-- 
2.26.2

Michael Forney

2020-Apr-25 23:24 UTC

head link

[PATCH 1/4] Remove obsolete SSH1 testdata

---
 regress/unittests/sshkey/testdata/rsa1_1         | Bin 533 -> 0 bytes
 regress/unittests/sshkey/testdata/rsa1_1.fp      |   1 -
 regress/unittests/sshkey/testdata/rsa1_1.fp.bb   |   1 -
 regress/unittests/sshkey/testdata/rsa1_1.param.n |   1 -
 regress/unittests/sshkey/testdata/rsa1_1.pub     |   1 -
 regress/unittests/sshkey/testdata/rsa1_1_pw      | Bin 533 -> 0 bytes
 regress/unittests/sshkey/testdata/rsa1_2         | Bin 981 -> 0 bytes
 regress/unittests/sshkey/testdata/rsa1_2.fp      |   1 -
 regress/unittests/sshkey/testdata/rsa1_2.fp.bb   |   1 -
 regress/unittests/sshkey/testdata/rsa1_2.param.n |   1 -
 regress/unittests/sshkey/testdata/rsa1_2.pub     |   1 -
 11 files changed, 8 deletions(-)
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.fp
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.fp.bb
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.param.n
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.pub
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1_pw
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.fp
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.fp.bb
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.param.n
 delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.pub

diff --git a/regress/unittests/sshkey/testdata/rsa1_1
b/regress/unittests/sshkey/testdata/rsa1_1
deleted file mode 100644
index
161cc04dc700b60ac13cc992f44aeed3b4c2fc73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmV+w0_y!!Q%E3CQb|@pR7D_5MOh$5NlZl`Mo&^rK~x|yE-?xK000000000400aQe
zjHh~4Zn}tnnucr$N at N0fQ&gxN5QR-NF at gFCH4-DHUzw3#gfr0^oIz)OFnj~UqnKs5
zK5=r=!Ps~+JeUMH*5pPZ2A~F9*IfRm%6}nKi}Lh8D)gMJ?oqNXJKV+Sds)nBAAD&-
zr+)D}{re;^2Y0t8G>r?VkPDz|h-WDP5di=J0000GQd2=OAarGObRcVGc_1S(>8a_d
z1O6^MLtR;P0Aha?N>efe+ at Qqg`T^?BGuRaWqtzg6b(8NfWWp*u01+g>rq2*DV*tRg
zgmU;RS>INdHtDFQK5PVMH6CTnl2y-4bv`f*v5~xEmGtMvCWrLmgswuUNyA~iQc#5k
zNWgBD{}CKtZ_(LtabRalX6jRb)j*HYQ~?40DY5PO{*~ZB4Np66dUgnEJ+eGhBDMLo
z-#aVXxB at qou{1Yvn1urGMb-`0gtLdf+KFEA4ruHC at +H8QXwVNL0sz@^?a0D(O~cgn
zw<M6dx+f$&UXy=It9G}A1xH>NUbkJU4{y5 at DYT)Kqz*9hj2XHJb2x$ZfJXV(?|F^R
z0)YYm^D7G^UF0}cT*X;k^H&3-n|P<NKRfq*RToiHHeHQp6>%=XkO<Z+x%1F_*V$Zr
X5k2#$3;g}Vwjj>2sHniH00000<=N?l

diff --git a/regress/unittests/sshkey/testdata/rsa1_1.fp
b/regress/unittests/sshkey/testdata/rsa1_1.fp
deleted file mode 100644
index 21b3d1a9..00000000
--- a/regress/unittests/sshkey/testdata/rsa1_1.fp
+++ /dev/null
@@ -1 +0,0 @@
-SHA256:/kk7K9S9kwYFiFilnZYFwCsQJweI/SGQVR2nIa8VBhE
diff --git a/regress/unittests/sshkey/testdata/rsa1_1.fp.bb
b/regress/unittests/sshkey/testdata/rsa1_1.fp.bb
deleted file mode 100644
index 62991b3e..00000000
--- a/regress/unittests/sshkey/testdata/rsa1_1.fp.bb
+++ /dev/null
@@ -1 +0,0 @@
-xilil-nabyf-gynih-duheb-gokyp-bofet-nekac-bosod-lozin-kuvyh-poxix
diff --git a/regress/unittests/sshkey/testdata/rsa1_1.param.n
b/regress/unittests/sshkey/testdata/rsa1_1.param.n
deleted file mode 100644
index 9a2549bb..00000000
--- a/regress/unittests/sshkey/testdata/rsa1_1.param.n
+++ /dev/null
@@ -1 +0,0 @@
-00ce8ca77a556eba887f9a866c084a6402785354a81c10854d343181fa09351223a65f99915f8433d11a9c41677d307c03c3a39865b83e7172d2c1d878333c980438d6e4462106a0065cd75cfea7ca7f21538bf2f43f2af49cacee51b22e3bdcc5e87b59cc691f7c6942a77ef13bfdfb24300777b727348d0ba7900ba06b886729
diff --git a/regress/unittests/sshkey/testdata/rsa1_1.pub
b/regress/unittests/sshkey/testdata/rsa1_1.pub
deleted file mode 100644
index f665b0d6..00000000
--- a/regress/unittests/sshkey/testdata/rsa1_1.pub
+++ /dev/null
@@ -1 +0,0 @@
-1024 65537
145043942670517902781741650890610683756045780348507433188994725700923246927874581962206512480287863636935077725837494808988986557337885675565086448774391442851909709751605441036910145362277967349042489937363543710406342212883803780768870873303921572812138116796733586484633244057911618360651775855949808953129
RSA1 test key #1
diff --git a/regress/unittests/sshkey/testdata/rsa1_1_pw
b/regress/unittests/sshkey/testdata/rsa1_1_pw
deleted file mode 100644
index
e73c6794ade5991924286b3a88e6727cafa4ed36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmV+w0_y!!Q%E3CQb|@pR7D_5MOh$5NlZl`Mo&^rK~x|yE-?xK0{{R30000400aQe
zjHh~4Zn}tnnucr$N at N0fQ&gxN5QR-NF at gFCH4-DHUzw3#gfr0^oIz)OFnj~UqnKs5
zK5=r=!Ps~+JeUMH*5pPZ2A~F9*IfRm%6}nKi}Lh8D)gMJ?oqNXJKV+Sds)nBAAD&-
zr+)D}{re;^2Y0t8G>r?VkPDz|h-WDP5di=J0000GQd2=OAarGObRcVGc_1S(9dX_c
zt!-(~5GKp~q7pg{JNHA=o?qT_*ho&?f$UIK9G`Te9*Yv2(xIBWdOVF}EJAbVq-=zq
z3dbMWv!)`=%Z-f&>w&YV&d{TvE2ql$;)&1I-9eO?JG|DYj)oaR@#sA9o*X4EqUbQz|Au{Sc6RfPBmERdh8WJjN-v0u*nf7hPxO=V{h2B7#DMi>kBt5M1Yvz~2wnK!{X67+
z^UyAq&zuTy-Sycy;sY=0Sf)NyOOBB^4mgY1eBz#XBWW76jM=AM(_iVdb}qg9dBr#<
zEur5a{CGeW+_wAOz at vwnlhNe*A~nmmJ#z6|#&BzrB3RwVoN7*RgL`f4WQ at pQRaZDX
z^8l2Ixvm->)Jg;>$b!(EdFFixji6xePF3<T*4QZb9$L#ZkG`4E!Qq}KN^tbn+ at hB8
X*MO_ebW|Q7X{saX(|Spmp+w(d at r?ac

diff --git a/regress/unittests/sshkey/testdata/rsa1_2
b/regress/unittests/sshkey/testdata/rsa1_2
deleted file mode 100644
index
1d672ddea393fe786673f5c8aed8a772eaaa9f7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 981
zcmV;`11kJeQ%E3CQb|@pR7D_5MOh$5NlZl`Mo&^rK~x|yE-?xK000000000800;oe
zu#vTT6-Pk9yKo@%Y9XPW#1CYBvZ}GVy)eqYBp(DfIUZ;?YolIB#w57v_O+BG)WN7o
z$^9Pn&BwvF_2u6qx2;h-c>)rK(~MI6`r}qsWuAsfvcHS%_sN!I<W)2Pd(p+*J>lB@
z^3zJthZR{-st-L-3pUW$1iQ at M@mjMSquoHg^%-Dgsed_s^>)htwg$d}GWOtMO6m at m
zo0WtqW^?+x9lf725=mS_h(e;P9~WrdLQl5+&hD#`Cd$qHgHH+#3A%HwgJ98vx`n$H
zWmR0pr8eu02HzSUgb at e8A+9K**t14oor_rSKt-;h#I1je_BmHgYZNN>drq?e5di=J
z0000GQd2=OAarGObRcVGc_1S)>7nVN2mp&47ez;2CnBg*EvHadE^)5M3K3hoEiVBK
zD%x5Yj5y|Xiwf6HMmEJ4N64vZTtO-A;$qHW;uuGEO)LaP{MKQ+19k?j3*iqdOxXZ>
z8DIUkj81uR^~d2a_vitlJ713-Yhba!zN-H+k`#P=*$55g`oo8n%C8nOS$Ribxo?g0
z1RN^250~War6lDH?r|1<9ZZn&R9BxLGxw+M)LEL&m-!5Fu){$PM5Jfn{vV~!EZw^z=}8RQ^%BRVZMx40wep8
at 3tq4HUWnh5Ju4N`AzDHATVcDkb`W6tH~yHs*~^h98#7Ii
zHr?HRMZHESfUG&XfZ*~_AX`T^W?=*Xx2vEp1QaXFTmpFLT*E*SAcA;*`_4;#VIX%s
z2q8kJy|jou6OfeejakO;@ept*7;`F4<&zWE at O91qC~*ANgci3}I-&RYt-s~DBG*lA
zE)~Uvj_`axmx{1qTM=AMI*yx8iCwQxyBCF49xk$=S>k5~O3P18)Is+nLarid1OU;-
z9zDcq2+H&;NG$Z*Zl8ZR+6oPe at bEF7NNa;=J1!8;jm-vy)Xps;CCP at Qv8szlNFZ-o
z`dc<h9hrss)BdQe5l=(P$)fJPMY63Vp`F`*mg=?oD?FZr7$o14-FnB$MV$pd-g{L(
zg6pW1s4I1S=S`^tibN&CxDDr!!+8V%_gc`21vNw2QMrhLPX+6tyh8!Uw*w(RMD*P!
z*Xq{ddhxzc>{4+6T^HvT^3f&a)O!dQk8tJyO;V21C;+vPoWT1k2N1^2gpv#lD?TU5
zN{DcJm2WIZZJAu}H`vnnK>;LkrGyr_9%!9_uD at Ho^#$T+_ub8^JwEAweiMv~00000
Dc>K$3

diff --git a/regress/unittests/sshkey/testdata/rsa1_2.fp
b/regress/unittests/sshkey/testdata/rsa1_2.fp
deleted file mode 100644
index 00516d52..00000000
--- a/regress/unittests/sshkey/testdata/rsa1_2.fp
+++ /dev/null
@@ -1 +0,0 @@
-SHA256:JaOeRCnLl/TLe7vn1+aQ4ONyKZCUhK5x3k4VHilmbpE
diff --git a/regress/unittests/sshkey/testdata/rsa1_2.fp.bb
b/regress/unittests/sshkey/testdata/rsa1_2.fp.bb
deleted file mode 100644
index b4989a58..00000000
--- a/regress/unittests/sshkey/testdata/rsa1_2.fp.bb
+++ /dev/null
@@ -1 +0,0 @@
-xipag-zohut-zepuk-pisyv-kamog-pupus-netud-tudis-melup-cynov-gaxox
diff --git a/regress/unittests/sshkey/testdata/rsa1_2.param.n
b/regress/unittests/sshkey/testdata/rsa1_2.param.n
deleted file mode 100644
index 25d438d0..00000000
--- a/regress/unittests/sshkey/testdata/rsa1_2.param.n
+++ /dev/null
@@ -1 +0,0 @@
-00cab091b57a154740c1bb7020f46a21a19dc40f647db2aab1babd30cabe241f0437391e68376ba35e48c624b8eaf6b59424d4c1a848c9fd1ef5cdc7c1b7f5e5df23b7ad513b79021286d38c52fdfae35656659e8649b2bf8bedf7c99664e45534007bd1c5dc3de1dafdf2d34ad087155951aa0f3d500b36d0d804bbccdef15ab31ca3dd40bdf5196065a97f397ef576caffb606be8232f6e0614aea0e979b9584296673fabb1dbd9f3212495c428842a2ab1f1768dd424fb6fdceeeab9126cacdfc834f0a0d09ba73ad8360d183ba85bb1565555cc6a536eb8d06df1a1e841107c021ae28a2d8b3465f9d8b58ef4045aea1c4ad7f8bf639574d6b142af67b4eb3
diff --git a/regress/unittests/sshkey/testdata/rsa1_2.pub
b/regress/unittests/sshkey/testdata/rsa1_2.pub
deleted file mode 100644
index acab6dda..00000000
--- a/regress/unittests/sshkey/testdata/rsa1_2.pub
+++ /dev/null
@@ -1 +0,0 @@
-2048 65537
25587207108642486834576012232250034427766229965612147538722032399009467293691448851087324679403117563681753304072089087252850866332601294130674473984011813227791089686736237645788471744456489819306046398653719249100878753563464696688916667605969658659855996383142110932332560049231682024775766802333675397528993897914717996946881193454997890776063024953924432026083898531677702536941151535135950834711001926404724453460085864892836473957600610133803037286539329764689125111700732309717375455919436557475211197800228646235077584780367991159670572954337165006813357814232200750568307753718414790655085790471723847208627
RSA1 test key #2
-- 
2.26.2

Michael Forney

2020-Apr-25 23:24 UTC

head link

[PATCH 2/4] Update mktestdata.sh for new ssh-keygen defaults

---
 regress/unittests/sshkey/mktestdata.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/regress/unittests/sshkey/mktestdata.sh
b/regress/unittests/sshkey/mktestdata.sh
index 93da34c6..05425ec8 100755
--- a/regress/unittests/sshkey/mktestdata.sh
+++ b/regress/unittests/sshkey/mktestdata.sh
@@ -77,14 +77,14 @@ rm -f rsa_1_pw dsa_1_pw ecdsa_1_pw ed25519_1_pw
 rm -f rsa_n_pw dsa_n_pw ecdsa_n_pw
 rm -f pw *.pub *.bn.* *.param.* *.fp *.fp.bb
 
-ssh-keygen -t rsa -b 1024 -C "RSA test key #1" -N "" -f
rsa_1
-ssh-keygen -t dsa -b 1024 -C "DSA test key #1" -N "" -f
dsa_1
-ssh-keygen -t ecdsa -b 256 -C "ECDSA test key #1" -N "" -f
ecdsa_1
+ssh-keygen -t rsa -b 1024 -C "RSA test key #1" -N "" -f
rsa_1 -m PEM
+ssh-keygen -t dsa -b 1024 -C "DSA test key #1" -N "" -f
dsa_1 -m PEM
+ssh-keygen -t ecdsa -b 256 -C "ECDSA test key #1" -N "" -f
ecdsa_1 -m PEM
 ssh-keygen -t ed25519 -C "ED25519 test key #1" -N "" -f
ed25519_1
 
-ssh-keygen -t rsa -b 2048 -C "RSA test key #2" -N "" -f
rsa_2
-ssh-keygen -t dsa -b 1024 -C "DSA test key #2" -N "" -f
dsa_2
-ssh-keygen -t ecdsa -b 521 -C "ECDSA test key #2" -N "" -f
ecdsa_2
+ssh-keygen -t rsa -b 2048 -C "RSA test key #2" -N "" -f
rsa_2 -m PEM
+ssh-keygen -t dsa -b 1024 -C "DSA test key #2" -N "" -f
dsa_2 -m PEM
+ssh-keygen -t ecdsa -b 521 -C "ECDSA test key #2" -N "" -f
ecdsa_2 -m PEM
 ssh-keygen -t ed25519 -C "ED25519 test key #1" -N "" -f
ed25519_2
 
 cp rsa_1 rsa_n
@@ -99,13 +99,13 @@ cp rsa_1 rsa_n_pw
 cp dsa_1 dsa_n_pw
 cp ecdsa_1 ecdsa_n_pw
 
-ssh-keygen -pf rsa_1_pw -N "$PW"
-ssh-keygen -pf dsa_1_pw -N "$PW"
-ssh-keygen -pf ecdsa_1_pw -N "$PW"
+ssh-keygen -pf rsa_1_pw -m PEM -N "$PW"
+ssh-keygen -pf dsa_1_pw -m PEM -N "$PW"
+ssh-keygen -pf ecdsa_1_pw -m PEM -N "$PW"
 ssh-keygen -pf ed25519_1_pw -N "$PW"
-ssh-keygen -opf rsa_n_pw -N "$PW"
-ssh-keygen -opf dsa_n_pw -N "$PW"
-ssh-keygen -opf ecdsa_n_pw -N "$PW"
+ssh-keygen -pf rsa_n_pw -N "$PW"
+ssh-keygen -pf dsa_n_pw -N "$PW"
+ssh-keygen -pf ecdsa_n_pw -N "$PW"
 
 rsa_params rsa_1 rsa_1.param
 rsa_params rsa_2 rsa_2.param
-- 
2.26.2

Michael Forney

2020-Apr-25 23:24 UTC

head link

[PATCH 3/4] Delete newline after processing with sed

sed requires that the inputs are text files, and POSIX defines a
text file as zero or more lines, each with a trailing newline.

Some implementations of sed will always print a newline after the
line, even if it didn't originally have one, causing an extra blank
line when the newline is re-added below.
---
 regress/unittests/sshkey/mktestdata.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/regress/unittests/sshkey/mktestdata.sh
b/regress/unittests/sshkey/mktestdata.sh
index 05425ec8..4969061d 100755
--- a/regress/unittests/sshkey/mktestdata.sh
+++ b/regress/unittests/sshkey/mktestdata.sh
@@ -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
-- 
2.26.2

Michael Forney

2020-Apr-25 23:24 UTC

head link

[PATCH 4/4] Fix new-format sshkey testdata

Currently, rsa_n is just a copy of rsa_1, and is not actually in
the new key format.
---
 regress/unittests/sshkey/mktestdata.sh    |  4 +++
 regress/unittests/sshkey/testdata/dsa_n   | 33 ++++++++++++++---------
 regress/unittests/sshkey/testdata/ecdsa_n | 13 +++++----
 regress/unittests/sshkey/testdata/rsa_n   | 31 ++++++++++-----------
 4 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/regress/unittests/sshkey/mktestdata.sh
b/regress/unittests/sshkey/mktestdata.sh
index 4969061d..b30cd38c 100755
--- a/regress/unittests/sshkey/mktestdata.sh
+++ b/regress/unittests/sshkey/mktestdata.sh
@@ -91,6 +91,10 @@ cp rsa_1 rsa_n
 cp dsa_1 dsa_n
 cp ecdsa_1 ecdsa_n
 
+ssh-keygen -pf rsa_n -N ""
+ssh-keygen -pf dsa_n -N ""
+ssh-keygen -pf ecdsa_n -N ""
+
 cp rsa_1 rsa_1_pw
 cp dsa_1 dsa_1_pw
 cp ecdsa_1 ecdsa_1_pw
diff --git a/regress/unittests/sshkey/testdata/dsa_n
b/regress/unittests/sshkey/testdata/dsa_n
index d3f24824..1512f881 100644
--- a/regress/unittests/sshkey/testdata/dsa_n
+++ b/regress/unittests/sshkey/testdata/dsa_n
@@ -1,12 +1,21 @@
------BEGIN DSA PRIVATE KEY-----
-MIIBvAIBAAKBgQD6kutNFRsHTwEAv6d39Lhsqy1apdHBZ9c2HfyRr7WmypyGIy2m
-Ka43vzXI8CNwmRSYs+A6d0vJC7Pl+f9QzJ/04NWOA+MiwfurwrR3CRe61QRYb8Py
-mcHOxueHs95IcjrbIPNn86cjnPP5qvv/guUzCjuww4zBdJOXpligrGt2XwIVAKMD
-/50qQy7j8JaMk+1+Xtg1pK01AoGBAO7l9QVVbSSoy5lq6cOtvpf8UlwOa6+zBwbl
-o4gmFd1RwX1yWkA8kQ7RrhCSg8Hc6mIGnKRgKRli/3LgbSfZ0obFJehkRtEWtN4P
-h8fVUeS74iQbIwFQeKlYHIlNTRoGtAbdi3nHdV+BBkEQc1V3rjqYqhjOoz/yNsgz
-LND26HrdAoGBAOdXpyfmobEBaOqZAuvgj1P0uhjG2P31Ufurv22FWPBU3A9qrkxb
-OXwE0LwvjCvrsQV/lrYhJz/tiys40VeahulWZE5SAHMXGIf95LiLSgaXMjko7joo
-t+LK84ltLymwZ4QMnYjnZSSclf1UuyQMcUtb34+I0u9Ycnyhp2mSFsQtAhRYIbQ5
-KfXsZuBPuWe5FJz3ldaEgw=------END DSA PRIVATE KEY-----
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABswAAAAdzc2gtZH
+NzAAAAgQD6kutNFRsHTwEAv6d39Lhsqy1apdHBZ9c2HfyRr7WmypyGIy2mKa43vzXI8CNw
+mRSYs+A6d0vJC7Pl+f9QzJ/04NWOA+MiwfurwrR3CRe61QRYb8PymcHOxueHs95IcjrbIP
+Nn86cjnPP5qvv/guUzCjuww4zBdJOXpligrGt2XwAAABUAowP/nSpDLuPwloyT7X5e2DWk
+rTUAAACBAO7l9QVVbSSoy5lq6cOtvpf8UlwOa6+zBwblo4gmFd1RwX1yWkA8kQ7RrhCSg8
+Hc6mIGnKRgKRli/3LgbSfZ0obFJehkRtEWtN4Ph8fVUeS74iQbIwFQeKlYHIlNTRoGtAbd
+i3nHdV+BBkEQc1V3rjqYqhjOoz/yNsgzLND26HrdAAAAgQDnV6cn5qGxAWjqmQLr4I9T9L
+oYxtj99VH7q79thVjwVNwPaq5MWzl8BNC8L4wr67EFf5a2ISc/7YsrONFXmobpVmROUgBz
+FxiH/eS4i0oGlzI5KO46KLfiyvOJbS8psGeEDJ2I52UknJX9VLskDHFLW9+PiNLvWHJ8oa
+dpkhbELQAAAdgq2gGnKtoBpwAAAAdzc2gtZHNzAAAAgQD6kutNFRsHTwEAv6d39Lhsqy1a
+pdHBZ9c2HfyRr7WmypyGIy2mKa43vzXI8CNwmRSYs+A6d0vJC7Pl+f9QzJ/04NWOA+Miwf
+urwrR3CRe61QRYb8PymcHOxueHs95IcjrbIPNn86cjnPP5qvv/guUzCjuww4zBdJOXplig
+rGt2XwAAABUAowP/nSpDLuPwloyT7X5e2DWkrTUAAACBAO7l9QVVbSSoy5lq6cOtvpf8Ul
+wOa6+zBwblo4gmFd1RwX1yWkA8kQ7RrhCSg8Hc6mIGnKRgKRli/3LgbSfZ0obFJehkRtEW
+tN4Ph8fVUeS74iQbIwFQeKlYHIlNTRoGtAbdi3nHdV+BBkEQc1V3rjqYqhjOoz/yNsgzLN
+D26HrdAAAAgQDnV6cn5qGxAWjqmQLr4I9T9LoYxtj99VH7q79thVjwVNwPaq5MWzl8BNC8
+L4wr67EFf5a2ISc/7YsrONFXmobpVmROUgBzFxiH/eS4i0oGlzI5KO46KLfiyvOJbS8psG
+eEDJ2I52UknJX9VLskDHFLW9+PiNLvWHJ8oadpkhbELQAAABRYIbQ5KfXsZuBPuWe5FJz3
+ldaEgwAAAAAB
+-----END OPENSSH PRIVATE KEY-----
diff --git a/regress/unittests/sshkey/testdata/ecdsa_n
b/regress/unittests/sshkey/testdata/ecdsa_n
index 80382b62..27ec659f 100644
--- a/regress/unittests/sshkey/testdata/ecdsa_n
+++ b/regress/unittests/sshkey/testdata/ecdsa_n
@@ -1,5 +1,8 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPPNyUAnjvFr+eT/7t/IyjuQQd/aLFiTY92LB9gIjyrMoAoGCCqGSM49
-AwEHoUQDQgAEDFlblkOrW9ydKVhtM+9AY3c9saBE7SG3lFx38nBavkADDaI9jh3/
-kvG/Jt9vpm22qwoklTCGDfzCkXkIKaWlBw=------END EC PRIVATE KEY-----
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS
+1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQMWVuWQ6tb3J0pWG0z70Bjdz2xoETt
+IbeUXHfycFq+QAMNoj2OHf+S8b8m32+mbbarCiSVMIYN/MKReQgppaUHAAAAoClkLxQpZC
+8UAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAxZW5ZDq1vcnSlY
+bTPvQGN3PbGgRO0ht5Rcd/JwWr5AAw2iPY4d/5Lxvybfb6ZttqsKJJUwhg38wpF5CCmlpQ
+cAAAAhAPPNyUAnjvFr+eT/7t/IyjuQQd/aLFiTY92LB9gIjyrMAAAAAAECAwQFBgc+-----END
OPENSSH PRIVATE KEY-----
diff --git a/regress/unittests/sshkey/testdata/rsa_n
b/regress/unittests/sshkey/testdata/rsa_n
index 5de3f842..7d5a8bd1 100644
--- a/regress/unittests/sshkey/testdata/rsa_n
+++ b/regress/unittests/sshkey/testdata/rsa_n
@@ -1,15 +1,16 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18u
-d6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKd
-NSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+wIDAQAB
-AoGAXyj5mpjmbD+YlxGIWz/zrM4hGsWgd4VteKEJxT6MMI4uzCRpkMd0ck8oHiwZ
-GAI/SwUzIsgtONQuH3AXVsUgghW4Ynn+8ksEv0IZ918WDMDwqvqkyrVzsOsZzqYj
-Pf8DUDKCpwFjnlknJ04yvWBZvVhWtY4OiZ8GV0Ttsu3k+GECQQD1YHfvBb5FdJBv
-Uhde2Il+jaFia8mwVVNNaiD2ECxXx6CzGz54ZLEB9NPVfDUZK8lJ4UJDqelWNh3i
-PF3RefWDAkEA1CVBzAFL4mNwpleVPzrfy69xP3gWOa26MxM/GE6zx9jC7HgQ3KPa
-WKdG/FuHs085aTRDaDLmGcZ8IvMuu7NgKQJAcIOKmxR0Gd8IN7NZugjqixggb0Pj
-mLKXXwESGiJyYtHL0zTj4Uqyi6Ya2GJ66o7UXscmnmYz828fJtTtZBdbRwJBALfi
-C2QvA32Zv/0PEXibKXy996WSC4G3ShwXZKtHHKHvCxY5BDSbehk59VesZrVPyG2e
-NYdOBxD0cIlCzJE56/ECQAndVkxvO8hwyEFGGwF3faHIAe/OxVb+MjaU25//Pe1/
-h/e6tlCk4w9CODpyV685gV394eYwMcGDcIkipTNUDZs------END RSA PRIVATE KEY-----
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAlwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAIEAy1eZVE7exawA7HgfwhoRGc6aKI4xFucvPnj7y6aZitzJjCNfLner
+8c6St28GS2JFUsnyWCNB5iLhoXbu8jK1usG/OIG6vAt9V6HvRDkXCFLhkrwynTUjNUo5YQ
+6rkW5QxQfJE6Kl8sdZaq13nF8pcSFDi9IxPrtK1Nfeu6QycfsAAAH423gPKNt4DygAAAAH
+c3NoLXJzYQAAAIEAy1eZVE7exawA7HgfwhoRGc6aKI4xFucvPnj7y6aZitzJjCNfLner8c
+6St28GS2JFUsnyWCNB5iLhoXbu8jK1usG/OIG6vAt9V6HvRDkXCFLhkrwynTUjNUo5YQ6r
+kW5QxQfJE6Kl8sdZaq13nF8pcSFDi9IxPrtK1Nfeu6QycfsAAAADAQABAAAAgF8o+ZqY5m
+w/mJcRiFs/86zOIRrFoHeFbXihCcU+jDCOLswkaZDHdHJPKB4sGRgCP0sFMyLILTjULh9w
+F1bFIIIVuGJ5/vJLBL9CGfdfFgzA8Kr6pMq1c7DrGc6mIz3/A1AygqcBY55ZJydOMr1gWb
+1YVrWODomfBldE7bLt5PhhAAAAQAndVkxvO8hwyEFGGwF3faHIAe/OxVb+MjaU25//Pe1/
+h/e6tlCk4w9CODpyV685gV394eYwMcGDcIkipTNUDZsAAABBAPVgd+8FvkV0kG9SF17YiX
+6NoWJrybBVU01qIPYQLFfHoLMbPnhksQH009V8NRkryUnhQkOp6VY2HeI8XdF59YMAAABB
+ANQlQcwBS+JjcKZXlT8638uvcT94FjmtujMTPxhOs8fYwux4ENyj2linRvxbh7NPOWk0Q2
+gy5hnGfCLzLruzYCkAAAAAAQID
+-----END OPENSSH PRIVATE KEY-----
-- 
2.26.2

openssh unix dev - Apr 2020 - [PATCH 0/4] sshkey mktestdata.sh fixes

[PATCH 0/4] sshkey mktestdata.sh fixes

[PATCH 1/4] Remove obsolete SSH1 testdata

[PATCH 2/4] Update mktestdata.sh for new ssh-keygen defaults

[PATCH 3/4] Delete newline after processing with sed

[PATCH 4/4] Fix new-format sshkey testdata