Removed ISODE cruft
authorTheodore Tso <tytso@mit.edu>
Fri, 10 Feb 1995 22:57:18 +0000 (22:57 +0000)
committerTheodore Tso <tytso@mit.edu>
Fri, 10 Feb 1995 22:57:18 +0000 (22:57 +0000)
krb5_encode.h and krb5_decode.h have been poured into include/krb5/asn1.h.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4938 dc483132-0cff-0310-8789-dd5450dbe970

12 files changed:
src/lib/krb5/asn.1/ChangeLog
src/lib/krb5/asn.1/Imakefile.isode [deleted file]
src/lib/krb5/asn.1/Makefile.in
src/lib/krb5/asn.1/Makefile.isode.in [deleted file]
src/lib/krb5/asn.1/Makefile.sane.in [deleted file]
src/lib/krb5/asn.1/asn1_k_encode.c
src/lib/krb5/asn.1/configure.in
src/lib/krb5/asn.1/krb5_decode.c
src/lib/krb5/asn.1/krb5_decode.h [deleted file]
src/lib/krb5/asn.1/krb5_encode.c
src/lib/krb5/asn.1/krb5_encode.h [deleted file]
src/lib/krb5/asn.1/process.perl [deleted file]

index 4498926161612b2d8cf17c794ee703200707d1e1..fe4e331f7ef032057852767230f5c19d3f737e22 100644 (file)
@@ -1,3 +1,22 @@
+Fri Feb 10 15:30:45 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * asn1_k_encode.c: Remove #include of krb5_encode.h (it's not
+               needed).
+
+       * krb5_encode.h:
+       * krb5_decode.h: These files removed; their contents have been
+               poured into include/krb5/asn1.h.
+
+       * Makefile.isode.in: Removed.
+
+       * process.perl: Removed (isode cruft).
+
+       * Makefile.sane.in: Removed; contents moved to Makefile.in
+
+       * configure.in: 
+       * Makefile.in: Removed isode croft.  (Makefile.in was
+               Makefile.sane.in) 
+
 Fri Feb  3 01:02:43 1995  John Gilmore  <gnu@cygnus.com>
 
        * asn1_decode_k.c => asn1_k_decode.c
