diff options
author | Ken Raeburn <raeburn@mit.edu> | 2001-04-10 04:04:09 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2001-04-10 04:04:09 +0000 |
commit | 42277e88ffee1de939b0b3f7a88f253fb5b2af36 (patch) | |
tree | f920bd99bcae1cd4925287cc78db792f753a7fa2 /src/lib/des425 | |
parent | c050b649dc41c43f13a3b40417f0a4cba25d5857 (diff) | |
download | krb5-42277e88ffee1de939b0b3f7a88f253fb5b2af36.zip krb5-42277e88ffee1de939b0b3f7a88f253fb5b2af36.tar.gz krb5-42277e88ffee1de939b0b3f7a88f253fb5b2af36.tar.bz2 |
cleanup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13154 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/des425')
-rw-r--r-- | src/lib/des425/ChangeLog | 7 | ||||
-rw-r--r-- | src/lib/des425/Makefile.in | 13 | ||||
-rw-r--r-- | src/lib/des425/k4_glue.c | 48 |
3 files changed, 13 insertions, 55 deletions
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 15efee5..412dc64 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,10 @@ +2001-04-10 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (STLIBOBJS, OBJS, SRCS): Delete references to + k4_glue.c etc. + (clean): Remove t_quad and t_pcbc object files and test programs. + * k4_glue.c: Deleted. + 2001-04-09 Ken Raeburn <raeburn@mit.edu> * t_pcbc.c: New file. diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 60ee9bb..70ce858 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -41,8 +41,7 @@ STLIBOBJS=cksum.o \ str_to_key.o \ unix_time.o \ util.o \ - weak_key.o \ - k4_glue.o + weak_key.o OBJS= $(OUTPRE)cksum.$(OBJEXT) \ @@ -58,8 +57,7 @@ OBJS= $(OUTPRE)cksum.$(OBJEXT) \ $(OUTPRE)str_to_key.$(OBJEXT) \ $(OUTPRE)unix_time.$(OBJEXT) \ $(OUTPRE)util.$(OBJEXT) \ - $(OUTPRE)weak_key.$(OBJEXT) \ - $(OUTPRE)k4_glue.$(OBJEXT) + $(OUTPRE)weak_key.$(OBJEXT) SRCS= $(srcdir)/cksum.c \ $(srcdir)/des.c \ @@ -74,8 +72,7 @@ SRCS= $(srcdir)/cksum.c \ $(srcdir)/str_to_key.c \ $(srcdir)/unix_time.c \ $(srcdir)/util.c \ - $(srcdir)/weak_key.c \ - $(srcdir)/k4_glue.c + $(srcdir)/weak_key.c all-unix:: all-liblinks all-mac:: $(OBJS) @@ -104,7 +101,9 @@ check-unix:: verify t_quad t_pcbc check-windows:: clean:: - $(RM) $(OUTPRE)verify$(EXEEXT) $(OUTPRE)verify.$(OBJEXT) + $(RM) $(OUTPRE)verify$(EXEEXT) $(OUTPRE)verify.$(OBJEXT) \ + $(OUTPRE)t_quad$(EXEEXT) $(OUTPRE)t_quad.$(OBJEXT) \ + $(OUTPRE)t_pcbc$(EXEEXT) $(OUTPRE)t_pcbc.$(OBJEXT) clean-unix:: clean-liblinks clean-libs clean-libobjs diff --git a/src/lib/des425/k4_glue.c b/src/lib/des425/k4_glue.c deleted file mode 100644 index cab1891..0000000 --- a/src/lib/des425/k4_glue.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * lib/des425/k4_glue.c - * - * Copyright 1995 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Furthermore if you modify this software you must label - * your software as modified software and not distribute it in such a - * fashion that it might be confused with the original M.I.T. software. - * M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - */ - -/* - * k4_glue.c - The glue which holds us together with old versions of K4. - */ - -/* - * This is here because old versions of the Kerberos version 4 library - * reference this symbol. It's just a dangling reference which is supposed - * to be defined by referencing modules. For the purpose of building shared - * libraries, we'll need a definition, and since the des425 library is - * required for K4 compatability, this is as good a place as any. - * - * In an effort to keep this bit of (ahem) logic from being too intrusive, - * we use #pragma weak, if available, otherwise just go with a normal def. - */ - -#if HAVE_PRAGMA_WEAK -#pragma weak req_act_vno = des425_req_act_vno -const int des425_req_act_vno = 4; -#else /* HAVE_PRAGMA_WEAK */ -const int req_act_vno = 4; -#endif /* HAVE_PRAGMA_WEAK */ |