Revert to previous fcrypt implementation until the new one actually works.

diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common
index d0c86a0fd9a679f970c03b32acbe520130d6312b..73a84c64dd320a035b8ce1b5d6f8d9815b75ee0c 100644 (file)
--- a/src/libafs/Makefile.common
+++ b/src/libafs/Makefile.common
@@ -95,7 +95,7 @@ AFSAOBJS = \
        xdr_arrayn.o    \
        xdr_int64.o     \
        Kvice.cs.o      \
-       bg-fcrypt.o             \
+       fcrypt.o                \
        rx.o            \
        rx_rdwr.o       \
        rx_clock.o      \
@@ -114,6 +114,7 @@ AFSAOBJS = \
        Krxstat.ss.o    \
        Krxstat.xdr.o   \
        rxstat.o        \
+       crypt_conn.o    \
        AFS_component_version_number.o\
        afs_exporter.o  \
        rxkad_client.o  \
@@ -246,7 +247,9 @@ afs_memcache.o: $(AFS)/afs_memcache.c
        $(CRULE1);
 afs_stat.o: $(AFS)/afs_stat.c
        $(CRULE1);
-bg-fcrypt.o:   $(AFS)/bg-fcrypt.c
+fcrypt.o:      $(AFS)/fcrypt.c
+       $(CRULE1);
+crypt_conn.o: $(AFS)/crypt_conn.c
        $(CRULE1);
 rxkad_client.o: $(AFS)/rxkad_client.c
        $(CRULE1);

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 0f4ec27be68cfe22646e93793b19cfccfe1f287c..cc2fee5d17dd0167e6105dc06587fe49d87ad873 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -102,7 +102,8 @@ RXKADOBJS =\
        ticket.o \
        ticket5.o \
        crc.o \
-       bg-fcrypt.o
+       fcrypt.o \
+       crypt_conn.o
 
 DESOBJS =\
        des.o \
@@ -206,7 +207,10 @@ ticket5.o: ${RXKAD}/ticket5.c
 crc.o: ${RXKAD}/crc.c
        ${CCRULE}
 
