Skip to content

update to CVS as of today (20160503) #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djmdjm wants to merge 14 commits into
base: master
Choose a base branch
from
Open

update to CVS as of today (20160503) #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cb03388
kill reallocn
djmdjm Feb 2, 2016
48f2405
cvs update 20160307; keep conflicts
djmdjm Mar 8, 2016
73a167b
resolve conflicts
djmdjm Mar 8, 2016
670dc26
fixup
djmdjm Mar 8, 2016
7816779
cvs update; keep conflicts
djmdjm Apr 12, 2016
8b51409
resolve conflicts
djmdjm Apr 12, 2016
7cdd0f1
fixup
djmdjm Apr 12, 2016
1911b6b
cvs up regress; keep conflicts
djmdjm Apr 12, 2016
a35e1c5
resolve conflict
djmdjm Apr 12, 2016
3035c39
unit tests are in regress/ now
djmdjm Apr 15, 2016
0bad1d4
cvs up; no conflicts
djmdjm Apr 15, 2016
143da59
cvs update; keep conflicts
djmdjm May 3, 2016
a63c6d7
resolve conflicts
djmdjm May 3, 2016
55d7155
cvs up; no conflicts
djmdjm May 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# $OpenBSD:$

.if defined(LEAKMALLOC)
SUBDIR= leakmalloc ssh unittests
SUBDIR= leakmalloc sshunittests
.else
SUBDIR= ssh unittests regress
SUBDIR= ssh regress
.endif

