rfc3961: Add a kernel rfc3961 implementation

[openafs.git] / src / libafs / Makefile.common.in

diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in
index ad6d6fa..00f5330 100644 (file)
--- a/src/libafs/Makefile.common.in
+++ b/src/libafs/Makefile.common.in
@@ -23,18 +23,16 @@ TOP_SRC_VNOPS = ${TOP_SRCDIR}/afs/VNOPS
 TOP_SRC_RXKAD = ${TOP_SRCDIR}/rxkad
 
 COMMON_INCLUDE = -I. -I.. -I../nfs \
+       -I$(TOP_SRCDIR)/crypto/hcrypto/kernel \
        -I${TOP_SRCDIR} \
        -I${TOP_SRCDIR}/afs \
        -I${TOP_SRCDIR}/afs/${MKAFS_OSTYPE} \
        -I${TOP_SRCDIR}/config \
        -I${TOP_SRCDIR}/rx/${MKAFS_OSTYPE} \
-       -I${TOP_SRCDIR}/rxkad \
-       -I${TOP_SRCDIR}/util \
+       -I${TOP_SRCDIR}/external/heimdal \
        -I${TOP_OBJDIR}/src \
        -I${TOP_OBJDIR}/src/afs \
        -I${TOP_OBJDIR}/src/afs/${MKAFS_OSTYPE} \
-       -I${TOP_OBJDIR}/src/util \
-       -I${TOP_OBJDIR}/src/rxkad \
        -I${TOP_OBJDIR}/src/config \
        -I${TOP_OBJDIR}/src/fsint \
        -I${TOP_OBJDIR}/src/vlserver \
@@ -93,7 +91,6 @@ AFSAOBJS = \
        afs_init.o \
        afs_lock.o      \
        afs_mariner.o \
-       afs_md5.o \
        afs_memcache.o  \
        afs_fetchstore.o        \
        afs_osi.o               \
@@ -169,7 +166,27 @@ AFSAOBJS = \
        rxkad_common.o  \
        xdr_afsuuid.o   \
        xdr.o           \
-       token.xdr.o     \
+       Ktoken.xdr.o    \
+       md5.o           \
+       evp.o           \
+       evp-algs.o      \
+       rand-kernel.o   \
+       alloc-kernel.o  \
+       aes.o           \
+       rijndael-alg-fst.o \
+       sha.o           \
+       n-fold.o        \
+       crypto.o        \
+       crypto-algs.o   \
+       crypto-aes.o    \
+       crypto-context.o \
+       crypto-copy.o   \
+       crypto-ct.o     \
+       crypto-evp.o    \
+       crypto-data.o   \
+       crypto-keyblock.o \
+       crypto-store-int.o \
+       crypto-random.o \
        afs_uuid.o $(AFS_OS_OBJS)
 
 # These next two allow nfs and nonfs builds to occur in the same directory.
@@ -238,7 +255,7 @@ AFSPAGOBJS = \
        AFS_component_version_number.o\
        xdr_afsuuid.o   \
        xdr.o           \
-       token.xdr.o     \
+       Ktoken.xdr.o    \
        afs_uuid.o $(AFS_OS_PAGOBJS)
 
 
@@ -274,8 +291,6 @@ afs_init.o: $(TOP_SRC_AFS)/afs_init.c
        $(CRULE_OPT)
 afs_mariner.o: $(TOP_SRC_AFS)/afs_mariner.c
        $(CRULE_OPT)
-afs_md5.o: $(TOP_SRC_AFS)/afs_md5.c
-       $(CRULE_OPT)
 afs_osidnlc.o: $(TOP_SRC_AFS)/afs_osidnlc.c
        $(CRULE_OPT)
 afs_osi.o:     $(TOP_SRC_AFS)/afs_osi.c
@@ -348,7 +363,7 @@ xdr_mem.o: $(TOP_SRCDIR)/rx/xdr_mem.c
        $(CRULE_OPT)
 xdr_len.o: $(TOP_SRCDIR)/rx/xdr_len.c
        $(CRULE_OPT)
-token.xdr.o: $(TOP_OBJDIR)/src/auth/token.xdr.c
+Ktoken.xdr.o: $(TOP_OBJDIR)/src/auth/Ktoken.xdr.c
        $(CRULE_OPT)
 
 # these files are not to be optimized - subject to change.
@@ -388,6 +403,12 @@ rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE_NOOPT)
 rxkad_common.o: $(TOP_SRC_RXKAD)/rxkad_common.c
        $(CRULE_NOOPT)
+
+CFLAGS-fcrypt.o = -I${TOP_SRCDIR}/rxkad -I$(TOP_OBJDIR)/src/rxkad
+CFLAGS-crypt_conn.o = -I${TOP_SRCDIR}/rxkad -I$(TOP_OBJDIR)/src/rxkad
+CFLAGS-rxkad_client.o = -I${TOP_SRCDIR}/rxkad -I$(TOP_OBJDIR)/src/rxkad
+CFLAGS-rxkad_common.o = -I${TOP_SRCDIR}/rxkad -I$(TOP_OBJDIR)/src/rxkad
+
 afs_exporter.o: $(TOP_SRC_AFS)/afs_exporter.c
        $(CRULE_NOOPT)
 afs_nfsclnt.o: $(TOP_SRC_AFS)/afs_nfsclnt.c
