summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2014-07-22 23:35:39 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2014-07-22 23:35:39 +0000
commit050f04b4f5942b7d663acff4c533bdac29683010 (patch)
treea313187cba86cd76dd4b80286543247ac43dfe54 /regress/usr.bin
parent43514b814b6a471a815526d645d01c91acb3c943 (diff)
Regenerate test keys with certs signed with ed25519 instead of ecdsa.
These can be used in -portable on platforms that don't support ECDSA.
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_120
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.g2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.priv2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1_pw22
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_220
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n20
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n_pw39
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_16
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.priv2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1_pw8
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_210
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.priv2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n6
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n_pw14
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_18
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1_pw12
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_28
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1bin421 -> 421 bytes
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.param.n2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1_pwbin421 -> 421 bytes
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2bin981 -> 981 bytes
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.param.n2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_120
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.n2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.p2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.q2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1_pw22
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_250
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp.bb2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.n2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.p2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.q2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.pub2
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n20
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n_pw24
74 files changed, 218 insertions, 217 deletions
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1 b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1
index 7517963d444..34346869f97 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1
@@ -1,12 +1,12 @@
-----BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQCB2IZRhajAULw+W8SLX5kxD/88CuVIKqojrZD5C+4T5D4YwQ0L
-6DvbvPHRhid1jmL4VLrG1MfOQvFMbePC9ydvf6CKDK/LPb8Wiq0cR2uBit2CVDIo
-4M7bk4X9+u7AwgENNbEAbdNBJRuMxwJiv4OawFGmFaASFNqVCRaq7MzA8wIVAMHA
-azJLtfjdILh3uV77BT3MxGIPAoGASU6xzUFx2PG3g81RBIO09NauCcf/0EYpyMls
-xNJ3MrQnVPWQwqjFepsEcU95ItbsUVkav0mqW319Am6/EAvroYcCHDyo+JUAUPiL
-WXmF6eEMNa97aNM5cQQwzYQvqt+F2mjK4SPxQObCA3O/YEmB8xUtn09BPDP2r/4Z
-y2ywGIECgYB6/rbpAUv4klwv7fX+v5nBFB3pnt5QPZrC6BxDmhG1v5vdNkvIWo4t
-OYnxV/5O3vJQQGi81uA0LjrpH3K9HRos8QP7QnsDYdAYyqLekrFzmnQOxMnYoj0n
-rZBr07TFifBI/m+/vboaegF93/xyNiGcG39i9sWoUQ+Qu1rsdLLg7QIVAITGqmpX
-T8lOnqkCA3X/7XZfZKUb
+MIIBuwIBAAKBgQCxBNwH8TmLXqiZa0b9pxC6W+zS4Voqp8S+QwecYpNPTmhjaUYI
+E/aJWAzFVtdbysLM89ukvw/z8qBkbMSefdypKmjUtgv51ZD4nfV4Wxb+G+1QExHr
+M+kowOOL3XbcsdbPLUt8vxDJbBlQRch4zyai7CWjQR3JFXpR8sevUFJxSQIVAIdE
+oncp2DEY2U/ZZnIyGCwApCzfAoGARW+eewZTv1Eosxv3ANKx372pf5+fQKwnWizI
+j5z/GY3w3xobRCP9FiL4K3Nip2FvHLTGpRrlfm19RWYAg77VsNgztC4V9C8QrKWc
+WJdkUkoQpZ3VoO25rO13hmIelkal3omKCF4ZE/edeF3d2B8DlzYs0aBcjTCMDrub
+/CJILcYCgYEAgJt9jefGQi4Sl5F8h3jYo52LygE8sNYyurElMKVmyhFSKJ1Ifi9j
+4hNp2jZzu7jpZWhYndUoPaG6gbRB7fL3p5knlRo3P2Dznd6u6NAdhrADWW+JX9n1
+/EMKUv0h8rRFI/3b9RY1HVVzBQH7V3sNJ6iekH8JqOy1liCMaMylw4gCFBl7Lc6V
+hmTiTuhLXjoRdCZS/p/m
-----END DSA PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.fp
index 79009e5ddf6..56ee1f89b9e 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.fp
@@ -1 +1 @@
-6d:a9:24:3f:d5:b0:51:76:6d:98:2a:eb:64:ad:e1:3e
+5a:4a:41:8c:4e:fa:4c:52:19:f9:39:49:31:fb:fd:74
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.pub
index ccc9e34f800..023edf136bf 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1-cert.pub
@@ -1 +1 @@
-ssh-dss-cert-v01@openssh.com AAAAHHNzaC1kc3MtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgyiDlcNJnT+1aDuTAT6IFROmPV36yZXS1+eg8j93Lbv4AAACBAIHYhlGFqMBQvD5bxItfmTEP/zwK5UgqqiOtkPkL7hPkPhjBDQvoO9u88dGGJ3WOYvhUusbUx85C8Uxt48L3J29/oIoMr8s9vxaKrRxHa4GK3YJUMijgztuThf367sDCAQ01sQBt00ElG4zHAmK/g5rAUaYVoBIU2pUJFqrszMDzAAAAFQDBwGsyS7X43SC4d7le+wU9zMRiDwAAAIBJTrHNQXHY8beDzVEEg7T01q4Jx//QRinIyWzE0ncytCdU9ZDCqMV6mwRxT3ki1uxRWRq/SapbfX0Cbr8QC+uhhwIcPKj4lQBQ+ItZeYXp4Qw1r3to0zlxBDDNhC+q34XaaMrhI/FA5sIDc79gSYHzFS2fT0E8M/av/hnLbLAYgQAAAIB6/rbpAUv4klwv7fX+v5nBFB3pnt5QPZrC6BxDmhG1v5vdNkvIWo4tOYnxV/5O3vJQQGi81uA0LjrpH3K9HRos8QP7QnsDYdAYyqLekrFzmnQOxMnYoj0nrZBr07TFifBI/m+/vboaegF93/xyNiGcG39i9sWoUQ+Qu1rsdLLg7QAAAAAAAAAGAAAAAgAAAAZqdWxpdXMAAAASAAAABWhvc3QxAAAABWhvc3QyAAAAADaLg2AAAAAATR3h4AAAAAAAAAAAAAAAAAAAAGgAAAATZWNkc2Etc2hhMi1uaXN0cDI1NgAAAAhuaXN0cDI1NgAAAEEEeFVBN9rCVt76ZAhb71aQxLwcmq5SigrJG8nRvoBI3Tzfa8/Sp16hupzUeHJht3/BNI8sPvcI1DMVTuOREstl6wAAAGQAAAATZWNkc2Etc2hhMi1uaXN0cDI1NgAAAEkAAAAgMIrMGDb0MQT95GiXw93m4l7D+ruiJKLclEP/e68J/GMAAAAhAMbXfc7vVtOU4ofibChKSTHAUrDotY+qr50UDVhCIBhJ DSA test key #1
+ssh-dss-cert-v01@openssh.com AAAAHHNzaC1kc3MtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgj8zueN51MSQ7jW3fFwqyJWA3DycAAavQ8WgMHqcUG7YAAACBALEE3AfxOYteqJlrRv2nELpb7NLhWiqnxL5DB5xik09OaGNpRggT9olYDMVW11vKwszz26S/D/PyoGRsxJ593KkqaNS2C/nVkPid9XhbFv4b7VATEesz6SjA44vddtyx1s8tS3y/EMlsGVBFyHjPJqLsJaNBHckVelHyx69QUnFJAAAAFQCHRKJ3KdgxGNlP2WZyMhgsAKQs3wAAAIBFb557BlO/USizG/cA0rHfval/n59ArCdaLMiPnP8ZjfDfGhtEI/0WIvgrc2KnYW8ctMalGuV+bX1FZgCDvtWw2DO0LhX0LxCspZxYl2RSShClndWg7bms7XeGYh6WRqXeiYoIXhkT9514Xd3YHwOXNizRoFyNMIwOu5v8IkgtxgAAAIEAgJt9jefGQi4Sl5F8h3jYo52LygE8sNYyurElMKVmyhFSKJ1Ifi9j4hNp2jZzu7jpZWhYndUoPaG6gbRB7fL3p5knlRo3P2Dznd6u6NAdhrADWW+JX9n1/EMKUv0h8rRFI/3b9RY1HVVzBQH7V3sNJ6iekH8JqOy1liCMaMylw4gAAAAAAAAABgAAAAIAAAAGanVsaXVzAAAAEgAAAAVob3N0MQAAAAVob3N0MgAAAAA2i4NgAAAAAE0d4eAAAAAAAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAILk95V5J3LKVx8bcLSB4073R7d0aAvR8gJrPvnV0D3MQAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEA6qftqozw0ah9PG9obAg8iOPwQv6AsT9t/1G69eArSd9Am85OKIhAvYguI1Xtr9rw78X/Xk+6HtyAOF3QemaQD dsa_1.pub
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp
index 79009e5ddf6..56ee1f89b9e 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp
@@ -1 +1 @@
-6d:a9:24:3f:d5:b0:51:76:6d:98:2a:eb:64:ad:e1:3e
+5a:4a:41:8c:4e:fa:4c:52:19:f9:39:49:31:fb:fd:74
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp.bb
index 9d0d51a635e..07dd9b4182b 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.fp.bb
@@ -1 +1 @@
-xumel-lusic-nevym-gyfup-ginyg-deliv-tetam-humef-vykul-tadit-pixix
+xosat-baneh-gocad-relek-kepur-mibip-motog-bykyb-hisug-mysus-tuxix
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.g b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.g
index deb29000ca3..4b09f6d18d8 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.g
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.g
@@ -1 +1 @@
-494eb1cd4171d8f1b783cd510483b4f4d6ae09c7ffd04629c8c96cc4d27732b42754f590c2a8c57a9b04714f7922d6ec51591abf49aa5b7d7d026ebf100beba187021c3ca8f8950050f88b597985e9e10c35af7b68d339710430cd842faadf85da68cae123f140e6c20373bf604981f3152d9f4f413c33f6affe19cb6cb01881
+456f9e7b0653bf5128b31bf700d2b1dfbda97f9f9f40ac275a2cc88f9cff198df0df1a1b4423fd1622f82b7362a7616f1cb4c6a51ae57e6d7d45660083bed5b0d833b42e15f42f10aca59c589764524a10a59dd5a0edb9aced7786621e9646a5de898a085e1913f79d785dddd81f0397362cd1a05c8d308c0ebb9bfc22482dc6
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.priv b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.priv
index 314148b5539..2dd737cbe5e 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.priv
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.priv
@@ -1 +1 @@
-0084c6aa6a574fc94e9ea9020375ffed765f64a51b
+197b2dce958664e24ee84b5e3a11742652fe9fe6
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.pub
index bde5b10a32c..b23d7207f66 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.param.pub
@@ -1 +1 @@
-7afeb6e9014bf8925c2fedf5febf99c1141de99ede503d9ac2e81c439a11b5bf9bdd364bc85a8e2d3989f157fe4edef2504068bcd6e0342e3ae91f72bd1d1a2cf103fb427b0361d018caa2de92b1739a740ec4c9d8a23d27ad906bd3b4c589f048fe6fbfbdba1a7a017ddffc7236219c1b7f62f6c5a8510f90bb5aec74b2e0ed
+00809b7d8de7c6422e1297917c8778d8a39d8bca013cb0d632bab12530a566ca1152289d487e2f63e21369da3673bbb8e96568589dd5283da1ba81b441edf2f7a79927951a373f60f39ddeaee8d01d86b003596f895fd9f5fc430a52fd21f2b44523fddbf516351d55730501fb577b0d27a89e907f09a8ecb596208c68cca5c388
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.pub
index 51c2c1bb343..89681970cae 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1.pub
@@ -1 +1 @@
-ssh-dss AAAAB3NzaC1kc3MAAACBAIHYhlGFqMBQvD5bxItfmTEP/zwK5UgqqiOtkPkL7hPkPhjBDQvoO9u88dGGJ3WOYvhUusbUx85C8Uxt48L3J29/oIoMr8s9vxaKrRxHa4GK3YJUMijgztuThf367sDCAQ01sQBt00ElG4zHAmK/g5rAUaYVoBIU2pUJFqrszMDzAAAAFQDBwGsyS7X43SC4d7le+wU9zMRiDwAAAIBJTrHNQXHY8beDzVEEg7T01q4Jx//QRinIyWzE0ncytCdU9ZDCqMV6mwRxT3ki1uxRWRq/SapbfX0Cbr8QC+uhhwIcPKj4lQBQ+ItZeYXp4Qw1r3to0zlxBDDNhC+q34XaaMrhI/FA5sIDc79gSYHzFS2fT0E8M/av/hnLbLAYgQAAAIB6/rbpAUv4klwv7fX+v5nBFB3pnt5QPZrC6BxDmhG1v5vdNkvIWo4tOYnxV/5O3vJQQGi81uA0LjrpH3K9HRos8QP7QnsDYdAYyqLekrFzmnQOxMnYoj0nrZBr07TFifBI/m+/vboaegF93/xyNiGcG39i9sWoUQ+Qu1rsdLLg7Q== DSA test key #1
+ssh-dss AAAAB3NzaC1kc3MAAACBALEE3AfxOYteqJlrRv2nELpb7NLhWiqnxL5DB5xik09OaGNpRggT9olYDMVW11vKwszz26S/D/PyoGRsxJ593KkqaNS2C/nVkPid9XhbFv4b7VATEesz6SjA44vddtyx1s8tS3y/EMlsGVBFyHjPJqLsJaNBHckVelHyx69QUnFJAAAAFQCHRKJ3KdgxGNlP2WZyMhgsAKQs3wAAAIBFb557BlO/USizG/cA0rHfval/n59ArCdaLMiPnP8ZjfDfGhtEI/0WIvgrc2KnYW8ctMalGuV+bX1FZgCDvtWw2DO0LhX0LxCspZxYl2RSShClndWg7bms7XeGYh6WRqXeiYoIXhkT9514Xd3YHwOXNizRoFyNMIwOu5v8IkgtxgAAAIEAgJt9jefGQi4Sl5F8h3jYo52LygE8sNYyurElMKVmyhFSKJ1Ifi9j4hNp2jZzu7jpZWhYndUoPaG6gbRB7fL3p5knlRo3P2Dznd6u6NAdhrADWW+JX9n1/EMKUv0h8rRFI/3b9RY1HVVzBQH7V3sNJ6iekH8JqOy1liCMaMylw4g= DSA test key #1
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1_pw b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1_pw
index 1bedcb0cee8..1402153a037 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1_pw
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_1_pw
@@ -1,15 +1,15 @@
-----BEGIN DSA PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,65B3055CF40728FF588846F0AEFE21B2
+DEK-Info: AES-128-CBC,9E668E24E7B9D658E3E7D0446B32B376
-I3cUBSbhjltkTMvTaDABixfwLr8faxL9/YOoEFenmBj0JwwrSV7L8VGbb68BbwCr
-5EOgySFEazgXUbiuILg47lWxp/IKegz1KrO6bXoE1bKT+UxjrI+e8CDi4kpEh98F
-jM6V0QZmotMVwJh6NIfuuOBN92mS8In8remGGBA08VWPjW1CsmjmTDFNzOW5Uzo9
-gG9dM08NljQ8Mf3L2iKoTpLQVr//0Q//0Ei3qCEUOvOOH05mWiecGwPAiCSH2jSO
-GlP59jbwxfIZ2klGrj9D8xCBzTZgdHDlS2cdnJ0GasaPiFnWwX91zaatK+vCvWp6
-apWY6biRn0g9EGJob9YZ6eg3ZGHcFsf/7yDbSjuG3Uj8FhmrP/MkK7Ht7db2hiGL
-9uUrNcZhLUFyynTcEfBOFuAtoqktDNTN2VjMj9szJWipF8U9hGeRfw4hFeMXYPHD
-k/+j4qS4fc5EAx1Vd6iMXRzxiUre8GGzyq2nSm1POtyQPG+3UQTRU3zBBudIx9N9
-WCXWHw0+xNHgOX/HtLUkq+2ghxnU+6Whew5eqSdKLMoB7KIKxsxf8wNkv4yOM1KJ
-JWXaXOCyIWclCuc1Uj27Zw==
+hDjDLbfCAQutblxLuyNzSLxISSgXTgyzq8St9GE0lUtEc7i0xGNWwoWpFSbtD9y1
+yTG5UkhATQt56SY1ABfXZ21wieYuEEQeSJi0gwUQNNt2SwwITx4EdzDedWiHjikt
+jbzH3v33agp/odw2X9wY6zu75y9CeW9o7SszRl286DliWIHJmhMlbb8r7jRqu62H
+s5YYxD0xS1ipWauxklmIXMWNZHcARo8ZiJOuNdLshrSrl8DUW9P6F89FvxclQzKr
+44u3OBm7KbgPvPURDFLgNP6uCGBjzHvhHTpzVBxmQzCl3aGgsTKXiwJ1eupNjntB
+ji0EnbznvoxR6qhXxw/WQ+MnWlWqTXka/2qaB6m3oJv+Zn7cPCJ5kvHnhr2JmNMl
+igTh4Ov4LZLyNgO0Lbec4KyxW9QInRV5CY4Pu5lhqHteiPmOIGMWFtuh8Bb8Kg2q
+VvXnPo5I3FjqV7UhDduO1Wn558sBZWQPqRbHVPN6wXJuM3HGkBl+aNjn0qddv9tr
+VFJd/xdly2Ne81g3CB8jysE+3WEOrV9kdybocp/EhSOzP4i6pjWlyWdR5+CgbvRm
+TUIeIaQbmPIB5251o5YK+Q==
-----END DSA PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2 b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2
index 2ad7393c4a6..b189dc821d0 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2
@@ -1,12 +1,12 @@
-----BEGIN DSA PRIVATE KEY-----
-MIIBvAIBAAKBgQDzY25r/QuRHe5YvbwajDpB4/DyY3LH/OTVWcQdflDH2xH6823W
-H2i7FwnuYzsAJkbM1L9n3N9bOXhiGmYIpUKfkE1EKRekNnLW9D0/AvkVzcBN/Lqc
-zy4TxmE7oxClIS+6uksoRHhohFkHPWZDYTxo6mD5vVfzCh2jSSzjEhzFLwIVANtk
-v40w5aRP8C8TQciVJCUy5yp1AoGBAO+s5wkzEftttboUCci3pK0L9wUPHkhTNgC+
-sFjdtiVVpptGkLsujyllEyIFChVUrN5ZNgjv7bzSEe0FSU0XtmZ77GU96ff7jWmD
-9xUqm4aIwu/3DSgitOO+XLgb2J08eLY+Lglp40AoWFfwy57flpPMT4q5nk77QfS1
-gzC2X0CtAoGAPfbEG6KUOec9H1xfnwb8AVCk6jOy+XfiGtE3cnlECNQjQkPcp1Jm
-CrhrEh1rRmOwJdMkDLhmOHy6IFnzvj85IAm9qY6M2f8svZ/ASCAnQ6SnHDwhl3eO
-ZQPi03Fka3QXjkwJb/gnmoWuGayM7dPbJg0Ib62GrPGj6/vkaQsGy3ACFQDL5o4e
-vjA1Kf3kA2WYhOy/8kfeJg==
+MIIBuwIBAAKBgQDoMxCTyBnLPSO7CRU3RyfJLANLKBZ3/LdcsyNaARctaRA5gzRb
+XdTFFU+rWKfxv+otm0KyCOepLtWy8tjKRYb7Ni46USlGwtM0Adx/3vR4iWNfipDP
+K2V4O97JyMe3wsbF7siC01U4b8Ki+J44iFG9nuRnOTHqUWI615mraQRwlQIVAMsX
+nsPGH8QrU11F1ScAIfZC165dAoGACCXyOHFkxABpJDtJs6AE7Hl3XjI4dnlim/XH
+Y60W6gcO7gHSE2r2ljCubJqoUXmxd5mLKgnu91jIG/4URwDM4V7pb2k99sXpAi8I
+L52eQl88C0bRD9+lEJfR4PMT39EccDRPB4+E055RoYQZ/McIyad8sF3Qwt084Eq+
+IkUt2coCgYEAxZRpCY82sM9Mu4B0EcH6O8seRqIRScmelljhUtKxuvf2PChwIWkR
+HK9lORHBE3iKyurC5Muf3abuHKwMFjrOjHKOTqXBRrDZ7RgLQA0aUAQD3lWc9OTP
+NShjphpq5xr0HZB31eJg3/Mo6KxYlRpzMXbTyenZP0XLICSSAywvTDoCFG5whl2k
+Y2FLGfi9V6ylUVH6jKgE
-----END DSA PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp
index a9a2a45dee3..ba9de82a8a8 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp
@@ -1 +1 @@
-3d:fb:a3:22:95:17:89:1f:24:31:e7:ec:9f:ce:09:0b
+72:5f:50:6b:e5:64:c5:62:21:92:3f:8b:10:9b:9f:1a
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp.bb
index 788bffee5a3..37a5221a764 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.fp.bb
@@ -1 +1 @@
-xuzoh-nuhut-lyrum-luhap-givyl-nygiz-nybyr-higes-pahor-nivic-zyxex
+xesoh-mebaf-feced-lenuz-sicam-pevok-bosak-nogaz-ligen-fekef-fixex
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.pub
index da4ac7f8783..6ed2736b1b8 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_2.pub
@@ -1 +1 @@
-ssh-dss AAAAB3NzaC1kc3MAAACBAPNjbmv9C5Ed7li9vBqMOkHj8PJjcsf85NVZxB1+UMfbEfrzbdYfaLsXCe5jOwAmRszUv2fc31s5eGIaZgilQp+QTUQpF6Q2ctb0PT8C+RXNwE38upzPLhPGYTujEKUhL7q6SyhEeGiEWQc9ZkNhPGjqYPm9V/MKHaNJLOMSHMUvAAAAFQDbZL+NMOWkT/AvE0HIlSQlMucqdQAAAIEA76znCTMR+221uhQJyLekrQv3BQ8eSFM2AL6wWN22JVWmm0aQuy6PKWUTIgUKFVSs3lk2CO/tvNIR7QVJTRe2ZnvsZT3p9/uNaYP3FSqbhojC7/cNKCK0475cuBvYnTx4tj4uCWnjQChYV/DLnt+Wk8xPirmeTvtB9LWDMLZfQK0AAACAPfbEG6KUOec9H1xfnwb8AVCk6jOy+XfiGtE3cnlECNQjQkPcp1JmCrhrEh1rRmOwJdMkDLhmOHy6IFnzvj85IAm9qY6M2f8svZ/ASCAnQ6SnHDwhl3eOZQPi03Fka3QXjkwJb/gnmoWuGayM7dPbJg0Ib62GrPGj6/vkaQsGy3A= DSA test key #2
+ssh-dss AAAAB3NzaC1kc3MAAACBAOgzEJPIGcs9I7sJFTdHJ8ksA0soFnf8t1yzI1oBFy1pEDmDNFtd1MUVT6tYp/G/6i2bQrII56ku1bLy2MpFhvs2LjpRKUbC0zQB3H/e9HiJY1+KkM8rZXg73snIx7fCxsXuyILTVThvwqL4njiIUb2e5Gc5MepRYjrXmatpBHCVAAAAFQDLF57Dxh/EK1NdRdUnACH2QteuXQAAAIAIJfI4cWTEAGkkO0mzoATseXdeMjh2eWKb9cdjrRbqBw7uAdITavaWMK5smqhRebF3mYsqCe73WMgb/hRHAMzhXulvaT32xekCLwgvnZ5CXzwLRtEP36UQl9Hg8xPf0RxwNE8Hj4TTnlGhhBn8xwjJp3ywXdDC3TzgSr4iRS3ZygAAAIEAxZRpCY82sM9Mu4B0EcH6O8seRqIRScmelljhUtKxuvf2PChwIWkRHK9lORHBE3iKyurC5Muf3abuHKwMFjrOjHKOTqXBRrDZ7RgLQA0aUAQD3lWc9OTPNShjphpq5xr0HZB31eJg3/Mo6KxYlRpzMXbTyenZP0XLICSSAywvTDo= DSA test key #2
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n
index 7517963d444..34346869f97 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n
@@ -1,12 +1,12 @@
-----BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQCB2IZRhajAULw+W8SLX5kxD/88CuVIKqojrZD5C+4T5D4YwQ0L
-6DvbvPHRhid1jmL4VLrG1MfOQvFMbePC9ydvf6CKDK/LPb8Wiq0cR2uBit2CVDIo
-4M7bk4X9+u7AwgENNbEAbdNBJRuMxwJiv4OawFGmFaASFNqVCRaq7MzA8wIVAMHA
-azJLtfjdILh3uV77BT3MxGIPAoGASU6xzUFx2PG3g81RBIO09NauCcf/0EYpyMls
-xNJ3MrQnVPWQwqjFepsEcU95ItbsUVkav0mqW319Am6/EAvroYcCHDyo+JUAUPiL
-WXmF6eEMNa97aNM5cQQwzYQvqt+F2mjK4SPxQObCA3O/YEmB8xUtn09BPDP2r/4Z
-y2ywGIECgYB6/rbpAUv4klwv7fX+v5nBFB3pnt5QPZrC6BxDmhG1v5vdNkvIWo4t
-OYnxV/5O3vJQQGi81uA0LjrpH3K9HRos8QP7QnsDYdAYyqLekrFzmnQOxMnYoj0n
-rZBr07TFifBI/m+/vboaegF93/xyNiGcG39i9sWoUQ+Qu1rsdLLg7QIVAITGqmpX
-T8lOnqkCA3X/7XZfZKUb
+MIIBuwIBAAKBgQCxBNwH8TmLXqiZa0b9pxC6W+zS4Voqp8S+QwecYpNPTmhjaUYI
+E/aJWAzFVtdbysLM89ukvw/z8qBkbMSefdypKmjUtgv51ZD4nfV4Wxb+G+1QExHr
+M+kowOOL3XbcsdbPLUt8vxDJbBlQRch4zyai7CWjQR3JFXpR8sevUFJxSQIVAIdE
+oncp2DEY2U/ZZnIyGCwApCzfAoGARW+eewZTv1Eosxv3ANKx372pf5+fQKwnWizI
+j5z/GY3w3xobRCP9FiL4K3Nip2FvHLTGpRrlfm19RWYAg77VsNgztC4V9C8QrKWc
+WJdkUkoQpZ3VoO25rO13hmIelkal3omKCF4ZE/edeF3d2B8DlzYs0aBcjTCMDrub
+/CJILcYCgYEAgJt9jefGQi4Sl5F8h3jYo52LygE8sNYyurElMKVmyhFSKJ1Ifi9j
+4hNp2jZzu7jpZWhYndUoPaG6gbRB7fL3p5knlRo3P2Dznd6u6NAdhrADWW+JX9n1
+/EMKUv0h8rRFI/3b9RY1HVVzBQH7V3sNJ6iekH8JqOy1liCMaMylw4gCFBl7Lc6V
+hmTiTuhLXjoRdCZS/p/m
-----END DSA PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n_pw b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n_pw
index 568f8512d74..42f70dd230c 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n_pw
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/dsa_n_pw
@@ -1,21 +1,22 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-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
+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
+Xrny2wNtt/DybCkA==
-----END OPENSSH PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1 b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1
index 9b8b9f43271..aec73dd61f8 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1
@@ -1,5 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDUJpHhcwtTxAYqTeBC2WNcZJ3VJrAI97F2n2PeootjCoAoGCCqGSM49
-AwEHoUQDQgAEeFVBN9rCVt76ZAhb71aQxLwcmq5SigrJG8nRvoBI3Tzfa8/Sp16h
-upzUeHJht3/BNI8sPvcI1DMVTuOREstl6w==
+MHcCAQEEIFghsFR1K95tz8qOl3+tX6fv8a/O6AfNbxOSFZX3ihxooAoGCCqGSM49
+AwEHoUQDQgAEalpgP0BOePHtTw0Pus4tdhTb8P9yWUZluvLf1D8vrHImT+G4vr/W
+xo5iXGKQVEifuUVyLkAW2kDrq8J/szeRiQ==
-----END EC PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.fp
index fec523c47b8..a56dbc8d011 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.fp
@@ -1 +1 @@
-db:df:20:25:bf:74:fc:1d:61:2f:c0:cd:53:7f:a0:69
+f7:be:4c:02:65:ed:4c:11:af:ab:a8:dd:0a:92:e7:44
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.pub
index 1dde0640cd2..29b06a4dd4a 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1-cert.pub
@@ -1 +1 @@
-ecdsa-sha2-nistp256-cert-v01@openssh.com AAAAKGVjZHNhLXNoYTItbmlzdHAyNTYtY2VydC12MDFAb3BlbnNzaC5jb20AAAAg99cLkLZdAh1Q9TLiiFjDgLeXcncoQ2ChPj6vheH5aDAAAAAIbmlzdHAyNTYAAABBBHhVQTfawlbe+mQIW+9WkMS8HJquUooKyRvJ0b6ASN0832vP0qdeobqc1HhyYbd/wTSPLD73CNQzFU7jkRLLZesAAAAAAAAABwAAAAIAAAAGanVsaXVzAAAAEgAAAAVob3N0MQAAAAVob3N0MgAAAAA2i4NgAAAAAE0d4eAAAAAAAAAAAAAAAAAAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHhVQTfawlbe+mQIW+9WkMS8HJquUooKyRvJ0b6ASN0832vP0qdeobqc1HhyYbd/wTSPLD73CNQzFU7jkRLLZesAAABlAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAABKAAAAIQCNyzewlmw65HO5pgVlhNhTds90xhHWG7E26+w37vS6AQAAACEAofQD+jXVJIw0JFuL/4pEpHV8LA9swBOlr+0QSHOvrO8= ECDSA test key #1
+ecdsa-sha2-nistp256-cert-v01@openssh.com AAAAKGVjZHNhLXNoYTItbmlzdHAyNTYtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgjpoHehzmM54xz776HOiTOLPhkOwSWyXOMYeqDhDEcLgAAAAIbmlzdHAyNTYAAABBBGpaYD9ATnjx7U8ND7rOLXYU2/D/cllGZbry39Q/L6xyJk/huL6/1saOYlxikFRIn7lFci5AFtpA66vCf7M3kYkAAAAAAAAABwAAAAIAAAAGanVsaXVzAAAAEgAAAAVob3N0MQAAAAVob3N0MgAAAAA2i4NgAAAAAE0d4eAAAAAAAAAAAAAAAAAAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGpaYD9ATnjx7U8ND7rOLXYU2/D/cllGZbry39Q/L6xyJk/huL6/1saOYlxikFRIn7lFci5AFtpA66vCf7M3kYkAAABjAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAABIAAAAIFZM1PXlXf0a3VuGs7MVdWSealDXprT1nN5hQTg+m+EYAAAAIGN1yNXWEY5V315NhOD3mBuh/xCpfDn5rZjF4YntA7du ecdsa_1.pub
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp
index fec523c47b8..a56dbc8d011 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp
@@ -1 +1 @@
-db:df:20:25:bf:74:fc:1d:61:2f:c0:cd:53:7f:a0:69
+f7:be:4c:02:65:ed:4c:11:af:ab:a8:dd:0a:92:e7:44
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp.bb
index 9816feccd58..f01a5dd44ce 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.fp.bb
@@ -1 +1 @@
-xeroh-pefer-fypid-kipem-fosag-ludoz-vilym-nuvoz-rilyv-nonut-raxex
+xotah-hecal-zibyb-nadug-romuc-hator-venum-hobip-ruluh-ripus-naxix
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.priv b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.priv
index 7196f0c73cd..3475f1fe906 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.priv
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.priv
@@ -1 +1 @@
-3509a4785cc2d4f1018a937810b658d719277549ac023dec5da7d8f7a8a2d8c2
+5821b054752bde6dcfca8e977fad5fa7eff1afcee807cd6f13921595f78a1c68
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.pub
index 189f3182859..11847a39422 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.param.pub
@@ -1 +1 @@
-0478554137dac256defa64085bef5690c4bc1c9aae528a0ac91bc9d1be8048dd3cdf6bcfd2a75ea1ba9cd4787261b77fc1348f2c3ef708d433154ee39112cb65eb
+046a5a603f404e78f1ed4f0d0fbace2d7614dbf0ff72594665baf2dfd43f2fac72264fe1b8bebfd6c68e625c629054489fb945722e4016da40ebabc27fb3379189
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.pub
index cea2861b5d9..eca1620bcc9 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1.pub
@@ -1 +1 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHhVQTfawlbe+mQIW+9WkMS8HJquUooKyRvJ0b6ASN0832vP0qdeobqc1HhyYbd/wTSPLD73CNQzFU7jkRLLZes= ECDSA test key #1
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGpaYD9ATnjx7U8ND7rOLXYU2/D/cllGZbry39Q/L6xyJk/huL6/1saOYlxikFRIn7lFci5AFtpA66vCf7M3kYk= ECDSA test key #1
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1_pw b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1_pw
index 7fcf57a03c3..071154ab2c7 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1_pw
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_1_pw
@@ -1,8 +1,8 @@
-----BEGIN EC PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,332EEE2B8008A91D1F4342B9DEBE4FEA
+DEK-Info: AES-128-CBC,74C8AEA5BFAFCC2B1C8B13DE671F5610
-nMCab7D2wbVoKZvM37ZbTXiajSmyvWFQd3Mt3zeeEBoL6ib/48BFDogWlcDvRP7y
-tgKYhqK7JBO4GjSssL4Bu/rQgNK/0ZmS/V7hLN7wsU3DcrHYhfHknL8LbRfiJarB
-772nLAie9oaQcZZloNVa477CBGh7WXux/vRk2NlJ0Uo=
+vUsgOvCqezxPmcZcFqrSy9Y1MMlVguY0h9cfSPFC7gUrRr+45uCOYX5bOwEXecKn
+/9uCXZtlBwwqDS9iK5IPoUrjEHvzI5rVbHWUxDrEOVbsfiDuCxrQM19It6QIqC1v
+OSQEdXuBWR5WmhKNc3dqLbWsU8u2s60YwKQmZrj9nM4=
-----END EC PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2 b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2
index 651b00c937c..76ae07ad41d 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2
@@ -1,7 +1,7 @@
-----BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIB7SsuJvR+4aK3Js4gEaJ5UDEa2hJTCBM+/PBYv9ZUkf9PohUvfPfh
-xHRcF6tUhZDmChFeNQpt3sic2uTXa4lU8oigBwYFK4EEACOhgYkDgYYABABLAXz5
-fCAiumZWlWqzG5NxJx1a17WgZ2o+ffYrAJgXVrGGJudmIZSCDWFABtpuY7Ws3zRa
-CM3DZj+ua+qMWsUysQGwiC6n1YEUdVZste5Vdh1YqhImJcT3//TzJ6lfMaUpJxdU
-MeYe8bw+zuNAEJ+ax8W6lWKQwu4sh3Ffc6WmU+qYkg==
+MIHcAgEBBEIBg4kVxUfoo/RE/78/QBRqG6PZuHZ82eLnhmZVzBa7XREUiYI/Jw7r
+Qwp4FTBVfXL76Pt5AyBMf+52aVeOUlLRERSgBwYFK4EEACOhgYkDgYYABACNTJ5O
+uNo5dNgIQRLHzKU91m7immKFiutJ6BlDbkRkKr+Envj13J6HOgYvOTm0n7SPlKHS
+STZ4/T36d/rzQOAbIwEnbbwD9HMj6IzE4WH9lJzH7Zy7Tcyu6dOM8L7nOxCp3DUk
+F3aAnPSFJhD7NN0jBWOFsD6uy1OmaTklPfRAnCt1MQ==
-----END EC PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp
index a8b8320fb24..eb4bbdf0304 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp
@@ -1 +1 @@
-1e:54:1d:9d:43:f0:c9:2b:68:7a:6a:c3:33:36:66:92
+51:bd:ff:2b:6d:26:9b:90:f9:e1:4a:ca:a0:29:8e:70
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp.bb
index 5863db4cade..267bc63fdc2 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.fp.bb
@@ -1 +1 @@
-xefak-fyfim-lytem-nusir-kycog-vybyt-peguk-deniv-pukub-bydyr-rexux
+xuzaz-zuzuk-virop-vypah-zumel-gylak-selih-fevad-varag-zynif-haxox
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.priv b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.priv
index 66d88239034..537cdaac36c 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.priv
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.priv
@@ -1 +1 @@
-01ed2b2e26f47ee1a2b726ce2011a27950311ada125308133efcf058bfd65491ff4fa2152f7cf7e1c4745c17ab548590e60a115e350a6ddec89cdae4d76b8954f288
+01838915c547e8a3f444ffbf3f40146a1ba3d9b8767cd9e2e7866655cc16bb5d111489823f270eeb430a781530557d72fbe8fb7903204c7fee7669578e5252d11114
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.pub
index 646a3769cf0..3352ac769fc 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.param.pub
@@ -1 +1 @@
-04004b017cf97c2022ba6656956ab31b9371271d5ad7b5a0676a3e7df62b00981756b18626e7662194820d614006da6e63b5acdf345a08cdc3663fae6bea8c5ac532b101b0882ea7d5811475566cb5ee55761d58aa122625c4f7fff4f327a95f31a52927175431e61ef1bc3ecee340109f9ac7c5ba956290c2ee2c87715f73a5a653ea9892
+04008d4c9e4eb8da3974d8084112c7cca53dd66ee29a62858aeb49e819436e44642abf849ef8f5dc9e873a062f3939b49fb48f94a1d2493678fd3dfa77faf340e01b2301276dbc03f47323e88cc4e161fd949cc7ed9cbb4dccaee9d38cf0bee73b10a9dc35241776809cf4852610fb34dd23056385b03eaecb53a66939253df4409c2b7531
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.pub
index 2ca38b7b097..34e1881dd86 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_2.pub
@@ -1 +1 @@
-ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBABLAXz5fCAiumZWlWqzG5NxJx1a17WgZ2o+ffYrAJgXVrGGJudmIZSCDWFABtpuY7Ws3zRaCM3DZj+ua+qMWsUysQGwiC6n1YEUdVZste5Vdh1YqhImJcT3//TzJ6lfMaUpJxdUMeYe8bw+zuNAEJ+ax8W6lWKQwu4sh3Ffc6WmU+qYkg== ECDSA test key #2
+ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACNTJ5OuNo5dNgIQRLHzKU91m7immKFiutJ6BlDbkRkKr+Envj13J6HOgYvOTm0n7SPlKHSSTZ4/T36d/rzQOAbIwEnbbwD9HMj6IzE4WH9lJzH7Zy7Tcyu6dOM8L7nOxCp3DUkF3aAnPSFJhD7NN0jBWOFsD6uy1OmaTklPfRAnCt1MQ== ECDSA test key #2
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n
index 9b8b9f43271..aec73dd61f8 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n
@@ -1,5 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDUJpHhcwtTxAYqTeBC2WNcZJ3VJrAI97F2n2PeootjCoAoGCCqGSM49
-AwEHoUQDQgAEeFVBN9rCVt76ZAhb71aQxLwcmq5SigrJG8nRvoBI3Tzfa8/Sp16h
-upzUeHJht3/BNI8sPvcI1DMVTuOREstl6w==
+MHcCAQEEIFghsFR1K95tz8qOl3+tX6fv8a/O6AfNbxOSFZX3ihxooAoGCCqGSM49
+AwEHoUQDQgAEalpgP0BOePHtTw0Pus4tdhTb8P9yWUZluvLf1D8vrHImT+G4vr/W
+xo5iXGKQVEifuUVyLkAW2kDrq8J/szeRiQ==
-----END EC PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n_pw b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n_pw
index 1a232a53091..75d5859083f 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n_pw
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ecdsa_n_pw
@@ -1,9 +1,9 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABBjrPF4oU
-razQUC36K0kiJSAAAAEAAAAAEAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlz
-dHAyNTYAAABBBHhVQTfawlbe+mQIW+9WkMS8HJquUooKyRvJ0b6ASN0832vP0qdeobqc1H
-hyYbd/wTSPLD73CNQzFU7jkRLLZesAAACwRIjJkfLwAv6pn+FV4zyB7jwNpiM/Tvi8G9L1
-tyjowAbH5QspKcUk2QlGwAfDzZkwZaeO3AHN+jrxUZe59U39nBPUQTJtfwHB/9YDQmkxDf
-PSjPhSUgTJTjO7ZnJhiBhopSecrLlw9jEG3aU6jXrtLHvoeWsqgNC4FPR+NONY56Cp6HH/
-xcNMcG3bdfsLV7/aKN6L8xFOcwv5PZguUX+akbm28L2RtdwomHLlinxCBZQ=
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABBXqI6Z6o
+uRM+jAwdhnDoIMAAAAEAAAAAEAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlz
+dHAyNTYAAABBBGpaYD9ATnjx7U8ND7rOLXYU2/D/cllGZbry39Q/L6xyJk/huL6/1saOYl
+xikFRIn7lFci5AFtpA66vCf7M3kYkAAACwYMnoCTqvUTG0ktSSMNsOZLCdal5J4avEpM1L
+sV9SL/RVcwo3ChprhwsnQsaAtMiJCRcHerKgD9qy1MNNaE5VNfVJ0Ih/7ut04cbFKed8p6
+0V+w8WP7WvFffBPoHn+GGbQd1FDGzHhXUB61pH8Qzd1bI/sld/XEtMk7iYjNGQe9Rt0RaK
+Wi8trwaA0Fb2w/EFnrdsFFxrIhQEqYBdEQJo782IqAsMG9OwUaM0vy+8bcI=
-----END OPENSSH PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1 b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1
index 9834e6b1670..a537ae13dd5 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1
@@ -1,7 +1,7 @@
-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACD9nC84xPJD/K1WHPNss8ONwRTYYXhE+JfNMTACxwMC9QAAAJgHI6RaByOk
-WgAAAAtzc2gtZWQyNTUxOQAAACD9nC84xPJD/K1WHPNss8ONwRTYYXhE+JfNMTACxwMC9Q
-AAAEBTSW4tcSIyBvJIs9X0+veV3KEnF5tMFTuDRn2UUCDg4f2cLzjE8kP8rVYc82yzw43B
-FNhheET4l80xMALHAwL1AAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg==
+QyNTUxOQAAACC5PeVeSdyylcfG3C0geNO90e3dGgL0fICaz751dA9zEAAAAJglsAcYJbAH
+GAAAAAtzc2gtZWQyNTUxOQAAACC5PeVeSdyylcfG3C0geNO90e3dGgL0fICaz751dA9zEA
+AAAED6HJ8Bh8tdQvhMd5o8IxtIwBv8/FV48FpBFWAbYdsIsLk95V5J3LKVx8bcLSB4073R
+7d0aAvR8gJrPvnV0D3MQAAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg==
-----END OPENSSH PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.fp
index a1065afb133..e6d23d0b84c 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.fp
@@ -1 +1 @@
-c5:bc:c6:f0:71:ff:18:01:b6:bb:20:0e:5c:c9:45:dd
+19:08:8e:7e:4d:e5:de:86:2a:09:47:65:eb:0a:51:2f
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.pub
index e1af85b51d2..ad0b9a888e9 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1-cert.pub
@@ -1 +1 @@
-ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAICJMFRc+O68lpgxZhFEBSABACLSyhq6uRr5p64SX7rG8AAAAIP2cLzjE8kP8rVYc82yzw43BFNhheET4l80xMALHAwL1AAAAAAAAAAgAAAACAAAABmp1bGl1cwAAABIAAAAFaG9zdDEAAAAFaG9zdDIAAAAANouDYAAAAABNHeHgAAAAAAAAAAAAAAAAAAAAaAAAABNlY2RzYS1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQR4VUE32sJW3vpkCFvvVpDEvByarlKKCskbydG+gEjdPN9rz9KnXqG6nNR4cmG3f8E0jyw+9wjUMxVO45ESy2XrAAAAZQAAABNlY2RzYS1zaGEyLW5pc3RwMjU2AAAASgAAACEAmB/afp9JrHKRDZjHg7t4gguDZUlM7TbJh/QGWBJtKNwAAAAhAIfciGrKUngYx8c+MrLs9xm/H15UjQ1b/hmDjHPnBUXJ ED25519 test key #1
+ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIHmdL66MkkOvncpc0W4MdvlJZMfQthHiOUv+XKm7gvzOAAAAILk95V5J3LKVx8bcLSB4073R7d0aAvR8gJrPvnV0D3MQAAAAAAAAAAgAAAACAAAABmp1bGl1cwAAABIAAAAFaG9zdDEAAAAFaG9zdDIAAAAANouDYAAAAABNHeHgAAAAAAAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACC5PeVeSdyylcfG3C0geNO90e3dGgL0fICaz751dA9zEAAAAFMAAAALc3NoLWVkMjU1MTkAAABAsUStKm1z3Rtvwy3eXE1DrgVp6kix2iEQXfB66IHX2UpAj5yl0eQGXWTSEDIxHDIb0SJvUH43OWX0PrEeAs0mAA== ed25519_1.pub
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp
index a1065afb133..e6d23d0b84c 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp
@@ -1 +1 @@
-c5:bc:c6:f0:71:ff:18:01:b6:bb:20:0e:5c:c9:45:dd
+19:08:8e:7e:4d:e5:de:86:2a:09:47:65:eb:0a:51:2f
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp.bb
index 19fed08195c..591a711b443 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.fp.bb
@@ -1 +1 @@
-xunad-cibit-losah-sapes-fegor-fypyg-sifuv-buciv-cacim-votid-guxex
+xofip-nuhoh-botam-cypeg-panig-tunef-bimav-numeb-nikic-gocyf-paxax
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.pub
index 585c72389d6..633e05077ae 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2cLzjE8kP8rVYc82yzw43BFNhheET4l80xMALHAwL1 ED25519 test key #1
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILk95V5J3LKVx8bcLSB4073R7d0aAvR8gJrPvnV0D3MQ ED25519 test key #1
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1_pw b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1_pw
index 995e4c06aba..9fc635208b6 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1_pw
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_1_pw
@@ -1,8 +1,8 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABDAj0Bpln
-j9yho1+E35Cs50AAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIP2cLzjE8kP8rVYc
-82yzw43BFNhheET4l80xMALHAwL1AAAAkOUMXMXJCs4Ra9eTz7ZmI+62mynIdc75adQIJ6
-Y1FhHU1FiNKA6thIsJQ2GkVraYUbsRr2cSId0wOdDyqCz8qGtUJGJf/CpC8xGyDiFxSRmX
-Q/jVwSPluusjq3hXSXgVkhMCl7x6wvdOYrgir1JAmt7xZ+GH16h9UshdQJQP2WRreYzBGa
-epCGVXiKDRt1h6qQ==
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABAlT1eewp
+9gl0gue+sSrBWKAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAILk95V5J3LKVx8bc
+LSB4073R7d0aAvR8gJrPvnV0D3MQAAAAoMrL9ixIQHoJ86DcKMGt26+bCeaoyGjW5hha2Y
+IxAZ+rRvNjUuv3MGvbUxtUpPZkTP/vk2fVSCuCD9St5Lbt/LKdIk2MfWIFbjZ6iEfdzxz0
+DHmsSDMps8dbePqqIPULR8av447jEzQEkUc8GSR6WqFSJOjJ8OvrJat1KcEK7V2tjZnLS1
+GoLMqVAtCVhuXwUkeJiRQE/JRl172hxB+LAVw=
-----END OPENSSH PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2 b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2
index cffc23eba04..a6e5f0040a0 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2
@@ -1,7 +1,7 @@
-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACD9RTuggxlEg440MCY7b8x7AXErFCkvyqOBzGa2H72HgAAAAJjVTVis1U1Y
-rAAAAAtzc2gtZWQyNTUxOQAAACD9RTuggxlEg440MCY7b8x7AXErFCkvyqOBzGa2H72HgA
-AAAECg5ZFCAGyGayR8cfdh9Z+atBw2D7iDCyhlM/Z9BhS8Y/1FO6CDGUSDjjQwJjtvzHsB
-cSsUKS/Ko4HMZrYfvYeAAAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg==
+QyNTUxOQAAACBXUfO5Kid+jhRnyVt+1r9wj2FN/mZ6RfgGdySeYoq4WAAAAJjGeKsZxnir
+GQAAAAtzc2gtZWQyNTUxOQAAACBXUfO5Kid+jhRnyVt+1r9wj2FN/mZ6RfgGdySeYoq4WA
+AAAEB+gn4gGClQl2WMeOkikY+w0A0kSw1KH4Oyami7hlypsFdR87kqJ36OFGfJW37Wv3CP
+YU3+ZnpF+AZ3JJ5iirhYAAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg==
-----END OPENSSH PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp
index bd9bdf1bb32..02c684f36af 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp
@@ -1 +1 @@
-8a:9b:6b:7a:72:4a:33:e7:82:f4:44:36:4f:03:ab:fb
+5c:c9:ae:a3:0c:aa:28:29:b8:fc:7c:64:ba:6e:e9:c9
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp.bb
index d344f8b7a78..ebe782e2c7d 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.fp.bb
@@ -1 +1 @@
-xopaz-sytem-gohun-gekug-nupyz-mizeb-satur-gykyz-bytuk-cynak-zoxax
+xenoz-tovup-zecyt-hohar-motam-sugid-fecyz-tutyk-gosom-ginar-kixux
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.pub
index 36f769adef9..37b93352a54 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/ed25519_2.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP1FO6CDGUSDjjQwJjtvzHsBcSsUKS/Ko4HMZrYfvYeA ED25519 test key #1
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFdR87kqJ36OFGfJW37Wv3CPYU3+ZnpF+AZ3JJ5iirhY ED25519 test key #1
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1 b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1
index 2ec1d9ee645..d22014e8811 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1
Binary files differ
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp
index f124ea658da..782ece0dbec 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp
@@ -1 +1 @@
-ca:c8:b5:7e:5e:c3:0d:b9:7a:01:08:07:e6:8d:84:ff
+a8:82:9b:98:c5:e6:19:d6:83:39:9f:4d:3a:8f:7c:80
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp.bb
index cbcd469dc9a..caaf9511a85 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.fp.bb
@@ -1 +1 @@
-xolod-lezac-hozas-zyvam-femup-resyn-tabeh-cimil-todab-pimak-maxox
+xukib-cymuf-mylib-kecih-rogyb-sorid-belys-kytem-dinin-cicil-kyxex
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.param.n b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.param.n
index 50b9f6805fb..4ceb373622f 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.param.n
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.param.n
@@ -1 +1 @@
-00c410f14bcebcbddc6ffeaa710252ad90fbef0d050ec87d3383a9d238d6711fbef589e4878403c264c7966fe49bad711536dce5d87a955b85e59407cb05b42fa7403d9f69ff0939dc6c706bdcf06b6b261d989bd36b3285406a2ed222823c2395
+00cf68059e5c7743318d740d3ebb55eb577891c9c3098817703f4c3157285055c2daa50102509ebdcade324e541c965e2931fd3459052fe65d013722da805d7ec8ef5b97cc006789d0566c5578b23e7aaa5be2b055d85798030cdead2eb2cc4eb3
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.pub
index bc70397b724..56cf30d3043 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1.pub
@@ -1 +1 @@
-768 65537 1189048026044302003027146850139461857907776498392388644081572317839873971656566933581374195515931390619470169918301657448827055049126798186766951463208246494942453808397018298947013383501856813897052663039958494425741000753698055061 RSA1 test key #1
+768 65537 1257820658919101781627826212425999371251377782154008557690434337796299274692579921603319269571889066123773172648045269780061837011867522525764583065919572648969392756890567918758763032103894830246827894023662422727333291801518558899 RSA1 test key #1
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1_pw b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1_pw
index a3a18aa8c33..3113dbc0fd9 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1_pw
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_1_pw
Binary files differ
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2 b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2
index ae266299ae2..e75e665ffc5 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2
Binary files differ
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp
index 8b3bdd3a970..c3325371d56 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp
@@ -1 +1 @@
-81:76:19:cb:e3:ea:6f:5d:44:0d:c2:0b:de:f1:57:c4
+c0:83:1c:97:5f:32:77:7e:e4:e3:e9:29:b9:eb:76:9c
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp.bb
index d519e7b9beb..cd80371401b 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.fp.bb
@@ -1 +1 @@
-xocoh-kufyf-rirac-kepuc-gurig-mekog-pylir-fezyd-nosub-govug-lyxyx
+xifad-vevot-sozyl-fapeb-meryf-kylut-cydiv-firik-gavyb-lanad-kaxox
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.param.n b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.param.n
index 6a88ee87f39..f8143a4b93c 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.param.n
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.param.n
@@ -1 +1 @@
-00f41a2e0ea0e61ba8c26cf6e1bd44a78406681186a7791de3242bedc244e06c17a18747fb88b1380aeba3c857923452b9e38673817bd1a23f7d2075923b1d95d9969bbcd21aa04dfe467e4c7d8a47a10bd63dd6dce4ffe779a61f4540bcfcd9300d69055260be095e5e8460e82396779c0a50625fb85604899e443135ca261860351264b5cd9347b3b2d0493dc8ab58a76739834e94e6a931a81b47ec07a0d18e6326cf141c4cecf21ce33e55c4337b58e81f98ba37aa2363c4b7b9b681832fc82bfd065e78225963b5dee3339fc5f93b1e03fb23b944af1044c428face1e9074cac094e1b1466567bcd0052c7a3cd54413e0223cd3ead772c224fe9992a1cc4d
+00b08a9fa386aceaab2ec3e9cdc7e6cb4eac9e98620279eed6762e1f513739a417ac8a86231fad3b8727a9de994973a7aae674a132547341984ade91aa1c22f01d2f0204ea7fa121969c367a5d04bda384066cf94e0b56d1efc47f50ca28e90603547df41c0676550d82d369f699b457d4f0f077999d9e76ab679fbf4206d418dbabed1823f14e4ddf3aac987686e6b006f8a23ea6af13b4c0e5b1fb5b1eb4db2f47b229422c450574cae9c64db5dcfce050836b6bdfa8fb541b4d426444a5ea20ad51a25d3048414ced2e199da2997968273e8beb10f3a351e98a57b00dadfa8f00a39bb55be94dae898fda6021d728f32b2ec93edd16e51073be3ac7511e5085
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.pub
index c57a552dd45..de1afbb8bce 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa1_2.pub
@@ -1 +1 @@
-2048 65537 30815056206845718337883693475648720850145825019377625660339254990170671928186378018861225635606515759973597729576094610770872780661576141002020091115398326221356676709078132441993985409561447755934597661311399662597377239284991122793182116387265444497738700221133645372503575578155284370786624391167692459891729408171168746091407569853493645212173229529277332482208795686490659301613799014974247858014846717332898701883748838319394666276585141978582467494951081034069208462692298663692548804886954137194606203245934935998707318505433583480495694779849614216589821145199486122690013311036780783985671309143185809329229 RSA1 test key #2
+2048 65537 22286299513474010485021611215236051675183880694440075228245854420062562171290421803318459093678819161498086077099067169041536315773126601869537036602014639497662916952995546870691495931205282427606841521014293638607226118353743812583642616889028731910222603216563207637006843580936568089467160095319593442255227365472917576488012409542775346105980501967996562422764758836868135158147777193940857952623773420292946843206784104932927528915610322518810753953608862466374219925252817405397507396462117715293725218947744085154122395590957537510003558169729949140038634486299736757269280065662263306737701939154762092925061 RSA1 test key #2
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1 b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1
index a84a9e2eb7d..09e79a72e3e 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1
@@ -1,12 +1,12 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIByQIBAAJhAKAJGOfpr4S2inakOMcqjGQ1RLNwp4FWvWYc+xxnAqfJS7vwZ8ie
-2fcniZMS69o9CXiACUw2LYbNGZMfrnzjQEaKlObDi5HB1XNE+9z01m2GS9XH+Eg0
-ilNeAx/hfNEDVQIDAQABAmB8O3OtHHhXYskMHqHA4qPHap6hWZN+0RIIQfkhbEng
-bGAxTgeS8tWrinK+zFJwwS3tYmSc8YfT/4gX/DG1nudv+Pjjhwom/HMTiK/Tw4JN
-ZhWCPKB8T1rICkGAtbMq2KECMQDTa9o6g/Nb2zkvJq+04SQ5ivqZdWXaeZixz1Xt
-JKgqRLoMxny81E/LaeeKXfNACE0CMQDBx4hGEBlm8aJwj6SdZ50Ulu8c4hz4ZcJo
-v2T+BY8ogmlaF1ADcFXeHDmE7Cg16ykCMF7zTCIFirERRqBXdof8qSEyupNa9zBk
-deA9ZrDHSsMY9JmyNukzTNblLDinMwzp7QIwUq/O4X6rKDdBhmB08MmuyINjQuLl
-U8UwQLwy3wYGQVXsmInMFbuQmHdYv/R5cBCJAjAquE/FnCRxuI2NEhoqrO3FG0wO
-cByLc/Svz1ct3eGUMabUxfQdi8Ka97gv9CW9EbI=
+MIIBywIBAAJhAM/6MDmVVm/uNQmZpOcthoAAgMDUg7G4H6ZLLyPEhboKaBBHvIdw
+ZdDmB+0LDf3D1aWXyUd2/pCkCysiBzqd/523zAzjY7HayqL6A940AxKBBbWLn+X6
+i2yJR7dTOYkk6QIDAQABAmAgKanBjfWzE5yCIo+c7K5rJyjCKVtAZaAHYIMmveKM
+VcWoFt/x9hDY0GoTX21HfDxLX8oDxnsmhsOrnvSmgUChFwkm45eSETqeVDWwIVFA
+FGL1s38xQsciWZWBFNppAIECMQD7nslReAxwz/Ad++ACXswfJg1l2wUQ1gJA3zh3
+jln6a4s3aV1zxbKlIn8iqBv0BZkCMQDTmO4WqyNnin73XCZs0DWu7GsfcuaH8QnD
+wqPjJgrclTZXedxHkeqO2oyZW4mLC9ECMBb/blsZ49kzyDiVWuYcj/+Q1MyodhAR
+32bagCi9RBAVYEYSRU5dlXRucLxULSnikQIxAJ5teY5Vcru6kZfJUifUuO0QrKAu
+WnbcPVBqMmUHfchsm/RhFFIt6W4uKmlEhTYrkQIxAMAStb7QCU3yU6ZkN7uL22Zs
+498i4jY6y+VEXv+L9O09VdlEnXhbUisOhy1bhyS3yg==
-----END RSA PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.fp
index 66002343a79..bf9c2e3626f 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.fp
@@ -1 +1 @@
-93:53:33:f1:ca:bc:c2:df:a1:a2:0e:df:2d:d4:32:77
+be:27:4c:16:27:f5:04:03:62:a8:b7:91:df:a5:b1:3b
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.pub
index aea5a04d61f..51b1ce0ddb7 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1-cert.pub
@@ -1 +1 @@
-ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgAkIaUrWrYvXkf55DvHtHsjLNCn22Hvx4PpKyeW7fvA0AAAADAQABAAAAYQCgCRjn6a+Etop2pDjHKoxkNUSzcKeBVr1mHPscZwKnyUu78GfIntn3J4mTEuvaPQl4gAlMNi2GzRmTH65840BGipTmw4uRwdVzRPvc9NZthkvVx/hINIpTXgMf4XzRA1UAAAAAAAAABQAAAAIAAAAGanVsaXVzAAAAEgAAAAVob3N0MQAAAAVob3N0MgAAAAA2i4NgAAAAAE0d4eAAAAAAAAAAAAAAAAAAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHhVQTfawlbe+mQIW+9WkMS8HJquUooKyRvJ0b6ASN0832vP0qdeobqc1HhyYbd/wTSPLD73CNQzFU7jkRLLZesAAABlAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAABKAAAAIQDEZOWcEwfnm+mpfKMsGdXgWkTZDM9FD7tXGjHhTAIXnwAAACEA4eTYbu8nl1ycJnHUAWmy4sayJNm4vHZNYH1Wzvsh3dQ= RSA test key #1
+ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAg1i9Ueveqg9sFSGsEYmsQqlI+dpC3nqhucPfwBVo3DtcAAAADAQABAAAAYQDP+jA5lVZv7jUJmaTnLYaAAIDA1IOxuB+mSy8jxIW6CmgQR7yHcGXQ5gftCw39w9Wll8lHdv6QpAsrIgc6nf+dt8wM42Ox2sqi+gPeNAMSgQW1i5/l+otsiUe3UzmJJOkAAAAAAAAABQAAAAIAAAAGanVsaXVzAAAAEgAAAAVob3N0MQAAAAVob3N0MgAAAAA2i4NgAAAAAE0d4eAAAAAAAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAILk95V5J3LKVx8bcLSB4073R7d0aAvR8gJrPvnV0D3MQAAAAUwAAAAtzc2gtZWQyNTUxOQAAAED0TLf2Mv2F9TBt1Skf/1vviUgt7bt9xvL5HqugnVDfKaEg+RNKgfa5Rtpteb39EODkH8v4FJPWlmNG0F9w0cYF rsa_1.pub
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp
index 66002343a79..bf9c2e3626f 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp
@@ -1 +1 @@
-93:53:33:f1:ca:bc:c2:df:a1:a2:0e:df:2d:d4:32:77
+be:27:4c:16:27:f5:04:03:62:a8:b7:91:df:a5:b1:3b
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp.bb
index 11f62b45922..448133bad64 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.fp.bb
@@ -1 +1 @@
-xiriz-botoh-migez-rorom-fekat-hytar-bykys-selos-hanez-sukil-moxox
+xetif-zuvul-nylyc-vykor-lumac-gyhyv-bacih-cimyk-sycen-gikym-pixax
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.n b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.n
index 6c83fd7943d..2ffc2ba7e76 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.n
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.n
@@ -1 +1 @@
-00a00918e7e9af84b68a76a438c72a8c643544b370a78156bd661cfb1c6702a7c94bbbf067c89ed9f727899312ebda3d097880094c362d86cd19931fae7ce340468a94e6c38b91c1d57344fbdcf4d66d864bd5c7f848348a535e031fe17cd10355
+00cffa303995566fee350999a4e72d86800080c0d483b1b81fa64b2f23c485ba0a681047bc877065d0e607ed0b0dfdc3d5a597c94776fe90a40b2b22073a9dff9db7cc0ce363b1dacaa2fa03de3403128105b58b9fe5fa8b6c8947b753398924e9
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.p b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.p
index 92c064b2a6a..4fcf148c3c1 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.p
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.p
@@ -1 +1 @@
-00d36bda3a83f35bdb392f26afb4e124398afa997565da7998b1cf55ed24a82a44ba0cc67cbcd44fcb69e78a5df340084d
+00fb9ec951780c70cff01dfbe0025ecc1f260d65db0510d60240df38778e59fa6b8b37695d73c5b2a5227f22a81bf40599
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.q b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.q
index f19e1b769d5..3473f5144b0 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.q
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.param.q
@@ -1 +1 @@
-00c1c78846101966f1a2708fa49d679d1496ef1ce21cf865c268bf64fe058f2882695a1750037055de1c3984ec2835eb29
+00d398ee16ab23678a7ef75c266cd035aeec6b1f72e687f109c3c2a3e3260adc95365779dc4791ea8eda8c995b898b0bd1
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.pub
index 54517b47cd0..889fdae86d0 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAYQCgCRjn6a+Etop2pDjHKoxkNUSzcKeBVr1mHPscZwKnyUu78GfIntn3J4mTEuvaPQl4gAlMNi2GzRmTH65840BGipTmw4uRwdVzRPvc9NZthkvVx/hINIpTXgMf4XzRA1U= RSA test key #1
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAYQDP+jA5lVZv7jUJmaTnLYaAAIDA1IOxuB+mSy8jxIW6CmgQR7yHcGXQ5gftCw39w9Wll8lHdv6QpAsrIgc6nf+dt8wM42Ox2sqi+gPeNAMSgQW1i5/l+otsiUe3UzmJJOk= RSA test key #1
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1_pw b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1_pw
index c2df7719612..71637a59bc0 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1_pw
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_1_pw
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,64F8EBAD788B4A84B988458AE466E543
+DEK-Info: AES-128-CBC,1E851A01F12A49FDC256E7A665C61D4B
-Sce5ZTGCDNjY3mXUZohtyPyR7CFo9zaC4NWRDhYVOYT1l3vOX/ULXvvGo/VtsXOw
-eP+TCKYRKAm9yoOVh0E+MwI1TN4vnS8tuE6H5HJxpsE126Q3wFX1mY3ar+laTbrJ
-3uMm2suNSKSh4p46XRC9XFBnxjxaN7RfbwvAaSckqbNjc++NRDOfbE9QS9VlbPA1
-LxUzjAOhgRtQouaQzh2fwcv2xwq2K53iQch/eKe1BqUyv0v6Xb5SalrZa582c9ax
-W4OErS+NrvpI2DxKmoptM24kGaulRggANh+b6k2ZK5GtkSE00kPSVz30po4oo9vb
-oj1tTPjjlW4AGhiCOJM8EGpBJQztGzOCrOLT9bLL0GKE8m3MuwD5+xg/mWAylVnI
-a4LB20Nv9q8yv+6gKgDuMMVdnQit2NEN/s/vW9XOftDO45DgQkib6UTKi/QfVpNW
-/t2Cdd/NH/JRZuvsq/ywMxHf7r65YZ0Ncgv8oEhvIi0mNRI7i3MIvDB0eo8rFQ8E
-R+hNgVkOQS1XGSPacj0GktvQHvysKqzlAq/LDE2tsb9bVh1R8st99R7nCN0RZ1Fc
-PgQkod7cQluBexoqIPTPYJJzVVF0OYjV1WnLXc4MTcY=
++sfWU7kg3idmHL6vShby5LXnfF4bZDPhJjv89uldae7qPEgEW8qS8o0Ssokxf7Au
+/vTQnbSB+gy/qZaUOykOzqiV1YL7UfkbOkM2QYnzzrVeGzI5RZ0G9iH8HBn2owQ+
+Ejf1UKDUVZEea5X0IwQRfE0zaZqFS4tyEex0iKz8dI4FvyabKLZsCs1DBGO7A3ml
+LgP947mh10yKWTP2fbq8LOhDUEWCXrh2NzuH6Rl5nNyC4MNQEkLzK1wL7J/WCNaL
+sciYmuqEQRDikDDQQFZw2wjBD638fhK+IhuN3VGegiXFnu5C+p9kzUvqVk4X9g2r
+BMmlP0pceFv/fEwtNNaeI2Tt7mIsWsZTmCqdzOUAYqGIiNjzykWw64nMO3TpVpbA
+i4854RhblbeiyjENbMVPU6BAk4fx7OJvDElLxwN43CS3U0MldbI7A4uG3B3RTSCj
+1rGxRNAHWC3q3zzrn6gLwrUVje4iTedaKItLIHQeo1A091Tr8AqQdZi/Ck2Ju0Hl
+4Qdwzjw1Y5n1Akm+EWh31ydxtUQ0YBOz/W6DKwTNA1D8oH9bZBG4f0pnvVhtttAO
+WKj+DUqMa+f3OOmQ9UXlitk2pEgjeMngTgfQnhZiCts=
-----END RSA PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2 b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2
index 9ab9fa4ee7e..058cf777a1a 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp
index b0188f744cd..53939f413db 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp
@@ -1 +1 @@
-01:8d:df:4c:ac:4a:94:eb:27:97:cb:94:fd:cb:7a:15
+fb:8f:7b:26:3d:42:40:ef:ed:f1:ed:ee:66:9e:ba:b0
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp.bb b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp.bb
index eafc066a66c..e90a3571a2a 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp.bb
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.fp.bb
@@ -1 +1 @@
-xekar-cohun-vigov-suzus-filiv-vomit-dobor-kimuk-bekop-rinal-hexox
+xepev-gupub-vuvyg-femiv-gonat-defiv-hirak-betub-pahut-veryd-hexix
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.n b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.n
index 891f02072be..389de422697 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.n
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.n
@@ -1 +1 @@
-00e3c0b3fe1190bc47d4b2039bc00668ef79c16bf6a99581ef52e14981c4c93975d6466a884ade12d9a03661167fbd2128e5df175530ea425b31843150b757c8ef6377ae58ccbadfc32debfde8ccf20a20941633fd53473b9981d187959971c1817d30fa11c042dd78436b8ce7256b1f6f21c4d1449d62b5a345abf7ee9e7efff650dc5e64364e9de73c3d96f447ca5d53e9bee2bb1dfbe495986d6569c1cf9ba574484bb11d64d40a902221268505056cb73b7be0ee2f65798e6d3ad6e2000cd647b71c13fdcc3ca3f02bfa591d67ed2553e0054370ad33d1ecafdfbe252174c5a657d777373e1806bbb6cbcedde07889b5edc3d0e5c0ae85273f10e51ad6d37d
+009434bfca07857ec47f9a164afd730753f83346880fb8c408614775ed60e3329ac0e9d41b7244c3acd9bf9ab7f4f48e980218e0a2810bd7aa16335cfa71eb031342b0689b32eae4e65c530b3be1dae26b451e19aeb62c89710f4c28aaf4bc2eb8dfce16419ca0664d0e955cfbc7d5923e2197cda979333b17e1362ae41d39a3609bf9ea401712b473c71d6190f44b2e7b816469440df226ae3387f864b3df23ce7d170371c0240dfd30a8541b9b5fe5eeb3e4178f622e45bdd9c343d59c6ac46212f9261db839f696e083f2dbb25e8e81942bb92f212a2277601011b767ae0827a0eea00529b5d147d4ccc1fa611f7022e0e8bfc3a1cf44085daf0a2803f80a91
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.p b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.p
index e0933e108b1..c3c9a130a20 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.p
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.p
@@ -1 +1 @@
-00fa5bb8c72aa3b7f4c63658ea9c7aa8346deddace9bb8446ee31e2966ec8a130d2e57ed2751db85f1c46e743109d85220290d87818703a530d6183c3059c8100f304d1b7a74783654a924a3e465bc4daea8bdd2621524caa4ed4c0e9942663cbf885378d4e8aec40a964de8deb1317c99d3ade3440c1fb1348acc4f8193972c27
+00c455d4a04d5eae8eafa7d6a4bd1fe6c3de246235c4fd83b3d728b429391952cea051173c2b3b26333944677d6b9e7804e23407600bee3c47e2a9c9d4832956dd0b9ebcc828da108b60eeda1b90b47e4f1378e8aebe7ac560f3bcad225693f06076b3edceee393fb8e65ac8e41e7fb2fadf1c2afab5b19638d2c9f662022160af
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.q b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.q
index 62fc2107653..728c474b065 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.q
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.param.q
@@ -1 +1 @@
-00e8e292cca64a0bf1117a32233280ca6b05dcafe1f152e0b30d4cc8f487b265b39bdabf5afa1b64dd2373b3ce2f7a400e2988c5d2bc28387ab4363117e4f9db36b61209ca64639c5303e320ae7be24827c33f89cbc69569a98f8fd3e9f0d0a2ace2d044976e89040cf3aae2edd21485ce281c137a11c2a743867afd94a27eb5bb
+00c13ea3e6d45e23ab31a4796d3d46ef39da43d3878bea080100ac336f9681a1afc38feb14d73839bb263c7628204041339e50568964d09a699fcb579ff62e9803036e66f78a3ab57034c71db9b409d97dba5e816b980e7d3e3b1b2edaf56dd51bd36833e8fe71ea9730e6acc4ab499d760bc7894dd184bdb8c5d7352d6f2798bf
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.pub b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.pub
index 9af3bf39f7d..ed9f78cad2f 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.pub
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_2.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjwLP+EZC8R9SyA5vABmjvecFr9qmVge9S4UmBxMk5ddZGaohK3hLZoDZhFn+9ISjl3xdVMOpCWzGEMVC3V8jvY3euWMy638Mt6/3ozPIKIJQWM/1TRzuZgdGHlZlxwYF9MPoRwELdeENrjOclax9vIcTRRJ1itaNFq/funn7/9lDcXmQ2Tp3nPD2W9EfKXVPpvuK7HfvklZhtZWnBz5uldEhLsR1k1AqQIiEmhQUFbLc7e+DuL2V5jm061uIADNZHtxwT/cw8o/Ar+lkdZ+0lU+AFQ3CtM9Hsr9++JSF0xaZX13c3PhgGu7bLzt3geIm17cPQ5cCuhSc/EOUa1tN9 RSA test key #2
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUNL/KB4V+xH+aFkr9cwdT+DNGiA+4xAhhR3XtYOMymsDp1BtyRMOs2b+at/T0jpgCGOCigQvXqhYzXPpx6wMTQrBomzLq5OZcUws74dria0UeGa62LIlxD0woqvS8LrjfzhZBnKBmTQ6VXPvH1ZI+IZfNqXkzOxfhNirkHTmjYJv56kAXErRzxx1hkPRLLnuBZGlEDfImrjOH+GSz3yPOfRcDccAkDf0wqFQbm1/l7rPkF49iLkW92cND1ZxqxGIS+SYduDn2luCD8tuyXo6BlCu5LyEqIndgEBG3Z64IJ6DuoAUptdFH1MzB+mEfcCLg6L/Doc9ECF2vCigD+AqR RSA test key #2
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n
index a84a9e2eb7d..09e79a72e3e 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n
@@ -1,12 +1,12 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIByQIBAAJhAKAJGOfpr4S2inakOMcqjGQ1RLNwp4FWvWYc+xxnAqfJS7vwZ8ie
-2fcniZMS69o9CXiACUw2LYbNGZMfrnzjQEaKlObDi5HB1XNE+9z01m2GS9XH+Eg0
-ilNeAx/hfNEDVQIDAQABAmB8O3OtHHhXYskMHqHA4qPHap6hWZN+0RIIQfkhbEng
-bGAxTgeS8tWrinK+zFJwwS3tYmSc8YfT/4gX/DG1nudv+Pjjhwom/HMTiK/Tw4JN
-ZhWCPKB8T1rICkGAtbMq2KECMQDTa9o6g/Nb2zkvJq+04SQ5ivqZdWXaeZixz1Xt
-JKgqRLoMxny81E/LaeeKXfNACE0CMQDBx4hGEBlm8aJwj6SdZ50Ulu8c4hz4ZcJo
-v2T+BY8ogmlaF1ADcFXeHDmE7Cg16ykCMF7zTCIFirERRqBXdof8qSEyupNa9zBk
-deA9ZrDHSsMY9JmyNukzTNblLDinMwzp7QIwUq/O4X6rKDdBhmB08MmuyINjQuLl
-U8UwQLwy3wYGQVXsmInMFbuQmHdYv/R5cBCJAjAquE/FnCRxuI2NEhoqrO3FG0wO
-cByLc/Svz1ct3eGUMabUxfQdi8Ka97gv9CW9EbI=
+MIIBywIBAAJhAM/6MDmVVm/uNQmZpOcthoAAgMDUg7G4H6ZLLyPEhboKaBBHvIdw
+ZdDmB+0LDf3D1aWXyUd2/pCkCysiBzqd/523zAzjY7HayqL6A940AxKBBbWLn+X6
+i2yJR7dTOYkk6QIDAQABAmAgKanBjfWzE5yCIo+c7K5rJyjCKVtAZaAHYIMmveKM
+VcWoFt/x9hDY0GoTX21HfDxLX8oDxnsmhsOrnvSmgUChFwkm45eSETqeVDWwIVFA
+FGL1s38xQsciWZWBFNppAIECMQD7nslReAxwz/Ad++ACXswfJg1l2wUQ1gJA3zh3
+jln6a4s3aV1zxbKlIn8iqBv0BZkCMQDTmO4WqyNnin73XCZs0DWu7GsfcuaH8QnD
+wqPjJgrclTZXedxHkeqO2oyZW4mLC9ECMBb/blsZ49kzyDiVWuYcj/+Q1MyodhAR
+32bagCi9RBAVYEYSRU5dlXRucLxULSnikQIxAJ5teY5Vcru6kZfJUifUuO0QrKAu
+WnbcPVBqMmUHfchsm/RhFFIt6W4uKmlEhTYrkQIxAMAStb7QCU3yU6ZkN7uL22Zs
+498i4jY6y+VEXv+L9O09VdlEnXhbUisOhy1bhyS3yg==
-----END RSA PRIVATE KEY-----
diff --git a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n_pw b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n_pw
index 1f8b01b2c75..0166fd5f184 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n_pw
+++ b/regress/usr.bin/ssh/unittests/sshkey/testdata/rsa_n_pw
@@ -1,14 +1,14 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABAXd4Cj36
-3zRAFUwdBRAs0yAAAAEAAAAAEAAAB3AAAAB3NzaC1yc2EAAAADAQABAAAAYQCgCRjn6a+E
-top2pDjHKoxkNUSzcKeBVr1mHPscZwKnyUu78GfIntn3J4mTEuvaPQl4gAlMNi2GzRmTH6
-5840BGipTmw4uRwdVzRPvc9NZthkvVx/hINIpTXgMf4XzRA1UAAAGQYoRrooXzXUXdgJVU
-6oeuIcZiBeomdRKu5LrGZF3l2TjLy51+OzJI3ML7f61QneTh8YF8p0UIu6hUM14kifbTse
-qPJZPiLcSM0wbqQz/TRsWwC02wNo4nrHOHwLhqog1l5R52+Ac9O3axuA8t5zfqEMbU8tNE
-GR090/TL1dSQ8z9sHa2ofzODqyuNQZRLKWwhVq/auUiaaUYdTi5i5lInVc9iHaEoCvvp0k
-maG34o4GMHrrp857EmhTL7BrOa5VKYnHW9A3eHcf3JvDNR0crt5ER0wvmivPVr4efy9Cln
-sNBCtZ8rvgsABgM6U6DneX92IogICQGT6nRfyttsMXPO6wt0HUTUAXuD90IAjBueJSvMIO
-g5os68pBvL5rDuB2XCasBIJU27f4NnDQ3aPoSzBA+UgluUs5iWP9+FakY4cQ1cH6tMXGDM
-yW/hSSGzLWukKnFj2XX41boSdH53ZJamL3OoM+ApKSKryOvpTGHQexuFdp1jlZbemKZwBM
-5R7E70V2EaRAxqkRzJyHBQtWIoVQ==
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABClELgtaZ
+qAmMwESpqXDN0uAAAAEAAAAAEAAAB3AAAAB3NzaC1yc2EAAAADAQABAAAAYQDP+jA5lVZv
+7jUJmaTnLYaAAIDA1IOxuB+mSy8jxIW6CmgQR7yHcGXQ5gftCw39w9Wll8lHdv6QpAsrIg
+c6nf+dt8wM42Ox2sqi+gPeNAMSgQW1i5/l+otsiUe3UzmJJOkAAAGgwJpHy/nshQa9+Jbw
+yomvgNMYvuuoD7Ll7iCY/RFFGXivTkki27C9q0qx3afauSLQQWFanGhjeJn7JPy98lMcVl
+qnn5XOE5+xxZqA8ONOBD8eH0KBcTH17DH1A1z94p5zZ1VJKIWsBZ0krxgHIXcdv9ucAckj
+N0vAEBm+0wsfy2TTOtuqXvcj65wFwknpyy/SSvU0QTr99FiYe9PIhIslBHO6wlqxfKj+Tm
+E/nCb75dAVu6gTtS2P0pdOqV/V7VHX5C0z3BROqpKDJJcVeoc7vRkEl+MWfvvQrG66IPEW
+luohFXPDPDrxu1zDduyRsmNwpBHChi2rFhxtsjxNK0svMwESeCCKAWmPxnzLJfvMbTCv00
+SpaCr7WhtzsGt73axqSkeOdynp5NNrN7MEdwruMZFirF4BcI2z2H9ugpS+qbLPuE2H5vln
+h7NSwBUNwmZ+4TC8MXFH9KIpRg8dNhf66OU610LYiN4+ZfOYCmfQfgQuBGhMTYFMY6O4SB
+NCdIavvWY6rDSBq7QC1f4rHpwiXxpkiE43Rd8fM32TaPlBPtA=
-----END OPENSSH PRIVATE KEY-----