From ef6187491ccb0f6428c4eca3874c501e4851e8e1 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Thu, 5 Nov 1998 04:36:48 +0000 Subject: [PATCH] Make sure filenames are unique across all of the krb5 directories. Renamed all of the */encrypt.c and */decrypt.c files to {dk,raw,old}_{en,de}crypt.c. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11014 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/dk/Makefile.in | 12 ++++++------ src/lib/crypto/dk/{decrypt.c => dk_decrypt.c} | 0 src/lib/crypto/dk/{encrypt.c => dk_encrypt.c} | 0 src/lib/crypto/old/Makefile.in | 7 ++++--- src/lib/crypto/old/{decrypt.c => old_decrypt.c} | 0 src/lib/crypto/old/{encrypt.c => old_encrypt.c} | 0 src/lib/crypto/raw/Makefile.in | 6 +++--- src/lib/crypto/raw/{decrypt.c => raw_decrypt.c} | 0 src/lib/crypto/raw/{encrypt.c => raw_encrypt.c} | 0 9 files changed, 13 insertions(+), 12 deletions(-) rename src/lib/crypto/dk/{decrypt.c => dk_decrypt.c} (100%) rename src/lib/crypto/dk/{encrypt.c => dk_encrypt.c} (100%) rename src/lib/crypto/old/{decrypt.c => old_decrypt.c} (100%) rename src/lib/crypto/old/{encrypt.c => old_encrypt.c} (100%) rename src/lib/crypto/raw/{decrypt.c => raw_decrypt.c} (100%) rename src/lib/crypto/raw/{encrypt.c => raw_encrypt.c} (100%) diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in index 076b0dd66..120978861 100644 --- a/src/lib/crypto/dk/Makefile.in +++ b/src/lib/crypto/dk/Makefile.in @@ -14,23 +14,23 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS=\ checksum.o \ - decrypt.o \ + dk_decrypt.o \ + dk_encrypt.o \ derive.o \ - encrypt.o \ stringtokey.o OBJS=\ checksum.$(OBJEXT) \ - decrypt.$(OBJEXT) \ + dk_decrypt.$(OBJEXT) \ + dk_encrypt.$(OBJEXT) \ derive.$(OBJEXT) \ - encrypt.$(OBJEXT) \ stringtokey.$(OBJEXT) SRCS=\ $(srcdir)/checksum.c \ - $(srcdir)/decrypt.c \ + $(srcdir)/dk_decrypt.c \ + $(srcdir)/dk_encrypt.c \ $(srcdir)/derive.c \ - $(srcdir)/encrypt.c \ $(srcdir)/stringtokey.c ##DOS##LIBOBJS = $(OBJS) diff --git a/src/lib/crypto/dk/decrypt.c b/src/lib/crypto/dk/dk_decrypt.c similarity index 100% rename from src/lib/crypto/dk/decrypt.c rename to src/lib/crypto/dk/dk_decrypt.c diff --git a/src/lib/crypto/dk/encrypt.c b/src/lib/crypto/dk/dk_encrypt.c similarity index 100% rename from src/lib/crypto/dk/encrypt.c rename to src/lib/crypto/dk/dk_encrypt.c diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in index 4bb754465..eb6c772af 100644 --- a/src/lib/crypto/old/Makefile.in +++ b/src/lib/crypto/old/Makefile.in @@ -12,11 +12,12 @@ PROG_RPATH=$(KRB5_LIBDIR) RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf -STLIBOBJS= decrypt.o des_stringtokey.o encrypt.o +STLIBOBJS= des_stringtokey.o old_decrypt.o old_encrypt.o -OBJS= decrypt.$(OBJEXT) des_stringtokey.$(OBJEXT) encrypt.$(OBJEXT) +OBJS= des_stringtokey.$(OBJEXT) old_decrypt.$(OBJEXT) old_encrypt.$(OBJEXT) -SRCS= $(srcdir)/decrypt.c $(srcdir)/des_stringtokey.c $(srcdir)/encrypt.c +SRCS= $(srcdir)/des_stringtokey.c $(srcdir)/old_decrypt.c \ + $(srcdir)/old_encrypt.c ##DOS##LIBOBJS = $(OBJS) diff --git a/src/lib/crypto/old/decrypt.c b/src/lib/crypto/old/old_decrypt.c similarity index 100% rename from src/lib/crypto/old/decrypt.c rename to src/lib/crypto/old/old_decrypt.c diff --git a/src/lib/crypto/old/encrypt.c b/src/lib/crypto/old/old_encrypt.c similarity index 100% rename from src/lib/crypto/old/encrypt.c rename to src/lib/crypto/old/old_encrypt.c diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in index ebff787c1..24b88e0d8 100644 --- a/src/lib/crypto/raw/Makefile.in +++ b/src/lib/crypto/raw/Makefile.in @@ -12,11 +12,11 @@ PROG_RPATH=$(KRB5_LIBDIR) RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf -STLIBOBJS= decrypt.o encrypt.o +STLIBOBJS= raw_decrypt.o raw_encrypt.o -OBJS= decrypt.$(OBJEXT) encrypt.$(OBJEXT) +OBJS= raw_decrypt.$(OBJEXT) raw_encrypt.$(OBJEXT) -SRCS= $(srcdir)/decrypt.c $(srcdir)/encrypt.c +SRCS= $(srcdir)/raw_decrypt.c $(srcdir)/raw_encrypt.c ##DOS##LIBOBJS = $(OBJS) diff --git a/src/lib/crypto/raw/decrypt.c b/src/lib/crypto/raw/raw_decrypt.c similarity index 100% rename from src/lib/crypto/raw/decrypt.c rename to src/lib/crypto/raw/raw_decrypt.c diff --git a/src/lib/crypto/raw/encrypt.c b/src/lib/crypto/raw/raw_encrypt.c similarity index 100% rename from src/lib/crypto/raw/encrypt.c rename to src/lib/crypto/raw/raw_encrypt.c -- 2.26.2