Use libcrypto in place of libdes.

This commit is contained in:
Mark Murray 2000-02-24 20:57:04 +00:00
parent f8fa53397f
commit fea326b4d1
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=57448
24 changed files with 50 additions and 46 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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}

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>