Module Name: src
Committed By: christos
Date: Sat Apr 20 17:16:41 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/bin/ssh-keyscan: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/dist: OVERVIEW PROTOCOL
PROTOCOL.certkeys PROTOCOL.mux atomicio.c atomicio.h auth-krb5.c
auth-options.c auth-pam.c auth-pam.h auth.c auth.h
auth2-hostbased.c auth2-krb5.c auth2-pubkey.c auth2.c authfd.c
authfd.h authfile.c channels.c channels.h cipher.c cipher.h
clientloop.c crypto_api.h dh.c dh.h digest-openssl.c dispatch.c
dispatch.h groupaccess.c kex.c kex.h kexc25519.c kexdh.c kexecdh.c
kexgen.c kexgex.c kexgexc.c kexgexs.c kexsntrup4591761x25519.c
krl.c krl.h match.c match.h misc.c misc.h moduli.c monitor.c
monitor.h monitor_wrap.c monitor_wrap.h mux.c myproposal.h
namespace.h nchan.c packet.c packet.h pfilter.c progressmeter.c
progressmeter.h readconf.c readconf.h readpass.c scp.1 scp.c
servconf.c servconf.h serverloop.c session.c session.h
sftp-client.c sftp-client.h sftp-common.c sftp-server.c sftp.1
sftp.c sntrup4591761.c ssh-add.1 ssh-add.c ssh-agent.c ssh-dss.c
ssh-ecdsa.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.c ssh-keysign.c
ssh-pkcs11-client.c ssh-pkcs11-helper.8 ssh-pkcs11-helper.c
ssh-pkcs11.c ssh-pkcs11.h ssh-rsa.c ssh.1 ssh.c ssh.h ssh2.h
ssh_api.c ssh_config ssh_config.5 sshbuf-getput-crypto.c sshbuf.c
sshbuf.h sshconnect.c sshconnect.h sshconnect2.c sshd.c
sshd_config.5 sshkey.c sshkey.h version.h
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: kexc25519c.c kexc25519s.c
kexdhc.c kexdhs.c kexecdhc.c kexecdhs.c opacket.c opacket.h
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/OVERVIEW \
src/crypto/external/bsd/openssh/dist/atomicio.h \
src/crypto/external/bsd/openssh/dist/digest-openssl.c \
src/crypto/external/bsd/openssh/dist/dispatch.h \
src/crypto/external/bsd/openssh/dist/kexc25519.c \
src/crypto/external/bsd/openssh/dist/kexdh.c \
src/crypto/external/bsd/openssh/dist/kexecdh.c \
src/crypto/external/bsd/openssh/dist/namespace.h \
src/crypto/external/bsd/openssh/dist/ssh_api.c
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/cipher.h \
src/crypto/external/bsd/openssh/dist/moduli.c \
src/crypto/external/bsd/openssh/dist/sshconnect.h
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys \
src/crypto/external/bsd/openssh/dist/dh.h \
src/crypto/external/bsd/openssh/dist/match.c \
src/crypto/external/bsd/openssh/dist/monitor.h \
src/crypto/external/bsd/openssh/dist/progressmeter.c \
src/crypto/external/bsd/openssh/dist/sftp-client.h \
src/crypto/external/bsd/openssh/dist/sftp-common.c \
src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/PROTOCOL.mux \
src/crypto/external/bsd/openssh/dist/dispatch.c \
src/crypto/external/bsd/openssh/dist/match.h \
src/crypto/external/bsd/openssh/dist/nchan.c \
src/crypto/external/bsd/openssh/dist/sshbuf.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/atomicio.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/groupaccess.c \
src/crypto/external/bsd/openssh/dist/session.h \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 \
src/crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c \
src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth-krb5.c \
src/crypto/external/bsd/openssh/dist/kexgexc.c \
src/crypto/external/bsd/openssh/dist/krl.c \
src/crypto/external/bsd/openssh/dist/ssh-add.1 \
src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/auth-pam.c \
src/crypto/external/bsd/openssh/dist/auth.h \
src/crypto/external/bsd/openssh/dist/auth2.c \
src/crypto/external/bsd/openssh/dist/kexgexs.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.1 \
src/crypto/external/bsd/openssh/dist/ssh-add.c \
src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.23 -r1.24 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-keyscan.c \
src/crypto/external/bsd/openssh/dist/ssh.1 \
src/crypto/external/bsd/openssh/dist/ssh_config.5 \
src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/ssh-dss.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/scp.c \
src/crypto/external/bsd/openssh/dist/sftp-client.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/authfd.h \
src/crypto/external/bsd/openssh/dist/readpass.c \
src/crypto/external/bsd/openssh/dist/ssh.h \
src/crypto/external/bsd/openssh/dist/ssh2.h \
src/crypto/external/bsd/openssh/dist/ssh_config
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/authfile.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/cipher.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c
cvs rdiff -u -r1.25 -r1.26 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.2 -r1.3 src/crypto/external/bsd/openssh/dist/crypto_api.h \
src/crypto/external/bsd/openssh/dist/krl.h
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/dh.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.8 -r0 src/crypto/external/bsd/openssh/dist/kexc25519c.c
cvs rdiff -u -r1.9 -r0 src/crypto/external/bsd/openssh/dist/kexc25519s.c
cvs rdiff -u -r1.13 -r0 src/crypto/external/bsd/openssh/dist/kexdhc.c
cvs rdiff -u -r1.17 -r0 src/crypto/external/bsd/openssh/dist/kexdhs.c
cvs rdiff -u -r1.10 -r0 src/crypto/external/bsd/openssh/dist/kexecdhc.c \
src/crypto/external/bsd/openssh/dist/opacket.c \
src/crypto/external/bsd/openssh/dist/opacket.h
cvs rdiff -u -r1.11 -r0 src/crypto/external/bsd/openssh/dist/kexecdhs.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/openssh/dist/kexgen.c \
src/crypto/external/bsd/openssh/dist/kexsntrup4591761x25519.c \
src/crypto/external/bsd/openssh/dist/sntrup4591761.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/kexgex.c \
src/crypto/external/bsd/openssh/dist/pfilter.c \
src/crypto/external/bsd/openssh/dist/progressmeter.h \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/monitor.c
cvs rdiff -u -r1.24 -r1.25 \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/readconf.h
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/session.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/ssh-keygen.c \
src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.5 -r1.6 \
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.26 -r1.27 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.22 -r1.23 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.
