RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [regress/cert-hostkey.sh] Fix merge botch

This commit is contained in:
Damien Miller 2013-12-07 17:07:15 +11:00
parent f54542af3a
commit eb401585bb
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -48,6 +48,7 @@
- (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in]
[openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on
Linux
- (djm) [regress/cert-hostkey.sh] Fix merge botch
20131205
- (djm) OpenBSD CVS Sync

8
regress/cert-hostkey.sh
View File

@ -76,6 +76,8 @@ done
printf "* "
cat $OBJ/cert_host_key_rsa.pub
if test "x$TEST_SSH_ECC" = "xyes"; then
printf '@revoked '
printf "* "
cat $OBJ/cert_host_key_ecdsa-sha2-nistp256.pub
printf '@revoked '
printf "* "
@ -83,12 +85,12 @@ done
printf '@revoked '
printf "* "
cat $OBJ/cert_host_key_ecdsa-sha2-nistp521.pub
printf '@revoked '
printf "* "
cat $OBJ/cert_host_key_ed25519.pub
fi
printf '@revoked '
printf "* "
cat $OBJ/cert_host_key_ed25519.pub
printf '@revoked '
printf "* "
cat $OBJ/cert_host_key_dsa.pub
printf '@revoked '
printf "* "