From fbbfb51e7d997a40bf7d57150f69bfb055831a07 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 25 Apr 2010 22:07:04 +0100 Subject: [PATCH] Move rxkad/domestic/* into rxkad/ directory proper Historically, the fcrypt code lived in its own directory, named 'domestic', so that ACLs could be used to prevent nasty foreigners from getting access to it. Now that those days are gone, having the domestic directory just complicates builds. Remove it, and reunite fcrypt with the rest of the tree. Change-Id: I2d1f66463121bbb391260b613913d76c27931429 Reviewed-on: http://gerrit.openafs.org/1836 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/NTObjdir | 1 - src/libafs/Makefile.common.in | 5 ++--- src/libafs/MakefileProto.OBSD.in | 1 - src/libafsrpc/Makefile.in | 8 ++++---- src/libuafs/Makefile.common.in | 13 ++++++------- src/rxkad/Makefile.in | 18 +++--------------- src/rxkad/NTMakefile | 10 +++++----- src/rxkad/{domestic => }/crypt_conn.c | 2 +- src/rxkad/{domestic => }/fcrypt.c | 0 src/rxkad/{domestic => }/fcrypt.h | 0 src/rxkad/libafsdep | 6 +++++- src/rxkad/rxkad_prototypes.h | 4 ++-- src/rxkad/{domestic => }/sboxes.h | 0 src/rxkad/{domestic => }/tcrypt.c | 0 src/shlibafsrpc/Makefile.in | 4 ++-- 15 files changed, 30 insertions(+), 42 deletions(-) rename src/rxkad/{domestic => }/crypt_conn.c (99%) rename src/rxkad/{domestic => }/fcrypt.c (100%) rename src/rxkad/{domestic => }/fcrypt.h (100%) rename src/rxkad/{domestic => }/sboxes.h (100%) rename src/rxkad/{domestic => }/tcrypt.c (100%) diff --git a/src/NTObjdir b/src/NTObjdir index 238c9685c..51066e7f9 100755 --- a/src/NTObjdir +++ b/src/NTObjdir @@ -168,7 +168,6 @@ dirs="\ rxgen \ rxstat \ rxkad \ - rxkad/domestic \ rxkad/test \ fsint \ audit \ diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in index b4f9dd3a3..c6efd5448 100644 --- a/src/libafs/Makefile.common.in +++ b/src/libafs/Makefile.common.in @@ -29,7 +29,6 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \ -I${TOP_SRCDIR}/config \ -I${TOP_SRCDIR}/rx/${MKAFS_OSTYPE} \ -I${TOP_SRCDIR}/rxkad \ - -I${TOP_SRCDIR}/rxkad/domestic \ -I${TOP_SRCDIR}/util \ -I${TOP_OBJDIR}/src \ -I${TOP_OBJDIR}/src/afs \ @@ -366,9 +365,9 @@ afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c $(CRULE_NOOPT) afs_syscall.o: $(TOP_SRC_AFS)/afs_syscall.c $(CRULE_NOOPT) -fcrypt.o: $(TOP_SRC_RXKAD)/domestic/fcrypt.c +fcrypt.o: $(TOP_SRC_RXKAD)/fcrypt.c $(CRULE_NOOPT) -crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c +crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c $(CRULE_NOOPT) rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c $(CRULE_NOOPT) diff --git a/src/libafs/MakefileProto.OBSD.in b/src/libafs/MakefileProto.OBSD.in index 60419b430..7a1054a64 100644 --- a/src/libafs/MakefileProto.OBSD.in +++ b/src/libafs/MakefileProto.OBSD.in @@ -67,7 +67,6 @@ COMMON_INCLUDE = \ -I${TOP_SRCDIR}/rx \ -I${TOP_SRCDIR}/rx/${MKAFS_OSTYPE} \ -I${TOP_SRCDIR}/rxkad \ - -I${TOP_SRCDIR}/domestic \ -I${TOP_SRCDIR}/util \ -I${TOP_SRCDIR}/../include \ -I${TOP_SRCDIR}/../include/afs diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index 38d270fc9..f7a6fe89f 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -214,11 +214,11 @@ md4.o: ${RXKAD}/md4.c md5.o: ${RXKAD}/md5.c ${CCRULE} -I../rxkad ${RXKAD}/md5.c -fcrypt.o: ${RXKAD}/domestic/fcrypt.c - ${CCRULE} -I../rxkad ${RXKAD}/domestic/fcrypt.c +fcrypt.o: ${RXKAD}/fcrypt.c + ${CCRULE} -I../rxkad ${RXKAD}/fcrypt.c -crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c - ${CCRULE} -I../rxkad ${RXKAD}/domestic/crypt_conn.c +crypt_conn.o: ${RXKAD}/crypt_conn.c + ${CCRULE} -I../rxkad ${RXKAD}/crypt_conn.c AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c ${CCRULE} ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in index 238ee0c4c..0f732ab3e 100644 --- a/src/libuafs/Makefile.common.in +++ b/src/libuafs/Makefile.common.in @@ -39,7 +39,6 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \ -I${TOP_SRCDIR}/rx \ -I${TOP_SRCDIR}/rx/UKERNEL \ -I${TOP_SRCDIR}/rxkad \ - -I${TOP_SRCDIR}/rxkad/domestic \ -I${TOP_SRCDIR}/util \ -I${TOP_OBJDIR}/src \ -I${TOP_OBJDIR}/src/afs/UKERNEL \ @@ -723,9 +722,9 @@ $(UOBJ)/afs_fetchstore.o: $(TOP_SRC_AFS)/afs_fetchstore.c $(CRULE1) $(UOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c $(CRULE1) -$(UOBJ)/fcrypt.o: $(TOP_SRC_RXKAD)/domestic/fcrypt.c +$(UOBJ)/fcrypt.o: $(TOP_SRC_RXKAD)/fcrypt.c $(CRULE1) -$(UOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c +$(UOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c $(CRULE1) $(UOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c $(CRULE1) @@ -1000,9 +999,9 @@ $(WEBOBJ)/afs_fetchstore.o: $(TOP_SRC_AFS)/afs_fetchstore.c $(CRULE2) $(WEBOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c $(CRULE2) -$(WEBOBJ)/fcrypt.o: $(TOP_SRC_RXKAD)/domestic/fcrypt.c +$(WEBOBJ)/fcrypt.o: $(TOP_SRC_RXKAD)/fcrypt.c $(CRULE2) -$(WEBOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c +$(WEBOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c $(CRULE2) $(WEBOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c $(CRULE2) @@ -1281,9 +1280,9 @@ $(JUAFS)/afs_fetchstore.o: $(TOP_SRC_AFS)/afs_fetchstore.c $(CRULE1) $(JUAFS)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c $(CRULE1) -$(JUAFS)/fcrypt.o: $(TOP_SRC_RXKAD)/domestic/fcrypt.c +$(JUAFS)/fcrypt.o: $(TOP_SRC_RXKAD)/fcrypt.c $(CRULE1) -$(JUAFS)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c +$(JUAFS)/crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c $(CRULE1) $(JUAFS)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c $(CRULE1) diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index dc4207257..dc9ae2c60 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -85,14 +85,11 @@ md4.o: md4.c ${INCLS} md5.o: md5.c ${INCLS} -fcrypt.o: ${srcdir}/domestic/fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h - ${CCOBJ} ${CFLAGS} -c ${srcdir}/domestic/fcrypt.c +fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h -crypt_conn.o: ${srcdir}/domestic/crypt_conn.c fcrypt.h private_data.h ${INCLS} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/domestic/crypt_conn.c +crypt_conn.o: crypt_conn.c fcrypt.h private_data.h ${INCLS} -tcrypt.o: ${srcdir}/domestic/tcrypt.c AFS_component_version_number.o - ${CCOBJ} ${CFLAGS} -c ${srcdir}/domestic/fcrypt.c +tcrypt.o: tcrypt.c AFS_component_version_number.o tcrypt: tcrypt.o librxkad.a ${CC} -o tcrypt tcrypt.o librxkad.a @@ -135,13 +132,4 @@ clean: test: cd test; $(MAKE) -# These sources are kept in a separate directory so that we can use an -# ACL to comply with source export restrictions. - -fcrypt.h: domestic/fcrypt.h - ${INSTALL_DATA} $? $@ - -sboxes.h: domestic/sboxes.h - ${INSTALL_DATA} $? $@ - include ../config/Makefile.version diff --git a/src/rxkad/NTMakefile b/src/rxkad/NTMakefile index 1797072f6..00e71f130 100644 --- a/src/rxkad/NTMakefile +++ b/src/rxkad/NTMakefile @@ -47,17 +47,17 @@ $(LIBFILE): $(LIBOBJS) $(INCFILES):$$(@F) $(COPY) $** $(INCFILEDIR)\. - $(COPY) domestic\fcrypt.h $(INCFILEDIR)\. + $(COPY) fcrypt.h $(INCFILEDIR)\. rxkad.h rxkad_errs.c : rxkad_errs.et rxkad.p.h $(DEL) rxkad_errs.c $(COMPILE_ET) rxkad_errs -h rxkad -$(OUT)\fcrypt.obj: DOMESTIC\fcrypt.c DOMESTIC\fcrypt.h DOMESTIC\sboxes.h DOMESTIC\rxkad.h DOMESTIC\rxkad_prototypes.h - $(C2OBJ) DOMESTIC\fcrypt.c +$(OUT)\fcrypt.obj: fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h + $(C2OBJ) fcrypt.c -$(OUT)\crypt_conn.obj: DOMESTIC\crypt_conn.c DOMESTIC\fcrypt.h private_data.h - $(C2OBJ) DOMESTIC\crypt_conn.c +$(OUT)\crypt_conn.obj: crypt_conn.c fcrypt.h private_data.h + $(C2OBJ) crypt_conn.c install: $(INCFILES) $(LIBFILE) diff --git a/src/rxkad/domestic/crypt_conn.c b/src/rxkad/crypt_conn.c similarity index 99% rename from src/rxkad/domestic/crypt_conn.c rename to src/rxkad/crypt_conn.c index ab2d44ba5..cf570a7d9 100644 --- a/src/rxkad/domestic/crypt_conn.c +++ b/src/rxkad/crypt_conn.c @@ -45,7 +45,7 @@ #endif /* KERNEL */ #include -#include "../private_data.h" +#include "private_data.h" #define XPRT_RXKAD_CRYPT afs_int32 diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/fcrypt.c similarity index 100% rename from src/rxkad/domestic/fcrypt.c rename to src/rxkad/fcrypt.c diff --git a/src/rxkad/domestic/fcrypt.h b/src/rxkad/fcrypt.h similarity index 100% rename from src/rxkad/domestic/fcrypt.h rename to src/rxkad/fcrypt.h diff --git a/src/rxkad/libafsdep b/src/rxkad/libafsdep index e2254c576..ddf830fa5 100644 --- a/src/rxkad/libafsdep +++ b/src/rxkad/libafsdep @@ -3,4 +3,8 @@ rxkad_prototypes.h rxkad_client.[ch] rxkad_common.c private_data.h -domestic/*.[ch] +crypt_conn.c +fcrypt.c +fcrypt.h +sboxes.h +tcrypt.c diff --git a/src/rxkad/rxkad_prototypes.h b/src/rxkad/rxkad_prototypes.h index 505a65e8f..36b8938aa 100644 --- a/src/rxkad/rxkad_prototypes.h +++ b/src/rxkad/rxkad_prototypes.h @@ -19,7 +19,7 @@ #include #endif -/* domestic/crypt_conn.c */ +/* crypt_conn.c */ extern afs_int32 rxkad_DecryptPacket(const struct rx_connection *conn, const fc_KeySchedule * schedule, const fc_InitializationVector * ivec, @@ -30,7 +30,7 @@ extern afs_int32 rxkad_EncryptPacket(const struct rx_connection *conn, const int len, struct rx_packet *packet); -/* domestic/fcrypt.c */ +/* fcrypt.c */ extern int fc_keysched(struct ktc_encryptionKey *key, fc_KeySchedule schedule); extern afs_int32 fc_ecb_encrypt(void * clear, void * cipher, diff --git a/src/rxkad/domestic/sboxes.h b/src/rxkad/sboxes.h similarity index 100% rename from src/rxkad/domestic/sboxes.h rename to src/rxkad/sboxes.h diff --git a/src/rxkad/domestic/tcrypt.c b/src/rxkad/tcrypt.c similarity index 100% rename from src/rxkad/domestic/tcrypt.c rename to src/rxkad/tcrypt.c diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in index dddb5e723..1a1e8d5b1 100644 --- a/src/shlibafsrpc/Makefile.in +++ b/src/shlibafsrpc/Makefile.in @@ -232,10 +232,10 @@ md4.o: ${RXKAD}/md4.c md5.o: ${RXKAD}/md5.c ${CCRULE} -fcrypt.o: ${RXKAD}/domestic/fcrypt.c +fcrypt.o: ${RXKAD}/fcrypt.c ${CCRULE} -I../rxkad -I${RXKAD} -crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c +crypt_conn.o: ${RXKAD}/crypt_conn.c ${CCRULE} -I../rxkad -I${RXKAD} AFS_component_version_number.o: ${RX}/AFS_component_version_number.c -- 2.39.5