Date: Thu, 21 Jan 2016 17:33:11 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r294516 - in user/ngie/socket-tests: . bin/sh contrib/bsnmp/snmp_mibII contrib/mdocml crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/caldera crypto/openssh/contrib/cygwin ... Message-ID: <201601211733.u0LHXBqI015123@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Jan 21 17:33:10 2016 New Revision: 294516 URL: https://svnweb.freebsd.org/changeset/base/294516 Log: MFhead @ r294514 Added: user/ngie/socket-tests/crypto/openssh/.cvsignore - copied unchanged from r294514, head/crypto/openssh/.cvsignore user/ngie/socket-tests/crypto/openssh/bitmap.c - copied unchanged from r294514, head/crypto/openssh/bitmap.c user/ngie/socket-tests/crypto/openssh/bitmap.h - copied unchanged from r294514, head/crypto/openssh/bitmap.h user/ngie/socket-tests/crypto/openssh/cipher-aesctr.c - copied unchanged from r294514, head/crypto/openssh/cipher-aesctr.c user/ngie/socket-tests/crypto/openssh/cipher-aesctr.h - copied unchanged from r294514, head/crypto/openssh/cipher-aesctr.h user/ngie/socket-tests/crypto/openssh/opacket.c - copied unchanged from r294514, head/crypto/openssh/opacket.c user/ngie/socket-tests/crypto/openssh/opacket.h - copied unchanged from r294514, head/crypto/openssh/opacket.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/.cvsignore - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/.cvsignore user/ngie/socket-tests/crypto/openssh/openbsd-compat/kludge-fd_set.c - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/kludge-fd_set.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/md5.c - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/md5.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/md5.h - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/md5.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/reallocarray.c - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/reallocarray.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/regress/.cvsignore - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/regress/.cvsignore user/ngie/socket-tests/crypto/openssh/openbsd-compat/regress/opensslvertest.c - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/regress/opensslvertest.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/rmd160.c - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/rmd160.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/rmd160.h - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/rmd160.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/sha1.c - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/sha1.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/sha1.h - copied unchanged from r294514, head/crypto/openssh/openbsd-compat/sha1.h user/ngie/socket-tests/crypto/openssh/regress/.cvsignore - copied unchanged from r294514, head/crypto/openssh/regress/.cvsignore user/ngie/socket-tests/crypto/openssh/regress/cfgparse.sh - copied unchanged from r294514, head/crypto/openssh/regress/cfgparse.sh user/ngie/socket-tests/crypto/openssh/regress/hostkey-agent.sh - copied unchanged from r294514, head/crypto/openssh/regress/hostkey-agent.sh user/ngie/socket-tests/crypto/openssh/regress/hostkey-rotate.sh - copied unchanged from r294514, head/crypto/openssh/regress/hostkey-rotate.sh user/ngie/socket-tests/crypto/openssh/regress/keygen-knownhosts.sh - copied unchanged from r294514, head/crypto/openssh/regress/keygen-knownhosts.sh user/ngie/socket-tests/crypto/openssh/regress/limit-keytype.sh - copied unchanged from r294514, head/crypto/openssh/regress/limit-keytype.sh user/ngie/socket-tests/crypto/openssh/regress/multipubkey.sh - copied unchanged from r294514, head/crypto/openssh/regress/multipubkey.sh user/ngie/socket-tests/crypto/openssh/regress/netcat.c - copied unchanged from r294514, head/crypto/openssh/regress/netcat.c user/ngie/socket-tests/crypto/openssh/regress/principals-command.sh - copied unchanged from r294514, head/crypto/openssh/regress/principals-command.sh user/ngie/socket-tests/crypto/openssh/regress/t11.ok - copied unchanged from r294514, head/crypto/openssh/regress/t11.ok user/ngie/socket-tests/crypto/openssh/regress/unittests/ - copied from r294514, head/crypto/openssh/regress/unittests/ user/ngie/socket-tests/crypto/openssh/regress/valgrind-unit.sh - copied unchanged from r294514, head/crypto/openssh/regress/valgrind-unit.sh user/ngie/socket-tests/crypto/openssh/scard/.cvsignore - copied unchanged from r294514, head/crypto/openssh/scard/.cvsignore user/ngie/socket-tests/crypto/openssh/ssh_api.c - copied unchanged from r294514, head/crypto/openssh/ssh_api.c user/ngie/socket-tests/crypto/openssh/ssh_api.h - copied unchanged from r294514, head/crypto/openssh/ssh_api.h user/ngie/socket-tests/crypto/openssh/sshbuf-getput-basic.c - copied unchanged from r294514, head/crypto/openssh/sshbuf-getput-basic.c user/ngie/socket-tests/crypto/openssh/sshbuf-getput-crypto.c - copied unchanged from r294514, head/crypto/openssh/sshbuf-getput-crypto.c user/ngie/socket-tests/crypto/openssh/sshbuf-misc.c - copied unchanged from r294514, head/crypto/openssh/sshbuf-misc.c user/ngie/socket-tests/crypto/openssh/sshbuf.c - copied unchanged from r294514, head/crypto/openssh/sshbuf.c user/ngie/socket-tests/crypto/openssh/sshbuf.h - copied unchanged from r294514, head/crypto/openssh/sshbuf.h user/ngie/socket-tests/crypto/openssh/ssherr.c - copied unchanged from r294514, head/crypto/openssh/ssherr.c user/ngie/socket-tests/crypto/openssh/ssherr.h - copied unchanged from r294514, head/crypto/openssh/ssherr.h user/ngie/socket-tests/crypto/openssh/sshkey.c - copied unchanged from r294514, head/crypto/openssh/sshkey.c user/ngie/socket-tests/crypto/openssh/sshkey.h - copied unchanged from r294514, head/crypto/openssh/sshkey.h user/ngie/socket-tests/lib/libc/riscv/SYS.h - copied unchanged from r294514, head/lib/libc/riscv/SYS.h user/ngie/socket-tests/lib/libc/riscv/Symbol.map - copied unchanged from r294514, head/lib/libc/riscv/Symbol.map user/ngie/socket-tests/lib/libc/riscv/_fpmath.h - copied unchanged from r294514, head/lib/libc/riscv/_fpmath.h user/ngie/socket-tests/lib/libc/riscv/arith.h - copied unchanged from r294514, head/lib/libc/riscv/arith.h user/ngie/socket-tests/lib/libc/riscv/gd_qnan.h - copied unchanged from r294514, head/lib/libc/riscv/gd_qnan.h user/ngie/socket-tests/lib/libc/riscv/gen/ - copied from r294514, head/lib/libc/riscv/gen/ user/ngie/socket-tests/lib/libc/riscv/sys/ - copied from r294514, head/lib/libc/riscv/sys/ user/ngie/socket-tests/share/man/man4/cfi.4 - copied unchanged from r294514, head/share/man/man4/cfi.4 user/ngie/socket-tests/sys/arm/at91/at91_ohci.c - copied unchanged from r294514, head/sys/arm/at91/at91_ohci.c user/ngie/socket-tests/sys/arm/at91/at91_ohci_fdt.c - copied unchanged from r294514, head/sys/arm/at91/at91_ohci_fdt.c user/ngie/socket-tests/sys/arm/conf/ARMADA38X - copied unchanged from r294514, head/sys/arm/conf/ARMADA38X user/ngie/socket-tests/sys/arm/mv/armada38x/ - copied from r294514, head/sys/arm/mv/armada38x/ user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-380.dtsi - copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-380.dtsi user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-385.dtsi - copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-385.dtsi user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-388-gp.dts - copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-388-gp.dts user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-388.dtsi - copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-388.dtsi user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-38x.dtsi - copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-38x.dtsi user/ngie/socket-tests/sys/fs/ext2fs/ext2_hash.c - copied unchanged from r294514, head/sys/fs/ext2fs/ext2_hash.c user/ngie/socket-tests/sys/fs/ext2fs/ext2_htree.c - copied unchanged from r294514, head/sys/fs/ext2fs/ext2_htree.c Deleted: user/ngie/socket-tests/crypto/openssh/README.hpn user/ngie/socket-tests/crypto/openssh/compress.c user/ngie/socket-tests/crypto/openssh/compress.h user/ngie/socket-tests/crypto/openssh/config.h.in user/ngie/socket-tests/crypto/openssh/configure user/ngie/socket-tests/crypto/openssh/contrib/caldera/ user/ngie/socket-tests/crypto/openssh/moduli.0 user/ngie/socket-tests/crypto/openssh/scp.0 user/ngie/socket-tests/crypto/openssh/sftp-server.0 user/ngie/socket-tests/crypto/openssh/sftp.0 user/ngie/socket-tests/crypto/openssh/ssh-add.0 user/ngie/socket-tests/crypto/openssh/ssh-agent.0 user/ngie/socket-tests/crypto/openssh/ssh-keygen.0 user/ngie/socket-tests/crypto/openssh/ssh-keyscan.0 user/ngie/socket-tests/crypto/openssh/ssh-keysign.0 user/ngie/socket-tests/crypto/openssh/ssh-pkcs11-helper.0 user/ngie/socket-tests/crypto/openssh/ssh.0 user/ngie/socket-tests/crypto/openssh/ssh_config.0 user/ngie/socket-tests/crypto/openssh/sshd.0 user/ngie/socket-tests/crypto/openssh/sshd_config.0 user/ngie/socket-tests/sys/dev/fdt/fdt_arm64.c user/ngie/socket-tests/sys/dev/fdt/fdt_mips.c user/ngie/socket-tests/sys/dev/fdt/fdt_x86.c user/ngie/socket-tests/sys/dev/usb/controller/ohci_atmelarm.c user/ngie/socket-tests/sys/dev/usb/controller/ohci_fdt.c Modified: user/ngie/socket-tests/ObsoleteFiles.inc user/ngie/socket-tests/UPDATING user/ngie/socket-tests/bin/sh/options.c user/ngie/socket-tests/bin/sh/options.h user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.c user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII_interfaces.c user/ngie/socket-tests/contrib/mdocml/main.c user/ngie/socket-tests/crypto/openssh/ChangeLog user/ngie/socket-tests/crypto/openssh/FREEBSD-upgrade user/ngie/socket-tests/crypto/openssh/INSTALL user/ngie/socket-tests/crypto/openssh/Makefile.in user/ngie/socket-tests/crypto/openssh/OVERVIEW user/ngie/socket-tests/crypto/openssh/PROTOCOL user/ngie/socket-tests/crypto/openssh/PROTOCOL.agent user/ngie/socket-tests/crypto/openssh/PROTOCOL.krl user/ngie/socket-tests/crypto/openssh/PROTOCOL.mux user/ngie/socket-tests/crypto/openssh/README user/ngie/socket-tests/crypto/openssh/addrmatch.c user/ngie/socket-tests/crypto/openssh/atomicio.c user/ngie/socket-tests/crypto/openssh/auth-bsdauth.c user/ngie/socket-tests/crypto/openssh/auth-chall.c user/ngie/socket-tests/crypto/openssh/auth-krb5.c user/ngie/socket-tests/crypto/openssh/auth-options.c user/ngie/socket-tests/crypto/openssh/auth-options.h user/ngie/socket-tests/crypto/openssh/auth-pam.c user/ngie/socket-tests/crypto/openssh/auth-passwd.c user/ngie/socket-tests/crypto/openssh/auth-rh-rsa.c user/ngie/socket-tests/crypto/openssh/auth-rhosts.c user/ngie/socket-tests/crypto/openssh/auth-rsa.c user/ngie/socket-tests/crypto/openssh/auth.c user/ngie/socket-tests/crypto/openssh/auth.h user/ngie/socket-tests/crypto/openssh/auth1.c user/ngie/socket-tests/crypto/openssh/auth2-chall.c user/ngie/socket-tests/crypto/openssh/auth2-gss.c user/ngie/socket-tests/crypto/openssh/auth2-hostbased.c user/ngie/socket-tests/crypto/openssh/auth2-kbdint.c user/ngie/socket-tests/crypto/openssh/auth2-none.c user/ngie/socket-tests/crypto/openssh/auth2-passwd.c user/ngie/socket-tests/crypto/openssh/auth2-pubkey.c user/ngie/socket-tests/crypto/openssh/auth2.c user/ngie/socket-tests/crypto/openssh/authfd.c user/ngie/socket-tests/crypto/openssh/authfd.h user/ngie/socket-tests/crypto/openssh/authfile.c user/ngie/socket-tests/crypto/openssh/authfile.h user/ngie/socket-tests/crypto/openssh/bufaux.c user/ngie/socket-tests/crypto/openssh/bufbn.c user/ngie/socket-tests/crypto/openssh/bufec.c user/ngie/socket-tests/crypto/openssh/buffer.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/buffer.h (contents, props changed) user/ngie/socket-tests/crypto/openssh/canohost.c user/ngie/socket-tests/crypto/openssh/chacha.h user/ngie/socket-tests/crypto/openssh/channels.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/channels.h (contents, props changed) user/ngie/socket-tests/crypto/openssh/cipher-3des1.c user/ngie/socket-tests/crypto/openssh/cipher-bf1.c user/ngie/socket-tests/crypto/openssh/cipher-chachapoly.c user/ngie/socket-tests/crypto/openssh/cipher-chachapoly.h user/ngie/socket-tests/crypto/openssh/cipher-ctr.c user/ngie/socket-tests/crypto/openssh/cipher.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/cipher.h user/ngie/socket-tests/crypto/openssh/clientloop.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/compat.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/compat.h (contents, props changed) user/ngie/socket-tests/crypto/openssh/config.guess user/ngie/socket-tests/crypto/openssh/config.h user/ngie/socket-tests/crypto/openssh/configure.ac (contents, props changed) user/ngie/socket-tests/crypto/openssh/contrib/Makefile user/ngie/socket-tests/crypto/openssh/contrib/README user/ngie/socket-tests/crypto/openssh/contrib/cygwin/README user/ngie/socket-tests/crypto/openssh/contrib/cygwin/ssh-host-config user/ngie/socket-tests/crypto/openssh/contrib/cygwin/ssh-user-config user/ngie/socket-tests/crypto/openssh/contrib/redhat/openssh.spec user/ngie/socket-tests/crypto/openssh/contrib/suse/openssh.spec user/ngie/socket-tests/crypto/openssh/deattack.c user/ngie/socket-tests/crypto/openssh/deattack.h user/ngie/socket-tests/crypto/openssh/defines.h user/ngie/socket-tests/crypto/openssh/dh.c user/ngie/socket-tests/crypto/openssh/dh.h user/ngie/socket-tests/crypto/openssh/digest-libc.c user/ngie/socket-tests/crypto/openssh/digest-openssl.c user/ngie/socket-tests/crypto/openssh/digest.h user/ngie/socket-tests/crypto/openssh/dispatch.c user/ngie/socket-tests/crypto/openssh/dispatch.h user/ngie/socket-tests/crypto/openssh/dns.c user/ngie/socket-tests/crypto/openssh/dns.h user/ngie/socket-tests/crypto/openssh/entropy.c user/ngie/socket-tests/crypto/openssh/freebsd-configure.sh user/ngie/socket-tests/crypto/openssh/freebsd-post-merge.sh user/ngie/socket-tests/crypto/openssh/freebsd-pre-merge.sh user/ngie/socket-tests/crypto/openssh/ge25519.h user/ngie/socket-tests/crypto/openssh/groupaccess.c user/ngie/socket-tests/crypto/openssh/gss-genr.c user/ngie/socket-tests/crypto/openssh/gss-serv-krb5.c user/ngie/socket-tests/crypto/openssh/gss-serv.c user/ngie/socket-tests/crypto/openssh/hmac.c user/ngie/socket-tests/crypto/openssh/hmac.h user/ngie/socket-tests/crypto/openssh/hostfile.c user/ngie/socket-tests/crypto/openssh/hostfile.h user/ngie/socket-tests/crypto/openssh/includes.h user/ngie/socket-tests/crypto/openssh/kex.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/kex.h (contents, props changed) user/ngie/socket-tests/crypto/openssh/kexc25519.c user/ngie/socket-tests/crypto/openssh/kexc25519c.c user/ngie/socket-tests/crypto/openssh/kexc25519s.c user/ngie/socket-tests/crypto/openssh/kexdh.c user/ngie/socket-tests/crypto/openssh/kexdhc.c user/ngie/socket-tests/crypto/openssh/kexdhs.c user/ngie/socket-tests/crypto/openssh/kexecdh.c user/ngie/socket-tests/crypto/openssh/kexecdhc.c user/ngie/socket-tests/crypto/openssh/kexecdhs.c user/ngie/socket-tests/crypto/openssh/kexgex.c user/ngie/socket-tests/crypto/openssh/kexgexc.c user/ngie/socket-tests/crypto/openssh/kexgexs.c user/ngie/socket-tests/crypto/openssh/key.c user/ngie/socket-tests/crypto/openssh/key.h user/ngie/socket-tests/crypto/openssh/krl.c user/ngie/socket-tests/crypto/openssh/krl.h user/ngie/socket-tests/crypto/openssh/log.c user/ngie/socket-tests/crypto/openssh/loginrec.c user/ngie/socket-tests/crypto/openssh/mac.c user/ngie/socket-tests/crypto/openssh/mac.h user/ngie/socket-tests/crypto/openssh/match.c user/ngie/socket-tests/crypto/openssh/match.h user/ngie/socket-tests/crypto/openssh/misc.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/misc.h (contents, props changed) user/ngie/socket-tests/crypto/openssh/moduli user/ngie/socket-tests/crypto/openssh/moduli.c user/ngie/socket-tests/crypto/openssh/monitor.c user/ngie/socket-tests/crypto/openssh/monitor.h user/ngie/socket-tests/crypto/openssh/monitor_fdpass.c user/ngie/socket-tests/crypto/openssh/monitor_mm.c user/ngie/socket-tests/crypto/openssh/monitor_wrap.c user/ngie/socket-tests/crypto/openssh/monitor_wrap.h user/ngie/socket-tests/crypto/openssh/msg.c user/ngie/socket-tests/crypto/openssh/msg.h user/ngie/socket-tests/crypto/openssh/mux.c user/ngie/socket-tests/crypto/openssh/myproposal.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/Makefile.in user/ngie/socket-tests/crypto/openssh/openbsd-compat/arc4random.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/bcrypt_pbkdf.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/blowfish.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-cygwin_util.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-cygwin_util.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-misc.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-misc.h (contents, props changed) user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-snprintf.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/explicit_bzero.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/fake-rfc2553.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/openbsd-compat.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/openssl-compat.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/openssl-compat.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/port-linux.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/port-tun.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/port-uw.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/readpassphrase.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/realpath.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/regress/Makefile.in user/ngie/socket-tests/crypto/openssh/openbsd-compat/sha2.c user/ngie/socket-tests/crypto/openssh/openbsd-compat/sha2.h user/ngie/socket-tests/crypto/openssh/openbsd-compat/xcrypt.c user/ngie/socket-tests/crypto/openssh/opensshd.init.in user/ngie/socket-tests/crypto/openssh/packet.c user/ngie/socket-tests/crypto/openssh/packet.h (contents, props changed) user/ngie/socket-tests/crypto/openssh/platform.c user/ngie/socket-tests/crypto/openssh/poly1305.h user/ngie/socket-tests/crypto/openssh/progressmeter.c user/ngie/socket-tests/crypto/openssh/progressmeter.h user/ngie/socket-tests/crypto/openssh/readconf.c user/ngie/socket-tests/crypto/openssh/readconf.h user/ngie/socket-tests/crypto/openssh/regress/Makefile user/ngie/socket-tests/crypto/openssh/regress/README.regress user/ngie/socket-tests/crypto/openssh/regress/agent-pkcs11.sh user/ngie/socket-tests/crypto/openssh/regress/agent-timeout.sh user/ngie/socket-tests/crypto/openssh/regress/agent.sh user/ngie/socket-tests/crypto/openssh/regress/broken-pipe.sh user/ngie/socket-tests/crypto/openssh/regress/cert-hostkey.sh user/ngie/socket-tests/crypto/openssh/regress/cert-userkey.sh user/ngie/socket-tests/crypto/openssh/regress/cfgmatch.sh user/ngie/socket-tests/crypto/openssh/regress/cipher-speed.sh user/ngie/socket-tests/crypto/openssh/regress/connect-privsep.sh user/ngie/socket-tests/crypto/openssh/regress/connect.sh user/ngie/socket-tests/crypto/openssh/regress/dhgex.sh user/ngie/socket-tests/crypto/openssh/regress/dynamic-forward.sh user/ngie/socket-tests/crypto/openssh/regress/exit-status.sh user/ngie/socket-tests/crypto/openssh/regress/forcecommand.sh user/ngie/socket-tests/crypto/openssh/regress/forward-control.sh user/ngie/socket-tests/crypto/openssh/regress/forwarding.sh user/ngie/socket-tests/crypto/openssh/regress/host-expand.sh user/ngie/socket-tests/crypto/openssh/regress/integrity.sh user/ngie/socket-tests/crypto/openssh/regress/kextype.sh user/ngie/socket-tests/crypto/openssh/regress/key-options.sh user/ngie/socket-tests/crypto/openssh/regress/keygen-change.sh user/ngie/socket-tests/crypto/openssh/regress/keys-command.sh user/ngie/socket-tests/crypto/openssh/regress/keyscan.sh user/ngie/socket-tests/crypto/openssh/regress/keytype.sh user/ngie/socket-tests/crypto/openssh/regress/krl.sh user/ngie/socket-tests/crypto/openssh/regress/localcommand.sh user/ngie/socket-tests/crypto/openssh/regress/login-timeout.sh user/ngie/socket-tests/crypto/openssh/regress/multiplex.sh user/ngie/socket-tests/crypto/openssh/regress/proto-mismatch.sh user/ngie/socket-tests/crypto/openssh/regress/proto-version.sh user/ngie/socket-tests/crypto/openssh/regress/proxy-connect.sh user/ngie/socket-tests/crypto/openssh/regress/reconfigure.sh user/ngie/socket-tests/crypto/openssh/regress/reexec.sh user/ngie/socket-tests/crypto/openssh/regress/rekey.sh user/ngie/socket-tests/crypto/openssh/regress/ssh-com.sh user/ngie/socket-tests/crypto/openssh/regress/ssh2putty.sh user/ngie/socket-tests/crypto/openssh/regress/sshd-log-wrapper.sh user/ngie/socket-tests/crypto/openssh/regress/stderr-data.sh user/ngie/socket-tests/crypto/openssh/regress/t4.ok user/ngie/socket-tests/crypto/openssh/regress/test-exec.sh user/ngie/socket-tests/crypto/openssh/regress/transfer.sh user/ngie/socket-tests/crypto/openssh/regress/try-ciphers.sh user/ngie/socket-tests/crypto/openssh/regress/yes-head.sh user/ngie/socket-tests/crypto/openssh/rijndael.c user/ngie/socket-tests/crypto/openssh/rijndael.h user/ngie/socket-tests/crypto/openssh/roaming_client.c user/ngie/socket-tests/crypto/openssh/roaming_common.c user/ngie/socket-tests/crypto/openssh/roaming_dummy.c user/ngie/socket-tests/crypto/openssh/rsa.c user/ngie/socket-tests/crypto/openssh/rsa.h user/ngie/socket-tests/crypto/openssh/sandbox-seccomp-filter.c user/ngie/socket-tests/crypto/openssh/sandbox-systrace.c user/ngie/socket-tests/crypto/openssh/scp.1 (contents, props changed) user/ngie/socket-tests/crypto/openssh/scp.c user/ngie/socket-tests/crypto/openssh/servconf.c user/ngie/socket-tests/crypto/openssh/servconf.h (contents, props changed) user/ngie/socket-tests/crypto/openssh/serverloop.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/session.c user/ngie/socket-tests/crypto/openssh/sftp-client.c user/ngie/socket-tests/crypto/openssh/sftp-client.h user/ngie/socket-tests/crypto/openssh/sftp-common.c user/ngie/socket-tests/crypto/openssh/sftp-common.h user/ngie/socket-tests/crypto/openssh/sftp-glob.c user/ngie/socket-tests/crypto/openssh/sftp-server.8 (contents, props changed) user/ngie/socket-tests/crypto/openssh/sftp-server.c user/ngie/socket-tests/crypto/openssh/sftp.1 (contents, props changed) user/ngie/socket-tests/crypto/openssh/sftp.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/ssh-add.1 (contents, props changed) user/ngie/socket-tests/crypto/openssh/ssh-add.c user/ngie/socket-tests/crypto/openssh/ssh-agent.1 user/ngie/socket-tests/crypto/openssh/ssh-agent.c user/ngie/socket-tests/crypto/openssh/ssh-dss.c user/ngie/socket-tests/crypto/openssh/ssh-ecdsa.c user/ngie/socket-tests/crypto/openssh/ssh-ed25519.c user/ngie/socket-tests/crypto/openssh/ssh-keygen.1 (contents, props changed) user/ngie/socket-tests/crypto/openssh/ssh-keygen.c user/ngie/socket-tests/crypto/openssh/ssh-keyscan.1 (contents, props changed) user/ngie/socket-tests/crypto/openssh/ssh-keyscan.c user/ngie/socket-tests/crypto/openssh/ssh-keysign.c user/ngie/socket-tests/crypto/openssh/ssh-pkcs11-client.c user/ngie/socket-tests/crypto/openssh/ssh-pkcs11-helper.c user/ngie/socket-tests/crypto/openssh/ssh-pkcs11.c user/ngie/socket-tests/crypto/openssh/ssh-pkcs11.h user/ngie/socket-tests/crypto/openssh/ssh-rsa.c user/ngie/socket-tests/crypto/openssh/ssh.1 user/ngie/socket-tests/crypto/openssh/ssh.c user/ngie/socket-tests/crypto/openssh/ssh.h user/ngie/socket-tests/crypto/openssh/ssh_config user/ngie/socket-tests/crypto/openssh/ssh_config.5 user/ngie/socket-tests/crypto/openssh/ssh_namespace.h user/ngie/socket-tests/crypto/openssh/sshconnect.c user/ngie/socket-tests/crypto/openssh/sshconnect1.c user/ngie/socket-tests/crypto/openssh/sshconnect2.c (contents, props changed) user/ngie/socket-tests/crypto/openssh/sshd.8 user/ngie/socket-tests/crypto/openssh/sshd.c user/ngie/socket-tests/crypto/openssh/sshd_config user/ngie/socket-tests/crypto/openssh/sshd_config.5 user/ngie/socket-tests/crypto/openssh/sshlogin.c user/ngie/socket-tests/crypto/openssh/sshpty.c user/ngie/socket-tests/crypto/openssh/uidswap.c user/ngie/socket-tests/crypto/openssh/umac.c user/ngie/socket-tests/crypto/openssh/uuencode.c user/ngie/socket-tests/crypto/openssh/version.h user/ngie/socket-tests/crypto/openssh/xmalloc.c user/ngie/socket-tests/crypto/openssh/xmalloc.h user/ngie/socket-tests/etc/defaults/rc.conf user/ngie/socket-tests/etc/rc.d/ldconfig user/ngie/socket-tests/gnu/lib/libgcc/Makefile user/ngie/socket-tests/lib/clang/clang.lib.mk user/ngie/socket-tests/lib/libc/Makefile user/ngie/socket-tests/lib/libc/gen/tls.c user/ngie/socket-tests/lib/libc/riscv/Makefile.inc user/ngie/socket-tests/lib/libc/stdlib/jemalloc/Makefile.inc user/ngie/socket-tests/lib/libc/sys/utimensat.2 user/ngie/socket-tests/lib/libc/sys/utrace.2 user/ngie/socket-tests/lib/libc/xdr/xdr_float.c user/ngie/socket-tests/lib/libelftc/elftc_version.c user/ngie/socket-tests/lib/libfetch/common.c user/ngie/socket-tests/lib/libpam/modules/pam_ssh/pam_ssh.c user/ngie/socket-tests/lib/libstand/Makefile user/ngie/socket-tests/libexec/rtld-elf/aarch64/reloc.c user/ngie/socket-tests/libexec/rtld-elf/amd64/reloc.c user/ngie/socket-tests/libexec/rtld-elf/arm/reloc.c user/ngie/socket-tests/libexec/rtld-elf/debug.c user/ngie/socket-tests/libexec/rtld-elf/i386/reloc.c user/ngie/socket-tests/libexec/rtld-elf/paths.h user/ngie/socket-tests/libexec/rtld-elf/powerpc/reloc.c user/ngie/socket-tests/libexec/rtld-elf/powerpc64/reloc.c user/ngie/socket-tests/libexec/rtld-elf/riscv/reloc.c user/ngie/socket-tests/libexec/rtld-elf/rtld.c user/ngie/socket-tests/libexec/rtld-elf/rtld.h user/ngie/socket-tests/libexec/rtld-elf/sparc64/reloc.c user/ngie/socket-tests/sbin/ldconfig/ldconfig.c user/ngie/socket-tests/secure/lib/libssh/Makefile user/ngie/socket-tests/secure/usr.sbin/sshd/Makefile user/ngie/socket-tests/share/man/man4/Makefile user/ngie/socket-tests/share/man/man4/ddb.4 user/ngie/socket-tests/share/man/man7/tuning.7 user/ngie/socket-tests/share/man/man9/vref.9 user/ngie/socket-tests/share/misc/committers-src.dot user/ngie/socket-tests/share/misc/organization.dot user/ngie/socket-tests/share/mk/bsd.dep.mk user/ngie/socket-tests/share/mk/bsd.lib.mk user/ngie/socket-tests/share/mk/bsd.subdir.mk user/ngie/socket-tests/share/mk/local.init.mk user/ngie/socket-tests/share/mk/local.sys.mk user/ngie/socket-tests/share/mk/sys.mk user/ngie/socket-tests/sys/amd64/amd64/fpu.c user/ngie/socket-tests/sys/arm/arm/gic.c user/ngie/socket-tests/sys/arm/arm/physmem.c user/ngie/socket-tests/sys/arm/at91/at91.c user/ngie/socket-tests/sys/arm/at91/at91_common.c user/ngie/socket-tests/sys/arm/at91/at91_machdep.c user/ngie/socket-tests/sys/arm/at91/files.at91 user/ngie/socket-tests/sys/arm/at91/uart_cpu_at91usart.c user/ngie/socket-tests/sys/arm/conf/DB-78XXX user/ngie/socket-tests/sys/arm/conf/DB-88F5XXX user/ngie/socket-tests/sys/arm/conf/DB-88F6XXX user/ngie/socket-tests/sys/arm/conf/DOCKSTAR user/ngie/socket-tests/sys/arm/conf/DREAMPLUG-1001 user/ngie/socket-tests/sys/arm/conf/SHEEVAPLUG user/ngie/socket-tests/sys/arm/conf/TS7800 user/ngie/socket-tests/sys/arm/freescale/imx/imx_sdhci.c user/ngie/socket-tests/sys/arm/include/sysarch.h user/ngie/socket-tests/sys/arm/mv/armadaxp/armadaxp.c user/ngie/socket-tests/sys/arm/mv/files.mv user/ngie/socket-tests/sys/arm/mv/mv_common.c user/ngie/socket-tests/sys/arm/mv/mv_machdep.c user/ngie/socket-tests/sys/arm/mv/mv_pci.c user/ngie/socket-tests/sys/arm/mv/mvreg.h user/ngie/socket-tests/sys/arm/mv/mvvar.h user/ngie/socket-tests/sys/arm/mv/mvwin.h user/ngie/socket-tests/sys/arm/mv/timer.c user/ngie/socket-tests/sys/arm/mv/twsi.c user/ngie/socket-tests/sys/arm64/cavium/thunder_pcie.c user/ngie/socket-tests/sys/arm64/cavium/thunder_pcie_common.c user/ngie/socket-tests/sys/arm64/cavium/thunder_pcie_common.h user/ngie/socket-tests/sys/arm64/cavium/thunder_pcie_pem.c user/ngie/socket-tests/sys/boot/common/console.c user/ngie/socket-tests/sys/boot/common/ufsread.c user/ngie/socket-tests/sys/boot/efi/boot1/Makefile user/ngie/socket-tests/sys/boot/efi/boot1/boot1.c user/ngie/socket-tests/sys/boot/efi/boot1/boot_module.h user/ngie/socket-tests/sys/boot/efi/boot1/ufs_module.c user/ngie/socket-tests/sys/boot/efi/boot1/zfs_module.c user/ngie/socket-tests/sys/boot/fdt/dts/arm/db78460.dts user/ngie/socket-tests/sys/boot/fdt/dts/arm/rk3188.dtsi user/ngie/socket-tests/sys/boot/fdt/dts/arm/sun4i-a10.dtsi user/ngie/socket-tests/sys/boot/fdt/dts/arm/sun7i-a20.dtsi user/ngie/socket-tests/sys/boot/mips/beri/boot2/flashboot.ldscript user/ngie/socket-tests/sys/boot/mips/beri/boot2/jtagboot.ldscript user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/ngie/socket-tests/sys/compat/linux/linux_socket.c user/ngie/socket-tests/sys/compat/linuxkpi/common/include/linux/idr.h user/ngie/socket-tests/sys/compat/linuxkpi/common/src/linux_compat.c user/ngie/socket-tests/sys/compat/linuxkpi/common/src/linux_idr.c user/ngie/socket-tests/sys/conf/files user/ngie/socket-tests/sys/conf/files.amd64 user/ngie/socket-tests/sys/conf/files.arm64 user/ngie/socket-tests/sys/conf/files.i386 user/ngie/socket-tests/sys/conf/files.mips user/ngie/socket-tests/sys/conf/options.arm user/ngie/socket-tests/sys/dev/cxgb/cxgb_sge.c user/ngie/socket-tests/sys/dev/cxgbe/iw_cxgbe/cm.c user/ngie/socket-tests/sys/dev/cxgbe/t4_sge.c user/ngie/socket-tests/sys/dev/e1000/if_igb.c user/ngie/socket-tests/sys/dev/fdt/fdt_common.c user/ngie/socket-tests/sys/dev/fdt/fdt_common.h user/ngie/socket-tests/sys/dev/hwpmc/hwpmc_e500.c user/ngie/socket-tests/sys/dev/hwpmc/hwpmc_powerpc.c user/ngie/socket-tests/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c user/ngie/socket-tests/sys/dev/iwm/if_iwm.c user/ngie/socket-tests/sys/dev/ixgbe/if_ix.c user/ngie/socket-tests/sys/dev/ixgbe/if_ixv.c user/ngie/socket-tests/sys/dev/mlx5/mlx5_en/en.h user/ngie/socket-tests/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/socket-tests/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/socket-tests/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/ngie/socket-tests/sys/dev/mxge/if_mxge.c user/ngie/socket-tests/sys/dev/ofw/ofw_bus_subr.c user/ngie/socket-tests/sys/dev/ofw/ofw_fdt.c user/ngie/socket-tests/sys/dev/pci/pcireg.h user/ngie/socket-tests/sys/dev/sfxge/common/ef10_tlv_layout.h user/ngie/socket-tests/sys/dev/sfxge/common/efsys.h user/ngie/socket-tests/sys/dev/sfxge/common/efx.h user/ngie/socket-tests/sys/dev/sfxge/common/efx_impl.h user/ngie/socket-tests/sys/dev/sfxge/common/efx_mac.c user/ngie/socket-tests/sys/dev/sfxge/common/efx_nvram.c user/ngie/socket-tests/sys/dev/sfxge/common/efx_regs_ef10.h user/ngie/socket-tests/sys/dev/sfxge/common/hunt_ev.c user/ngie/socket-tests/sys/dev/sfxge/common/hunt_impl.h user/ngie/socket-tests/sys/dev/sfxge/common/hunt_mac.c user/ngie/socket-tests/sys/dev/sfxge/common/hunt_nic.c user/ngie/socket-tests/sys/dev/sfxge/common/hunt_nvram.c user/ngie/socket-tests/sys/dev/sfxge/common/siena_flash.h user/ngie/socket-tests/sys/dev/sfxge/common/siena_impl.h user/ngie/socket-tests/sys/dev/sfxge/common/siena_nvram.c user/ngie/socket-tests/sys/dev/sfxge/sfxge_version.h user/ngie/socket-tests/sys/dev/uart/uart_cpu_fdt.c user/ngie/socket-tests/sys/dev/uart/uart_dev_ns8250.c user/ngie/socket-tests/sys/dev/uart/uart_tty.c user/ngie/socket-tests/sys/dev/usb/controller/ehci_mv.c user/ngie/socket-tests/sys/dev/usb/serial/usb_serial.c user/ngie/socket-tests/sys/dev/usb/wlan/if_urtwn.c user/ngie/socket-tests/sys/dev/usb/wlan/if_urtwnreg.h user/ngie/socket-tests/sys/dev/usb/wlan/if_urtwnvar.h user/ngie/socket-tests/sys/dev/xen/netfront/netfront.c user/ngie/socket-tests/sys/fs/devfs/devfs_vnops.c user/ngie/socket-tests/sys/fs/ext2fs/ext2_dir.h user/ngie/socket-tests/sys/fs/ext2fs/ext2_extern.h user/ngie/socket-tests/sys/fs/ext2fs/ext2_lookup.c user/ngie/socket-tests/sys/fs/ext2fs/ext2_vfsops.c user/ngie/socket-tests/sys/fs/ext2fs/ext2fs.h user/ngie/socket-tests/sys/fs/nandfs/nandfs_segment.c user/ngie/socket-tests/sys/i386/isa/npx.c user/ngie/socket-tests/sys/kern/kern_exit.c user/ngie/socket-tests/sys/kern/kern_proc.c user/ngie/socket-tests/sys/kern/tty.c user/ngie/socket-tests/sys/kern/vfs_aio.c user/ngie/socket-tests/sys/kern/vfs_cache.c user/ngie/socket-tests/sys/kern/vfs_subr.c user/ngie/socket-tests/sys/kern/vfs_vnops.c user/ngie/socket-tests/sys/mips/include/asm.h user/ngie/socket-tests/sys/modules/ext2fs/Makefile user/ngie/socket-tests/sys/modules/i2c/iicbb/Makefile user/ngie/socket-tests/sys/modules/ix/Makefile user/ngie/socket-tests/sys/modules/ixlv/Makefile user/ngie/socket-tests/sys/modules/ixv/Makefile user/ngie/socket-tests/sys/netinet/igmp.c user/ngie/socket-tests/sys/netinet/tcp_lro.c user/ngie/socket-tests/sys/netinet/tcp_lro.h user/ngie/socket-tests/sys/netinet6/ip6_forward.c user/ngie/socket-tests/sys/powerpc/booke/pmap.c user/ngie/socket-tests/sys/powerpc/include/vmparam.h user/ngie/socket-tests/sys/powerpc/ofw/ofw_pci.c user/ngie/socket-tests/sys/powerpc/ofw/ofw_pci.h user/ngie/socket-tests/sys/powerpc/pseries/rtas_pci.c user/ngie/socket-tests/sys/riscv/include/riscvreg.h user/ngie/socket-tests/sys/security/audit/audit_worker.c user/ngie/socket-tests/sys/sys/elf_common.h user/ngie/socket-tests/sys/sys/fcntl.h user/ngie/socket-tests/sys/sys/param.h user/ngie/socket-tests/sys/sys/proc.h user/ngie/socket-tests/sys/sys/ttydevsw.h user/ngie/socket-tests/sys/sys/vnode.h user/ngie/socket-tests/sys/vm/vm_extern.h user/ngie/socket-tests/sys/vm/vm_map.c user/ngie/socket-tests/sys/vm/vm_phys.c user/ngie/socket-tests/tools/build/check-links.sh user/ngie/socket-tests/tools/tools/nanobsd/embedded/rpi2.cfg user/ngie/socket-tests/usr.bin/finger/net.c user/ngie/socket-tests/usr.bin/iscsictl/iscsictl.8 user/ngie/socket-tests/usr.bin/m4/misc.c user/ngie/socket-tests/usr.bin/truncate/tests/truncate_test.sh user/ngie/socket-tests/usr.sbin/bsdinstall/scripts/zfsboot user/ngie/socket-tests/usr.sbin/jail/command.c user/ngie/socket-tests/usr.sbin/jail/config.c user/ngie/socket-tests/usr.sbin/jls/jls.8 user/ngie/socket-tests/usr.sbin/vidcontrol/vidcontrol.1 user/ngie/socket-tests/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: user/ngie/socket-tests/ (props changed) user/ngie/socket-tests/contrib/mdocml/ (props changed) user/ngie/socket-tests/crypto/openssh/ (props changed) user/ngie/socket-tests/crypto/openssh/contrib/ssh-copy-id.1 (props changed) user/ngie/socket-tests/crypto/openssh/moduli.5 (props changed) user/ngie/socket-tests/crypto/openssh/openbsd-compat/ (props changed) user/ngie/socket-tests/crypto/openssh/openbsd-compat/regress/ (props changed) user/ngie/socket-tests/crypto/openssh/ssh-keysign.8 (props changed) user/ngie/socket-tests/crypto/openssh/ssh-pkcs11-helper.8 (props changed) user/ngie/socket-tests/gnu/lib/ (props changed) user/ngie/socket-tests/lib/libc/ (props changed) user/ngie/socket-tests/sbin/ (props changed) user/ngie/socket-tests/share/ (props changed) user/ngie/socket-tests/share/man/man4/ (props changed) user/ngie/socket-tests/sys/ (props changed) user/ngie/socket-tests/sys/boot/ (props changed) user/ngie/socket-tests/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/socket-tests/sys/conf/ (props changed) user/ngie/socket-tests/sys/dev/hyperv/ (props changed) user/ngie/socket-tests/usr.sbin/jail/ (props changed) Modified: user/ngie/socket-tests/ObsoleteFiles.inc ============================================================================== --- user/ngie/socket-tests/ObsoleteFiles.inc Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/ObsoleteFiles.inc Thu Jan 21 17:33:10 2016 (r294516) @@ -39,9 +39,9 @@ # done # 20160116: Update mandoc to cvs snapshot 20160116 -OLD_FILES+=/usr/share/mdocml/example.style.css -OLD_FILES+=/usr/share/mdocml/style.css -OLD_DIRS+=/usr/share/mdocml +OLD_FILES+=usr/share/mdocml/example.style.css +OLD_FILES+=usr/share/mdocml/style.css +OLD_DIRS+=usr/share/mdocml # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1. OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h Modified: user/ngie/socket-tests/UPDATING ============================================================================== --- user/ngie/socket-tests/UPDATING Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/UPDATING Thu Jan 21 17:33:10 2016 (r294516) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160119: + The NONE and HPN patches has been removed from OpenSSH. They are + still available in the security/openssh-portable port. + 20160113: With the addition of ypldap(8), a new _ypldap user is now required during installworld. "mergemaster -p" can be used to add the user Modified: user/ngie/socket-tests/bin/sh/options.c ============================================================================== --- user/ngie/socket-tests/bin/sh/options.c Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/bin/sh/options.c Thu Jan 21 17:33:10 2016 (r294516) @@ -74,6 +74,7 @@ static void options(int); static void minus_o(char *, int); static void setoption(int, int); static void setoptionbyindex(int, int); +static void setparam(int, char **); static int getopts(char *, char *, char **, char ***, char **); @@ -224,7 +225,7 @@ end_options1: end_options2: if (!cmdline) { if (*argptr == NULL) - setparam(argptr); + setparam(0, argptr); return; } @@ -318,22 +319,20 @@ setoption(int flag, int val) * Set the shell parameters. */ -void -setparam(char **argv) +static void +setparam(int argc, char **argv) { char **newparam; char **ap; - int nparam; - for (nparam = 0 ; argv[nparam] ; nparam++); - ap = newparam = ckmalloc((nparam + 1) * sizeof *ap); + ap = newparam = ckmalloc((argc + 1) * sizeof *ap); while (*argv) { *ap++ = savestr(*argv++); } *ap = NULL; freeparam(&shellparam); shellparam.malloc = 1; - shellparam.nparam = nparam; + shellparam.nparam = argc; shellparam.p = newparam; shellparam.optp = NULL; shellparam.reset = 1; @@ -371,8 +370,7 @@ freeparam(struct shparam *param) int shiftcmd(int argc, char **argv) { - int n; - char **ap1, **ap2; + int i, n; n = 1; if (argc > 1) @@ -381,12 +379,11 @@ shiftcmd(int argc, char **argv) return 1; INTOFF; shellparam.nparam -= n; - for (ap1 = shellparam.p ; --n >= 0 ; ap1++) { - if (shellparam.malloc) - ckfree(*ap1); - } - ap2 = shellparam.p; - while ((*ap2++ = *ap1++) != NULL); + if (shellparam.malloc) + for (i = 0; i < n; i++) + ckfree(shellparam.p[i]); + memmove(shellparam.p, shellparam.p + n, + (shellparam.nparam + 1) * sizeof(shellparam.p[0])); shellparam.reset = 1; INTON; return 0; @@ -407,7 +404,7 @@ setcmd(int argc, char **argv) options(0); optschanged(); if (*argptr != NULL) { - setparam(argptr); + setparam(argc - (argptr - argv), argptr); } INTON; return 0; Modified: user/ngie/socket-tests/bin/sh/options.h ============================================================================== --- user/ngie/socket-tests/bin/sh/options.h Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/bin/sh/options.h Thu Jan 21 17:33:10 2016 (r294516) @@ -108,7 +108,6 @@ extern char *nextopt_optptr; /* used by void procargs(int, char **); void optschanged(void); -void setparam(char **); void freeparam(struct shparam *); int nextopt(const char *); void getoptsreset(const char *); Modified: user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.c Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.c Thu Jan 21 17:33:10 2016 (r294516) @@ -443,6 +443,7 @@ mib_fetch_ifmib(struct mibif *ifp) size_t len; void *newmib; struct ifmibdata oldmib = ifp->mib; + struct ifreq irr; if (fetch_generic_mib(ifp, &oldmib) == -1) return (-1); @@ -514,6 +515,18 @@ mib_fetch_ifmib(struct mibif *ifp) } out: + strncpy(irr.ifr_name, ifp->name, sizeof(irr.ifr_name)); + irr.ifr_buffer.buffer = MIBIF_PRIV(ifp)->alias; + irr.ifr_buffer.length = sizeof(MIBIF_PRIV(ifp)->alias); + if (ioctl(mib_netsock, SIOCGIFDESCR, &irr) == -1) { + MIBIF_PRIV(ifp)->alias[0] = 0; + if (errno != ENOMSG) + syslog(LOG_WARNING, "SIOCGIFDESCR (%s): %m", ifp->name); + } else if (irr.ifr_buffer.buffer == NULL) { + MIBIF_PRIV(ifp)->alias[0] = 0; + syslog(LOG_WARNING, "SIOCGIFDESCR (%s): too long (%zu)", + ifp->name, irr.ifr_buffer.length); + } ifp->mibtick = get_ticks(); return (0); } Modified: user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h ============================================================================== --- user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h Thu Jan 21 17:33:10 2016 (r294516) @@ -57,6 +57,9 @@ #include "snmp_mibII.h" #include "mibII_tree.h" +/* maximum size of the interface alias */ +static const u_int MIBIF_ALIAS_SIZE = 64 + 1; + /* * Interface list and flags. */ @@ -77,6 +80,9 @@ struct mibif_private { uint64_t hc_opackets; uint64_t hc_imcasts; uint64_t hc_ipackets; + + /* this should be made public */ + char alias[MIBIF_ALIAS_SIZE]; }; #define MIBIF_PRIV(IFP) ((struct mibif_private *)((IFP)->private)) Modified: user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII_interfaces.c ============================================================================== --- user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII_interfaces.c Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII_interfaces.c Thu Jan 21 17:33:10 2016 (r294516) @@ -528,7 +528,7 @@ op_ifxtable(struct snmp_context *ctx, st break; case LEAF_ifAlias: - ret = string_get(value, "", -1); + ret = string_get(value, MIBIF_PRIV(ifp)->alias, -1); break; case LEAF_ifCounterDiscontinuityTime: Modified: user/ngie/socket-tests/contrib/mdocml/main.c ============================================================================== --- user/ngie/socket-tests/contrib/mdocml/main.c Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/contrib/mdocml/main.c Thu Jan 21 17:33:10 2016 (r294516) @@ -720,7 +720,7 @@ parse(struct curparse *curp, int fd, con /* Begin by parsing the file itself. */ assert(file); - assert(fd > 0); + assert(fd >= 0); rctmp = mparse_readfd(curp->mp, fd, file); if (fd != STDIN_FILENO) Copied: user/ngie/socket-tests/crypto/openssh/.cvsignore (from r294514, head/crypto/openssh/.cvsignore) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/socket-tests/crypto/openssh/.cvsignore Thu Jan 21 17:33:10 2016 (r294516, copy of r294514, head/crypto/openssh/.cvsignore) @@ -0,0 +1,28 @@ +*.0 +*.out +Makefile +autom4te.cache +buildit.sh +buildpkg.sh +config.cache +config.h +config.h.in +config.log +config.status +configure +openssh.xml +opensshd.init +scp +sftp +sftp-server +ssh +ssh-add +ssh-agent +ssh-keygen +ssh-keyscan +ssh-keysign +ssh-pkcs11-helper +sshd +stamp-h.in +survey +survey.sh Modified: user/ngie/socket-tests/crypto/openssh/ChangeLog ============================================================================== --- user/ngie/socket-tests/crypto/openssh/ChangeLog Thu Jan 21 17:29:01 2016 (r294515) +++ user/ngie/socket-tests/crypto/openssh/ChangeLog Thu Jan 21 17:33:10 2016 (r294516) @@ -1,2887 +1,7615 @@ -20140313 - - (djm) Release OpenSSH 6.6 - -20140304 - - OpenBSD CVS Sync - - djm@cvs.openbsd.org 2014/03/03 22:22:30 - [session.c] - ignore enviornment variables with embedded '=' or '\0' characters; - spotted by Jann Horn; ok deraadt@ - -20140301 - - (djm) [regress/Makefile] Disable dhgex regress test; it breaks when - no moduli file exists at the expected location. - -20140228 - - OpenBSD CVS Sync - - djm@cvs.openbsd.org 2014/02/27 00:41:49 - [bufbn.c] - fix unsigned overflow that could lead to reading a short ssh protocol - 1 bignum value; found by Ben Hawkes; ok deraadt@ - - djm@cvs.openbsd.org 2014/02/27 08:25:09 - [bufbn.c] - off by one in range check - - djm@cvs.openbsd.org 2014/02/27 22:47:07 - [sshd_config.5] - bz#2184 clarify behaviour of a keyword that appears in multiple - matching Match blocks; ok dtucker@ - - djm@cvs.openbsd.org 2014/02/27 22:57:40 - [version.h] - openssh-6.6 - - dtucker@cvs.openbsd.org 2014/01/19 23:43:02 - [regress/sftp-chroot.sh] - Don't use -q on sftp as it suppresses logging, instead redirect the - output to the regress logfile. - - dtucker@cvs.openbsd.org 2014/01/20 00:00:30 - [sregress/ftp-chroot.sh] - append to rather than truncating the log file - - dtucker@cvs.openbsd.org 2014/01/25 04:35:32 - [regress/Makefile regress/dhgex.sh] - Add a test for DH GEX sizes - - djm@cvs.openbsd.org 2014/01/26 10:22:10 - [regress/cert-hostkey.sh] - automatically generate revoked keys from listed keys rather than - manually specifying each type; from portable - (Id sync only) - - djm@cvs.openbsd.org 2014/01/26 10:49:17 - [scp-ssh-wrapper.sh scp.sh] - make sure $SCP is tested on the remote end rather than whichever one - happens to be in $PATH; from portable - (Id sync only) - - djm@cvs.openbsd.org 2014/02/27 20:04:16 - [login-timeout.sh] - remove any existing LoginGraceTime from sshd_config before adding - a specific one for the test back in - - djm@cvs.openbsd.org 2014/02/27 21:21:25 - [agent-ptrace.sh agent.sh] - keep return values that are printed in error messages; - from portable - (Id sync only) - - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - [contrib/suse/openssh.spec] Crank version numbers - - (djm) [regress/host-expand.sh] Add RCS Id - -20140227 - - OpenBSD CVS Sync - - djm@cvs.openbsd.org 2014/02/26 20:18:37 - [ssh.c] - bz#2205: avoid early hostname lookups unless canonicalisation is enabled; - ok dtucker@ markus@ - - djm@cvs.openbsd.org 2014/02/26 20:28:44 - [auth2-gss.c gss-serv.c ssh-gss.h sshd.c] - bz#2107 - cache OIDs of supported GSSAPI mechanisms before privsep - sandboxing, as running this code in the sandbox can cause violations; - ok markus@ - - djm@cvs.openbsd.org 2014/02/26 20:29:29 - [channels.c] - don't assume that the socks4 username is \0 terminated; - spotted by Ben Hawkes; ok markus@ - - markus@cvs.openbsd.org 2014/02/26 21:53:37 - [sshd.c] - ssh_gssapi_prepare_supported_oids needs GSSAPI - -20140224 - - OpenBSD CVS Sync - - djm@cvs.openbsd.org 2014/02/07 06:55:54 - [cipher.c mac.c] - remove some logging that makes ssh debugging output very verbose; - ok markus - - djm@cvs.openbsd.org 2014/02/15 23:05:36 - [channels.c] - avoid spurious "getsockname failed: Bad file descriptor" errors in ssh -W; - bz#2200, debian#738692 via Colin Watson; ok dtucker@ - - djm@cvs.openbsd.org 2014/02/22 01:32:19 - [readconf.c] - when processing Match blocks, skip 'exec' clauses if previous predicates - failed to match; ok markus@ - - djm@cvs.openbsd.org 2014/02/23 20:03:42 - [ssh-ed25519.c] - check for unsigned overflow; not reachable in OpenSSH but others might - copy our code... - - djm@cvs.openbsd.org 2014/02/23 20:11:36 - [readconf.c readconf.h ssh.c ssh_config.5] - reparse ssh_config and ~/.ssh/config if hostname canonicalisation changes - the hostname. This allows users to write configurations that always - refer to canonical hostnames, e.g. - - CanonicalizeHostname yes - CanonicalDomains int.example.org example.org - CanonicalizeFallbackLocal no - - Host *.int.example.org - Compression off - Host *.example.org - User djm - - ok markus@ +commit c88ac102f0eb89f2eaa314cb2e2e0ca3c890c443 +Author: Damien Miller <djm@mindrot.org> +Date: Thu Jan 14 11:08:19 2016 +1100 + + bump version numbers + +commit 302bc21e6fadacb04b665868cd69b625ef69df90 +Author: Damien Miller <djm@mindrot.org> +Date: Thu Jan 14 11:04:04 2016 +1100 + + openssh-7.1p2 + +commit 6b33763242c063e4e0593877e835eeb1fd1b60aa +Author: Damien Miller <djm@mindrot.org> +Date: Thu Jan 14 11:02:58 2016 +1100 + + forcibly disable roaming support in the client + +commit 34d364f0d2e1e30a444009f0e04299bb7c94ba13 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Mon Oct 5 17:11:21 2015 +0000 + + upstream commit + + some more bzero->explicit_bzero, from Michael McConville + + Upstream-ID: 17f19545685c33327db2efdc357c1c9225ff00d0 + +commit 8f5b93026797b9f7fba90d0c717570421ccebbd3 +Author: guenther@openbsd.org <guenther@openbsd.org> +Date: Fri Sep 11 08:50:04 2015 +0000 + + upstream commit + + Use explicit_bzero() when zeroing before free() + + from Michael McConville (mmcconv1 (at) sccs.swarthmore.edu) + ok millert@ djm@ + + Upstream-ID: 2e3337db046c3fe70c7369ee31515ac73ec00f50 + +commit d77148e3a3ef6c29b26ec74331455394581aa257 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Sun Nov 8 21:59:11 2015 +0000 + + upstream commit + + fix OOB read in packet code caused by missing return + statement found by Ben Hawkes; ok markus@ deraadt@ + + Upstream-ID: a3e3a85434ebfa0690d4879091959591f30efc62 + +commit 076d849e17ab12603627f87b301e2dca71bae518 +Author: Damien Miller <djm@mindrot.org> +Date: Sat Nov 14 18:44:49 2015 +1100 + + read back from libcrypto RAND when privdropping + + makes certain libcrypto implementations cache a /dev/urandom fd + in preparation of sandboxing. Based on patch by Greg Hartman. + +commit f72adc0150011a28f177617a8456e1f83733099d +Author: djm@openbsd.org <djm@openbsd.org> +Date: Sun Dec 13 22:42:23 2015 +0000 + + upstream commit + + unbreak connections with peers that set + first_kex_follows; fix from Matt Johnston va bz#2515 + + Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b + +commit 04bd8d019ccd906cac1a2b362517b8505f3759e6 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Tue Jan 12 23:42:54 2016 +0000 + + upstream commit + + use explicit_bzero() more liberally in the buffer code; ok + deraadt + + Upstream-ID: 0ece37069fd66bc6e4f55eb1321f93df372b65bf + +commit e91346dc2bbf460246df2ab591b7613908c1b0ad +Author: Damien Miller <djm@mindrot.org> +Date: Fri Aug 21 14:49:03 2015 +1000 + + we don't use Github for issues/pull-requests + +commit a4f5b507c708cc3dc2c8dd2d02e4416d7514dc23 +Author: Damien Miller <djm@mindrot.org> +Date: Fri Aug 21 14:43:55 2015 +1000 + + fix URL for connect.c + +commit d026a8d3da0f8186598442997c7d0a28e7275414 +Author: Damien Miller <djm@mindrot.org> +Date: Fri Aug 21 13:47:10 2015 +1000 + + update version numbers for 7.1 + +commit 78f8f589f0ca1c9f41e5a9bae3cda5ce8a6b42ed +Author: djm@openbsd.org <djm@openbsd.org> +Date: Fri Aug 21 03:45:26 2015 +0000 + + upstream commit + + openssh-7.1 + + Upstream-ID: ff7b1ef4b06caddfb45e08ba998128c88be3d73f + +commit 32a181980c62fce94f7f9ffaf6a79d90f0c309cf +Author: djm@openbsd.org <djm@openbsd.org> +Date: Fri Aug 21 03:42:19 2015 +0000 + + upstream commit + + fix inverted logic that broke PermitRootLogin; reported + by Mantas Mikulenas; ok markus@ + + Upstream-ID: 260dd6a904c1bb7e43267e394b1c9cf70bdd5ea5 + +commit ce445b0ed927e45bd5bdce8f836eb353998dd65c +Author: deraadt@openbsd.org <deraadt@openbsd.org> +Date: Thu Aug 20 22:32:42 2015 +0000 + + upstream commit + + Do not cast result of malloc/calloc/realloc* if stdlib.h + is in scope ok krw millert + + Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667 + +commit 05291e5288704d1a98bacda269eb5a0153599146 +Author: naddy@openbsd.org <naddy@openbsd.org> +Date: Thu Aug 20 19:20:06 2015 +0000 + + upstream commit + + In the certificates section, be consistent about using + "host_key" and "user_key" for the respective key types. ok sthen@ deraadt@ + + Upstream-ID: 9e037ea3b15577b238604c5533e082a3947f13cb + +commit 8543d4ef6f2e9f98c3e6b77c894ceec30c5e4ae4 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Aug 19 23:21:42 2015 +0000 + + upstream commit + + Better compat matching for WinSCP, add compat matching + for FuTTY (fork of PuTTY); ok markus@ deraadt@ + + Upstream-ID: 24001d1ac115fa3260fbdc329a4b9aeb283c5389 + +commit ec6eda16ebab771aa3dfc90629b41953b999cb1e +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Aug 19 23:19:01 2015 +0000 + + upstream commit + + fix double-free() in error path of DSA key generation + reported by Mateusz Kocielski; ok markus@ + + Upstream-ID: 4735d8f888b10599a935fa1b374787089116713c + +commit 45b0eb752c94954a6de046bfaaf129e518ad4b5b +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Aug 19 23:18:26 2015 +0000 + + upstream commit + + fix free() of uninitialised pointer reported by Mateusz + Kocielski; ok markus@ + + Upstream-ID: 519552b050618501a06b7b023de5cb104e2c5663 + +commit c837643b93509a3ef538cb6624b678c5fe32ff79 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Aug 19 23:17:51 2015 +0000 + + upstream commit + + fixed unlink([uninitialised memory]) reported by Mateusz + Kocielski; ok markus@ + + Upstream-ID: 14a0c4e7d891f5a8dabc4b89d4f6b7c0d5a20109 + +commit 1f8d3d629cd553031021068eb9c646a5f1e50994 +Author: jmc@openbsd.org <jmc@openbsd.org> +Date: Fri Aug 14 15:32:41 2015 +0000 + + upstream commit + + match myproposal.h order; from brian conway (i snuck in a + tweak while here) + + ok dtucker + + Upstream-ID: 35174a19b5237ea36aa3798f042bf5933b772c67 + +commit 1dc8d93ce69d6565747eb44446ed117187621b26 +Author: deraadt@openbsd.org <deraadt@openbsd.org> +Date: Thu Aug 6 14:53:21 2015 +0000 + + upstream commit + + add prohibit-password as a synonymn for without-password, + since the without-password is causing too many questions. Harden it to ban + all but pubkey, hostbased, and GSSAPI auth (when the latter is enabled) from + djm, ok markus + + Upstream-ID: d53317d7b28942153e6236d3fd6e12ceb482db7a + +commit 90a95a4745a531b62b81ce3b025e892bdc434de5 +Author: Damien Miller <djm@mindrot.org> +Date: Tue Aug 11 13:53:41 2015 +1000 + + update version in README + +commit 318c37743534b58124f1bab37a8a0087a3a9bd2f +Author: Damien Miller <djm@mindrot.org> +Date: Tue Aug 11 13:53:09 2015 +1000 + + update versions in *.spec + +commit 5e75f5198769056089fb06c4d738ab0e5abc66f7 +Author: Damien Miller <djm@mindrot.org> +Date: Tue Aug 11 13:34:12 2015 +1000 + + set sshpam_ctxt to NULL after free + + Avoids use-after-free in monitor when privsep child is compromised. + Reported by Moritz Jodeit; ok dtucker@ + +commit d4697fe9a28dab7255c60433e4dd23cf7fce8a8b +Author: Damien Miller <djm@mindrot.org> +Date: Tue Aug 11 13:33:24 2015 +1000 + + Don't resend username to PAM; it already has it. + + Pointed out by Moritz Jodeit; ok dtucker@ + +commit 88763a6c893bf3dfe951ba9271bf09715e8d91ca +Author: Darren Tucker <dtucker@zip.com.au> +Date: Mon Jul 27 12:14:25 2015 +1000 + + Import updated moduli file from OpenBSD. + +commit 55b263fb7cfeacb81aaf1c2036e0394c881637da +Author: Damien Miller <djm@mindrot.org> +Date: Mon Aug 10 11:13:44 2015 +1000 + + let principals-command.sh work for noexec /var/run + +commit 2651e34cd11b1aac3a0fe23b86d8c2ff35c07897 +Author: Damien Miller <djm@mindrot.org> +Date: Thu Aug 6 11:43:42 2015 +1000 + + work around echo -n / sed behaviour in tests + +commit d85dad81778c1aa8106acd46930b25fdf0d15b2a +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Aug 5 05:27:33 2015 +0000 + + upstream commit + + adjust for RSA minimum modulus switch; ok deraadt@ + + Upstream-Regress-ID: 5a72c83431b96224d583c573ca281cd3a3ebfdae + +commit 57e8e229bad5fe6056b5f1199665f5f7008192c6 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Tue Aug 4 05:23:06 2015 +0000 + + upstream commit + + backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this + release; problems spotted by sthen@ ok deraadt@ markus@ + + Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822 + +commit f097d0ea1e0889ca0fa2e53a00214e43ab7fa22a +Author: djm@openbsd.org <djm@openbsd.org> +Date: Sun Aug 2 09:56:42 2015 +0000 + + upstream commit + + openssh 7.0; ok deraadt@ + + Upstream-ID: c63afdef537f57f28ae84145c5a8e29e9250221f + +commit 3d5728a0f6874ce4efb16913a12963595070f3a9 +Author: chris@openbsd.org <chris@openbsd.org> +Date: Fri Jul 31 15:38:09 2015 +0000 + + upstream commit + + Allow PermitRootLogin to be overridden by config + + ok markus@ deeradt@ + + Upstream-ID: 5cf3e26ed702888de84e2dc9d0054ccf4d9125b4 + +commit 6f941396b6835ad18018845f515b0c4fe20be21a +Author: djm@openbsd.org <djm@openbsd.org> +Date: Thu Jul 30 23:09:15 2015 +0000 + + upstream commit + + fix pty permissions; patch from Nikolay Edigaryev; ok + deraadt + + Upstream-ID: 40ff076d2878b916fbfd8e4f45dbe5bec019e550 + +commit f4373ed1e8fbc7c8ce3fc4ea97d0ba2e0c1d7ef0 +Author: deraadt@openbsd.org <deraadt@openbsd.org> +Date: Thu Jul 30 19:23:02 2015 +0000 + + upstream commit + + change default: PermitRootLogin without-password matching + install script changes coming as well ok djm markus + + Upstream-ID: 0e2a6c4441daf5498b47a61767382bead5eb8ea6 + +commit 0c30ba91f87fcda7e975e6ff8a057f624e87ea1c +Author: Damien Miller <djm@mindrot.org> +Date: Thu Jul 30 12:31:39 2015 +1000 + + downgrade OOM adjustment logging: verbose -> debug + +commit f9eca249d4961f28ae4b09186d7dc91de74b5895 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Thu Jul 30 00:01:34 2015 +0000 + + upstream commit + + Allow ssh_config and sshd_config kex parameters options be + prefixed by a '+' to indicate that the specified items be appended to the + default rather than replacing it. + + approach suggested by dtucker@, feedback dlg@, ok markus@ + + Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a + +commit 5cefe769105a2a2e3ca7479d28d9a325d5ef0163 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Jul 29 08:34:54 2015 +0000 + + upstream commit + + fix bug in previous; was printing incorrect string for + failed host key algorithms negotiation + + Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e + +commit f319912b0d0e1675b8bb051ed8213792c788bcb2 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Jul 29 04:43:06 2015 +0000 + + upstream commit + + include the peer's offer when logging a failure to + negotiate a mutual set of algorithms (kex, pubkey, ciphers, etc.) ok markus@ + + Upstream-ID: bbb8caabf5c01790bb845f5ce135565248d7c796 + +commit b6ea0e573042eb85d84defb19227c89eb74cf05a +Author: djm@openbsd.org <djm@openbsd.org> +Date: Tue Jul 28 23:20:42 2015 +0000 + + upstream commit + + add Cisco to the list of clients that choke on the + hostkeys update extension. Pointed out by Howard Kash + + Upstream-ID: c9eadde28ecec056c73d09ee10ba4570dfba7e84 + +commit 3f628c7b537291c1019ce86af90756fb4e66d0fd +Author: guenther@openbsd.org <guenther@openbsd.org> +Date: Mon Jul 27 16:29:23 2015 +0000 + + upstream commit + + Permit kbind(2) use in the sandbox now, to ease testing + of ld.so work using it + + reminded by miod@, ok deraadt@ + + Upstream-ID: 523922e4d1ba7a091e3824e77a8a3c818ee97413 + +commit ebe27ebe520098bbc0fe58945a87ce8490121edb +Author: millert@openbsd.org <millert@openbsd.org> +Date: Mon Jul 20 18:44:12 2015 +0000 + + upstream commit + + Move .Pp before .Bl, not after to quiet mandoc -Tlint. + Noticed by jmc@ + + Upstream-ID: 59fadbf8407cec4e6931e50c53cfa0214a848e23 + +commit d5d91d0da819611167782c66ab629159169d94d4 +Author: millert@openbsd.org <millert@openbsd.org> +Date: Mon Jul 20 18:42:35 2015 +0000 + + upstream commit + + Sync usage with SYNOPSIS + + Upstream-ID: 7a321a170181a54f6450deabaccb6ef60cf3f0b7 + +commit 79ec2142fbc68dd2ed9688608da355fc0b1ed743 +Author: millert@openbsd.org <millert@openbsd.org> +Date: Mon Jul 20 15:39:52 2015 +0000 + + upstream commit + + Better desciption of Unix domain socket forwarding. + bz#2423; ok jmc@ + + Upstream-ID: 85e28874726897e3f26ae50dfa2e8d2de683805d + +commit d56fd1828074a4031b18b8faa0bf949669eb18a0 +Author: Damien Miller <djm@mindrot.org> +Date: Mon Jul 20 11:19:51 2015 +1000 + + make realpath.c compile -Wsign-compare clean + +commit c63c9a691dca26bb7648827f5a13668832948929 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Mon Jul 20 00:30:01 2015 +0000 + + upstream commit + + mention that the default of UseDNS=no implies that + hostnames cannot be used for host matching in sshd_config and + authorized_keys; bz#2045, ok dtucker@ + + Upstream-ID: 0812705d5f2dfa59aab01f2764ee800b1741c4e1 + +commit 63ebcd0005e9894fcd6871b7b80aeea1fec0ff76 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Sat Jul 18 08:02:17 2015 +0000 + + upstream commit + + don't ignore PKCS#11 hosted keys that return empty + CKA_ID; patch by Jakub Jelen via bz#2429; ok markus + + Upstream-ID: 2f7c94744eb0342f8ee8bf97b2351d4e00116485 + +commit b15fd989c8c62074397160147a8d5bc34b3f3c63 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Sat Jul 18 08:00:21 2015 +0000 + + upstream commit + + skip uninitialised PKCS#11 slots; patch from Jakub Jelen + in bz#2427 ok markus@ + + Upstream-ID: 744c1e7796e237ad32992d0d02148e8a18f27d29 + +commit 5b64f85bb811246c59ebab70aed331f26ba37b18 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Sat Jul 18 07:57:14 2015 +0000 + + upstream commit + + only query each keyboard-interactive device once per + authentication request regardless of how many times it is listed; ok markus@ + + Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1 + +commit cd7324d0667794eb5c236d8a4e0f236251babc2d +Author: djm@openbsd.org <djm@openbsd.org> +Date: Fri Jul 17 03:34:27 2015 +0000 + + upstream commit + + remove -u flag to diff (only used for error output) to make + things easier for -portable + + Upstream-Regress-ID: a5d6777d2909540d87afec3039d9bb2414ade548 + +commit deb8d99ecba70b67f4af7880b11ca8768df9ec3a +Author: djm@openbsd.org <djm@openbsd.org> +Date: Fri Jul 17 03:09:19 2015 +0000 + + upstream commit + + direct-streamlocal@openssh.com Unix domain foward + messages do not contain a "reserved for future use" field and in fact, + serverloop.c checks that there isn't one. Remove erroneous mention from + PROTOCOL description. bz#2421 from Daniel Black + + Upstream-ID: 3d51a19e64f72f764682f1b08f35a8aa810a43ac + +commit 356b61f365405b5257f5b2ab446e5d7bd33a7b52 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Fri Jul 17 03:04:27 2015 +0000 + + upstream commit + + describe magic for setting up Unix domain socket fowards + via the mux channel; bz#2422 patch from Daniel Black + + Upstream-ID: 943080fe3864715c423bdeb7c920bb30c4eee861 + +commit d3e2aee41487d55b8d7d40f538b84ff1db7989bc +Author: Darren Tucker <dtucker@zip.com.au> +Date: Fri Jul 17 12:52:34 2015 +1000 + + Check if realpath works on nonexistent files. + + On some platforms the native realpath doesn't work with non-existent + files (this is actually specified in some versions of POSIX), however + the sftp spec says its realpath with "canonicalize any given path name". + On those platforms, use realpath from the compat library. + + In addition, when compiling with -DFORTIFY_SOURCE, glibc redefines + the realpath symbol to the checked version, so redefine ours to + something else so we pick up the compat version we want. + + bz#2428, ok djm@ + +commit 25b14610dab655646a109db5ef8cb4c4bf2a48a0 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Fri Jul 17 02:47:45 2015 +0000 + + upstream commit + + fix incorrect test for SSH1 keys when compiled without SSH1 + support + + Upstream-ID: 6004d720345b8e481c405e8ad05ce2271726e451 + +commit df56a8035d429b2184ee94aaa7e580c1ff67f73a +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Jul 15 08:00:11 2015 +0000 + + upstream commit + + fix NULL-deref when SSH1 reenabled + + Upstream-ID: f22fd805288c92b3e9646782d15b48894b2d5295 + +commit 41e38c4d49dd60908484e6703316651333f16b93 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Jul 15 07:19:50 2015 +0000 + + upstream commit + + regen RSA1 test keys; the last batch was missing their + private parts + + Upstream-Regress-ID: 7ccf437305dd63ff0b48dd50c5fd0f4d4230c10a + +commit 5bf0933184cb622ca3f96d224bf3299fd2285acc +Author: markus@openbsd.org <markus@openbsd.org> +Date: Fri Jul 10 06:23:25 2015 +0000 + + upstream commit + + Adapt tests, now that DSA if off by default; use + PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA. + + Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c + +commit 7a6e3fd7b41dbd3756b6bf9acd67954c0b1564cc +Author: markus@openbsd.org <markus@openbsd.org> +Date: Tue Jul 7 14:54:16 2015 +0000 + + upstream commit + + regen test data after mktestdata.sh changes + + Upstream-Regress-ID: 3495ecb082b9a7c048a2d7c5c845d3bf181d25a4 + +commit 7c8c174c69f681d4910fa41c37646763692b28e2 +Author: markus@openbsd.org <markus@openbsd.org> +Date: Tue Jul 7 14:53:30 2015 +0000 + + upstream commit + + adapt tests to new minimum RSA size and default FP format + + Upstream-Regress-ID: a4b30afd174ce82b96df14eb49fb0b81398ffd0e + +commit 6a977a4b68747ade189e43d302f33403fd4a47ac +Author: djm@openbsd.org <djm@openbsd.org> +Date: Fri Jul 3 04:39:23 2015 +0000 + + upstream commit + + legacy v00 certificates are gone; adapt and don't try to + test them; "sure" markus@ dtucker@ + + Upstream-Regress-ID: c57321e69b3cd4a3b3396dfcc43f0803d047da12 + +commit 0c4123ad5e93fb90fee9c6635b13a6cdabaac385 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Wed Jul 1 23:11:18 2015 +0000 + + upstream commit + + don't expect SSH v.1 in unittests + + Upstream-Regress-ID: f8812b16668ba78e6a698646b2a652b90b653397 + +commit 3c099845798a817cdde513c39074ec2063781f18 +Author: djm@openbsd.org <djm@openbsd.org> +Date: Mon Jun 15 06:38:50 2015 +0000 + + upstream commit + + turn SSH1 back on to match src/usr.bin/ssh being tested + + Upstream-Regress-ID: 6c4f763a2f0cc6893bf33983919e9030ae638333 + +commit b1dc2b33689668c75e95f873a42d5aea1f4af1db +Author: dtucker@openbsd.org <dtucker@openbsd.org> +Date: Mon Jul 13 04:57:14 2015 +0000 + + upstream commit + + Add "PuTTY_Local:" to the clients to which we do not + offer DH-GEX. This was the string that was used for development versions + prior to September 2014 and they don't do RFC4419 DH-GEX, but unfortunately + there are some extant products based on those versions. bx2424 from Jay + Rouman, ok markus@ djm@ + + Upstream-ID: be34d41e18b966832fe09ca243d275b81882e1d5 + +commit 3a1638dda19bbc73d0ae02b4c251ce08e564b4b9 +Author: markus@openbsd.org <markus@openbsd.org> +Date: Fri Jul 10 06:21:53 2015 +0000 + + upstream commit + + Turn off DSA by default; add HostKeyAlgorithms to the + server and PubkeyAcceptedKeyTypes to the client side, so it still can be + tested or turned back on; feedback and ok djm@ + + Upstream-ID: 8450a9e6d83f80c9bfed864ff061dfc9323cec21 + +commit 16db0a7ee9a87945cc594d13863cfcb86038db59 +Author: markus@openbsd.org <markus@openbsd.org> +Date: Thu Jul 9 09:49:46 2015 +0000 + + upstream commit + + re-enable ed25519-certs if compiled w/o openssl; ok djm + + Upstream-ID: e10c90808b001fd2c7a93778418e9b318f5c4c49 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601211733.u0LHXBqI015123>