summaryrefslogtreecommitdiffstats
path: root/kerberos5/usr.bin
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2000-02-24 21:15:14 +0000
committermarkm <markm@FreeBSD.org>2000-02-24 21:15:14 +0000
commit3c2d308df199b1234f387684a75fc94c93ec7a70 (patch)
tree058bf8a1b743362571c136ae5bdbeab150dd817f /kerberos5/usr.bin
parent4dfdc66cab217db1c43f8f5db234a731900d85b0 (diff)
downloadFreeBSD-src-3c2d308df199b1234f387684a75fc94c93ec7a70.zip
FreeBSD-src-3c2d308df199b1234f387684a75fc94c93ec7a70.tar.gz
Use libcrypto instead of libdes. Upgrade for Heimdal-0.2p
Diffstat (limited to 'kerberos5/usr.bin')
-rw-r--r--kerberos5/usr.bin/k5admin/Makefile6
-rw-r--r--kerberos5/usr.bin/k5auth/Makefile9
-rw-r--r--kerberos5/usr.bin/k5destroy/Makefile4
-rw-r--r--kerberos5/usr.bin/k5init/Makefile4
-rw-r--r--kerberos5/usr.bin/k5list/Makefile4
-rw-r--r--kerberos5/usr.bin/k5passwd/Makefile4
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile6
-rw-r--r--kerberos5/usr.bin/kauth/Makefile9
-rw-r--r--kerberos5/usr.bin/kdestroy/Makefile4
-rw-r--r--kerberos5/usr.bin/kinit/Makefile4
-rw-r--r--kerberos5/usr.bin/klist/Makefile4
-rw-r--r--kerberos5/usr.bin/kpasswd/Makefile4
12 files changed, 32 insertions, 30 deletions
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
index d7640f1..8e247eb 100644
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -23,12 +23,12 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err \
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \
-L${SLOBJDIR} -lsl -lreadline
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBSL} \
- ${LIBREADLINE}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
+ ${LIBSL} ${LIBREADLINE}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5auth/Makefile b/kerberos5/usr.bin/k5auth/Makefile
index 33c13b3..dbec434 100644
--- a/kerberos5/usr.bin/k5auth/Makefile
+++ b/kerberos5/usr.bin/k5auth/Makefile
@@ -1,19 +1,20 @@
# $FreeBSD$
PROG= kauth
-SRCS= kauth.c rkinit.c encdata.c marshall.c
+SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/appl/kauth
+ -I${KRB5DIR}/appl/kauth \
+ -I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
index 68db1c0..797005d 100644
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ b/kerberos5/usr.bin/k5destroy/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
index 3dcfc33..8618f35 100644
--- a/kerberos5/usr.bin/k5init/Makefile
+++ b/kerberos5/usr.bin/k5init/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
index 5dfd39f..e40949d 100644
--- a/kerberos5/usr.bin/k5list/Makefile
+++ b/kerberos5/usr.bin/k5list/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
index 55d5062..298645b 100644
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ b/kerberos5/usr.bin/k5passwd/Makefile
@@ -14,9 +14,9 @@ _krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index d7640f1..8e247eb 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -23,12 +23,12 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err \
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \
-L${SLOBJDIR} -lsl -lreadline
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBSL} \
- ${LIBREADLINE}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
+ ${LIBSL} ${LIBREADLINE}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kauth/Makefile b/kerberos5/usr.bin/kauth/Makefile
index 33c13b3..dbec434 100644
--- a/kerberos5/usr.bin/kauth/Makefile
+++ b/kerberos5/usr.bin/kauth/Makefile
@@ -1,19 +1,20 @@
# $FreeBSD$
PROG= kauth
-SRCS= kauth.c rkinit.c encdata.c marshall.c
+SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/appl/kauth
+ -I${KRB5DIR}/appl/kauth \
+ -I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 68db1c0..797005d 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 3dcfc33..8618f35 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index 5dfd39f..e40949d 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index 55d5062..298645b 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -14,9 +14,9 @@ _krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud