summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2009-05-22 18:46:28 +0000
committerdes <des@FreeBSD.org>2009-05-22 18:46:28 +0000
commit8bf56a9772e08d79d1a808bb69be82ca688afc76 (patch)
treed3b23c04145e95d8d26c4e6efa1cd05fa34fd795 /secure
parent56fa0af6738b5c4466957197aaa372d30e74440b (diff)
parentf4c3a2131f559534b5693fd15df8d89049db7cbb (diff)
downloadFreeBSD-src-8bf56a9772e08d79d1a808bb69be82ca688afc76.zip
FreeBSD-src-8bf56a9772e08d79d1a808bb69be82ca688afc76.tar.gz
Upgrade to OpenSSH 5.2p1.
MFC after: 3 months
Diffstat (limited to 'secure')
-rw-r--r--secure/lib/libssh/Makefile2
-rw-r--r--secure/usr.sbin/sshd/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 8724e38..5a3659a 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -13,7 +13,7 @@ SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.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 umac.c
+ entropy.c scard-opensc.c umac.c jpake.c schnorr.c
# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 0fc5ce0..282a402 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -9,7 +9,7 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.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-none.c auth2-passwd.c auth2-pubkey.c auth2-jpake.c \
monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c \
auth-krb5.c \
auth2-gss.c gss-serv.c gss-serv-krb5.c \
OpenPOWER on IntegriCloud