revert-rxkad-new-fcrypt-20021028

until we know why it's brokenn
This commit is contained in:
Derrick Brashear 2002-12-10 15:32:23 +00:00
parent f7f1c50256
commit 98e536b4cc
2 changed files with 21 additions and 11 deletions

View File

@ -14,7 +14,7 @@ INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
rxkad.h rxkad_prototypes.h fcrypt.h v5gen.h
OBJS=rxkad_client.o rxkad_server.o rxkad_common.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
@ -61,6 +61,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}
@ -79,8 +81,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 rxkad_prototypes.h
${CC} ${CFLAGS} -c bg-fcrypt.c
fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
${CC} ${CFLAGS} -c fcrypt.c
tcrypt: tcrypt.o librxkad.a
${CC} -o tcrypt tcrypt.o librxkad.a
@ -99,7 +101,7 @@ fc_test.o: ${INCLS}
clean:
$(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
AFS_component_version_number.c \
fcrypt.h sboxes.h \
crypt_conn.c fcrypt.c fcrypt.h sboxes.h \
fc_test
test:
@ -108,9 +110,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} $? $@

View File

@ -16,20 +16,19 @@
/* domestic/crypt_conn.c */
extern afs_int32 rxkad_DecryptPacket (const struct rx_connection *conn,
const fc_KeySchedule *schedule, const afs_uint32 *ivec,
int len, struct rx_packet *packet);
const fc_KeySchedule *schedule, const fc_InitializationVector *ivec,
const int len, struct rx_packet *packet);
extern afs_int32 rxkad_EncryptPacket (const struct rx_connection *conn,
const fc_KeySchedule *schedule, const afs_uint32 *iv,
int len, struct rx_packet *packet);
const fc_KeySchedule *schedule, const fc_InitializationVector *ivec,
const int len, struct rx_packet *packet);
/* domestic/fcrypt.c */
extern int fc_keysched (void *key,
extern int fc_keysched (struct ktc_encryptionKey *key,
fc_KeySchedule schedule);
extern afs_int32 fc_ecb_encrypt(afs_uint32 *clear, afs_uint32 *cipher,
fc_KeySchedule schedule, int encrypt);
extern afs_int32 fc_cbc_encrypt (afs_uint32 *input, afs_uint32 *output,
afs_int32 length,
extern afs_int32 fc_cbc_encrypt (char *input, char *output, afs_int32 length,
fc_KeySchedule key, afs_uint32 *xor, int encrypt);
/* rxkad_client.c */