From fea326b4d1dbc942ee05c62361b5499c20eb74e3 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Thu, 24 Feb 2000 20:57:04 +0000
Subject: [PATCH] Use libcrypto in place of libdes.

---
 kerberos5/libexec/telnetd/Makefile       | 4 ++--
 kerberos5/usr.bin/telnet/Makefile        | 4 ++--
 kerberosIV/Makefile.inc                  | 4 ++++
 kerberosIV/libexec/kauthd/Makefile       | 4 ++--
 kerberosIV/libexec/kipd/Makefile         | 4 ++--
 kerberosIV/libexec/kpropd/Makefile       | 4 ++--
 kerberosIV/libexec/telnetd/Makefile      | 4 ++--
 kerberosIV/usr.bin/kadmin/Makefile       | 4 ++--
 kerberosIV/usr.bin/kauth/Makefile        | 4 ++--
 kerberosIV/usr.bin/kdestroy/Makefile     | 4 ++--
 kerberosIV/usr.bin/kinit/Makefile        | 4 ++--
 kerberosIV/usr.bin/klist/Makefile        | 4 ++--
 kerberosIV/usr.bin/telnet/Makefile       | 4 ++--
 kerberosIV/usr.sbin/ext_srvtab/Makefile  | 4 ++--
 kerberosIV/usr.sbin/kadmind/Makefile     | 4 ++--
 kerberosIV/usr.sbin/kdb_destroy/Makefile | 4 ++--
 kerberosIV/usr.sbin/kdb_edit/Makefile    | 4 ++--
 kerberosIV/usr.sbin/kdb_init/Makefile    | 4 ++--
 kerberosIV/usr.sbin/kdb_util/Makefile    | 4 ++--
 kerberosIV/usr.sbin/kerberos/Makefile    | 4 ++--
 kerberosIV/usr.sbin/kip/Makefile         | 4 ++--
 kerberosIV/usr.sbin/kprop/Makefile       | 4 ++--
 kerberosIV/usr.sbin/ksrvutil/Makefile    | 4 ++--
 kerberosIV/usr.sbin/kstash/Makefile      | 4 ++--
 24 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
index 221bdb48d94..6ec63616fa1 100644
--- a/kerberos5/libexec/telnetd/Makefile
+++ b/kerberos5/libexec/telnetd/Makefile
@@ -13,9 +13,9 @@ CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
 		termstat.c utility.c authenc.c
 
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
+DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \
 		${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
+LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \
 		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index fb5219bfb9b..e3c97f58099 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -9,9 +9,9 @@ CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c tn3270.c utilities.c
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} \
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \
 		${LIBCOM_ERR} ${LIBIPSEC}
-LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
+LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \
 		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
index f4e8bb268aa..7c375c042df 100644
--- a/kerberosIV/Makefile.inc
+++ b/kerberosIV/Makefile.inc
@@ -71,6 +71,10 @@ TELNETOBJDIR=	${.CURDIR}/../../lib/libtelnet
 
 CFLAGS+= -I${.CURDIR}/../../include -Wall -DHAVE_CONFIG_H \
 	-I${INCLUDEOBJDIR} -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\"
+.if defined(RSAREF) && ${RSAREF} == YES
+LDADD+=	-lRSAglue
+DPADD+= ${LIBRSAGLUE}
+.endif
 
 protos.h: ${KRB4DIR}/include/protos.H
 	ln -sf ${.ALLSRC} ${.TARGET} 
