Module Name: src
Committed By: christos
Date: Sat Oct 7 19:39:20 UTC 2017
Modified Files:
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/dist: LICENCE PROTOCOL PROTOCOL.agent
PROTOCOL.certkeys auth-options.c auth-options.h auth-pam.c auth.c
auth.h auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c
auth2-krb5.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c
authfd.c authfd.h authfile.c bitmap.c bufbn.c buffer.h channels.c
channels.h cipher.c cipher.h clientloop.c clientloop.h compat.c
compat.h digest-libc.c digest-openssl.c dispatch.c dispatch.h dns.c
dns.h gss-serv.c hostfile.c kex.c kex.h kexc25519c.c kexc25519s.c
kexdhc.c kexdhs.c kexecdhc.c kexecdhs.c kexgexc.c kexgexs.c key.c
key.h krl.c log.c log.h mac.c misc.c misc.h monitor.c
monitor_wrap.c monitor_wrap.h mux.c myproposal.h nchan.c opacket.c
opacket.h packet.c packet.h pathnames.h readconf.c readconf.h scp.1
scp.c servconf.c servconf.h serverloop.c serverloop.h session.c
session.h sftp-client.c sftp-common.c sftp-server.c sftp.1 sftp.c
ssh-add.1 ssh-add.c ssh-agent.c ssh-gss.h ssh-keygen.1 ssh-keygen.c
ssh-keyscan.1 ssh-keyscan.c ssh-pkcs11-client.c ssh-pkcs11-helper.c
ssh-pkcs11.c ssh-rsa.c ssh.1 ssh.c ssh.h ssh_api.c ssh_config
ssh_config.5 sshbuf-getput-basic.c sshbuf.c sshbuf.h sshconnect.c
sshconnect.h sshconnect2.c sshd.8 sshd.c sshd_config.5 ssherr.c
sshkey.c sshkey.h ttymodes.c ttymodes.h umac.c utf8.c version.h
xmalloc.c xmalloc.h
src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048
moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192
src/crypto/external/bsd/openssh/lib: Makefile shlib_version
Removed Files:
src/crypto/external/bsd/openssh/dist: cipher-3des1.c cipher-bf1.c
deattack.c deattack.h rsa.c rsa.h ssh1.h sshconnect1.c
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/LICENCE \
src/crypto/external/bsd/openssh/dist/bitmap.c \
src/crypto/external/bsd/openssh/dist/digest-openssl.c \
src/crypto/external/bsd/openssh/dist/sshkey.h \
src/crypto/external/bsd/openssh/dist/utf8.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/buffer.h \
src/crypto/external/bsd/openssh/dist/compat.h \
src/crypto/external/bsd/openssh/dist/dns.h \
src/crypto/external/bsd/openssh/dist/kexdhc.c \
src/crypto/external/bsd/openssh/dist/kexgexc.c \
src/crypto/external/bsd/openssh/dist/sftp-common.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c \
src/crypto/external/bsd/openssh/dist/ssh.h \
src/crypto/external/bsd/openssh/dist/sshconnect.h \
src/crypto/external/bsd/openssh/dist/xmalloc.c \
src/crypto/external/bsd/openssh/dist/xmalloc.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
src/crypto/external/bsd/openssh/dist/auth-options.h \
src/crypto/external/bsd/openssh/dist/authfd.h \
src/crypto/external/bsd/openssh/dist/bufbn.c \
src/crypto/external/bsd/openssh/dist/dispatch.c \
src/crypto/external/bsd/openssh/dist/kexc25519s.c \
src/crypto/external/bsd/openssh/dist/kexecdhs.c \
src/crypto/external/bsd/openssh/dist/nchan.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys \
src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \
src/crypto/external/bsd/openssh/dist/auth2-none.c \
src/crypto/external/bsd/openssh/dist/auth2-passwd.c \
src/crypto/external/bsd/openssh/dist/kexecdhc.c \
src/crypto/external/bsd/openssh/dist/opacket.c \
src/crypto/external/bsd/openssh/dist/opacket.h \
src/crypto/external/bsd/openssh/dist/session.h \
src/crypto/external/bsd/openssh/dist/ssh-gss.h \
src/crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c \
src/crypto/external/bsd/openssh/dist/sshbuf.c \
src/crypto/external/bsd/openssh/dist/sshbuf.h \
src/crypto/external/bsd/openssh/dist/ttymodes.c \
src/crypto/external/bsd/openssh/dist/ttymodes.h
cvs rdiff -u -r1.15 -r1.16 \
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/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp.1 \
src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/auth-pam.c \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c
cvs rdiff -u -r1.19 -r1.20 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/sshconnect.c
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/auth2-chall.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-add.1 \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/auth2-gss.c \
src/crypto/external/bsd/openssh/dist/cipher.c \
src/crypto/external/bsd/openssh/dist/cipher.h \
src/crypto/external/bsd/openssh/dist/gss-serv.c \
src/crypto/external/bsd/openssh/dist/hostfile.c \
src/crypto/external/bsd/openssh/dist/krl.c \
src/crypto/external/bsd/openssh/dist/ssh_config \
src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/auth2-krb5.c \
src/crypto/external/bsd/openssh/dist/digest-libc.c \
src/crypto/external/bsd/openssh/dist/dispatch.h \
src/crypto/external/bsd/openssh/dist/kexc25519c.c \
src/crypto/external/bsd/openssh/dist/serverloop.h \
src/crypto/external/bsd/openssh/dist/ssh_api.c \
src/crypto/external/bsd/openssh/dist/ssherr.c
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/auth2.c \
src/crypto/external/bsd/openssh/dist/clientloop.h \
src/crypto/external/bsd/openssh/dist/dns.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/authfd.c \
src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/kexgexs.c \
src/crypto/external/bsd/openssh/dist/key.h \
src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \
src/crypto/external/bsd/openssh/dist/umac.c
cvs rdiff -u -r1.16 -r1.17 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 \
src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.18 -r1.19 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 \
src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.9 -r0 src/crypto/external/bsd/openssh/dist/cipher-3des1.c
cvs rdiff -u -r1.8 -r0 src/crypto/external/bsd/openssh/dist/cipher-bf1.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/key.c \
src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.6 -r0 src/crypto/external/bsd/openssh/dist/deattack.c \
src/crypto/external/bsd/openssh/dist/deattack.h \
src/crypto/external/bsd/openssh/dist/rsa.h
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/session.c
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/packet.c \
src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.7 -r0 src/crypto/external/bsd/openssh/dist/rsa.c \
src/crypto/external/bsd/openssh/dist/ssh1.h
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.20 -r1.21 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.26 -r1.27 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.10 -r0 src/crypto/external/bsd/openssh/dist/sshconnect1.c
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.19 -r1.20 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.
