summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2011-05-04 07:34:44 +0000
committerdes <des@FreeBSD.org>2011-05-04 07:34:44 +0000
commitee2afa8165baec284a83500803978f8a0e645ccd (patch)
treea745d3c673d44775cc175961e80d2246eb00e0df /secure
parentd035dd6f462a261f9b99bfa8545a924b314e1bb5 (diff)
parent1824cfda46b3f11c1c3c4071e80b73ca91553149 (diff)
downloadFreeBSD-src-ee2afa8165baec284a83500803978f8a0e645ccd.zip
FreeBSD-src-ee2afa8165baec284a83500803978f8a0e645ccd.tar.gz
Upgrade to OpenSSH 5.8p2.
Diffstat (limited to 'secure')
-rw-r--r--secure/lib/libssh/Makefile11
-rw-r--r--secure/usr.sbin/sshd/Makefile5
2 files changed, 9 insertions, 7 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index d50b8d1..662bb1a 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -11,17 +11,18 @@ SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
log.c match.c md-sha256.c moduli.c nchan.c packet.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 msg.c progressmeter.c dns.c \
- entropy.c umac.c jpake.c schnorr.c \
- ssh-pkcs11.c
+ monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
+ kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \
+ msg.c progressmeter.c dns.c entropy.c umac.c jpake.c \
+ schnorr.c ssh-pkcs11.c
# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.
# Portability layer
SRCS+= bsd-misc.c fmt_scaled.c getrrsetbyname.c glob.c \
- openssl-compat.c port-tun.c strtonum.c vis.c xcrypt.c xmmap.c
+ openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
+ vis.c xcrypt.c xmmap.c
# FreeBSD additions
SRCS+= version.c
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index b0b8bb7..702bcd0 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -5,16 +5,17 @@
PROG= sshd
SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
+ audit.c audit-bsm.c audit-linux.c platform.c \
sshpty.c sshlogin.c servconf.c serverloop.c \
auth.c auth1.c auth2.c auth-options.c session.c \
auth-chall.c auth2-chall.c groupaccess.c \
auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c auth2-jpake.c \
- monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c \
+ monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c kexecdhs.c \
auth-krb5.c \
auth2-gss.c gss-serv.c gss-serv-krb5.c \
loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
- audit.c audit-bsm.c platform.c sftp-server.c sftp-common.c \
+ sftp-server.c sftp-common.c \
roaming_common.c roaming_serv.c
# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
OpenPOWER on IntegriCloud