diff options
| author | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
| commit | 0f31b02d696704321e4e94e63dceff52599ab808 (patch) | |
| tree | 953c18ea1e163d5ebd4b0d153b6378646ff41808 /secure/lib | |
| parent | 5080a59fa0c3561940d69fe29dc75ac489f0183a (diff) | |
| download | FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.zip FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.tar.gz | |
MFS (r296781):
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
Approved by: re (marius)
Diffstat (limited to 'secure/lib')
| -rw-r--r-- | secure/lib/libssh/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 0d3f05c..92ba2bd 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -22,7 +22,8 @@ SRCS+= authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c \ sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c \ kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c \ kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c \ - kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c + kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c \ + platform-pledge.c # gss-genr.c should be in $SRCS but causes linking problems, so it is # compiled directly into sshd instead. |