.include <bsd.subdir.mk>
170 changes: 86 additions & 84 deletions regress/CVS/Entries
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,88 @@
/Makefile/1.82/Result of merge+Mon Jan 11 21:37:50 2016//
/host-expand.sh/1.4/Result of merge//
/Makefile/1.87/Result of merge//
/addrmatch.sh/1.4/Wed Apr 27 11:45:39 2016//
/agent-getpeereid.sh/1.5/Wed Apr 27 11:45:39 2016//
/agent-pkcs11.sh/1.2/Wed Apr 27 11:45:39 2016//
/agent-ptrace.sh/1.3/Tue May 3 08:32:34 2016//
/agent-timeout.sh/1.3/Tue May 3 08:32:34 2016//
/agent.sh/1.11/Tue May 3 08:32:34 2016//
/banner.sh/1.2/Wed Apr 27 11:45:39 2016//
/broken-pipe.sh/1.5/Tue May 3 08:32:34 2016//
/brokenkeys.sh/1.1/Wed Apr 27 11:45:39 2016//
/cert-file.sh/1.2/Tue May 3 08:32:34 2016//
/cert-hostkey.sh/1.14/Tue May 3 09:51:54 2016//
/cert-userkey.sh/1.15/Tue May 3 09:51:54 2016//
/cfginclude.sh/1.1/Fri Apr 15 00:31:10 2016//
/cfgmatch.sh/1.9/Tue May 3 08:32:34 2016//
/cfgparse.sh/1.5/Tue May 3 08:32:34 2016//
/cipher-speed.sh/1.13/Tue May 3 08:32:34 2016//
/conch-ciphers.sh/1.3/Wed Apr 27 11:45:39 2016//
/connect-privsep.sh/1.6/Tue May 3 08:32:34 2016//
/connect.sh/1.5/Tue May 3 08:32:34 2016//
/dhgex.sh/1.3/Tue May 3 08:32:34 2016//
/dsa_ssh2.prv/1.1/Wed Apr 27 11:45:39 2016//
/dsa_ssh2.pub/1.1/Wed Apr 27 11:45:39 2016//
/dynamic-forward.sh/1.11/Tue May 3 08:32:34 2016//
/envpass.sh/1.4/Wed Apr 27 11:45:39 2016//
/exit-status.sh/1.7/Tue May 3 08:32:34 2016//
/forcecommand.sh/1.3/Tue May 3 08:32:34 2016//
/forward-control.sh/1.3/Tue May 3 08:32:34 2016//
/forwarding.sh/1.16/Tue May 3 09:51:54 2016//
/hostkey-agent.sh/1.6/Tue May 3 08:32:34 2016//
/hostkey-rotate.sh/1.5/Tue May 3 08:32:34 2016//
/integrity.sh/1.18/Tue May 3 08:32:34 2016//
/kextype.sh/1.6/Tue May 3 08:32:34 2016//
/key-options.sh/1.3/Tue May 3 08:32:34 2016//
/keygen-change.sh/1.5/Tue May 3 08:32:34 2016//
/keygen-convert.sh/1.1/Wed Apr 27 11:45:39 2016//
/keygen-knownhosts.sh/1.3/Tue May 3 08:32:34 2016//
/keys-command.sh/1.3/Tue May 3 08:32:34 2016//
/keyscan.sh/1.5/Tue May 3 08:32:34 2016//
/keytype.sh/1.4/Tue May 3 08:32:34 2016//
/krl.sh/1.6/Tue May 3 08:32:34 2016//
/limit-keytype.sh/1.4/Tue May 3 08:32:34 2016//
/localcommand.sh/1.3/Tue May 3 08:32:34 2016//
/login-timeout.sh/1.7/Wed Apr 27 11:45:39 2016//
/modpipe.c/1.6/Wed Apr 27 11:45:39 2016//
/multiplex.sh/1.27/Wed Apr 27 11:45:39 2016//
/multipubkey.sh/1.1/Wed Apr 27 11:45:39 2016//
/portnum.sh/1.2/Wed Apr 27 11:45:39 2016//
/principals-command.sh/1.1/Tue May 3 08:32:34 2016//
/proto-mismatch.sh/1.4/Tue May 3 08:32:34 2016//
/proto-version.sh/1.5/Tue May 3 08:32:34 2016//
/proxy-connect.sh/1.9/Tue May 3 08:32:34 2016//
/putty-ciphers.sh/1.4/Wed Apr 27 11:45:39 2016//
/putty-kex.sh/1.3/Wed Apr 27 11:45:39 2016//
/putty-transfer.sh/1.3/Wed Apr 27 11:45:39 2016//
/reconfigure.sh/1.5/Tue May 3 08:32:34 2016//
/reexec.sh/1.8/Tue May 3 08:32:34 2016//
/rekey.sh/1.17/Tue May 3 08:32:34 2016//
/rsa_openssh.prv/1.1/Wed Apr 27 11:45:39 2016//
/rsa_openssh.pub/1.1/Wed Apr 27 11:45:39 2016//
/rsa_ssh2.prv/1.1/Wed Apr 27 11:45:39 2016//
/scp-ssh-wrapper.sh/1.3/Wed Apr 27 11:45:39 2016//
/scp.sh/1.10/Wed Apr 27 11:45:39 2016//
/sftp-badcmds.sh/1.6/Wed Apr 27 11:45:39 2016//
/sftp-batch.sh/1.5/Wed Apr 27 11:45:39 2016//
/sftp-chroot.sh/1.4/Wed Apr 27 11:45:39 2016//
/sftp-cmds.sh/1.14/Wed Apr 27 11:45:39 2016//
/sftp-glob.sh/1.4/Wed Apr 27 11:45:39 2016//
/sftp-perm.sh/1.2/Wed Apr 27 11:45:39 2016//
/sftp.sh/1.5/Wed Apr 27 11:45:39 2016//
/ssh-com-client.sh/1.7/Wed Apr 27 11:45:39 2016//
/ssh-com-keygen.sh/1.4/Wed Apr 27 11:45:39 2016//
/ssh-com-sftp.sh/1.7/Wed Apr 27 11:45:39 2016//
/ssh-com.sh/1.9/Tue May 3 08:32:34 2016//
/ssh2putty.sh/1.3/Tue May 3 08:32:34 2016//
/sshd-log-wrapper.sh/1.3/Wed Apr 27 11:45:39 2016//
/stderr-after-eof.sh/1.2/Wed Apr 27 11:45:39 2016//
/stderr-data.sh/1.4/Tue May 3 08:32:34 2016//
/t11.ok/1.1/Wed Apr 27 11:45:39 2016//
/t4.ok/1.2/Wed Apr 27 11:45:39 2016//
/t5.ok/1.1/Wed Apr 27 11:45:39 2016//
/test-exec.sh/1.53/Tue May 3 09:51:54 2016//
/transfer.sh/1.3/Tue May 3 08:32:34 2016//
/try-ciphers.sh/1.25/Tue May 3 08:32:34 2016//
/yes-head.sh/1.5/Tue May 3 08:32:34 2016//
D/misc////
D/unittests////
/addrmatch.sh/1.4/Mon Feb 1 06:34:45 2016//
/agent-getpeereid.sh/1.5/Mon Feb 1 06:34:45 2016//
/agent-pkcs11.sh/1.2/Mon Feb 1 06:34:45 2016//
/agent-ptrace.sh/1.3/Mon Feb 1 06:34:45 2016//
/agent-timeout.sh/1.3/Mon Feb 1 06:34:45 2016//
/agent.sh/1.11/Mon Feb 1 06:34:45 2016//
/banner.sh/1.2/Mon Feb 1 06:34:45 2016//
/broken-pipe.sh/1.5/Mon Feb 1 06:34:45 2016//
/brokenkeys.sh/1.1/Mon Feb 1 06:34:45 2016//
/cert-file.sh/1.2/Mon Feb 1 06:34:45 2016//
/cert-hostkey.sh/1.13/Mon Feb 1 06:34:45 2016//
/cert-userkey.sh/1.14/Mon Feb 1 06:34:45 2016//
/cfgmatch.sh/1.9/Mon Feb 1 06:34:45 2016//
/cfgparse.sh/1.5/Mon Feb 1 06:34:45 2016//
/cipher-speed.sh/1.13/Mon Feb 1 06:34:45 2016//
/conch-ciphers.sh/1.3/Mon Feb 1 06:34:45 2016//
/connect-privsep.sh/1.6/Mon Feb 1 06:34:45 2016//
/connect.sh/1.5/Mon Feb 1 06:34:45 2016//
/dhgex.sh/1.3/Mon Feb 1 06:34:45 2016//
/dsa_ssh2.prv/1.1/Mon Feb 1 06:34:45 2016//
/dsa_ssh2.pub/1.1/Mon Feb 1 06:34:45 2016//
/dynamic-forward.sh/1.11/Mon Feb 1 06:34:45 2016//
/envpass.sh/1.4/Mon Feb 1 06:34:45 2016//
/exit-status.sh/1.7/Mon Feb 1 06:34:45 2016//
/forcecommand.sh/1.3/Mon Feb 1 06:34:45 2016//
/forward-control.sh/1.3/Mon Feb 1 06:34:45 2016//
/forwarding.sh/1.15/Mon Feb 1 06:34:45 2016//
/hostkey-agent.sh/1.6/Mon Feb 1 06:34:45 2016//
/hostkey-rotate.sh/1.5/Mon Feb 1 06:34:45 2016//
/integrity.sh/1.16/Mon Feb 1 06:34:45 2016//
/kextype.sh/1.6/Mon Feb 1 06:34:45 2016//
/key-options.sh/1.3/Mon Feb 1 06:34:45 2016//
/keygen-change.sh/1.5/Mon Feb 1 06:34:45 2016//
/keygen-convert.sh/1.1/Mon Feb 1 06:34:45 2016//
/keygen-knownhosts.sh/1.3/Mon Feb 1 06:34:45 2016//
/keys-command.sh/1.3/Mon Feb 1 06:34:45 2016//
/keyscan.sh/1.5/Mon Feb 1 06:34:45 2016//
/keytype.sh/1.4/Mon Feb 1 06:34:45 2016//
/krl.sh/1.6/Mon Feb 1 06:34:45 2016//
/limit-keytype.sh/1.4/Mon Feb 1 06:34:45 2016//
/localcommand.sh/1.3/Mon Feb 1 06:34:45 2016//
/login-timeout.sh/1.7/Mon Feb 1 06:34:45 2016//
/modpipe.c/1.6/Mon Feb 1 06:34:45 2016//
/multiplex.sh/1.27/Mon Feb 1 06:34:45 2016//
/multipubkey.sh/1.1/Mon Feb 1 06:34:45 2016//
/portnum.sh/1.2/Mon Feb 1 06:34:45 2016//
/principals-command.sh/1.1/Mon Feb 1 06:34:45 2016//
/proto-mismatch.sh/1.4/Mon Feb 1 06:34:45 2016//
/proto-version.sh/1.5/Mon Feb 1 06:34:45 2016//
/proxy-connect.sh/1.8/Mon Feb 1 06:34:45 2016//
/putty-ciphers.sh/1.4/Mon Feb 1 06:34:45 2016//
/putty-kex.sh/1.3/Mon Feb 1 06:34:45 2016//
/putty-transfer.sh/1.3/Mon Feb 1 06:34:45 2016//
/reconfigure.sh/1.5/Mon Feb 1 06:34:45 2016//
/reexec.sh/1.8/Mon Feb 1 06:34:45 2016//
/rekey.sh/1.17/Mon Feb 1 06:34:58 2016//
/rsa_openssh.prv/1.1/Mon Feb 1 06:34:45 2016//
/rsa_openssh.pub/1.1/Mon Feb 1 06:34:45 2016//
/rsa_ssh2.prv/1.1/Mon Feb 1 06:34:45 2016//
/scp-ssh-wrapper.sh/1.3/Mon Feb 1 06:34:45 2016//
/scp.sh/1.10/Mon Feb 1 06:34:45 2016//
/sftp-badcmds.sh/1.6/Mon Feb 1 06:34:45 2016//
/sftp-batch.sh/1.5/Mon Feb 1 06:34:45 2016//
/sftp-chroot.sh/1.4/Mon Feb 1 06:34:45 2016//
/sftp-cmds.sh/1.14/Mon Feb 1 06:34:45 2016//
/sftp-glob.sh/1.4/Mon Feb 1 06:34:45 2016//
/sftp-perm.sh/1.2/Mon Feb 1 06:34:45 2016//
/sftp.sh/1.5/Mon Feb 1 06:34:45 2016//
/ssh-com-client.sh/1.7/Mon Feb 1 06:34:45 2016//
/ssh-com-keygen.sh/1.4/Mon Feb 1 06:34:45 2016//
/ssh-com-sftp.sh/1.7/Mon Feb 1 06:34:45 2016//
/ssh-com.sh/1.9/Mon Feb 1 06:34:45 2016//
/ssh2putty.sh/1.3/Mon Feb 1 06:34:45 2016//
/sshd-log-wrapper.sh/1.3/Mon Feb 1 06:34:45 2016//
/stderr-after-eof.sh/1.2/Mon Feb 1 06:34:45 2016//
/stderr-data.sh/1.4/Mon Feb 1 06:34:45 2016//
/t11.ok/1.1/Mon Feb 1 06:34:45 2016//
/t4.ok/1.2/Mon Feb 1 06:34:45 2016//
/t5.ok/1.1/Mon Feb 1 06:34:45 2016//
/test-exec.sh/1.51/Mon Feb 1 06:34:45 2016//
/transfer.sh/1.3/Mon Feb 1 06:34:45 2016//
/try-ciphers.sh/1.25/Mon Feb 1 06:34:45 2016//
/yes-head.sh/1.5/Mon Feb 1 06:34:45 2016//
62 changes: 36 additions & 26 deletions regress/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
# $OpenBSD: Makefile,v 1.82 2015/09/24 06:16:53 djm Exp $
# $OpenBSD: Makefile,v 1.87 2016/04/15 02:55:53 djm Exp $

