upstream commit

unbreak parsing of pubkey comments; with gerhard; ok
 djm/deraadt

1 files changed, 9 insertions, 2 deletions

diff --git a/regress/Makefile b/regress/Makefile
index ac1ee2d5f..dd3b79506 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,6 +1,6 @@
-#       $OpenBSD: Makefile,v 1.72 2014/12/22 08:06:03 djm Exp $
+#       $OpenBSD: Makefile,v 1.73 2015/01/12 20:13:27 markus Exp $
 
-REGRESS_TARGETS=        unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t-exec
+REGRESS_TARGETS=        unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
 tests:          $(REGRESS_TARGETS)
 
 # Interop tests are not run by default
@@ -76,6 +76,7 @@ INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex conch-ciphers
 USER!=          id -un
 CLEANFILES=     t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                 t8.out t8.out.pub t9.out t9.out.pub t10.out t10.out.pub \
+                t12.out t12.out.pub \
                 authorized_keys_${USER} known_hosts pidfile testdata \
                 ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
                 rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
@@ -169,6 +170,12 @@ t11:
         ${TEST_SSH_SSHKEYGEN} -E sha256 -lf ${.CURDIR}/rsa_openssh.pub |\
                 awk '{print $$2}' | diff - ${.CURDIR}/t11.ok
 
+t12.out:
+        ssh-keygen -q -t ed25519 -N '' -C 'test-comment-1234' -f $@
+
+t12: t12.out
+        ssh-keygen -lf t12.out.pub | grep -q test-comment-1234
+
 t-exec: ${LTESTS:=.sh}
         @if [ "x$?" = "x" ]; then exit 0; fi; \
         for TEST in ""$?; do \