diff --git a/src/lib/krb5/asn.1/Imakefile.isode b/src/lib/krb5/asn.1/Imakefile.isode
deleted file mode 100644 (file)
index a62d695..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-#      $Source$
-#      $Author$
-#      $Id$
-#
-#  Copyright 1990,1991 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.  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.
-# 
-# 
-NormalLibraryObjectRule()
-
-DEFINES=-DPEPSY_LINKABLE_FUNCS
-
-EHDRDIR=$(TOP)/include/krb5/asn.1
-
-SRCS= \
-       KRB5_tables.c   \
-       $(SRCDIR)encode.c       \
-       $(SRCDIR)decode.c       \
-       $(SRCDIR)adat2kadat.c   \
-       $(SRCDIR)addr2kaddr.c   \
-       $(SRCDIR)adr2kadr.c     \
-       $(SRCDIR)aprp2kaprp.c   \
-       $(SRCDIR)aprq2kaprq.c   \
-       $(SRCDIR)arep2karep.c   \
-       $(SRCDIR)auth2kauth.c   \
-       $(SRCDIR)cvt_flags.c    \
-       $(SRCDIR)ck2kck.c       \
-       $(SRCDIR)edat2kedat.c   \
-       $(SRCDIR)ekrp2kekrp.c   \
-       $(SRCDIR)enck2kkey.c    \
-       $(SRCDIR)err2kerr.c     \
-       $(SRCDIR)etpt2ketpt.c   \
-       $(SRCDIR)g2unix.c       \
-       $(SRCDIR)kadat2adat.c   \
-       $(SRCDIR)kaddr2addr.c   \
-       $(SRCDIR)kadr2adr.c     \
-       $(SRCDIR)kaprp2aprp.c   \
-       $(SRCDIR)kaprq2aprq.c   \
-       $(SRCDIR)karep2arep.c   \
-       $(SRCDIR)kauth2auth.c   \
-       $(SRCDIR)kck2ck.c       \
-       $(SRCDIR)kdcr2kkdcr.c   \
-       $(SRCDIR)kdcr2ktgsr.c   \
-       $(SRCDIR)kedat2edat.c   \
-       $(SRCDIR)kekrp2ekrp.c   \
-       $(SRCDIR)kerr2err.c     \
-       $(SRCDIR)ketpt2etpt.c   \
-       $(SRCDIR)kkdcr2kdcr.c   \
-       $(SRCDIR)kkey2enck.c    \
-       $(SRCDIR)klsrq2lsrq.c   \
-       $(SRCDIR)kprep2prep.c   \
-       $(SRCDIR)kprin2prin.c   \
-       $(SRCDIR)kpriv2priv.c   \
-       $(SRCDIR)ksafe2safe.c   \
-       $(SRCDIR)ktran2tran.c   \
-       $(SRCDIR)ktgrq2tgrq.c   \
-       $(SRCDIR)ktgsr2kdcr.c   \
-       $(SRCDIR)ktkt2tkt.c     \
-       $(SRCDIR)lsrq2klsrq.c   \
-       $(SRCDIR)prep2kprep.c   \
-       $(SRCDIR)prin2kprin.c   \
-       $(SRCDIR)priv2kpriv.c   \
-       $(SRCDIR)qbuf2data.c    \
-       $(SRCDIR)safe2ksafe.c   \
-       $(SRCDIR)tran2ktran.c   \
-       $(SRCDIR)tgrq2ktgrq.c   \
-       $(SRCDIR)tkt2ktkt.c     \
-       $(SRCDIR)u2gen.c        \
-       $(SRCDIR)ktgsr2kdcr.c   \
-       $(SRCDIR)kpwd2pwd.c     \
-       $(SRCDIR)kpwds2pwds.c   \
-       $(SRCDIR)pwd2kpwd.c     \
-       $(SRCDIR)pwds2kpwds.c   \
-       $(SRCDIR)cred2kcred.c   \
-       $(SRCDIR)crep2kcrep.c   \
-       $(SRCDIR)kcred2cred.c   \
-       $(SRCDIR)kcrep2crep.c
-
-OBJS= \
-       KRB5_tables.o   \
-       encode.o        \
-       decode.o        \
-       adat2kadat.o    \
-       addr2kaddr.o    \
-       adr2kadr.o      \
-       aprp2kaprp.o    \
-       aprq2kaprq.o    \
-       arep2karep.o    \
-       auth2kauth.o    \
-       cvt_flags.o     \
-       ck2kck.o        \
-       edat2kedat.o    \
-       ekrp2kekrp.o    \
-       enck2kkey.o     \
-       err2kerr.o      \
-       etpt2ketpt.o    \
-       g2unix.o        \
-       kadat2adat.o    \
-       kaddr2addr.o    \
-       kadr2adr.o      \
-       kaprp2aprp.o    \
-       kaprq2aprq.o    \
-       karep2arep.o    \
-       kauth2auth.o    \
-       kck2ck.o        \
-       kdcr2kkdcr.o    \
-       kdcr2ktgsr.o    \
-       kedat2edat.o    \
-       kekrp2ekrp.o    \
-       kerr2err.o      \
-       ketpt2etpt.o    \
-       kkdcr2kdcr.o    \
-       kkey2enck.o     \
-       klsrq2lsrq.o    \
-       kprep2prep.o    \
-       kprin2prin.o    \
-       kpriv2priv.o    \
-       ksafe2safe.o    \
-       ktran2tran.o    \
-       ktgrq2tgrq.o    \
-       ktgsr2kdcr.o    \
-       ktkt2tkt.o      \
-       lsrq2klsrq.o    \
-       prep2kprep.o    \
-       prin2kprin.o    \
-       priv2kpriv.o    \
-       qbuf2data.o     \
-       safe2ksafe.o    \
-       tran2ktran.o    \
-       tgrq2ktgrq.o    \
-       tkt2ktkt.o      \
-       u2gen.o         \
-       kpwd2pwd.o      \
-       kpwds2pwds.o    \
-       pwd2kpwd.o      \
-       pwds2kpwds.o    \
-       cred2kcred.o    \
-       crep2kcrep.o    \
-       kcred2cred.o    \
-       kcrep2crep.o
-
-all:: includes
-
-includes:: KRB5-types.h
-
-SubdirLibraryRule($(OBJS))
-
-PepsyTarget(KRB5)
-
-CopyHeader(KRB5-types.h,$(EHDRDIR))
-CopyHeader(KRB5_defs.h,$(EHDRDIR))
-CopyHeader(KRB5_pre_defs.h,$(EHDRDIR))
-
-Krb5InstallHeaders(KRB5_defs.h KRB5_pre_defs.h KRB5-types.h, $(KRB5_INCDIR)/krb5/asn.1)
-
-clean::
-       $(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
-
-SpecialObjectRule(KRB5_tables.o,KRB5_tables.c,)
-
-depend:: KRB5_tables.c
-
-DependTarget()
-
-#ifdef UseSedHack
-
-#define IHaveSpecialMakefileTarget
-
-Makefile:: $(SRCDIR)Imakefile
-       $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) $(SRCSUBDIR)Imakefile -s Makefile.new
-       $(MAKE) -f Makefile.new noop
-       -@if [ -f Makefile ]; then \
-               echo "$(RM) Makefile.bak; $(MV) Makefile Makefile.bak";\
-               $(RM) Makefile.bak; $(MV) Makefile Makefile.bak;\
-       fi
-       sed 's/^@/      @/' Makefile.new > Makefile || $(MV) Makefile.new Makefile
-       -$(RM) Makefile.new
-
-#endif
-
-noop::
index 744a82de03877588b2f9274371a592330e6f066c..c2e807c057a3d98031053177e66dc21236c092ec 100644 (file)
@@ -1,12 +1,51 @@
-ISODEMAKEFILE = @ISODEMAKEFILE@
+BUILDTOP=@BUILDTOP@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
-all::
-       echo making all in $(CURRENT_DIR)
-       $(MAKE) $(MFLAGS) -f $(ISODEMAKEFILE) CCOPTS="$(CCOPTS)" CC="$(CC)" \
-               CURRENT_DIR=$(CURRENT_DIR) all
+CFLAGS=$(CCOPTS) $(DEFS)
+LDFLAGS = -g
+
+RM = rm -f
+CP = cp
+
+
+PEPSY = @PEPSY@
+PSYFLAGS = @PSYFLAGS@
+
+KRB5ROOT = @KRB5ROOT@
+
+KRB5_INCDIR = $(KRB5ROOT)/include
+
+all:: $(OBJS)
+
+SRCTOP=$(srcdir)/$(BUILDTOP)
+
+EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
+
+SRCS= \
+       $(srcdir)asn1_decode.c\
+       $(srcdir)asn1_k_decode.c\
+       $(srcdir)asn1_ncode.c\
+       $(srcdir)asn1_get.c\
+       $(srcdir)asn1_make.c\
+       $(srcdir)asn1buf.c\
+       $(srcdir)krb5_decode.c\
+       $(srcdir)krb5_encode.c\
+       $(srcdir)asn1_k_encode.c\
+       $(srcdir)asn1_misc.c
+
+OBJS= \
+       asn1_decode.o\
+       asn1_k_decode.o\
+       asn1_encode.o\
+       asn1_get.o\
+       asn1_make.o\
+       asn1buf.o\
+       krb5_decode.o\
+       krb5_encode.o\
+       asn1_k_encode.o\
+       asn1_misc.o
 
 clean::
