Module Name: src Committed By: christos Date: Fri Mar 11 01:55:00 UTC 2016
Modified Files: src/crypto/external/bsd/openssh/dist: auth-bsdauth.c auth-krb5.c auth-options.c auth.h auth2-pubkey.c authfd.c authfd.h authfile.c bitmap.c channels.c cipher.c clientloop.c clientloop.h dh.h kex.c kex.h kexc25519s.c kexdhs.c kexecdhs.c kexgexs.c key.c key.h krl.c misc.c monitor.c monitor_wrap.c monitor_wrap.h mux.c myproposal.h opacket.c opacket.h packet.c packet.h readconf.c readconf.h readpass.c scp.1 scp.c servconf.c serverloop.c session.c sftp-client.c sftp-server-main.c sftp-server.c sftp.1 sftp.c ssh-add.c ssh-agent.1 ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh-rsa.c ssh.1 ssh.c ssh.h ssh2.h ssh_api.c ssh_config ssh_config.5 sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c sshbuf.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 ssherr.c sshkey.c sshlogin.c version.h xmalloc.c xmalloc.h Removed Files: src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.1536 Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/auth-bsdauth.c \ src/crypto/external/bsd/openssh/dist/kexc25519s.c \ src/crypto/external/bsd/openssh/dist/opacket.c \ src/crypto/external/bsd/openssh/dist/sftp-server-main.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.c \ src/crypto/external/bsd/openssh/dist/sshbuf.h cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/auth-krb5.c \ src/crypto/external/bsd/openssh/dist/cipher.c \ src/crypto/external/bsd/openssh/dist/krl.c \ src/crypto/external/bsd/openssh/dist/ssh-dss.c \ src/crypto/external/bsd/openssh/dist/ssh2.h cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssh/dist/auth-options.c \ src/crypto/external/bsd/openssh/dist/auth.h \ src/crypto/external/bsd/openssh/dist/clientloop.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.13 -r1.14 \ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \ src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/serverloop.c \ src/crypto/external/bsd/openssh/dist/sftp-server.c cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/key.h \ src/crypto/external/bsd/openssh/dist/scp.1 \ src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \ src/crypto/external/bsd/openssh/dist/ssh-keysign.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/authfd.h \ src/crypto/external/bsd/openssh/dist/dh.h \ src/crypto/external/bsd/openssh/dist/kexecdhs.c cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/authfile.c \ src/crypto/external/bsd/openssh/dist/myproposal.h \ src/crypto/external/bsd/openssh/dist/scp.c \ src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/bitmap.c \ src/crypto/external/bsd/openssh/dist/ssh_api.c cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/channels.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/ssh-keyscan.c cvs rdiff -u -r1.17 -r1.18 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/session.c \ src/crypto/external/bsd/openssh/dist/sftp.c cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/kexdhs.c \ src/crypto/external/bsd/openssh/dist/ssh-rsa.c \ src/crypto/external/bsd/openssh/dist/ssh_config cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/kexgexs.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.h \ src/crypto/external/bsd/openssh/dist/ssh-agent.1 \ src/crypto/external/bsd/openssh/dist/ssh-keysign.8 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/opacket.h \ src/crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c \ src/crypto/external/bsd/openssh/dist/ssherr.c cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/packet.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/readpass.c \ src/crypto/external/bsd/openssh/dist/ssh-ecdsa.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/sshconnect1.c \ src/crypto/external/bsd/openssh/dist/sshkey.c \ src/crypto/external/bsd/openssh/dist/sshlogin.c \ src/crypto/external/bsd/openssh/dist/xmalloc.c \ src/crypto/external/bsd/openssh/dist/xmalloc.h cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.c \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.16 -r1.17 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.15 -r1.16 src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \ src/crypto/external/bsd/openssh/dist/sshconnect.c \ src/crypto/external/bsd/openssh/dist/sshd.8 \ src/crypto/external/bsd/openssh/dist/sshd_config cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/ssh.c cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/sshconnect2.c cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/sshd.c cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/sshd_config.5 cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.1536 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.