Module Name: src
Committed By: christos
Date: Mon Jul 25 03:03:33 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/dist: LICENCE OVERVIEW PROTOCOL
PROTOCOL.agent PROTOCOL.certkeys PROTOCOL.mux README atomicio.c
atomicio.h auth-chall.c auth-krb5.c auth-options.c auth-options.h
auth-pam.h auth-rh-rsa.c auth-rsa.c auth.c auth.h auth1.c
auth2-chall.c auth2-hostbased.c auth2-jpake.c auth2-pubkey.c
auth2.c authfd.c authfile.c bufaux.c bufec.c buffer.h canohost.c
channels.c channels.h cipher-3des1.c cipher-bf1.c cipher-ctr-mt.c
cipher-ctr.c cipher.c cipher.h clientloop.c clientloop.h compat.c
compat.h compress.c dh.c dns.c fmt_scaled.h gss-genr.c
gss-serv-krb5.c gss-serv.c hostfile.c hostfile.h includes.h jpake.c
kex.c kex.h kexdhc.c kexdhs.c kexecdh.c kexecdhc.c kexecdhs.c
kexgexc.c kexgexs.c key.c key.h log.c log.h mac.c misc.c misc.h
moduli moduli.c monitor.c monitor_wrap.c monitor_wrap.h mux.c
myproposal.h nchan.c openssh2netbsd packet.c packet.h pathnames.h
pkcs11.h progressmeter.c readconf.c readconf.h readpass.c
roaming_dummy.c roaming_serv.c schnorr.c schnorr.h scp.1 scp.c
servconf.c servconf.h session.c sftp-client.c sftp-client.h
sftp-glob.c sftp-server.c sftp.1 sftp.c ssh-add.1 ssh-add.c
ssh-agent.1 ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-gss.h
ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8
ssh-keysign.c ssh-pkcs11-helper.8 ssh-pkcs11.c ssh-pkcs11.h
ssh-rsa.c ssh.1 ssh.c ssh2.h ssh_config.5 sshconnect.c sshconnect.h
sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 sshlogin.c
uuencode.c uuencode.h version.h
src/crypto/external/bsd/openssh/lib: Makefile shlib_version
Log Message:
- Merge conflicts
- WARNS=5
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/openssh/dist/LICENCE \
src/crypto/external/bsd/openssh/dist/OVERVIEW \
src/crypto/external/bsd/openssh/dist/README \
src/crypto/external/bsd/openssh/dist/bufec.c \
src/crypto/external/bsd/openssh/dist/kexecdh.c \
src/crypto/external/bsd/openssh/dist/kexecdhc.c \
src/crypto/external/bsd/openssh/dist/kexecdhs.c \
src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/PROTOCOL.agent
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys \
src/crypto/external/bsd/openssh/dist/PROTOCOL.mux \
src/crypto/external/bsd/openssh/dist/pkcs11.h \
src/crypto/external/bsd/openssh/dist/roaming_dummy.c \
src/crypto/external/bsd/openssh/dist/roaming_serv.c \
src/crypto/external/bsd/openssh/dist/schnorr.h \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/atomicio.c \
src/crypto/external/bsd/openssh/dist/atomicio.h \
src/crypto/external/bsd/openssh/dist/auth-chall.c \
src/crypto/external/bsd/openssh/dist/auth2-chall.c \
src/crypto/external/bsd/openssh/dist/cipher-ctr-mt.c \
src/crypto/external/bsd/openssh/dist/cipher.c \
src/crypto/external/bsd/openssh/dist/cipher.h \
src/crypto/external/bsd/openssh/dist/compat.c \
src/crypto/external/bsd/openssh/dist/compat.h \
src/crypto/external/bsd/openssh/dist/compress.c \
src/crypto/external/bsd/openssh/dist/gss-serv.c \
src/crypto/external/bsd/openssh/dist/kexdhc.c \
src/crypto/external/bsd/openssh/dist/kexgexc.c \
src/crypto/external/bsd/openssh/dist/log.c \
src/crypto/external/bsd/openssh/dist/log.h \
src/crypto/external/bsd/openssh/dist/mac.c \
src/crypto/external/bsd/openssh/dist/moduli.c \
src/crypto/external/bsd/openssh/dist/openssh2netbsd \
src/crypto/external/bsd/openssh/dist/readpass.c \
src/crypto/external/bsd/openssh/dist/ssh-gss.h \
src/crypto/external/bsd/openssh/dist/uuencode.h
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/auth-krb5.c \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/auth-options.h \
src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c \
src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/auth.h \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
src/crypto/external/bsd/openssh/dist/auth2-jpake.c \
src/crypto/external/bsd/openssh/dist/auth2.c \
src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/bufaux.c \
src/crypto/external/bsd/openssh/dist/buffer.h \
src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/cipher-3des1.c \
src/crypto/external/bsd/openssh/dist/cipher-bf1.c \
src/crypto/external/bsd/openssh/dist/cipher-ctr.c \
src/crypto/external/bsd/openssh/dist/clientloop.h \
src/crypto/external/bsd/openssh/dist/dh.c \
src/crypto/external/bsd/openssh/dist/dns.c \
src/crypto/external/bsd/openssh/dist/gss-genr.c \
src/crypto/external/bsd/openssh/dist/hostfile.c \
src/crypto/external/bsd/openssh/dist/hostfile.h \
src/crypto/external/bsd/openssh/dist/key.h \
src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/myproposal.h \
src/crypto/external/bsd/openssh/dist/nchan.c \
src/crypto/external/bsd/openssh/dist/packet.h \
src/crypto/external/bsd/openssh/dist/progressmeter.c \
src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/sftp-client.h \
src/crypto/external/bsd/openssh/dist/sftp-glob.c \
src/crypto/external/bsd/openssh/dist/ssh-add.c \
src/crypto/external/bsd/openssh/dist/ssh-dss.c \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c \
src/crypto/external/bsd/openssh/dist/ssh2.h \
src/crypto/external/bsd/openssh/dist/sshconnect.h \
src/crypto/external/bsd/openssh/dist/sshlogin.c \
src/crypto/external/bsd/openssh/dist/uuencode.c
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/auth-pam.h \
src/crypto/external/bsd/openssh/dist/fmt_scaled.h \
src/crypto/external/bsd/openssh/dist/includes.h \
src/crypto/external/bsd/openssh/dist/moduli
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/auth-rsa.c \
src/crypto/external/bsd/openssh/dist/auth1.c \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/canohost.c \
src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c \
src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/kexdhs.c \
src/crypto/external/bsd/openssh/dist/kexgexs.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/pathnames.h \
src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/schnorr.c \
src/crypto/external/bsd/openssh/dist/scp.c \
src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp-client.c \
src/crypto/external/bsd/openssh/dist/sftp-server.c \
src/crypto/external/bsd/openssh/dist/ssh-add.1 \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \
src/crypto/external/bsd/openssh/dist/ssh-keysign.8 \
src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/channels.c \
src/crypto/external/bsd/openssh/dist/jpake.c \
src/crypto/external/bsd/openssh/dist/kex.c \
src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/packet.c \
src/crypto/external/bsd/openssh/dist/sftp.1 \
src/crypto/external/bsd/openssh/dist/ssh-agent.1 \
src/crypto/external/bsd/openssh/dist/ssh-agent.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.c \
src/crypto/external/bsd/openssh/dist/ssh.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.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/key.c \
src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/session.c \
src/crypto/external/bsd/openssh/dist/sftp.c \
src/crypto/external/bsd/openssh/dist/ssh.1 \
src/crypto/external/bsd/openssh/dist/sshd_config
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 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.