-       echo making clean in $(CURRENT_DIR)
-       $(MAKE) $(MFLAGS) -f $(ISODEMAKEFILE) CCOPTS="$(CCOPTS)" CC="$(CC)" \
-               CURRENT_DIR=$(CURRENT_DIR) clean
+       $(RM) $(OBJS)
 
diff --git a/src/lib/krb5/asn.1/Makefile.isode.in b/src/lib/krb5/asn.1/Makefile.isode.in
deleted file mode 100644 (file)
index a7422bd..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
-# -I. for isode/
-CFLAGS = $(CCOPTS) $(DEFS) -DPEPSY_LINKABLE_FUNCS -DKRB5_USE_ISODE -I.
-LDFLAGS = -g
-
-RM = rm -f
-CP = cp
-
-
-PEPSY = @PEPSY@
-PSYFLAGS = @PSYFLAGS@
-
-KRB5ROOT = @KRB5ROOT@
-
-KRB5_INCDIR = $(KRB5ROOT)/include
-
-all::
-
-SRCTOP=$(srcdir)/$(BUILDTOP)
-
-EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
-
-SRCS= \
-       KRB5_tables.c   \
-       $(srcdir)/encode.c      \
-       $(srcdir)/decode.c      \
-       $(srcdir)/adat2kadat.c  \
-       $(srcdir)/addr2kaddr.c  \
-       $(srcdir)/adr2kadr.c    \
-       $(srcdir)/aprp2kaprp.c  \
-       $(srcdir)/aprq2kaprq.c  \
-       $(srcdir)/arep2karep.c  \
-       $(srcdir)/auth2kauth.c  \
-       $(srcdir)/cvt_flags.c   \
-       $(srcdir)/ck2kck.c      \
-       $(srcdir)/edat2kedat.c  \
-       $(srcdir)/ekrp2kekrp.c  \
-       $(srcdir)/enck2kkey.c   \
-       $(srcdir)/err2kerr.c    \
-       $(srcdir)/etpt2ketpt.c  \
-       $(srcdir)/g2unix.c      \
-       $(srcdir)/kadat2adat.c  \
-       $(srcdir)/kaddr2addr.c  \
-       $(srcdir)/kadr2adr.c    \
-       $(srcdir)/kaprp2aprp.c  \
-       $(srcdir)/kaprq2aprq.c  \
-       $(srcdir)/karep2arep.c  \
-       $(srcdir)/kauth2auth.c  \
-       $(srcdir)/kck2ck.c      \
-       $(srcdir)/kdcr2kkdcr.c  \
-       $(srcdir)/kdcr2ktgsr.c  \
-       $(srcdir)/kedat2edat.c  \
-       $(srcdir)/kekrp2ekrp.c  \
-       $(srcdir)/kerr2err.c    \
-       $(srcdir)/ketpt2etpt.c  \
-       $(srcdir)/kkdcr2kdcr.c  \
-       $(srcdir)/kkey2enck.c   \
-       $(srcdir)/klsrq2lsrq.c  \
-       $(srcdir)/kprep2prep.c  \
-       $(srcdir)/kprin2prin.c  \
-       $(srcdir)/kpriv2priv.c  \
-       $(srcdir)/ksafe2safe.c  \
-       $(srcdir)/ktran2tran.c  \
-       $(srcdir)/ktgrq2tgrq.c  \
-       $(srcdir)/ktgsr2kdcr.c  \
-       $(srcdir)/ktkt2tkt.c    \
-       $(srcdir)/lsrq2klsrq.c  \
-       $(srcdir)/prep2kprep.c  \
-       $(srcdir)/prin2kprin.c  \
-       $(srcdir)/priv2kpriv.c  \
-       $(srcdir)/qbuf2data.c   \
-       $(srcdir)/safe2ksafe.c  \
-       $(srcdir)/tran2ktran.c  \
-       $(srcdir)/tgrq2ktgrq.c  \
-       $(srcdir)/tkt2ktkt.c    \
-       $(srcdir)/u2gen.c       \
-       $(srcdir)/ktgsr2kdcr.c  \
-       $(srcdir)/kpwd2pwd.c    \
-       $(srcdir)/kpwds2pwds.c  \
-       $(srcdir)/pwd2kpwd.c    \
-       $(srcdir)/pwds2kpwds.c  \
-       $(srcdir)/cred2kcred.c  \
-       $(srcdir)/crep2kcrep.c  \
-       $(srcdir)/kcred2cred.c  \
-       $(srcdir)/kcrep2crep.c
-
-OBJS= \
-       KRB5_tables.o   \
-       encode.o        \
-       decode.o        \
-       adat2kadat.o    \
-       addr2kaddr.o    \
-       adr2kadr.o      \
-       aprp2kaprp.o    \
-       aprq2kaprq.o    \
-       arep2karep.o    \
-       auth2kauth.o    \
-       cvt_flags.o     \
-       ck2kck.o        \
-       edat2kedat.o    \
-       ekrp2kekrp.o    \
-       enck2kkey.o     \
-       err2kerr.o      \
-       etpt2ketpt.o    \
-       g2unix.o        \
-       kadat2adat.o    \
-       kaddr2addr.o    \
-       kadr2adr.o      \
-       kaprp2aprp.o    \
-       kaprq2aprq.o    \
-       karep2arep.o    \
-       kauth2auth.o    \
-       kck2ck.o        \
-       kdcr2kkdcr.o    \
-       kdcr2ktgsr.o    \
-       kedat2edat.o    \
-       kekrp2ekrp.o    \
-       kerr2err.o      \
-       ketpt2etpt.o    \
-       kkdcr2kdcr.o    \
-       kkey2enck.o     \
-       klsrq2lsrq.o    \
-       kprep2prep.o    \
-       kprin2prin.o    \
-       kpriv2priv.o    \
-       ksafe2safe.o    \
-       ktran2tran.o    \
-       ktgrq2tgrq.o    \
-       ktgsr2kdcr.o    \
-       ktkt2tkt.o      \
-       lsrq2klsrq.o    \
-       prep2kprep.o    \
-       prin2kprin.o    \
-       priv2kpriv.o    \
-       qbuf2data.o     \
-       safe2ksafe.o    \
-       tran2ktran.o    \
-       tgrq2ktgrq.o    \
-       tkt2ktkt.o      \
-       u2gen.o         \
-       kpwd2pwd.o      \
-       kpwds2pwds.o    \
-       pwd2kpwd.o      \
-       pwds2kpwds.o    \
-       cred2kcred.o    \
-       crep2kcrep.o    \
-       kcred2cred.o    \
-       kcrep2crep.o
-
-all:: includes
-
-includes:: KRB5-types.h
-
-clean::
-       $(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
-
-KRB5_tables.o: KRB5_tables.c
-
-
-depend:: KRB5_tables.c
-
-
-clean::
-       $(RM) $(OBJS)
-
diff --git a/src/lib/krb5/asn.1/Makefile.sane.in b/src/lib/krb5/asn.1/Makefile.sane.in
deleted file mode 100644 (file)
index abf0fe0..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CFLAGS=$(CCOPTS) $(DEFS)
-LDFLAGS = -g
-
-RM = rm -f
-CP = cp
-
-
-PEPSY = @PEPSY@
-PSYFLAGS = @PSYFLAGS@
-
-KRB5ROOT = @KRB5ROOT@
-
-KRB5_INCDIR = $(KRB5ROOT)/include
-
-all::
-
-SRCTOP=$(srcdir)/$(BUILDTOP)
-
-EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
-
-SRCS= \
-       $(srcdir)asn1_decode.c\
-       $(srcdir)asn1_k_decode.c\
-       $(srcdir)asn1_ncode.c\
-       $(srcdir)asn1_get.c\
-       $(srcdir)asn1_make.c\
-       $(srcdir)asn1buf.c\
-       $(srcdir)krb5_decode.c\
-       $(srcdir)krb5_encode.c\
-       $(srcdir)asn1_k_encode.c\
-       $(srcdir)asn1_misc.c
-
-OBJS= \
-       asn1_decode.o\
-       asn1_k_decode.o\
-       asn1_encode.o\
-       asn1_get.o\
-       asn1_make.o\
-       asn1buf.o\
-       krb5_decode.o\
-       krb5_encode.o\
-       asn1_k_encode.o\
-       asn1_misc.o
-
-all:: includes
-
-clean::
-       $(RM) $(OBJS)
-
-KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c::
-       echo '/* isode sucks */' > $@
-
-clean::
-       $(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
index b515301707cd0e6f8913aa3e3375292aa1c1f224..3114a79fcd52fe59111436c47337eb48912d837e 100644 (file)
@@ -22,7 +22,6 @@
  */
 
 #include "asn1_k_encode.h"
-#include "krb5_encode.h"
 #include "asn1_make.h"
 #include "asn1_encode.h"
 
index b17a3e63bbe0d234543fb15fe6510a83e68a9434..328a01f3aa2ea5c21353d814fb54763d5d734c0b 100644 (file)
@@ -5,32 +5,6 @@ WITH_CC dnl since we're not doing CONFIG_RULES
 dnl CONFIG_RULES
 AC_SET_BUILDTOP
 SubdirLibraryRule([${OBJS}])
-AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs],[
-UsePepsy
-PepsyTarget(KRB5)
-ISODEMAKEFILE=Makefile.isode],[
-ISODEMAKEFILE=Makefile.sane
-PEPSY='@echo'
-PSYFLAGS='not using pepsy'
-AC_SUBST(PEPSY)dnl
-AC_SUBST(PSYFLAGS)dnl
-])
-AC_SUBST(ISODEMAKEFILE)
-CopyHeader(KRB5-types.h,[$(EHDRDIR)])
-CopyHeader(KRB5_defs.h,[$(EHDRDIR)])
-CopyHeader(KRB5_pre_defs.h,[$(EHDRDIR)])
-Krb5InstallHeaders(KRB5_defs.h KRB5_pre_defs.h KRB5-types.h, [$(KRB5_INCDIR)/krb5/asn.1])
-dnl
-dnl ok this is broken but necessary because we're using autoconf
-dnl ...and we can't conditionalize the generation of make rules
-dnl
-CopySrcHeader(krb5_encode.h,[$(EHDRDIR)])
-CopySrcHeader(krb5_decode.h,[$(EHDRDIR)])
-Krb5InstallHeaders(krb5_encode.h krb5_decode.h, [$(KRB5_INCDIR)/krb5/asn.1])
 KRB_INCLUDE
