summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-07-23 10:34:26 +1000
committerDarren Tucker <dtucker@zip.com.au>2014-07-23 10:34:26 +1000
commit07e644251e809b1d4c062cf85bd1146a7e3f5a8a (patch)
tree2405561c66af272a7b3f234a27d3c617e6035d38
parentcea099a7c4eaecb01b001e5453bb4e5c25006c22 (diff)
downloadopenssh-git-07e644251e809b1d4c062cf85bd1146a7e3f5a8a.tar.gz
- 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
-rw-r--r--ChangeLog4
-rwxr-xr-xregress/unittests/sshkey/mktestdata.sh6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index db6e1d99..817e27c9 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 2039bf97..59e8c044 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