-bg-fcrypt.o: ${RXKAD}/bg-fcrypt.c
+fcrypt.o: ${RXKAD}/fcrypt.c
+       ${CCRULE}
+
+crypt_conn.o: ${RXKAD}/crypt_conn.c
        ${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c

diff --git a/src/libuafs/Makefile.common b/src/libuafs/Makefile.common
index 97688490dff8b1768eeefca6b12172309994ce8f..00a930380c55718465f327e614ecdec6f6b23448 100644 (file)
--- a/src/libuafs/Makefile.common
+++ b/src/libuafs/Makefile.common
@@ -107,7 +107,7 @@ UAFSOBJ = \
        $(UOBJ)/Kvice.xdr.o \
        $(UOBJ)/xdr_arrayn.o \
        $(UOBJ)/Kvice.cs.o \
-       $(UOBJ)/bg-fcrypt.o \
+       $(UOBJ)/fcrypt.o \
        $(UOBJ)/rx.o \
        $(UOBJ)/rx_rdwr.o \
        $(UOBJ)/rx_clock.o \
@@ -124,6 +124,7 @@ UAFSOBJ = \
        $(UOBJ)/Kvldbint.cs.o \
        $(UOBJ)/Kvldbint.xdr.o \
        $(UOBJ)/Kcallback.ss.o \
+       $(UOBJ)/crypt_conn.o \
        $(UOBJ)/AFS_component_version_number.o \
        $(UOBJ)/afs_exporter.o \
        $(UOBJ)/rxkad_client.o \
@@ -223,7 +224,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/Kvice.xdr.o \
        $(WEBOBJ)/xdr_arrayn.o \
        $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/bg-fcrypt.o \
+       $(WEBOBJ)/fcrypt.o \
        $(WEBOBJ)/rx.o \
        $(WEBOBJ)/rx_rdwr.o \
        $(WEBOBJ)/rx_clock.o \
@@ -240,6 +241,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
        $(WEBOBJ)/Kcallback.ss.o \
+       $(WEBOBJ)/crypt_conn.o \
        $(WEBOBJ)/AFS_component_version_number.o \
        $(WEBOBJ)/afs_exporter.o \
        $(WEBOBJ)/rxkad_client.o \
@@ -339,7 +341,7 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/Kvice.xdr.o \
        $(WEBOBJ)/xdr_arrayn.o \
        $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/bg-fcrypt.o \
+       $(WEBOBJ)/fcrypt.o \
        $(WEBOBJ)/rx.o \
        $(WEBOBJ)/rx_rdwr.o \
        $(WEBOBJ)/rx_clock.o \
@@ -356,6 +358,7 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
        $(WEBOBJ)/Kcallback.ss.o \
+       $(WEBOBJ)/crypt_conn.o \
        $(WEBOBJ)/AFS_component_version_number.o \
        $(WEBOBJ)/afs_exporter.o \
        $(WEBOBJ)/rxkad_client.o \
@@ -495,7 +498,9 @@ $(UOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
        $(CRULE1);
 $(UOBJ)/afs_stat.o: $(AFS)/afs_stat.c
        $(CRULE1);
-$(UOBJ)/bg-fcrypt.o:   $(AFS)/bg-fcrypt.c
+$(UOBJ)/fcrypt.o:      $(AFS)/fcrypt.c
+       $(CRULE1);
+$(UOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
        $(CRULE1);
 $(UOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
        $(CRULE1);
@@ -738,7 +743,9 @@ $(WEBOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
        $(CRULE2);
 $(WEBOBJ)/afs_stat.o: $(AFS)/afs_stat.c
        $(CRULE2);
-$(WEBOBJ)/bg-fcrypt.o:         $(AFS)/bg-fcrypt.c
+$(WEBOBJ)/fcrypt.o:    $(AFS)/fcrypt.c
+       $(CRULE2);
+$(WEBOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
        $(CRULE2);
 $(WEBOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
        $(CRULE2);

diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index 0f4b0bd51156a5572fdd3e64f551c5067d0cc68e..543e4adc7700d699892d72ced5f53a849effcfa6 100644 (file)
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -38,7 +38,7 @@ INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
        rxkad.h v5gen.h
 
 OBJS=rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o \
-       bg-fcrypt.o ticket.o ticket5.o crc.o
+       fcrypt.o crypt_conn.o ticket.o ticket5.o crc.o
 
 fc_test_OBJS=fc_test.o
 
@@ -57,8 +57,10 @@ all: kinstall ukinstall ${TOP_LIBDIR}/librxkad.a fc_test \
 kinstall: \
        ${KERNELDIR}/afs/private_data.h \
        ${KERNELDIR}/afs/rxkad.h \
+       ${KERNELDIR}/afs/sboxes.h \
        ${KERNELDIR}/afs/fcrypt.h \
-       ${KERNELDIR}/afs/bg-fcrypt.c \
+       ${KERNELDIR}/afs/fcrypt.c \
+       ${KERNELDIR}/afs/crypt_conn.c \
        ${KERNELDIR}/afs/rxkad_client.c \
        ${KERNELDIR}/afs/rxkad_common.c 
 
@@ -68,10 +70,16 @@ ${KERNELDIR}/afs/private_data.h: private_data.h
 ${KERNELDIR}/afs/rxkad.h: rxkad.h
        ${INSTALL} $? $@
 
+${KERNELDIR}/afs/sboxes.h: sboxes.h
+       ${INSTALL} $? $@
+
 ${KERNELDIR}/afs/fcrypt.h: fcrypt.h
        ${INSTALL} $? $@
 
-${KERNELDIR}/afs/bg-fcrypt.c: bg-fcrypt.c
+${KERNELDIR}/afs/fcrypt.c: fcrypt.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afs/crypt_conn.c: crypt_conn.c
        ${INSTALL} $? $@
 
 ${KERNELDIR}/afs/rxkad_client.c: rxkad_client.c
@@ -86,8 +94,10 @@ ukinstall: \
        ${UKERNELDIR}/afs/private_data.h \
        ${UKERNELDIR}/afs/rxkad.h \
        ${UKERNELDIR}/rx/rxkad.h \
+       ${UKERNELDIR}/afs/sboxes.h \
        ${UKERNELDIR}/afs/fcrypt.h \
-       ${UKERNELDIR}/afs/bg-fcrypt.c \
+       ${UKERNELDIR}/afs/fcrypt.c \
+       ${UKERNELDIR}/afs/crypt_conn.c \
        ${UKERNELDIR}/afs/rxkad_client.c \
        ${UKERNELDIR}/afs/rxkad_common.c \
        ${UKERNELDIR}/afs/ticket.c \
@@ -117,10 +127,16 @@ ${UKERNELDIR}/afs/lifetimes.h: lifetimes.h
 ${UKERNELDIR}/afs/ticket.c: ticket.c
        ${INSTALL} $? $@
 
+${UKERNELDIR}/afs/sboxes.h: sboxes.h
+       ${INSTALL} $? $@
+
 ${UKERNELDIR}/afs/fcrypt.h: fcrypt.h
        ${INSTALL} $? $@
 
-${UKERNELDIR}/afs/bg-fcrypt.c: bg-fcrypt.c
+${UKERNELDIR}/afs/fcrypt.c: fcrypt.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/crypt_conn.c: crypt_conn.c
        ${INSTALL} $? $@
 
 ${UKERNELDIR}/afs/rxkad_client.c: rxkad_client.c
@@ -152,6 +168,8 @@ librxkad.a: ${OBJS} AFS_component_version_number.o
        $(AR) crv $@ ${OBJS} AFS_component_version_number.o
        $(RANLIB) $@
 
+crypt_conn.o: fcrypt.h private_data.h crypt_conn.c ${INCLS}
+
 rxkad_client.o: fcrypt.h private_data.h rxkad_client.c ${INCLS}
 
 rxkad_server.o: fcrypt.h private_data.h rxkad_server.c ${INCLS}
@@ -170,8 +188,8 @@ ticket5.o: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS}
 
 crc.o: crc.c ${INCLS}
 
-bg-fcrypt.o: bg-fcrypt.c fcrypt.h rxkad.h
-       ${CC} ${CFLAGS} -c bg-fcrypt.c
+fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h
+       ${CC} ${CFLAGS} -c fcrypt.c
 
 tcrypt: tcrypt.o librxkad.a 
        ${CC} -o tcrypt tcrypt.o librxkad.a
@@ -190,7 +208,7 @@ fc_test.o: ${INCLS}
 clean: 
        $(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
                AFS_component_version_number.c \
-               fcrypt.h \
+               crypt_conn.c fcrypt.c fcrypt.h sboxes.h \
                fc_test
 
 test:
@@ -199,9 +217,18 @@ test:
 # These sources are kept in a separate directory so that we can use an
 # ACL to comply with source export restrictions.
 
+crypt_conn.c: domestic/crypt_conn.c
+       ${INSTALL} $? $@
+
+fcrypt.c: domestic/fcrypt.c
+       ${INSTALL} $? $@
+
 fcrypt.h: domestic/fcrypt.h
        ${INSTALL} $? $@
 
+sboxes.h: domestic/sboxes.h
+       ${INSTALL} $? $@
+
 tcrypt.c: domestic/tcrypt.c
        ${INSTALL} $? $@
 

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 6346c2a6e4661df0b0bbad74af25071106e41584..021028954a2e2b8072593d390050a81d7b436862 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -104,7 +104,8 @@ RXKADOBJS =\
        ticket.o \
        ticket5.o \
        crc.o \
-       bg-fcrypt.o 
+       fcrypt.o \
+       crypt_conn.o
 
 DESOBJS =\
        des.o \
@@ -214,7 +215,10 @@ ticket5.o: ${RXKAD}/ticket5.c
 crc.o: ${RXKAD}/crc.c
        ${CCRULE}
 
-bg-fcrypt.o: ${RXKAD}/bg-fcrypt.c
+fcrypt.o: ${RXKAD}/fcrypt.c
+       ${CCRULE}
+
+crypt_conn.o: ${RXKAD}/crypt_conn.c
        ${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c