summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/crypto/des/ChangeLog5
-rw-r--r--src/lib/crypto/des/Makefile.in6
-rw-r--r--src/lib/crypto/des/t_verify.c (renamed from src/lib/crypto/des/verify.c)0
3 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 80254d6922..5e19617591 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 28 16:00:00 1995 John Rivlin <jrivlin@fusion.com>
+
+ * Makefile.in: Renamed verify.c to t_verify.c to avoid conflict with
+ lib/gssapi/krb5/verify.c on the Mac.
+
Mon Sep 25 16:48:36 1995 Theodore Y. Ts'o <tytso@dcl>
* Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 5cd1c04eeb..4cd74bdcb1 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -62,8 +62,8 @@ depend:: $(SRCS)
clean::
$(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
-verify$(EXEEXT): verify.$(OBJEXT) $(DEPKLIB)
- $(CC) -o $@ verify.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS)
+verify$(EXEEXT): t_verify.$(OBJEXT) $(DEPKLIB)
+ $(CC) -o $@ t_verify.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS)
destest$(EXEEXT): destest.$(OBJEXT) $(DEPKLIB)
$(CC) -o $@ destest.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS)
@@ -79,7 +79,7 @@ check-unix:: destest verify
check-windows::
clean::
- $(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) verify.$(OBJEXT)
+ $(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) t_verify.$(OBJEXT)
clean-unix::
$(RM) shared/*
diff --git a/src/lib/crypto/des/verify.c b/src/lib/crypto/des/t_verify.c
index 7ae08c7638..7ae08c7638 100644
--- a/src/lib/crypto/des/verify.c
+++ b/src/lib/crypto/des/t_verify.c