Module Name: src
Committed By: christos
Date: Sun Aug 26 07:46:37 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh: openssh2netbsd
src/crypto/external/bsd/openssh/dist: OVERVIEW PROTOCOL
PROTOCOL.certkeys addrmatch.c auth-bsdauth.c auth-krb5.c
auth-options.c auth-options.h auth-pam.c auth-pam.h auth-passwd.c
auth-rhosts.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
channels.c channels.h clientloop.c clientloop.h compat.c compat.h
dh.c gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c kex.h
kexdhs.c kexgexs.c log.c log.h match.c match.h misc.c misc.h
monitor.c monitor.h monitor_wrap.c monitor_wrap.h msg.c mux.c
myproposal.h opacket.h packet.c packet.h readconf.c readconf.h
readpass.c scp.1 scp.c servconf.c servconf.h serverloop.c session.c
sftp-client.c sftp-server.c sftp.1 sftp.c ssh-agent.c ssh-gss.h
ssh-keygen.1 ssh-keygen.c ssh-keyscan.c ssh-keysign.c
ssh-pkcs11-client.c ssh-rsa.c ssh.1 ssh.c ssh.h ssh_api.h
ssh_config.5 sshbuf.c sshbuf.h sshconnect.c sshconnect.h
sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 ssherr.c
ssherr.h sshkey-xmss.c sshkey.c sshkey.h sshlogin.c ttymodes.c
uidswap.c uidswap.h umac.c umac128.c utf8.c version.h xmss_wots.c
src/crypto/external/bsd/openssh/dist/moduli-gen: 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: bufaux.c bufbn.c bufec.c buffer.c
buffer.h key.c key.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/openssh2netbsd
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/OVERVIEW \
src/crypto/external/bsd/openssh/dist/msg.c \
src/crypto/external/bsd/openssh/dist/uidswap.h \
src/crypto/external/bsd/openssh/dist/utf8.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/addrmatch.c \
src/crypto/external/bsd/openssh/dist/auth-krb5.c \
src/crypto/external/bsd/openssh/dist/auth2-gss.c \
src/crypto/external/bsd/openssh/dist/compat.h \
src/crypto/external/bsd/openssh/dist/gss-serv.c \
src/crypto/external/bsd/openssh/dist/hostfile.c \
src/crypto/external/bsd/openssh/dist/sshconnect.h
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys \
src/crypto/external/bsd/openssh/dist/auth-passwd.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/gss-genr.c \
src/crypto/external/bsd/openssh/dist/monitor.h \
src/crypto/external/bsd/openssh/dist/opacket.h \
src/crypto/external/bsd/openssh/dist/readpass.c \
src/crypto/external/bsd/openssh/dist/sshbuf.h \
src/crypto/external/bsd/openssh/dist/sshlogin.c \
src/crypto/external/bsd/openssh/dist/ttymodes.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/auth-bsdauth.c \
src/crypto/external/bsd/openssh/dist/auth-pam.h \
src/crypto/external/bsd/openssh/dist/auth2-krb5.c \
src/crypto/external/bsd/openssh/dist/ssherr.c \
src/crypto/external/bsd/openssh/dist/sshkey.h \
src/crypto/external/bsd/openssh/dist/uidswap.c
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/auth.h \
src/crypto/external/bsd/openssh/dist/log.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/myproposal.h \
src/crypto/external/bsd/openssh/dist/packet.h \
src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp-server.c \
src/crypto/external/bsd/openssh/dist/sftp.1
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssh/dist/auth-options.h \
src/crypto/external/bsd/openssh/dist/authfd.h \
src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c \
src/crypto/external/bsd/openssh/dist/ssh.h
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/auth-pam.c \
src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/kexdhs.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c \
src/crypto/external/bsd/openssh/dist/umac.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/auth-rhosts.c \
src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \
src/crypto/external/bsd/openssh/dist/match.c \
src/crypto/external/bsd/openssh/dist/match.h \
src/crypto/external/bsd/openssh/dist/ssh-gss.h \
src/crypto/external/bsd/openssh/dist/sshbuf.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/channels.c \
src/crypto/external/bsd/openssh/dist/kex.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.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth2-chall.c \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
src/crypto/external/bsd/openssh/dist/log.h
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/serverloop.c \
src/crypto/external/bsd/openssh/dist/sftp-client.c \
src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/auth2.c \
src/crypto/external/bsd/openssh/dist/clientloop.h \
src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/kexgexs.c \
src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/compat.c
cvs rdiff -u -r1.9 -r0 src/crypto/external/bsd/openssh/dist/bufaux.c \
src/crypto/external/bsd/openssh/dist/bufbn.c
cvs rdiff -u -r1.7 -r0 src/crypto/external/bsd/openssh/dist/bufec.c
cvs rdiff -u -r1.8 -r0 src/crypto/external/bsd/openssh/dist/buffer.c
cvs rdiff -u -r1.10 -r0 src/crypto/external/bsd/openssh/dist/buffer.h
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/dh.c \
src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/sftp.c \
src/crypto/external/bsd/openssh/dist/ssh-agent.c
cvs rdiff -u -r1.23 -r0 src/crypto/external/bsd/openssh/dist/key.c
cvs rdiff -u -r1.15 -r0 src/crypto/external/bsd/openssh/dist/key.h
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/scp.c
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/servconf.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/session.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/ssh-keygen.c \
src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/ssh.1 \
src/crypto/external/bsd/openssh/dist/ssh_config.5 \
src/crypto/external/bsd/openssh/dist/sshd_config
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/ssh_api.h
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/ssherr.h \
src/crypto/external/bsd/openssh/dist/sshkey-xmss.c \
src/crypto/external/bsd/openssh/dist/umac128.c \
src/crypto/external/bsd/openssh/dist/xmss_wots.c
cvs rdiff -u -r1.4 -r1.5 \
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.25 -r1.26 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.21 -r1.22 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.
