Module Name: src Committed By: christos Date: Thu Aug 13 10:33:21 UTC 2015
Modified Files: src/crypto/external/bsd/openssh/dist: OVERVIEW PROTOCOL PROTOCOL.mux addrmatch.c auth-options.c auth.c auth2-chall.c authfd.c authfile.c cipher.h clientloop.c compat.c kex.c kex.h key.c key.h krl.c log.c monitor.c myproposal.h packet.c readconf.c readconf.h scp.1 servconf.c servconf.h ssh-add.c ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh-keysign.c ssh-pkcs11.c ssh.1 ssh.c ssh.h ssh_config.5 sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 sshkey.c sshpty.c version.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/OVERVIEW \ src/crypto/external/bsd/openssh/dist/sshkey.c \ src/crypto/external/bsd/openssh/dist/sshpty.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/PROTOCOL \ src/crypto/external/bsd/openssh/dist/krl.c cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/PROTOCOL.mux \ src/crypto/external/bsd/openssh/dist/cipher.h cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/addrmatch.c \ src/crypto/external/bsd/openssh/dist/auth2-chall.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssh/dist/auth-options.c cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/kex.h \ src/crypto/external/bsd/openssh/dist/key.h \ src/crypto/external/bsd/openssh/dist/scp.1 \ src/crypto/external/bsd/openssh/dist/ssh-keysign.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/authfile.c \ src/crypto/external/bsd/openssh/dist/compat.c \ src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/myproposal.h \ src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/ssh_config.5 \ src/crypto/external/bsd/openssh/dist/sshd.8 \ src/crypto/external/bsd/openssh/dist/sshd_config cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/key.c cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/log.c \ src/crypto/external/bsd/openssh/dist/readconf.h \ src/crypto/external/bsd/openssh/dist/servconf.h cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/monitor.c \ src/crypto/external/bsd/openssh/dist/readconf.c \ src/crypto/external/bsd/openssh/dist/ssh-agent.c \ src/crypto/external/bsd/openssh/dist/ssh.1 \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/packet.c cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/ssh.c \ src/crypto/external/bsd/openssh/dist/sshd_config.5 cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-keygen.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/ssh.h cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/sshconnect2.c cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/sshd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.