diff options
| author | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
| commit | c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9 (patch) | |
| tree | 286162d33ef4c84bb329fd42641bbe0dd68cc42c /secure | |
| parent | 68f48e51f9a4d71d7fb9c332592215895a206ff6 (diff) | |
| parent | 57baac6b030508c9bcd74f3b995bd6a4a4f79211 (diff) | |
| download | FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.zip FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.tar.gz | |
Upgrade to OpenSSH 5.4p1.
MFC after: 1 month
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libssh/Makefile | 5 | ||||
| -rw-r--r-- | secure/libexec/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 32b5069..d50b8d1 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -12,8 +12,9 @@ SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.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 scard.c msg.c progressmeter.c dns.c \ - entropy.c scard-opensc.c umac.c jpake.c schnorr.c + kexgex.c kexdhc.c kexgexc.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. diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 1c3ee01..0c680e4 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -4,7 +4,7 @@ SUBDIR= .if ${MK_OPENSSH} != "no" -SUBDIR+=sftp-server ssh-keysign +SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper .endif .include <bsd.subdir.mk> diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 6944ac5..f85784e 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -11,7 +11,7 @@ MLINKS= ssh.1 slogin.1 SRCS= ssh.c readconf.c clientloop.c sshtty.c \ sshconnect.c sshconnect1.c sshconnect2.c mux.c \ - roaming_common.c + roaming_common.c roaming_client.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index d7a37a3..b0b8bb7 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -15,7 +15,7 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.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 \ - roaming_common.c + roaming_common.c roaming_serv.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c |
