diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-10-13 08:14:23 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-10-13 08:14:23 +0000 |
| commit | 6253030148c24c38d1793bdab4a29eeca5490a3a (patch) | |
| tree | ea7ea8d6528f4c8b8fb11e7fd95079af21751099 /usr.bin | |
| parent | 20544e8960fd11bf8f27949241138b657b848bce (diff) | |
The heimdal code switched to using DES from libcrypto when 0.7.2
was imported over four years ago, so we don't need to link libdes
for kerberos anymore.
ok mikeb@ deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index a4355be22b6..9d3de2ece91 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2009/10/24 11:22:37 andreas Exp $ +# $OpenBSD: Makefile,v 1.55 2010/10/13 08:14:22 jsg Exp $ .PATH: ${.CURDIR}/.. @@ -29,5 +29,5 @@ DPADD+= ${LIBGSSAPI} ${LIBKRB5} LDADD+= -lgssapi -lkrb5 .endif # KERBEROS5 -DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBDES} -LDADD+= -lcrypto -lz -ldes +DPADD+= ${LIBCRYPTO} ${LIBZ} +LDADD+= -lcrypto -lz diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 6597bd0860d..a479ec7ca21 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.71 2010/08/31 11:54:45 djm Exp $ +# $OpenBSD: Makefile,v 1.72 2010/10/13 08:14:22 jsg Exp $ .PATH: ${.CURDIR}/.. @@ -32,8 +32,8 @@ LDADD+= -lgssapi -lkrb5 -lkafs DPADD+= ${LIBGSSAPI} ${LIBKRB5} .endif -DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBDES} -LDADD+= -lcrypto -lutil -lz -ldes +DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +LDADD+= -lcrypto -lutil -lz .if (${TCP_WRAPPERS:L} == "yes") CFLAGS+= -DLIBWRAP |