diff --git a/kerberosIV/libexec/kauthd/Makefile b/kerberosIV/libexec/kauthd/Makefile
index 96041f1db85..def0ac3a442 100644
--- a/kerberosIV/libexec/kauthd/Makefile
+++ b/kerberosIV/libexec/kauthd/Makefile
@@ -8,9 +8,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/kafs \
 		-I${KRB4DIR}/lib/krb \
 		-I${KRB4DIR}/appl/kauth
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosIV/libexec/kipd/Makefile b/kerberosIV/libexec/kipd/Makefile
index fa750bee63e..3c3d2a7bda8 100644
--- a/kerberosIV/libexec/kipd/Makefile
+++ b/kerberosIV/libexec/kipd/Makefile
@@ -7,9 +7,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/roken \
 		-I${KRB4DIR}/lib/krb \
 		-I${KRB4DIR}/appl/kip
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosIV/libexec/kpropd/Makefile b/kerberosIV/libexec/kpropd/Makefile
index e4a41727875..e904b22677a 100644
--- a/kerberosIV/libexec/kpropd/Makefile
+++ b/kerberosIV/libexec/kpropd/Makefile
@@ -11,9 +11,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${INCLOBJDIR} \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosIV/libexec/telnetd/Makefile b/kerberosIV/libexec/telnetd/Makefile
index 221bdb48d94..6ec63616fa1 100644
--- a/kerberosIV/libexec/telnetd/Makefile
+++ b/kerberosIV/libexec/telnetd/Makefile
@@ -13,9 +13,9 @@ CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
 		termstat.c utility.c authenc.c
 
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
+DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \
 		${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
+LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \
 		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/kadmin/Makefile b/kerberosIV/usr.bin/kadmin/Makefile
index a22ecb1a518..4a985f24209 100644
--- a/kerberosIV/usr.bin/kadmin/Makefile
+++ b/kerberosIV/usr.bin/kadmin/Makefile
@@ -18,9 +18,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 LDADD=		-L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \
 		-L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \
 		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
-		-ldes -lcrypt -lcom_err -lreadline -ltermcap
+		-lcrypto -lcrypt -lcom_err -lreadline -ltermcap
 DPADD=		${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
-		${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \
+		${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \
 		${LIBTERMCAP}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/kauth/Makefile b/kerberosIV/usr.bin/kauth/Makefile
index f38cc47863b..0fcb7f5760a 100644
--- a/kerberosIV/usr.bin/kauth/Makefile
+++ b/kerberosIV/usr.bin/kauth/Makefile
@@ -9,8 +9,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/krb \
 		-I${KRB4DIR}/appl/kauth
 LDADD=		-L${ROKENOBJDIR} -lroken -L${KAFSOBJDIR} -lkafs \
-		-L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err
-DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+		-L${KRBOBJDIR} -lkrb -lcrypto -lcrypt -lcom_err
+DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/kdestroy/Makefile b/kerberosIV/usr.bin/kdestroy/Makefile
index 33dcd6d3226..e4c418cf4e0 100644
--- a/kerberosIV/usr.bin/kdestroy/Makefile
+++ b/kerberosIV/usr.bin/kdestroy/Makefile
@@ -12,9 +12,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/kuser \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/kinit/Makefile b/kerberosIV/usr.bin/kinit/Makefile
index 2476f91a160..1037bf85462 100644
--- a/kerberosIV/usr.bin/kinit/Makefile
+++ b/kerberosIV/usr.bin/kinit/Makefile
@@ -11,8 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/kuser \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+		-L${KRBOBJDIR} -lkrb -lcrypto -lcrypt -lcom_err
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosIV/usr.bin/klist/Makefile b/kerberosIV/usr.bin/klist/Makefile
index 2e0c0c02653..40fcb9b87b0 100644
--- a/kerberosIV/usr.bin/klist/Makefile
+++ b/kerberosIV/usr.bin/klist/Makefile
@@ -12,9 +12,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/kuser \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile
index fb5219bfb9b..e3c97f58099 100644
--- a/kerberosIV/usr.bin/telnet/Makefile
+++ b/kerberosIV/usr.bin/telnet/Makefile
@@ -9,9 +9,9 @@ CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c tn3270.c utilities.c
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} \
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \
 		${LIBCOM_ERR} ${LIBIPSEC}
-LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
+LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \
 		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile
index 46ea9c6102f..025c51bac89 100644
--- a/kerberosIV/usr.sbin/ext_srvtab/Makefile
+++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile
@@ -12,9 +12,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.sbin/kadmind/Makefile b/kerberosIV/usr.sbin/kadmind/Makefile
index 52698d42553..979b437aab8 100644
--- a/kerberosIV/usr.sbin/kadmind/Makefile
+++ b/kerberosIV/usr.sbin/kadmind/Makefile
@@ -18,9 +18,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 LDADD=		-L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \
 		-L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \
 		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
-		-ldes -lcom_err -lcrypt
+		-lcrypto -lcom_err -lcrypt
 DPADD=		${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
-		${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT}
+		${LIBCRYPTO} ${LIBCOM_ERR} ${LIBCRYPT}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile
index 30bfae2bbd4..b9cf7298f71 100644
--- a/kerberosIV/usr.sbin/kdb_destroy/Makefile
+++ b/kerberosIV/usr.sbin/kdb_destroy/Makefile
@@ -12,9 +12,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile
index 203768c96ba..ad3a0996ba7 100644
--- a/kerberosIV/usr.sbin/kdb_edit/Makefile
+++ b/kerberosIV/usr.sbin/kdb_edit/Makefile
@@ -12,9 +12,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile
index 3649a621f76..e351b7b5c88 100644
--- a/kerberosIV/usr.sbin/kdb_init/Makefile
+++ b/kerberosIV/usr.sbin/kdb_init/Makefile
@@ -12,9 +12,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile
index d08aea9f009..020c98e520a 100644
--- a/kerberosIV/usr.sbin/kdb_util/Makefile
+++ b/kerberosIV/usr.sbin/kdb_util/Makefile
@@ -12,9 +12,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.sbin/kerberos/Makefile b/kerberosIV/usr.sbin/kerberos/Makefile
index 885125aebbf..1df36d1c94f 100644
--- a/kerberosIV/usr.sbin/kerberos/Makefile
+++ b/kerberosIV/usr.sbin/kerberos/Makefile
@@ -16,9 +16,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.sbin/kip/Makefile b/kerberosIV/usr.sbin/kip/Makefile
index eadaf2e6f3b..b6d6e4bf507 100644
--- a/kerberosIV/usr.sbin/kip/Makefile
+++ b/kerberosIV/usr.sbin/kip/Makefile
@@ -9,9 +9,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/kadmin \
 		-I${KRBOBJDIR} \
 		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosIV/usr.sbin/kprop/Makefile b/kerberosIV/usr.sbin/kprop/Makefile
index 185a67b333f..d7f54fc7029 100644
--- a/kerberosIV/usr.sbin/kprop/Makefile
+++ b/kerberosIV/usr.sbin/kprop/Makefile
@@ -11,9 +11,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${INCLOBJDIR} \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosIV/usr.sbin/ksrvutil/Makefile b/kerberosIV/usr.sbin/ksrvutil/Makefile
index 8799cfc28da..648ac010cba 100644
--- a/kerberosIV/usr.sbin/ksrvutil/Makefile
+++ b/kerberosIV/usr.sbin/ksrvutil/Makefile
@@ -16,10 +16,10 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRBOBJDIR} \
 		-I${.CURDIR}/../include
 LDADD=		-L${ROKENOBJDIR} -lroken -L${KADMOBJDIR} -lkadm \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcom_err \
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcom_err \
 		-lcrypt
 DPADD=		${LIBROKEN} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
-		${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT}
+		${LIBCRYPTO} ${LIBCOM_ERR} ${LIBCRYPT}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile
index b05ae5d4fe4..c27338ef48d 100644
--- a/kerberosIV/usr.sbin/kstash/Makefile
+++ b/kerberosIV/usr.sbin/kstash/Makefile
@@ -12,9 +12,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${.CURDIR}/../include \
 		-I${.OBJDIR}
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -lcrypto -lcrypt \
 		-lcom_err
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBCOM_ERR}
 
 .include <bsd.prog.mk>