tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

unbreak parsing of pubkey comments; with gerhard; ok
 djm/deraadt
This commit is contained in:
markus@openbsd.org 2015-01-12 20:13:27 +00:00 committed by Damien Miller
parent 55358f0b4e
commit 27ca1a5c00
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
regress/Makefile
View File

@ -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) tests: $(REGRESS_TARGETS)
# Interop tests are not run by default # Interop tests are not run by default
@ -76,6 +76,7 @@ INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers
USER!= id -un USER!= id -un
CLEANFILES= t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ 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 \ 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 \ authorized_keys_${USER} known_hosts pidfile testdata \
ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \ ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ 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 |\ ${TEST_SSH_SSHKEYGEN} -E sha256 -lf ${.CURDIR}/rsa_openssh.pub |\
awk '{print $$2}' | diff - ${.CURDIR}/t11.ok 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} t-exec: ${LTESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \ @if [ "x$?" = "x" ]; then exit 0; fi; \
for TEST in ""$?; do \ for TEST in ""$?; do \