Use libcrypto in place of libdes.

This commit is contained in:
Mark Murray 2000-02-24 21:06:22 +00:00
parent f499a39621
commit 0ed9356caf
8 changed files with 11 additions and 15 deletions

View File

@ -87,8 +87,8 @@ SRCS+= kpasswd_standalone.c
CFLAGS+= -DKERBEROS
# XXX not defined: ${LIBKADM}, ${LIBCOM_ERR}
DPADD= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL}
LDADD= -lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil
DPADD= ${LIBKADM} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL}
LDADD= -lkadm -lkrb -lcrypto -lcrypt -lrpcsvc -lcom_err -lutil
DISTRIBUTION= krb4
.endif

View File

@ -11,13 +11,13 @@ INSTALLFLAGS=-fschg
.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
SRCS+= krcmd.c kcmd.c rcmd_util.c
DPADD= ${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
DPADD= ${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
-I${.CURDIR}/../../kerberosIV/include \
-I${.CURDIR}/../../crypto/kerberosIV/include \
-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
LDADD= -lutil -lkrb -ldes -lcrypt -lcom_err
LDADD= -lutil -lkrb -lcrypto -lcrypt -lcom_err
DISTRIBUTION= krb4
.PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd
.endif

View File

@ -73,7 +73,7 @@ static const char rcsid[] =
#include <err.h>
#ifdef KERBEROS
#include <des.h>
#include <openssl/des.h>
#include <krb.h>
#include "../../bin/rcp/pathnames.h"

View File

@ -14,8 +14,8 @@ CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
-I${.CURDIR}/../../crypto/kerberosIV/include \
-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
DPADD= ${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lutil -lkrb -ldes -lcrypt -lcom_err
DPADD= ${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lutil -lkrb -lcrypto -lcrypt -lcom_err
DISTRIBUTION= krb4
.PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd
.endif

View File

@ -69,7 +69,7 @@ static const char rcsid[] =
#include "pathnames.h"
#ifdef KERBEROS
#include <des.h>
#include <openssl/des.h>
#include <krb.h>
#include "krb.h"

View File

@ -15,8 +15,8 @@ CFLAGS+= -Wall
.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
CFLAGS+=-DKERBEROS
DPADD+= ${LIBKRB} ${LIBDES} ${LIBCOM_ERR}
LDADD+= -lkrb -ldes -lcom_err
DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
LDADD+= -lkrb -lcrypto -lcom_err
DISTRIBUTION= krb4
.endif

View File

@ -70,7 +70,7 @@ static const char rcsid[] =
#endif
#ifdef KERBEROS
#include <des.h>
#include <openssl/des.h>
#include <krb.h>
#include <netdb.h>

View File

@ -42,12 +42,8 @@ CFLAGS+=-DSKEY
CFLAGS+=-I${.CURDIR}/../../lib
CFLAGS+=-DINET6
#CFLAGS+= -DKRB4
DPADD= ${LIBTERMCAP} ${LIBTELNET}
LDADD= -ltermcap -ltelnet
#DPADD+= ${LIBKRB} ${LIBDES}
#LDADD+= -lkrb -ldes
.if !defined(RELEASE_CRUNCH)
CFLAGS+=-DIPSEC