From eb401585bb8336cbf81fe4fc58eb9f7cac3ab874 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 7 Dec 2013 17:07:15 +1100
Subject: [PATCH]  - (djm) [regress/cert-hostkey.sh] Fix merge botch

---
 ChangeLog               | 1 +
 regress/cert-hostkey.sh | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5edeb82b2..317dd2c46 100644
--- 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 da2cec87d..1ed5af501 100644
--- 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 "* "