Module Name: src Committed By: adam Date: Sun Nov 21 18:59:05 UTC 2010
Modified Files: src/crypto/external/bsd/openssh/dist: auth-rsa.c auth2-pubkey.c channels.c cipher-ctr-mt.c jpake.c kex.c key.c monitor.c packet.c roaming.h roaming_client.c roaming_common.c schnorr.c servconf.c servconf.h session.c sftp-common.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh.c sshd.c sshd_config sshd_config.5 version.h Added Files: src/crypto/external/bsd/openssh/dist: README.lpk ldapauth.c ldapauth.h lpk-user-example.txt openssh-lpk_openldap.schema openssh-lpk_sun.schema Log Message: Merge in our changes: - Updated OpenSSH-HPN to hpn13v10 - Added OpenSSH-LPK patches to retrive pubkey from LDAP - Replaced arc4random_buf() (which is not available on NetBSD) with arc4random - Disabled roaming reconnect (otherwise: problem with undef symbols in libssh) To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssh/dist/README.lpk \ src/crypto/external/bsd/openssh/dist/ldapauth.c \ src/crypto/external/bsd/openssh/dist/ldapauth.h \ src/crypto/external/bsd/openssh/dist/lpk-user-example.txt \ src/crypto/external/bsd/openssh/dist/openssh-lpk_openldap.schema \ src/crypto/external/bsd/openssh/dist/openssh-lpk_sun.schema cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/auth-rsa.c \ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \ src/crypto/external/bsd/openssh/dist/key.c \ src/crypto/external/bsd/openssh/dist/roaming_common.c \ src/crypto/external/bsd/openssh/dist/schnorr.c \ src/crypto/external/bsd/openssh/dist/servconf.h \ src/crypto/external/bsd/openssh/dist/sftp-common.c cvs rdiff -u -r1.4 -r1.5 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/servconf.c \ src/crypto/external/bsd/openssh/dist/session.c \ src/crypto/external/bsd/openssh/dist/ssh.c \ src/crypto/external/bsd/openssh/dist/sshd.c \ src/crypto/external/bsd/openssh/dist/sshd_config \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/cipher-ctr-mt.c cvs rdiff -u -r1.1.1.2 -r1.2 src/crypto/external/bsd/openssh/dist/roaming.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssh/dist/roaming_client.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c cvs rdiff -u -r1.6 -r1.7 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.