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

diff --git a/ChangeLog b/ChangeLog
index 5edeb82b2726fe86bb053ca15eeb6548f3618a8a..317dd2c4600ae073ba25e524c51e47b1ab66cc50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index da2cec87dabf49621cc232c63c7b4b0c769ce6bc..1ed5af501842e8e6c0487e77867465b527554f8f 100644 (file)
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -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 "* "