summaryrefslogtreecommitdiffstats
path: root/secure/lib
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2008-08-01 02:48:36 +0000
committerdes <des@FreeBSD.org>2008-08-01 02:48:36 +0000
commitb7aa600c416b507a21191efa2689c0a03031d58e (patch)
treeed813bdf7d8dbee35f19092d185e1a2793885204 /secure/lib
parenta2326b0bec3be2ec01f66d386cfe43139cbc579c (diff)
parent8f6f5baf400f08937451cf9c8ecc220e9efd2f63 (diff)
downloadFreeBSD-src-b7aa600c416b507a21191efa2689c0a03031d58e.zip
FreeBSD-src-b7aa600c416b507a21191efa2689c0a03031d58e.tar.gz
Upgrade to OpenSSH 5.1p1.
I have worked hard to reduce diffs against the vendor branch. One notable change in that respect is that we no longer prefer DSA over RSA - the reasons for doing so went away years ago. This may cause some surprises, as ssh will warn about unknown host keys even for hosts whose keys haven't changed. MFC after: 6 weeks
Diffstat (limited to 'secure/lib')
-rw-r--r--secure/lib/libssh/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index e2bdcc5..8724e38 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -9,18 +9,18 @@ SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.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 md-sha256.c moduli.c nchan.c packet.c \
- readpass.c rsa.c ttymodes.c xmalloc.c \
+ readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
monitor_fdpass.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 \
- entropy.c scard-opensc.c
+ entropy.c scard-opensc.c umac.c
# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.
# Portability layer
-SRCS+= bsd-closefrom.c bsd-misc.c getrrsetbyname.c \
- port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
+SRCS+= bsd-closefrom.c bsd-misc.c fmt_scaled.c getrrsetbyname.c \
+ openssl-compat.c port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
# FreeBSD additions
SRCS+= version.c
OpenPOWER on IntegriCloud