summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2006-03-13 12:20:39 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2006-03-13 12:20:39 +0000
commitef51747b37f29898730dbdaba22066b1ee3ee84d (patch)
treea4b30f03797bd3325cbc1c6e39f5dc2f31895c2c
parentb9a36c14f0cba028992dc40402a5180ff560b058 (diff)
regress test for various ssh-keygen IETF conversion line terminators; ok djm@
-rw-r--r--regress/usr.bin/ssh/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile
index 9f21755c6ec..09729260de8 100644
--- a/regress/usr.bin/ssh/Makefile
+++ b/regress/usr.bin/ssh/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2006/03/13 09:04:00 dtucker Exp $
+# $OpenBSD: Makefile,v 1.39 2006/03/13 12:20:38 dtucker Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7
@@ -51,6 +51,10 @@ CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \
t1:
ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
+ tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv
+ ssh-keygen -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv
+ awk '{print $$0 "\r"}' ${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_crnl.prv
+ ssh-keygen -if ${.OBJDIR}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv
t2:
cat ${.CURDIR}/rsa_openssh.prv > t2.out