summaryrefslogtreecommitdiffstats
path: root/secure/lib
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-04-12 20:22:59 +0000
committerdes <des@FreeBSD.org>2014-04-12 20:22:59 +0000
commitfaff1e38d22d47a8228fbfe7a7e7ae44391d4ca5 (patch)
tree1869bb83deee7739b988ace790deca83cd513254 /secure/lib
parent0918f176a2a27c20190030f7d90050e0b1a8e25c (diff)
downloadFreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.zip
FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.tar.gz
MFH (r263712): upgrade openssh to 6.6p1
MFH (r264308): restore p level in debugging output
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 1410a53..f4bfd06 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -15,17 +15,17 @@ SRCS= authfd.c authfile.c bufaux.c bufbn.c buffer.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 umac128.c \
- jpake.c schnorr.c ssh-pkcs11.c krl.c smult_curve25519_ref.c \
+ ssh-pkcs11.c krl.c smult_curve25519_ref.c \
kexc25519.c kexc25519c.c poly1305.c chacha.c cipher-chachapoly.c \
- ssh-ed25519.c digest.c \
+ ssh-ed25519.c digest-openssl.c hmac.c \
sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c
# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.
# Portability layer
-SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c fmt_scaled.c glob.c \
- openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
+SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c fmt_scaled.c \
+ glob.c openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
vis.c xcrypt.c xmmap.c
.if ${MK_LDNS} == "no"
OpenPOWER on IntegriCloud