Module Name: src Committed By: christos Date: Sun Jul 24 15:09:11 UTC 2011
Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6082 Log Message: from ftp.openbsd.org Status: Vendor Tag: OPENSSH Release Tags: v58-20110724 U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent U src/crypto/external/bsd/openssh/dist/OVERVIEW U src/crypto/external/bsd/openssh/dist/PROTOCOL C src/crypto/external/bsd/openssh/dist/dispatch.c C src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys U src/crypto/external/bsd/openssh/dist/PROTOCOL.mux U src/crypto/external/bsd/openssh/dist/README C src/crypto/external/bsd/openssh/dist/addrmatch.c C src/crypto/external/bsd/openssh/dist/atomicio.c C src/crypto/external/bsd/openssh/dist/atomicio.h C src/crypto/external/bsd/openssh/dist/auth-bsdauth.c C src/crypto/external/bsd/openssh/dist/auth-chall.c C src/crypto/external/bsd/openssh/dist/auth-krb5.c C src/crypto/external/bsd/openssh/dist/auth-options.c C src/crypto/external/bsd/openssh/dist/auth-options.h C src/crypto/external/bsd/openssh/dist/auth-passwd.c C src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c C src/crypto/external/bsd/openssh/dist/auth-rhosts.c C src/crypto/external/bsd/openssh/dist/auth-rsa.c C src/crypto/external/bsd/openssh/dist/auth.c C src/crypto/external/bsd/openssh/dist/auth.h C src/crypto/external/bsd/openssh/dist/auth1.c C src/crypto/external/bsd/openssh/dist/auth2-chall.c C src/crypto/external/bsd/openssh/dist/auth2-gss.c C src/crypto/external/bsd/openssh/dist/auth2-hostbased.c C src/crypto/external/bsd/openssh/dist/auth2-jpake.c C src/crypto/external/bsd/openssh/dist/auth2-kbdint.c C src/crypto/external/bsd/openssh/dist/auth2-none.c C src/crypto/external/bsd/openssh/dist/auth2-passwd.c C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c C src/crypto/external/bsd/openssh/dist/auth2.c C src/crypto/external/bsd/openssh/dist/authfd.c C src/crypto/external/bsd/openssh/dist/authfd.h C src/crypto/external/bsd/openssh/dist/authfile.c C src/crypto/external/bsd/openssh/dist/authfile.h C src/crypto/external/bsd/openssh/dist/bufaux.c C src/crypto/external/bsd/openssh/dist/bufbn.c N src/crypto/external/bsd/openssh/dist/bufec.c C src/crypto/external/bsd/openssh/dist/buffer.c C src/crypto/external/bsd/openssh/dist/buffer.h C src/crypto/external/bsd/openssh/dist/canohost.c C src/crypto/external/bsd/openssh/dist/canohost.h C src/crypto/external/bsd/openssh/dist/channels.c C src/crypto/external/bsd/openssh/dist/channels.h C src/crypto/external/bsd/openssh/dist/cipher.c C src/crypto/external/bsd/openssh/dist/cipher-3des1.c C src/crypto/external/bsd/openssh/dist/cipher-bf1.c C src/crypto/external/bsd/openssh/dist/cipher-ctr.c C src/crypto/external/bsd/openssh/dist/cipher.h C src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c C src/crypto/external/bsd/openssh/dist/clientloop.h C src/crypto/external/bsd/openssh/dist/compat.c C src/crypto/external/bsd/openssh/dist/compat.h C src/crypto/external/bsd/openssh/dist/compress.c C src/crypto/external/bsd/openssh/dist/compress.h C src/crypto/external/bsd/openssh/dist/crc32.c C src/crypto/external/bsd/openssh/dist/crc32.h C src/crypto/external/bsd/openssh/dist/deattack.c C src/crypto/external/bsd/openssh/dist/deattack.h C src/crypto/external/bsd/openssh/dist/dh.h C src/crypto/external/bsd/openssh/dist/groupaccess.c C src/crypto/external/bsd/openssh/dist/dispatch.h C src/crypto/external/bsd/openssh/dist/dns.c C src/crypto/external/bsd/openssh/dist/dns.h C src/crypto/external/bsd/openssh/dist/fatal.c C src/crypto/external/bsd/openssh/dist/jpake.c C src/crypto/external/bsd/openssh/dist/gss-genr.c C src/crypto/external/bsd/openssh/dist/groupaccess.h C src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c C src/crypto/external/bsd/openssh/dist/gss-serv.c C src/crypto/external/bsd/openssh/dist/hostfile.c C src/crypto/external/bsd/openssh/dist/hostfile.h C src/crypto/external/bsd/openssh/dist/jpake.h C src/crypto/external/bsd/openssh/dist/kex.c C src/crypto/external/bsd/openssh/dist/kex.h C src/crypto/external/bsd/openssh/dist/kexdh.c C src/crypto/external/bsd/openssh/dist/kexdhc.c C src/crypto/external/bsd/openssh/dist/kexdhs.c N src/crypto/external/bsd/openssh/dist/kexecdh.c N src/crypto/external/bsd/openssh/dist/kexecdhc.c N src/crypto/external/bsd/openssh/dist/kexecdhs.c C src/crypto/external/bsd/openssh/dist/kexgex.c C src/crypto/external/bsd/openssh/dist/kexgexc.c C src/crypto/external/bsd/openssh/dist/kexgexs.c C src/crypto/external/bsd/openssh/dist/key.c C src/crypto/external/bsd/openssh/dist/key.h C src/crypto/external/bsd/openssh/dist/log.c C src/crypto/external/bsd/openssh/dist/log.h C src/crypto/external/bsd/openssh/dist/mac.c C src/crypto/external/bsd/openssh/dist/mac.h C src/crypto/external/bsd/openssh/dist/match.c C src/crypto/external/bsd/openssh/dist/match.h C src/crypto/external/bsd/openssh/dist/misc.c C src/crypto/external/bsd/openssh/dist/sftp-server.8 C src/crypto/external/bsd/openssh/dist/misc.h C src/crypto/external/bsd/openssh/dist/moduli.c C src/crypto/external/bsd/openssh/dist/monitor.c C src/crypto/external/bsd/openssh/dist/monitor.h C src/crypto/external/bsd/openssh/dist/monitor_fdpass.c C src/crypto/external/bsd/openssh/dist/monitor_fdpass.h C src/crypto/external/bsd/openssh/dist/monitor_mm.c C src/crypto/external/bsd/openssh/dist/monitor_mm.h C src/crypto/external/bsd/openssh/dist/monitor_wrap.c C src/crypto/external/bsd/openssh/dist/monitor_wrap.h C src/crypto/external/bsd/openssh/dist/msg.c C src/crypto/external/bsd/openssh/dist/msg.h C src/crypto/external/bsd/openssh/dist/mux.c C src/crypto/external/bsd/openssh/dist/myproposal.h C src/crypto/external/bsd/openssh/dist/nchan.c C src/crypto/external/bsd/openssh/dist/nchan.ms C src/crypto/external/bsd/openssh/dist/nchan2.ms C src/crypto/external/bsd/openssh/dist/packet.c C src/crypto/external/bsd/openssh/dist/packet.h C src/crypto/external/bsd/openssh/dist/pathnames.h U src/crypto/external/bsd/openssh/dist/pkcs11.h C src/crypto/external/bsd/openssh/dist/progressmeter.c C src/crypto/external/bsd/openssh/dist/progressmeter.h C src/crypto/external/bsd/openssh/dist/readconf.c C src/crypto/external/bsd/openssh/dist/readconf.h C src/crypto/external/bsd/openssh/dist/readpass.c C src/crypto/external/bsd/openssh/dist/roaming.h C src/crypto/external/bsd/openssh/dist/roaming_client.c C src/crypto/external/bsd/openssh/dist/roaming_common.c U src/crypto/external/bsd/openssh/dist/roaming_dummy.c U src/crypto/external/bsd/openssh/dist/roaming_serv.c C src/crypto/external/bsd/openssh/dist/rsa.c C src/crypto/external/bsd/openssh/dist/rsa.h C src/crypto/external/bsd/openssh/dist/schnorr.c U src/crypto/external/bsd/openssh/dist/schnorr.h C src/crypto/external/bsd/openssh/dist/scp.1 C src/crypto/external/bsd/openssh/dist/scp.c C src/crypto/external/bsd/openssh/dist/servconf.c C src/crypto/external/bsd/openssh/dist/servconf.h C src/crypto/external/bsd/openssh/dist/serverloop.c C src/crypto/external/bsd/openssh/dist/serverloop.h C src/crypto/external/bsd/openssh/dist/session.c C src/crypto/external/bsd/openssh/dist/session.h C src/crypto/external/bsd/openssh/dist/sftp-client.c C src/crypto/external/bsd/openssh/dist/sftp-client.h C src/crypto/external/bsd/openssh/dist/sftp-common.c C src/crypto/external/bsd/openssh/dist/sftp-common.h C src/crypto/external/bsd/openssh/dist/sftp-glob.c C src/crypto/external/bsd/openssh/dist/sftp-server-main.c C src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c C src/crypto/external/bsd/openssh/dist/sftp-server.c C src/crypto/external/bsd/openssh/dist/sftp.1 C src/crypto/external/bsd/openssh/dist/sftp.c C src/crypto/external/bsd/openssh/dist/sftp.h C src/crypto/external/bsd/openssh/dist/ssh-add.1 C src/crypto/external/bsd/openssh/dist/ssh-add.c C src/crypto/external/bsd/openssh/dist/ssh-agent.1 C src/crypto/external/bsd/openssh/dist/ssh-agent.c C src/crypto/external/bsd/openssh/dist/ssh-dss.c N src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c C src/crypto/external/bsd/openssh/dist/ssh-gss.h C src/crypto/external/bsd/openssh/dist/ssh-keygen.1 C src/crypto/external/bsd/openssh/dist/ssh-keygen.c C src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 C src/crypto/external/bsd/openssh/dist/ssh-keyscan.c C src/crypto/external/bsd/openssh/dist/ssh-keysign.8 C src/crypto/external/bsd/openssh/dist/ssh-keysign.c U src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 C src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c C src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c U src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h C src/crypto/external/bsd/openssh/dist/ssh-rsa.c C src/crypto/external/bsd/openssh/dist/ssh.1 C src/crypto/external/bsd/openssh/dist/ssh.c C src/crypto/external/bsd/openssh/dist/ssh.h C src/crypto/external/bsd/openssh/dist/ssh1.h C src/crypto/external/bsd/openssh/dist/ssh2.h C src/crypto/external/bsd/openssh/dist/ssh_config C src/crypto/external/bsd/openssh/dist/ssh_config.5 C src/crypto/external/bsd/openssh/dist/sshconnect.c C src/crypto/external/bsd/openssh/dist/sshconnect.h C src/crypto/external/bsd/openssh/dist/sshconnect1.c C src/crypto/external/bsd/openssh/dist/sshconnect2.c C src/crypto/external/bsd/openssh/dist/sshd.8 C src/crypto/external/bsd/openssh/dist/sshd.c C src/crypto/external/bsd/openssh/dist/sshd_config C src/crypto/external/bsd/openssh/dist/sshd_config.5 C src/crypto/external/bsd/openssh/dist/sshlogin.c C src/crypto/external/bsd/openssh/dist/sshlogin.h C src/crypto/external/bsd/openssh/dist/sshpty.c C src/crypto/external/bsd/openssh/dist/sshpty.h C src/crypto/external/bsd/openssh/dist/sshtty.c C src/crypto/external/bsd/openssh/dist/ttymodes.c C src/crypto/external/bsd/openssh/dist/ttymodes.h C src/crypto/external/bsd/openssh/dist/uidswap.c C src/crypto/external/bsd/openssh/dist/uidswap.h C src/crypto/external/bsd/openssh/dist/umac.c C src/crypto/external/bsd/openssh/dist/umac.h C src/crypto/external/bsd/openssh/dist/uuencode.c C src/crypto/external/bsd/openssh/dist/uuencode.h C src/crypto/external/bsd/openssh/dist/version.h C src/crypto/external/bsd/openssh/dist/xmalloc.c C src/crypto/external/bsd/openssh/dist/xmalloc.h U src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper/Makefile 182 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENSSH:yesterday -jOPENSSH src/crypto/external/bsd/openssh/dist