Merge branch 'vendor/OPENSSH'

diff --cc secure/lib/libssh/Makefile
index 78bac5b,0000000..526a333
mode 100644,000000..100644
--- 1/secure/lib/libssh/Makefile
--- /dev/null
+++ b/secure/lib/libssh/Makefile
@@@ -1,28 -1,0 +1,29 @@@
 +# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.2.2.7 2003/02/03 17:31:12 des Exp $
 +# $DragonFly: src/secure/lib/libssh/Makefile,v 1.13 2008/09/28 17:18:02 pavalos Exp $
 +
 +LIB=  ssh
 +SHLIB_MAJOR= 4
 +SRCS= acss.c addrmatch.c authfd.c authfile.c \
 +      bufaux.c bufbn.c buffer.c canohost.c \
 +      channels.c cipher.c cipher-acss.c cipher-aes.c cipher-bf1.c \
 +      cipher-ctr.c cipher-3des1.c cleanup.c compat.c compress.c crc32.c \
-       deattack.c fatal.c hostfile.c log.c match.c moduli.c nchan.c packet.c \
++      deattack.c fatal.c hostfile.c log.c match.c md-sha256.c \
++      moduli.c nchan.c packet.c \
 +      readpass.c rsa.c ttymodes.c xmalloc.c atomicio.c \
 +      key.c dispatch.c kex.c mac.c uuencode.c misc.c rijndael.c ssh-dss.c \
 +      ssh-rsa.c dh.c kexdh.c kexgex.c kexdhc.c kexgexc.c scard.c msg.c \
 +      progressmeter.c dns.c scard-opensc.c getrrsetbyname.c uidswap.c umac.c
 +# Portability layer
 +SRCS+=        bsd-arc4random.c bsd-misc.c entropy.c port-tun.c
 +# FreeBSD additions
 +SRCS+=        version.c
 +
 +MAN=  moduli.5
 +
 +DPADD+=       ${LIBZ}
 +LDADD+=       -lz
 +
 +.include "../../Makefile.ssh.common"
 +.include <bsd.lib.mk>
 +
 +.PATH: ${SSHDIR}/openbsd-compat