diff options
author | des <des@FreeBSD.org> | 2016-03-12 23:53:20 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2016-03-12 23:53:20 +0000 |
commit | 629436fac8d85a5c231a09fdc142b64f3d6b0de4 (patch) | |
tree | 1d80569f877f044481a89257a41345cacf910c22 /secure/libexec | |
parent | 976f44ffb6fcd46b126d64871bc40d47ed7a3814 (diff) | |
download | FreeBSD-src-629436fac8d85a5c231a09fdc142b64f3d6b0de4.zip FreeBSD-src-629436fac8d85a5c231a09fdc142b64f3d6b0de4.tar.gz |
MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)
MFH (r296634): re-add aes-cbc to server-side default cipher list
MFH (r296651, r296657): fix gcc build of pam_ssh
PR: 207679
Security: CVE-2016-3115
Diffstat (limited to 'secure/libexec')
-rw-r--r-- | secure/libexec/sftp-server/Makefile | 5 | ||||
-rw-r--r-- | secure/libexec/ssh-keysign/Makefile | 2 | ||||
-rw-r--r-- | secure/libexec/ssh-pkcs11-helper/Makefile | 5 |
3 files changed, 1 insertions, 11 deletions
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 0c5f06c..c03272b 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -8,11 +8,6 @@ MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -.if !defined(NO_SHARED) -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c -.endif - DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index 3df2185..6953752 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -3,7 +3,7 @@ .include <bsd.own.mk> PROG= ssh-keysign -SRCS= ssh-keysign.c roaming_dummy.c readconf.c +SRCS= ssh-keysign.c readconf.c MAN= ssh-keysign.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index 548d01c..b5896d1 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -8,11 +8,6 @@ MAN= ssh-pkcs11-helper.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -.if !defined(NO_SHARED) -# required when linking with a dynamic libssh -SRCS+= roaming_dummy.c -.endif - DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh |