Module Name: src
Committed By: christos
Date: Tue Aug 2 13:45:13 UTC 2016
Modified Files:
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent
PROTOCOL.certkeys auth-krb5.c auth-options.c auth-pam.c
auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth.c auth.h
auth2-chall.c auth2-hostbased.c auth2.c authfile.c bufbn.c
canohost.c canohost.h channels.c clientloop.c compat.c dh.c dh.h
kex.c kex.h kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c
kexdhs.c kexgexs.c key.c log.c log.h mac.c mac.h misc.c misc.h
monitor.c monitor_fdpass.c monitor_wrap.c monitor_wrap.h mux.c
myproposal.h opacket.h packet.c packet.h pathnames.h
progressmeter.c readconf.c readconf.h scp.1 scp.c servconf.c
serverloop.c session.c session.h sftp-client.c sftp.1 sftp.c
ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c ssh-keygen.1
ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.1 ssh.c ssh1.h ssh2.h
ssh_api.c ssh_config.5 sshbuf-getput-basic.c sshbuf-getput-crypto.c
sshbuf-misc.c sshbuf.h sshconnect1.c sshconnect2.c sshd.c
sshd_config sshd_config.5 sshkey.c sshkey.h ttymodes.c ttymodes.h
utf8.c version.h
src/crypto/external/bsd/openssh/lib: Makefile shlib_version
Removed Files:
src/crypto/external/bsd/openssh/dist: sandbox-systrace.c
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/progressmeter.c \
src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c \
src/crypto/external/bsd/openssh/dist/sshconnect1.c \
src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c \
src/crypto/external/bsd/openssh/dist/dh.h \
src/crypto/external/bsd/openssh/dist/kexdhc.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys \
src/crypto/external/bsd/openssh/dist/auth-rhosts.c \
src/crypto/external/bsd/openssh/dist/bufbn.c \
src/crypto/external/bsd/openssh/dist/canohost.h \
src/crypto/external/bsd/openssh/dist/kexc25519s.c \
src/crypto/external/bsd/openssh/dist/mac.h \
src/crypto/external/bsd/openssh/dist/monitor_fdpass.c \
src/crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c \
src/crypto/external/bsd/openssh/dist/sshbuf-misc.c \
src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/auth-krb5.c \
src/crypto/external/bsd/openssh/dist/auth-pam.c \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
src/crypto/external/bsd/openssh/dist/canohost.c \
src/crypto/external/bsd/openssh/dist/ssh-dss.c \
src/crypto/external/bsd/openssh/dist/ssh2.h
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/auth.h \
src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/packet.h \
src/crypto/external/bsd/openssh/dist/sftp.1
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/auth-passwd.c \
src/crypto/external/bsd/openssh/dist/kexc25519.c \
src/crypto/external/bsd/openssh/dist/kexdh.c \
src/crypto/external/bsd/openssh/dist/opacket.h \
src/crypto/external/bsd/openssh/dist/session.h \
src/crypto/external/bsd/openssh/dist/ssh1.h \
src/crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c \
src/crypto/external/bsd/openssh/dist/ttymodes.c \
src/crypto/external/bsd/openssh/dist/ttymodes.h
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \
src/crypto/external/bsd/openssh/dist/sshd_config
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/auth2-chall.c \
src/crypto/external/bsd/openssh/dist/dh.c \
src/crypto/external/bsd/openssh/dist/kexdhs.c \
src/crypto/external/bsd/openssh/dist/log.h \
src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/pathnames.h \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/auth2.c \
src/crypto/external/bsd/openssh/dist/mac.c \
src/crypto/external/bsd/openssh/dist/scp.1
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/compat.c \
src/crypto/external/bsd/openssh/dist/log.c \
src/crypto/external/bsd/openssh/dist/myproposal.h \
src/crypto/external/bsd/openssh/dist/scp.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/channels.c \
src/crypto/external/bsd/openssh/dist/kex.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/key.c \
src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/kexc25519c.c \
src/crypto/external/bsd/openssh/dist/ssh-ed25519.c \
src/crypto/external/bsd/openssh/dist/ssh_api.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/kexgexs.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.h
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/packet.c \
src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.1.1.8 -r0 \
src/crypto/external/bsd/openssh/dist/sandbox-systrace.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/session.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-agent.c \
src/crypto/external/bsd/openssh/dist/ssh.1 \
src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/openssh/dist/utf8.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/lib/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