#.ifndef SKIP_UNIT
#SUBDIR= unittests
#.endif
.ifndef SKIP_UNIT
SUBDIR= unittests
.endif
SUBDIR+= misc

REGRESS_FAIL_EARLY= yes
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12

CLEANFILES+= t2.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

LTESTS= connect \
proxy-connect \
connect-privsep \
Expand Down Expand Up @@ -70,7 +67,8 @@ LTESTS= connect \
keygen-knownhosts \
hostkey-rotate \
principals-command \
cert-file
cert-file \
cfginclude

# works only with s-bits
# agent-ptrace \
Expand All @@ -81,22 +79,28 @@ INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers
#LTESTS= cipher-speed

USER!= id -un
CLEANFILES+= *.core authorized_keys_${USER} known_hosts pidfile \
ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
ls.copy banner.in banner.out empty.in \
scp-ssh-wrapper.exe ssh_proxy_envpass remote_pid \
sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
known_hosts-cert host_ca_key* cert_user_key* cert_host_key* \
authorized_principals_${USER} expect actual ready \
sshd_proxy.* authorized_keys_${USER}.* revoked-* krl-* \
ssh.log failed-ssh.log sshd.log failed-sshd.log \
regress.log failed-regress.log ssh-log-wrapper.sh \
sftp-server.sh sftp-server.log sftp.log kh.* hkr.* \
user_key* user_ca* host_* key.* agent-key.* ed25519-agent* \
known_hosts.* data modpipe ssh_proxy keys-command-args \
scp-ssh-wrapper.scp ssh_proxy_bak
CLEANFILES+= *.core actual agent-key.* authorized_keys_${USER} \
authorized_keys_${USER}.* authorized_principals_${USER} \
banner.in banner.out cert_host_key* cert_user_key* \
copy.1 copy.2 data ed25519-agent ed25519-agent* \
ed25519-agent.pub empty.in expect failed-regress.log \
failed-ssh.log failed-sshd.log hkr.* host.rsa host.rsa1 \
host_* host_ca_key* host_krl_* host_revoked_* key.* \
key.dsa-* key.ecdsa-* key.ed25519-512 key.ed25519-512.pub \
key.rsa-* keys-command-args kh.* known_hosts \
known_hosts-cert known_hosts.* krl-* ls.copy modpipe \
netcat pidfile putty.rsa2 ready regress.log remote_pid \
revoked-* rsa rsa-agent rsa-agent.pub rsa.pub rsa1 \
rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \
rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
ssh_proxy_envpass sshd.log sshd_config sshd_config.orig \
sshd_proxy sshd_proxy.* sshd_proxy_bak sshd_proxy_orig \
t10.out t10.out.pub t12.out t12.out.pub t2.out t3.out \
t6.out1 t6.out2 t7.out t7.out.pub t8.out t8.out.pub \
t9.out t9.out.pub testdata user_*key* user_ca* user_key*

SUDO_CLEAN+= /var/run/testdata_${USER} /var/run/keycommand_${USER}

Expand Down Expand Up @@ -210,7 +214,13 @@ INTEROP_TARGETS+=t-${t}
# Not run by default
interop: ${INTEROP_TARGETS}

clean:
.for s in ${SUBDIR}
CLEAN_SUBDIR+=c-${s}
c-${s}:
${MAKE} -C ${.CURDIR}/${s} clean
.endfor

clean: ${CLEAN_SUBDIR}
rm -f ${CLEANFILES}
test -z "${SUDO}" || ${SUDO} rm -f ${SUDO_CLEAN}
rm -rf .putty
Expand Down
Loading