- dtucker@cvs.openbsd.org 2014/07/22 23:23:22

     [regress/unittests/sshkey/mktestdata.sh]
     Sign test certs with ed25519 instead of ecdsa so that they'll work in
     -portable on platforms that don't have ECDSA in their OpenSSL.  ok djm

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index db6e1d999..817e27c98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@
      change the test for still-open Unix domain sockets to be robust against
      nc implementations that produce error messages. from -portable
      (Id sync only)
+   - dtucker@cvs.openbsd.org 2014/07/22 23:23:22
+     [regress/unittests/sshkey/mktestdata.sh]
+     Sign test certs with ed25519 instead of ecdsa so that they'll work in
+     -portable on platforms that don't have ECDSA in their OpenSSL.  ok djm
 
 20140721
  - OpenBSD CVS Sync
diff --git a/regress/unittests/sshkey/mktestdata.sh b/regress/unittests/sshkey/mktestdata.sh
index 2039bf974..59e8c044b 100755
--- a/regress/unittests/sshkey/mktestdata.sh
+++ b/regress/unittests/sshkey/mktestdata.sh
@@ -150,13 +150,13 @@ ssh-keygen -s rsa_2 -I hugo -n user1,user2 \
     -Oforce-command=/bin/ls -Ono-port-forwarding -Osource-address=10.0.0.0/8 \
     -V 19990101:20110101 -z 4 ed25519_1.pub
 
-ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \
+ssh-keygen -s ed25519_1 -I julius -n host1,host2 -h \
     -V 19990101:20110101 -z 5 rsa_1.pub
-ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \
+ssh-keygen -s ed25519_1 -I julius -n host1,host2 -h \
     -V 19990101:20110101 -z 6 dsa_1.pub
 ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \
     -V 19990101:20110101 -z 7 ecdsa_1.pub
-ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \
+ssh-keygen -s ed25519_1 -I julius -n host1,host2 -h \
     -V 19990101:20110101 -z 8 ed25519_1.pub
 
 ssh-keygen -lf rsa1_1 | awk '{print $2}' > rsa1_1.fp