-ISODE_INCLUDE
 WITH_KRB5ROOT
-EXTRA_RULES_OUT(includes.out)
-AC_OUTPUT(pre.out:[$]ac_prepend Makefile.out:Makefile.in post.out:[$]ac_postpend Makefile.isode.out:Makefile.isode.in Makefile.sane.out:Makefile.sane.in,
-       ,
-       [cat pre.out Makefile.out post.out > Makefile; cat pre.out [$]{ISODEMAKEFILE}.out post.out includes.out > [$]{ISODEMAKEFILE}])
+V5_AC_OUTPUT_MAKEFILE
index 91335a419080e1d77acf75d747d3bbebc5b45ceb..69deb3ebb65f68837d2ab3e8be0eb199ab56cb25 100644 (file)
@@ -21,7 +21,7 @@
  * or implied warranty.
  */
 
-#include "krb5_decode.h"
+#include <krb5.h>
 #include "krbasn1.h"
 #include "asn1_k_decode.h"
 #include "asn1_decode.h"
diff --git a/src/lib/krb5/asn.1/krb5_decode.h b/src/lib/krb5/asn.1/krb5_decode.h
deleted file mode 100644 (file)
index 06ef288..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * src/lib/krb5/asn.1/krb5_decode.h
- * 
- * Copyright 1994 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.  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.
- */
-
-#ifndef __KRB5_DECODE_H__
-#define __KRB5_DECODE_H__
-
-#include <krb5/krb5.h>
-
-/*
-   krb5_error_code decode_krb5_structure(const krb5_data *code,
-                                         krb5_structure **rep);
-                                         
-   requires  Expects **rep to not have been allocated;
-              a new *rep is allocated regardless of the old value.
-   effects   Decodes *code into **rep.
-            Returns ENOMEM if memory is exhausted.
-             Returns asn1 and krb5 errors.
-*/
-
-krb5_error_code decode_krb5_authenticator
-       PROTOTYPE((const krb5_data *code, krb5_authenticator **rep));
-
-krb5_error_code decode_krb5_ticket
-       PROTOTYPE((const krb5_data *code, krb5_ticket **rep));
-
-krb5_error_code decode_krb5_encryption_key
-       PROTOTYPE((const krb5_data *output, krb5_keyblock **rep));
-
-krb5_error_code decode_krb5_enc_tkt_part
-       PROTOTYPE((const krb5_data *output, krb5_enc_tkt_part **rep));
-
-krb5_error_code decode_krb5_enc_kdc_rep_part
-       PROTOTYPE((const krb5_data *output, krb5_enc_kdc_rep_part **rep));
-
-krb5_error_code decode_krb5_as_rep
-       PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
-
-krb5_error_code decode_krb5_tgs_rep
-       PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
-
-krb5_error_code decode_krb5_ap_req
-       PROTOTYPE((const krb5_data *output, krb5_ap_req **rep));
-
-krb5_error_code decode_krb5_ap_rep
-       PROTOTYPE((const krb5_data *output, krb5_ap_rep **rep));
-
-krb5_error_code decode_krb5_ap_rep_enc_part
-       PROTOTYPE((const krb5_data *output, krb5_ap_rep_enc_part **rep));
-
-krb5_error_code decode_krb5_as_req
-       PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
-
-krb5_error_code decode_krb5_tgs_req
-       PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
-
-krb5_error_code decode_krb5_kdc_req_body
-       PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
-
-krb5_error_code decode_krb5_safe
-       PROTOTYPE((const krb5_data *output, krb5_safe **rep));
-
-krb5_error_code decode_krb5_priv
-       PROTOTYPE((const krb5_data *output, krb5_priv **rep));
-
-krb5_error_code decode_krb5_enc_priv_part
-       PROTOTYPE((const krb5_data *output, krb5_priv_enc_part **rep));
-
-krb5_error_code decode_krb5_cred
-       PROTOTYPE((const krb5_data *output, krb5_cred **rep));
-
-krb5_error_code decode_krb5_enc_cred_part
-       PROTOTYPE((const krb5_data *output, krb5_cred_enc_part **rep));
-
-krb5_error_code decode_krb5_error
-       PROTOTYPE((const krb5_data *output, krb5_error **rep));
-
-krb5_error_code decode_krb5_authdata
-       PROTOTYPE((const krb5_data *output, krb5_authdata ***rep));
-
-krb5_error_code decode_krb5_pwd_sequence
-       PROTOTYPE((const krb5_data *output, passwd_phrase_element **rep));
-
-krb5_error_code decode_krb5_pwd_data
-       PROTOTYPE((const krb5_data *output, krb5_pwd_data **rep));
-
-#endif
index ca6d5c1ad7190d20831a82bfee888665c1b2034a..46d969688610d8de5e1f651a1bb5053b215e8810 100644 (file)
@@ -21,7 +21,7 @@
  * or implied warranty.
  */
 
