diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | regress/unittests/sshkey/mktestdata.sh | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -20,6 +20,10 @@ | |||
20 | change the test for still-open Unix domain sockets to be robust against | 20 | change the test for still-open Unix domain sockets to be robust against |
21 | nc implementations that produce error messages. from -portable | 21 | nc implementations that produce error messages. from -portable |
22 | (Id sync only) | 22 | (Id sync only) |
23 | - dtucker@cvs.openbsd.org 2014/07/22 23:23:22 | ||
24 | [regress/unittests/sshkey/mktestdata.sh] | ||
25 | Sign test certs with ed25519 instead of ecdsa so that they'll work in | ||
26 | -portable on platforms that don't have ECDSA in their OpenSSL. ok djm | ||
23 | 27 | ||
24 | 20140721 | 28 | 20140721 |
25 | - OpenBSD CVS Sync | 29 | - 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 \ | |||
150 | -Oforce-command=/bin/ls -Ono-port-forwarding -Osource-address=10.0.0.0/8 \ | 150 | -Oforce-command=/bin/ls -Ono-port-forwarding -Osource-address=10.0.0.0/8 \ |
151 | -V 19990101:20110101 -z 4 ed25519_1.pub | 151 | -V 19990101:20110101 -z 4 ed25519_1.pub |
152 | 152 | ||
153 | ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \ | 153 | ssh-keygen -s ed25519_1 -I julius -n host1,host2 -h \ |
154 | -V 19990101:20110101 -z 5 rsa_1.pub | 154 | -V 19990101:20110101 -z 5 rsa_1.pub |
155 | ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \ | 155 | ssh-keygen -s ed25519_1 -I julius -n host1,host2 -h \ |
156 | -V 19990101:20110101 -z 6 dsa_1.pub | 156 | -V 19990101:20110101 -z 6 dsa_1.pub |
157 | ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \ | 157 | ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \ |
158 | -V 19990101:20110101 -z 7 ecdsa_1.pub | 158 | -V 19990101:20110101 -z 7 ecdsa_1.pub |
159 | ssh-keygen -s ecdsa_1 -I julius -n host1,host2 -h \ | 159 | ssh-keygen -s ed25519_1 -I julius -n host1,host2 -h \ |
160 | -V 19990101:20110101 -z 8 ed25519_1.pub | 160 | -V 19990101:20110101 -z 8 ed25519_1.pub |
161 | 161 | ||
162 | ssh-keygen -lf rsa1_1 | awk '{print $2}' > rsa1_1.fp | 162 | ssh-keygen -lf rsa1_1 | awk '{print $2}' > rsa1_1.fp |