@@ -486,6 +507,86 @@ afs_pag_user.o: $(TOP_SRC_AFS)/afs_user.c
 rx_pag_knet.o: $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_knet.c
        $(CRULE_NOOPT)
 
+# Crypto
+md5.o: $(TOP_SRCDIR)/external/heimdal/hcrypto/md5.c
+       $(CRULE_OPT)
+
+evp.o: $(TOP_SRCDIR)/external/heimdal/hcrypto/evp.c
+       $(CRULE_OPT)
+CFLAGS-evp.o= -I$(TOP_INCDIR)/hcrypto \
+             -DHAVE_CONFIG_H
+
+evp-algs.o: $(TOP_SRCDIR)/crypto/hcrypto/kernel/evp-algs.c
+       $(CRULE_OPT)
+CFLAGS-evp-algs.o = -I$(TOP_INCDIR)/hcrypto
+
+rand-kernel.o: $(TOP_SRCDIR)/crypto/hcrypto/kernel/rand.c
+       $(CRULE_OPT)
+CFLAGS-rand-kernel.o = -I$(TOP_INCDIR)/hcrypto
+
+alloc-kernel.o: $(TOP_SRCDIR)/crypto/hcrypto/kernel/alloc.c
+       $(CRULE_OPT)
+
+aes.o: $(TOP_SRCDIR)/external/heimdal/hcrypto/aes.c
+       $(CRULE_OPT)
+
+rijndael-alg-fst.o:  $(TOP_SRCDIR)/external/heimdal/hcrypto/rijndael-alg-fst.c
+       $(CRULE_OPT)
+
+sha.o: $(TOP_SRCDIR)/external/heimdal/hcrypto/sha.c
+       $(CRULE_OPT)
+
+RFC3961_INCLUDES = -I$(TOP_SRCDIR)/crypto/rfc3961 \
+                  -I$(TOP_SRCDIR)/external/heimdal/krb5
+
+n-fold.o: $(TOP_SRCDIR)/external/heimdal/krb5/n-fold.c
+       $(CRULE_OPT)
+CFLAGS-n-fold.o = $(RFC3961_INCLUDES)
+
+crypto.o: $(TOP_SRCDIR)/external/heimdal/krb5/crypto.c
+       $(CRULE_OPT)
+CFLAGS-crypto.o = $(RFC3961_INCLUDES)
+
+crypto-aes.o: $(TOP_SRCDIR)/external/heimdal/krb5/crypto-aes.c
+       $(CRULE_OPT)
+CFLAGS-crypto-aes.o = $(RFC3961_INCLUDES)
+
+crypto-evp.o: $(TOP_SRCDIR)/external/heimdal/krb5/crypto-evp.c
+       $(CRULE_OPT)
+CFLAGS-crypto-evp.o = $(RFC3961_INCLUDES)
+
+crypto-data.o: $(TOP_SRCDIR)/external/heimdal/krb5/data.c
+       $(CRULE_OPT)
+CFLAGS-crypto-data.o = $(RFC3961_INCLUDES)
+
+crypto-keyblock.o: $(TOP_SRCDIR)/external/heimdal/krb5/keyblock.c
+       $(CRULE_OPT)
+CFLAGS-crypto-keyblock.o = $(RFC3961_INCLUDES)
+
+crypto-store-int.o: $(TOP_SRCDIR)/external/heimdal/krb5/store-int.c
+       $(CRULE_OPT)
+CFLAGS-crypto-store-int.o = $(RFC3961_INCLUDES)
+
+crypto-random.o: $(TOP_SRCDIR)/crypto/rfc3961/kernel/random.c
+       $(CRULE_OPT)
+CFLAGS-crypto-random.o = -I$(TOP_SRCDIR)/crypto/kernel
+
+crypto-algs.o: $(TOP_SRCDIR)/crypto/rfc3961/kernel/algs.c
+       $(CRULE_OPT)
+CFLAGS-crypto-algs.o = $(RFC3961_INCLUDES)
+
+crypto-copy.o: $(TOP_SRCDIR)/crypto/rfc3961/copy.c
+       $(CRULE_OPT)
+CFLAGS-crypto-copy.o = $(RFC3961_INCLUDES)
+
+crypto-context.o: $(TOP_SRCDIR)/crypto/rfc3961/context.c
+       $(CRULE_OPT)
+CFLAGS-crypto-context.o = $(RFC3961_INCLUDES)
+
+crypto-ct.o: $(TOP_SRCDIR)/external/heimdal/roken/ct.c
+       $(CRULE_OPT)
+CFLAGS-crypto-ct.o = $(RFC3961_INCLUDES)
+
 # Files which are specific to particular architectures/targets
 # but have common build rules. Place here instead of duplicating
 # in the per-platform Makefiles.
@@ -549,6 +650,8 @@ osi_fetchstore.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_fetchstore.c
        $(CRULE_NOOPT)
 osi_vcache.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vcache.c
        $(CRULE_NOOPT)
+osi_crypto.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_crypto.c
+       $(CRULE_OPT)
 
 clean:
        -$(RM) -rf STATIC* MODLOAD* $(AFS_OS_CLEAN)