-#include "krb5_encode.h"
+#include <krb5.h>
 #include "asn1_k_encode.h"
 #include "asn1_encode.h"
 #include "krbasn1.h"
diff --git a/src/lib/krb5/asn.1/krb5_encode.h b/src/lib/krb5/asn.1/krb5_encode.h
deleted file mode 100644 (file)
index af2dd71..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * src/lib/krb5/asn.1/krb5_encode.h
- * 
- * Copyright 1994 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.  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.
- */
-
-#ifndef __KRB5_ENCODE_H__
-#define __KRB5_ENCODE_H__
-
-#include <krb5/krb5.h>
-
-/*
-   krb5_error_code encode_krb5_structure(const krb5_structure *rep,
-                                        krb5_data **code);
-   modifies  *code
-   effects   Returns the ASN.1 encoding of *rep in **code.
-             Returns ASN1_MISSING_FIELD if a required field is emtpy in *rep.
-             Returns ENOMEM if memory runs out.
-*/
-
-krb5_error_code encode_krb5_authenticator
-       PROTOTYPE((const krb5_authenticator *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_ticket
-       PROTOTYPE((const krb5_ticket *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_encryption_key
-       PROTOTYPE((const krb5_keyblock *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_enc_tkt_part
-       PROTOTYPE((const krb5_enc_tkt_part *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_enc_kdc_rep_part
-       PROTOTYPE((const krb5_enc_kdc_rep_part *rep, krb5_data **code));
-
-/* yes, the translation is identical to that used for KDC__REP */ 
-krb5_error_code encode_krb5_as_rep
-       PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
-
-/* yes, the translation is identical to that used for KDC__REP */ 
-krb5_error_code encode_krb5_tgs_rep
-       PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_ap_req
-       PROTOTYPE((const krb5_ap_req *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_ap_rep
-       PROTOTYPE((const krb5_ap_rep *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_ap_rep_enc_part
-       PROTOTYPE((const krb5_ap_rep_enc_part *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_as_req
-       PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_tgs_req
-       PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_kdc_req_body
-       PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_safe
-       PROTOTYPE((const krb5_safe *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_priv
-       PROTOTYPE((const krb5_priv *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_enc_priv_part
-       PROTOTYPE((const krb5_priv_enc_part *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_cred
-       PROTOTYPE((const krb5_cred *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_enc_cred_part
-       PROTOTYPE((const krb5_cred_enc_part *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_error
-       PROTOTYPE((const krb5_error *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_authdata
-       PROTOTYPE((const krb5_authdata **rep, krb5_data **code));
-
-krb5_error_code encode_krb5_pwd_sequence
-       PROTOTYPE((const passwd_phrase_element *rep, krb5_data **code));
-
-krb5_error_code encode_krb5_pwd_data
-       PROTOTYPE((const krb5_pwd_data *rep, krb5_data **code));
-
-#endif
diff --git a/src/lib/krb5/asn.1/process.perl b/src/lib/krb5/asn.1/process.perl
deleted file mode 100644 (file)
index ce3e84b..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# usage: perl process <input-c-file> <output-prefix> <c-flist> <o-flist>
-#
-$header = "";
-$count = 0;
-$pepyid = "";
-$extrainclude = '#include <krb5/asn.1/KRB5-types-aux.h>' . "\n";
-
-if ($#ARGV != 3) {die "Usage: process input-file.c output-prefix cflist-file oflist-file";}
-
-print "processing ", $ARGV[0], "\n";
-open(CFILE, "< $ARGV[0]") || die "can't open $ARGV[0]";
-open(CFLIST, "> $ARGV[2]") || die "can't open $ARGV[2]";
-open(OFLIST, "> $ARGV[3]") || die "can't open $ARGV[2]";
-
-mainloop: while (<CFILE>) {
-       next mainloop if /^# line/;
-       if (/pepyid/) {
-               $pepyid = $_;
-       } elsif (/^\/\* ARGS|^free/) {
-               print "processing output from $pepyid" if ($count == 0);
-               close(OUTFILE);
-               $ofile = "$ARGV[1]" . $count . ".c";
-               open(OUTFILE, ">$ofile" ) || die "can't open file $ofile";
-               print OUTFILE $pepyid if ($count == 0);
-               print $ofile, "\n";
-               @clist = (@clist, " " . $ofile);
-               $count++;
-               print OUTFILE $header;
-               print OUTFILE $extrainclude;
-               print OUTFILE $_;
-       } elsif ($count == 0) {
-               $header .= $_;
-       } else {
-               print OUTFILE $_;
-       }
-}
-close(OUTFILE);
-print CFLIST "TYPESSRCS= ", @clist, "\n";
-close(CFLIST);
-while ($cfile = shift(@clist))  {
-       $cfile =~ s/.c$/.o/;
-       @olist = (@olist, $cfile);
-}
-print OFLIST "TYPESOBJS=", @olist, "\n";
-close(OFLIST);
-#
-#      $Source$
-#      $Author$
-#      $Id$