Module Name: src Committed By: christos Date: Wed May 2 02:41:08 UTC 2012
Modified Files: src/crypto/external/bsd/openssh/dist: PROTOCOL.mux auth-options.c auth2-pubkey.c auth2.c authfile.c channels.c channels.h clientloop.c clientloop.h compat.c compat.h dh.c key.c mac.c misc.c moduli.c monitor.c mux.c packet.c packet.h readconf.c readconf.h roaming.h roaming_client.c roaming_common.c scp.1 scp.c servconf.c session.c sftp-client.c sftp-glob.c sftp.1 sftp.c ssh-add.1 ssh-add.c ssh-ecdsa.c ssh-keygen.1 ssh-keygen.c ssh-pkcs11-client.c ssh.1 ssh.c ssh_config.5 sshd.8 sshd.c sshd_config.5 umac.c version.h Log Message: merge OpenSSH 6.0 Features: * ssh-keygen(1): Add optional checkpoints for moduli screening * ssh-add(1): new -k option to load plain keys (skipping certificates) * sshd(8): Add wildcard support to PermitOpen, allowing things like "PermitOpen localhost:*". bz #1857 * ssh(1): support for cancelling local and remote port forwards via the multiplex socket. Use ssh -O cancel -L xx:xx:xx -R yy:yy:yy user@host" to request the cancellation of the specified forwardings * support cancellation of local/dynamic forwardings from ~C commandline Bugfixes: * ssh(1): ensure that $DISPLAY contains only valid characters before using it to extract xauth data so that it can't be used to play local shell metacharacter games. * ssh(1): unbreak remote portforwarding with dynamic allocated listen ports * scp(1): uppress adding '--' to remote commandlines when the first argument does not start with '-'. saves breakage on some difficult-to-upgrade embedded/router platforms * ssh(1)/sshd(8): fix typo in IPQoS parsing: there is no "AF14" class, but there is an "AF21" class * ssh(1)/sshd(8): do not permit SSH2_MSG_SERVICE_REQUEST/ACCEPT during rekeying * ssh(1): skip attempting to create ~/.ssh when -F is passed * sshd(8): unbreak stdio forwarding when ControlPersist is in use; bz#1943 * sshd(1): send tty break to pty master instead of (probably already closed) slave side; bz#1859 * sftp(1): silence error spam for "ls */foo" in directory with files; bz#1683 * Fixed a number of memory and file descriptor leaks To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/PROTOCOL.mux \ src/crypto/external/bsd/openssh/dist/compat.c \ src/crypto/external/bsd/openssh/dist/compat.h \ src/crypto/external/bsd/openssh/dist/moduli.c \ src/crypto/external/bsd/openssh/dist/roaming.h \ src/crypto/external/bsd/openssh/dist/roaming_client.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/auth-options.c \ src/crypto/external/bsd/openssh/dist/dh.c \ src/crypto/external/bsd/openssh/dist/mac.c \ src/crypto/external/bsd/openssh/dist/scp.1 \ src/crypto/external/bsd/openssh/dist/sftp-glob.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \ src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/packet.h \ src/crypto/external/bsd/openssh/dist/scp.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/auth2.c \ src/crypto/external/bsd/openssh/dist/authfile.c \ src/crypto/external/bsd/openssh/dist/channels.h \ src/crypto/external/bsd/openssh/dist/clientloop.h \ src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/roaming_common.c \ src/crypto/external/bsd/openssh/dist/sftp-client.c \ src/crypto/external/bsd/openssh/dist/ssh-add.1 \ src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/channels.c \ src/crypto/external/bsd/openssh/dist/monitor.c \ src/crypto/external/bsd/openssh/dist/readconf.c \ src/crypto/external/bsd/openssh/dist/readconf.h \ src/crypto/external/bsd/openssh/dist/sftp.1 \ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \ src/crypto/external/bsd/openssh/dist/ssh_config.5 \ src/crypto/external/bsd/openssh/dist/sshd.8 \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/key.c \ src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/ssh.c \ src/crypto/external/bsd/openssh/dist/sshd.c cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/packet.c \ src/crypto/external/bsd/openssh/dist/session.c \ src/crypto/external/bsd/openssh/dist/sftp.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.c \ src/crypto/external/bsd/openssh/dist/ssh.1 cvs rdiff -u -r1.2 -r1.3 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/umac.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/sshd_config.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.