diff options
| author | John Gilmore <gnu@toad.com> | 1995-03-17 05:19:53 +0000 |
|---|---|---|
| committer | John Gilmore <gnu@toad.com> | 1995-03-17 05:19:53 +0000 |
| commit | 4dd1c4ca7319707587a565a0fcd8b105e285d4c1 (patch) | |
| tree | 312d504bd310b987f36d6ab52967ac82635a3cad | |
| parent | a31ef098d251569746200a3744fbde7cfc384544 (diff) | |
| download | krb5-4dd1c4ca7319707587a565a0fcd8b105e285d4c1.tar.gz krb5-4dd1c4ca7319707587a565a0fcd8b105e285d4c1.tar.xz krb5-4dd1c4ca7319707587a565a0fcd8b105e285d4c1.zip | |
* Makefile.in (LDFLAGS): Remove, conflicts with pre.in.
(clean): Insert FIXME.
(verify$(EXEEXT), destest$(EXEEXT)): Make them work on Mac.
(check-mac): Add, identical to Unix.
(clean): Use $(EXEEXT).
* des_int.h (mit_des_cbc_cksum): Fix prototype from void to long,
to match the actual function.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5143 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/crypto/des/ChangeLog | 10 | ||||
| -rw-r--r-- | src/lib/crypto/des/Makefile.in | 14 | ||||
| -rw-r--r-- | src/lib/crypto/des/des_int.h | 2 |
3 files changed, 19 insertions, 7 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 6a6be5466..0a4fcd6d6 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,13 @@ +Thu Mar 16 21:16:24 1995 John Gilmore (gnu at toad.com) + + * Makefile.in (LDFLAGS): Remove, conflicts with pre.in. + (clean): Insert FIXME. + (verify$(EXEEXT), destest$(EXEEXT)): Make them work on Mac. + (check-mac): Add, identical to Unix. + (clean): Use $(EXEEXT). + * des_int.h (mit_des_cbc_cksum): Fix prototype from void to long, + to match the actual function. + Tue Mar 14 17:28:35 1995 Keith Vetter (keithv@fusion.com) * f_cbc.c, f_cksum.c, f_pcbc.c: added casts so that chars get promoted diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index 94be80b3d..d874fc77e 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -1,5 +1,4 @@ CFLAGS = $(CCOPTS) $(DEFS) -LDFLAGS = -g ##DOSBUILDTOP = ..\..\.. ##DOSLIBNAME=..\crypto.lib @@ -48,17 +47,20 @@ includes:: depend depend:: $(SRCS) +# FIXME, this is left from the previous DES implementation. clean:: $(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h -verify: verify.$(OBJEXT) $(DEPKLIB) - $(CC) -o $@ verify.$(OBJEXT) $(KLIB) $(LIBS) $(LDFLAGS) +verify$(EXEEXT): verify.$(OBJEXT) $(DEPKLIB) + $(CC) -o $@ verify.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) -destest: destest.$(OBJEXT) $(DEPKLIB) - $(CC) -o $@ destest.$(OBJEXT) $(KLIB) $(LIBS) $(LDFLAGS) +destest$(EXEEXT): destest.$(OBJEXT) $(DEPKLIB) + $(CC) -o $@ destest.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) check:: check-$(WHAT) +check-mac: check-unix + check-unix:: destest verify ./verify -z ./verify -m @@ -68,4 +70,4 @@ check-unix:: destest verify check-windows:: clean:: - $(RM) destest verify destest.$(OBJEXT) verify.$(OBJEXT) + $(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) verify.$(OBJEXT) diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h index 4e1a7cfe3..8da43335f 100644 --- a/src/lib/crypto/des/des_int.h +++ b/src/lib/crypto/des/des_int.h @@ -35,7 +35,7 @@ extern krb5_error_code INTERFACE mit_des_cbc_checksum PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum FAR * )); /* cksum.c */ -extern void INTERFACE mit_des_cbc_cksum +extern long INTERFACE mit_des_cbc_cksum PROTOTYPE((krb5_octet *, krb5_octet *, long , mit_des_key_schedule , krb5_octet *)); /* des.c */ |