From e43659ab28cc39ea659aaf26a07ba0b8780b4c07 Mon Sep 17 00:00:00 2001 From: vlm Date: Sun, 19 Sep 2004 19:40:52 +0000 Subject: [PATCH] CGI environment for online ASN.1 compilation git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@355 59561ff5-6e30-0410-9f3c-9617f08c8826 --- ChangeLog | 4 + Makefile.am | 7 +- Makefile.in | 20 +- README | 23 +- asn1c/Makefile.am | 2 +- asn1c/Makefile.in | 3 +- asn1c/tests/Makefile.in | 1 - asn1c/webcgi/Makefile.am | 4 + asn1c/webcgi/Makefile.in | 437 +++++++++++++++++++++++++++++++ asn1c/webcgi/README | 21 ++ asn1c/webcgi/asn1c-suid-helper.c | 87 ++++++ asn1c/webcgi/asn1c.cgi | 435 ++++++++++++++++++++++++++++++ configure | 67 +++-- configure.in | 6 +- doc/Makefile.in | 1 - examples/Makefile.in | 1 - libasn1compiler/Makefile.in | 1 - libasn1fix/Makefile.in | 1 - libasn1parser/Makefile.in | 3 +- libasn1print/Makefile.in | 1 - skeletons/Makefile.in | 1 - skeletons/tests/Makefile.in | 1 - tests/Makefile.in | 1 - 23 files changed, 1057 insertions(+), 71 deletions(-) create mode 100644 asn1c/webcgi/Makefile.am create mode 100644 asn1c/webcgi/Makefile.in create mode 100644 asn1c/webcgi/README create mode 100644 asn1c/webcgi/asn1c-suid-helper.c create mode 100755 asn1c/webcgi/asn1c.cgi diff --git a/ChangeLog b/ChangeLog index 5949abeb..d8a65bdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ +0.9.6: 2004-Sep-19 + + * Added CGI for online ASN.1 compilation (asn1c/webcgi). + 0.9.5: 2004-Sep-17 * Fixed CER (common BER) decoder code. See check-25.c/VisibleString diff --git a/Makefile.am b/Makefile.am index 2b6d1e95..6d02a818 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,9 @@ SUBDIRS = \ skeletons examples tests \ doc asn1c -EXTRA_DIST = BUGS MANIFEST - docsdir = $(datadir)/doc/asn1c -docs_DATA = INSTALL README FAQ BUGS TODO +docs_DATA = README FAQ COPYING ChangeLog BUGS TODO + +EXTRA_DIST = asn1c.spec.in FAQ BUGS MANIFEST +CLEANFILES = asn1c.spec diff --git a/Makefile.in b/Makefile.in index ce718abd..98cf233b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,10 +36,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO config.guess config.sub depcomp install-sh ltconfig \ - ltmain.sh missing mkinstalldirs + $(srcdir)/Makefile.in $(srcdir)/asn1c.spec.in \ + $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ + ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ + install-sh ltconfig ltmain.sh missing mkinstalldirs subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -49,7 +49,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = asn1c.spec SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -132,7 +132,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ @@ -191,9 +190,10 @@ SUBDIRS = \ skeletons examples tests \ doc asn1c -EXTRA_DIST = BUGS MANIFEST docsdir = $(datadir)/doc/asn1c -docs_DATA = INSTALL README FAQ BUGS TODO +docs_DATA = README FAQ COPYING ChangeLog BUGS TODO +EXTRA_DIST = asn1c.spec.in FAQ BUGS MANIFEST +CLEANFILES = asn1c.spec all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -248,6 +248,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +asn1c.spec: $(top_builddir)/config.status $(srcdir)/asn1c.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -399,6 +401,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) + $(mkdir_p) $(distdir)/. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -560,6 +563,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f $(CONFIG_CLEAN_FILES) diff --git a/README b/README index 9face077..be74c6ba 100644 --- a/README +++ b/README @@ -1,12 +1,16 @@ WHAT TO READ? ============= -For quick installation tips read INSTALL. +If you haven't installed the asn1c yet, read the INSTALL file for +a short installation guide. For the list of asn1c command line options, see `asn1c -h` or `man asn1c`. For more complete documentation on this compiler and on using the -results of compilation please look into ./doc directory. +results of compilation phase, please look into asn1c-usage.{pdf,html}. +If you are building the compiler from the sources, these documents reside +in the ./doc directory, otherwise they lie nearby the README file you're +reading right now. Please also read the FAQ file. @@ -19,18 +23,19 @@ QUICK START After building [and installing] the compiler (see INSTALL), you may use the asn1c command to compile the ASN.1 specification: - asn1c + asn1c # Compile module If several specifications contain interdependencies, all of them must be specified: - asn1c ... + asn1c ... # Compile interdependent modules -The ./examples directory contains several ASN.1 modules and a script to -extract ASN.1 modules from RFC documents. Refer to the README file in that -directory. To compile X.509 PKI module: +If you are building the asn1c from the sources, the ./examples directory +contains several ASN.1 modules and a script to extract the ASN.1 modules +from RFC documents. Refer to the README file in that directory. +To compile the X.509 PKI module: - ./asn1c/asn1c -P ./examples/rfc3280-*.asn1 + ./asn1c/asn1c -P ./examples/rfc3280-*.asn1 # Compile-n-print In this example, -P option is used to instruct the compiler to print the compiled text on the standard output instead of creating multiple .c @@ -44,7 +49,7 @@ to dump out the parsed (and fixed) ASN.1 specification as it was whether a particular syntactic construction is properly supported by the compiler. - asn1c -EF + asn1c -EF # Check semantic validity MODEL OF OPERATION diff --git a/asn1c/Makefile.am b/asn1c/Makefile.am index 21da616d..63bb31c2 100644 --- a/asn1c/Makefile.am +++ b/asn1c/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = . tests +SUBDIRS = . tests webcgi AM_CFLAGS = @ADD_CFLAGS@ AM_CPPFLAGS = \ diff --git a/asn1c/Makefile.in b/asn1c/Makefile.in index 44d20fd1..431b38ab 100644 --- a/asn1c/Makefile.in +++ b/asn1c/Makefile.in @@ -143,7 +143,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ @@ -196,7 +195,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -SUBDIRS = . tests +SUBDIRS = . tests webcgi AM_CFLAGS = @ADD_CFLAGS@ AM_CPPFLAGS = \ -I${top_srcdir}/libasn1compiler \ diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in index 2105fb9e..e4b6b3b1 100644 --- a/asn1c/tests/Makefile.in +++ b/asn1c/tests/Makefile.in @@ -103,7 +103,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ diff --git a/asn1c/webcgi/Makefile.am b/asn1c/webcgi/Makefile.am new file mode 100644 index 00000000..332d2c5c --- /dev/null +++ b/asn1c/webcgi/Makefile.am @@ -0,0 +1,4 @@ + +noinst_SCRIPTS = asn1c.cgi +noinst_PROGRAMS = asn1c-suid-helper + diff --git a/asn1c/webcgi/Makefile.in b/asn1c/webcgi/Makefile.in new file mode 100644 index 00000000..8b83b04c --- /dev/null +++ b/asn1c/webcgi/Makefile.in @@ -0,0 +1,437 @@ +# Makefile.in generated by automake 1.8.4 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +SOURCES = asn1c-suid-helper.c + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +noinst_PROGRAMS = asn1c-suid-helper$(EXEEXT) +subdir = asn1c/webcgi +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +PROGRAMS = $(noinst_PROGRAMS) +asn1c_suid_helper_SOURCES = asn1c-suid-helper.c +asn1c_suid_helper_OBJECTS = asn1c-suid-helper.$(OBJEXT) +asn1c_suid_helper_LDADD = $(LDADD) +SCRIPTS = $(noinst_SCRIPTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/asn1c-suid-helper.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = asn1c-suid-helper.c +DIST_SOURCES = asn1c-suid-helper.c +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADD_CFLAGS = @ADD_CFLAGS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CONFIGURE_DEPENDS = @CONFIGURE_DEPENDS@ +CPLUSPLUS_FOUND_FALSE = @CPLUSPLUS_FOUND_FALSE@ +CPLUSPLUS_FOUND_TRUE = @CPLUSPLUS_FOUND_TRUE@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +noinst_SCRIPTS = asn1c.cgi +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu asn1c/webcgi/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu asn1c/webcgi/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +asn1c-suid-helper$(EXEEXT): $(asn1c_suid_helper_OBJECTS) $(asn1c_suid_helper_DEPENDENCIES) + @rm -f asn1c-suid-helper$(EXEEXT) + $(LINK) $(asn1c_suid_helper_LDFLAGS) $(asn1c_suid_helper_OBJECTS) $(asn1c_suid_helper_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1c-suid-helper.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -z "$$unique" && unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) $(SCRIPTS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/asn1c/webcgi/README b/asn1c/webcgi/README new file mode 100644 index 00000000..063b0fc3 --- /dev/null +++ b/asn1c/webcgi/README @@ -0,0 +1,21 @@ + +This is the source of the CGI-based Web wrapper around asn1c compiler. + +To install, execute the following steps in this directory + + CGIDIR=/path/where/webserver/CGIs/are/stored + make # Ensure the binary files are built + cp asn1c.cgi asn1c-suid-helper $CGIDIR + chmod 4555 $CGIDIR/asn1c-suid-helper + chown root $CGIDIR/asn1c-suid-helper + # edit the $CGIDIR/asn1c.cgi to set up a few preferences + # in the beginning of that Perl script. + +The chmod command makes the asn1c-suid-helper program setuid. +The asn1c-suid-helper is a tiny wrapper (look in the asn1c-suid-helper.c), +which has the single purpose of running the asn1c compiler under extremely +strict environment. +The root uid and 4555 mode actually _raise_ security of the whole ASN.1 CGI +system, so don't worry. +If you're still uncertain, just go read the source code, it's only a page long. + diff --git a/asn1c/webcgi/asn1c-suid-helper.c b/asn1c/webcgi/asn1c-suid-helper.c new file mode 100644 index 00000000..64390981 --- /dev/null +++ b/asn1c/webcgi/asn1c-suid-helper.c @@ -0,0 +1,87 @@ +#include +#include +#include +#include +#include +#include +#include + +/* + * This program chroots into a given directory, + * then executes the asn1c command with strict arguments checking. + */ +int +main(int ac, char **av) { + char **argv; + char *envp[] = { NULL }; /* Empty environment */ + int ret; + int i; + + if(ac < 3) { + setgid(getgid()); + setuid(getuid()); + fprintf(stderr, + "Usage: %s [options]\n", av[0]); + exit(EX_USAGE); + } + + ret = chroot(av[1]); + + /* Drop the privileges */ + setgid(getgid()); + setuid(getuid()); + + if(ret != 0) { + fprintf(stderr, "chroot(\"%s\") failed: %s\n", + av[1], strerror(errno)); + exit(EX_OSERR); + } + + if(chdir(av[2]) != 0) { + fprintf(stderr, "chdir(\"%s\") failed: %s\n", + av[2], strerror(errno)); + exit(EX_OSERR); + } + + if(ac > 64) { + fprintf(stderr, "Insecure number of arguments: %d\n", ac); + exit(EX_DATAERR); + } + + argv = calloc(ac + 1, sizeof(*argv)); + if(argv) { + argv[0] = "asn1c"; + argv[1] = "-S/skeletons"; + memcpy(argv + 2, av + 3, (ac - 3) * sizeof(*argv)); + } else { + perror("malloc()"); + exit(EX_OSERR); + } + + /* + * Check arguments for the permitted alphabet constraints. + */ + for(i = 3; i < ac; i++) { + char *p; + for(p = av[i];; p++) { + switch(*p) { + case '0' ... '9': case 'A' ... 'Z': case 'a' ... 'z': + case '.': case '_': case '-': case '=': + continue; + case '\0': + default: + break; + } + break; + } + if(*p || (p - av[i]) > 250) { + fprintf(stderr, "Insecure argument %d\n", i); + exit(EX_DATAERR); + } + } + + execve("/bin/asn1c", argv, envp); + + exit(EX_UNAVAILABLE); +} + diff --git a/asn1c/webcgi/asn1c.cgi b/asn1c/webcgi/asn1c.cgi new file mode 100755 index 00000000..68ab225c --- /dev/null +++ b/asn1c/webcgi/asn1c.cgi @@ -0,0 +1,435 @@ +#!/usr/bin/perl -w +# +# $Id$ +# + +############################################################################ +# The following preferences may be modified to match the local environment # +############################################################################ + +# Directory with the users data. +$TMPDIR = '/tmp/asn1c-cgi-jail/'; +$SUIDHelper = './asn1c-suid-helper'; +$SkeletonsDir = '/usr/local/share/asn1c'; # Will be needed only once +$MD5ProgramPath = 'md5'; + +$warn = '
'; +$unwarn = '
'; + +$OpEnvFailed = 'Failed to create the operations\' environment:'; +$RandFailed = 'No source of randomness'; +$SandBoxInitFailed = 'User playground initialization failed'; + +$myName = $ENV{SCRIPT_NAME}; # URL of this particular script (without args) + +$homePath = "" + . "Home" + . " >> asn1c" + . " >> Online ASN.1 Compiler" + . "

"; + +################################################### +# The code below rarely requires any modification # +################################################### + +my $content = ''; # Default content is empty + +use CGI qw/param cookie header upload escapeHTML/; + +$|=1; # Enable AutoFlush (for older versions of Perl) + +# If something goes wrong, this function is invoked to display the error message +sub bark($@) { + local $_ = join("
\n", @_); + $content = $warn . $_ . $unwarn; + goto PRINTOUT; +} + +# Make the directory name containing session files for the given Session ID +sub makeSessionDirName($$) { + local $pfx = shift; # Prefix is the name of the top-level directory + local $sid = shift; # Session identifier (md5) + $pfx . '/sessions/' . $sid . '/'; +} + +# Create ISO 8601 time string: "YYYY-MM-DDThh:mm:ss" +my $cachedTime; +sub isoTime() { + return $cachedTime if $cachedTime; + local @tm = localtime(time); + + $tm[5] += 1900; + $tm[4] += 1; + + # Insert leading zeros + for(my $i = 0; $i < 5; $i++) { + $tm[$i] =~ s/^(.)$/0$1/; + } + + $cachedTime = "$tm[5]-$tm[4]-$tm[3]T$tm[2]:$tm[1]:$tm[0]"; +} + +# Create the necessary environment for chrooting into. +sub prepareChrootEnvironment() { + return 1 if(-d $TMPDIR); # Envuronment already exists + mkdir $TMPDIR or bark($OpEnvFailed, $!); # Global directory + mkdir $TMPDIR . 'sessions' or bark($OpEnvFailed, $!); # User sessions + mkdir $TMPDIR . 'bin' or bark($OpEnvFailed, $!); # asn1c location + mkdir $TMPDIR . 'skeletons' or bark($OpEnvFailed, $!); # asn1c data + my $compiler_location = `cd / && which asn1c 2>/dev/null` + or bark($OpEnvFailed, $!); # copy asn1c in + $compiler_location =~ s/[^\/a-z1-9.-]//ig; + bark($OpEnvFailed, $!) unless($compiler_location =~ /^\//); + if(-d '/lib') { + # Merge in dynamic libc + mkdir $TMPDIR . 'lib' or bark($OpEnvFailed, $!); + system("cd $TMPDIR/lib && " + . "for i in" + . " /lib/libc.*" + . " /lib/libm.*" + . 'do ln $i; done'); + } elsif(-d '/usr/lib') { + # There's no /lib on MacOS + mkdir $TMPDIR . 'usr' or bark($OpEnvFailed, $!); + mkdir $TMPDIR . 'usr/lib' or bark($OpEnvFailed, $!); + mkdir $TMPDIR . 'usr/lib/system' or bark($OpEnvFailed, $!); + system("cd $TMPDIR/usr/lib && " + . "for i in" + . " /usr/lib/libc.*" + . " /usr/lib/libSystem.*" + . " /usr/lib/system/libmath*" + . " /usr/lib/dy*" + . '; do ln $i; done'); + } + system("cp $compiler_location $TMPDIR/bin 2>/dev/null") == 0 + or bark($OpEnvFailed, $!); + system("cp -r $SkeletonsDir/* $TMPDIR/skeletons >/dev/null 2>&1") == 0 + or bark($OpEnvFailed, $!); + return 1; +} + +my $EnvironmentSetOK = prepareChrootEnvironment(); + +# +# Prepare the session and create the session directory. +# If session exists, perfom arguments checking and execute historic views. +# +$session = cookie('SessionID'); +unless($session) { + $session = ''; + open(R, '/dev/urandom') + or open(R, '/dev/random') + or bark($RandFailed); + read(R, $session, 16) == 16 or bark("Not enough randomness"); + if($ENV{HTTP_USER_AGENT}) { + $session .= $ENV{HTTP_USER_AGENT}; # Add randomness + } + my $pid = open(R, "-|"); + if($pid == 0) { # Child + open(W, "| $MD5ProgramPath") or die; + print W $session; + exit(0); + } + $session = ; + $session =~ s/[^a-f0-9]//ig; + bark("md5 program is rotten here") if(length($session) != 32); + $sessionDir = makeSessionDirName($TMPDIR, $session); + mkdir($sessionDir) or bark($SandBoxInitFailed); + my $ck = cookie(-name=>'SessionID', -value=>$session, -expires=>'+1y'); + print header(-cookie=>$ck); +} else { + $session =~ s/[^a-f0-9]//ig; + bark("Nope, try again") if(length($session) != 32); # cool hacker? + + # Make sure the session directory exists + $sessionDir = makeSessionDirName($TMPDIR, $session); + mkdir($sessionDir) or bark($SandBoxInitFailed) unless(-d $sessionDir); + + local $t = param('time'); + local $trans = param('trans'); + local $fetch = param('fetch'); + local $show = param('show'); + + unless($t =~ /^[0-9TZ:+-]{14,}$/ && $trans =~ /^[.a-z0-9_-]+$/i) { + $fetch = ''; + $show = ''; + } + if($fetch =~ /^[.a-z0-9_-]+$/i || $show =~ /^(log|tgz)$/) { + local $fname = $sessionDir . '/' . $t . '--' . $trans; + + if($show eq 'tgz') { + printf("Content-Type: application/x-tar\n"); + printf("Content-Encoding: gzip\n\n"); + exec("cd $fname && " + . "for i in *.[ch]; do if [ -L \$i ]; then" + . " cp $TMPDIR/skeletons/\$i \$i.-;" + . " mv \$i.- \$i;" + . " fi done && tar --dereference --owner nobody --group nobody -zcvf - ./*.[ch] ./Makefile*"); + exit(0); + } + + if($show eq 'log') { + $fname .= '/+Log'; + } else { + $fname .= '/' . $fetch; + } + open(I, "< " . $fname) + or bark("Invalid or outdated request: [$fname] [$show] $!"); + printf "Content-Type: text/plain\n\n"; + while() { + print; + } + exit(0); + } + + print header(); +} +$HTTPHeaderGenerated = 1; + +open(LOG, ">> $sessionDir/+logfile") or bark("Sandbox error: $!"); +print LOG isoTime() . "\tIP=$ENV{REMOTE_ADDR}"; + +@gotSafeNames = (); +@gotNames = param('file'); +if($#gotNames != -1 && $gotNames[0] ne "") { + @gotFiles = upload('file'); +} else { + @gotNames = (); + @gotFiles = (); +} + +if($#gotNames == -1) { + my $text = param('text'); + if($text) { + push(@gotNames, 'module.asn1'); + } +} + +# Make safe filenames +foreach my $fname (@gotNames) { + local $_ = $fname; + s/.*\///g; # Strip directory components + s/.*\\//g; # Strip directory components (DOS version) + s/^[.-]/_/g; # Don't allow filenames starting with a dot or a dash + s/[^._a-z0-9-]/_/gi; + if(!length($_)) { + print LOG "\n"; + bark("Too strange filename: \"$fname\""); + } + $_ .= '.asn1' unless(/asn[1]{0,1}$/i); + @gotSafeNames = (@gotSafeNames, $_); + print LOG "\t" . $_; +} + +# +# Save the files and start compilation process. +# +if($#gotSafeNames >= 0) { + $transactionDir = isoTime() . '--' . join("-", @gotSafeNames); + print LOG "\tDST=$transactionDir"; + + my $sandbox = $sessionDir . '/' . $transactionDir; + mkdir($sandbox) or bark($SandBoxInitFailed); + + open(I, '> ' . $sandbox . '/+Names'); + print I join("\n", @gotNames); + open(I, '> ' . $sandbox . '/+safeNames'); + print I join("\n", @gotSafeNames); + for(my $i = 0; $i <= $#gotSafeNames; $i++) { + local $name = $gotSafeNames[$i]; + open(I, '> ' . $sandbox . '/'. $name); + if($#gotFiles == -1) { + print I scalar(param('text')); + } else { + while(<$gotFiles[$I]>) { + print I; + } + } + } + + my $inChDir = makeSessionDirName("/", $session) . $transactionDir; + my $options = ''; + $options .= " -Wdebug-lexer" if(param("optDebugL") eq "on"); + $options .= " -E" if(param("optE") eq "on"); + $options .= " -EF" if(param("optEF") eq "on"); + $options .= " -fnative-types" if(param("optNT") eq "on"); + system("$TMPDIR/bin/asn1c -v 2>&1 | sed -e 's/^/-- /' > $sandbox/\+Log && $SUIDHelper $TMPDIR $inChDir $options @gotSafeNames >> $sandbox/+Log 2>&1; " + . "echo \$? > $sandbox/+ExitCode"); + bark("Failed to initiate compilation process: $!") + if(!-r $sandbox . '/+ExitCode'); +} + +#print join("
\n", `env`); + +$form = + "

" +. "Pick the ASN.1 module file:
\n" +. "
\n" +. "Alternatively, enter the ASN.1 specification into the area below:
\n" +. "
\n" +. "

" +. "" +. "These options may be enabled to control the compiler's behavior:
\n" +. " Debug lexer (-Wdebug-lexer)
\n" +. " Just parse and dump (do not compile) (-E)
\n" +. " Parse, perform semantic checks, and dump (-E -F)
\n" +. " Employ native machine types (e.g. double instead of REAL_t) (-fnative-types)
\n" +. "" +. "

\n" +. "\n" +. "

\n"; +; + +# +# Gather previous transactions to generate the history page. +# The history page contains a list of several last ASN.1 files +# which were uploaded for compilation into the system +# by this particular browser (cookie-tracked). +# +opendir(SD, $sessionDir) or bark("Cannot open sandbox: $!"); +my @transactions = readdir(SD); +my $CountHistoryItems = 0; +foreach my $trans (sort { $b <=> $a } @transactions) { + next unless($trans =~ /^([0-9TZ:+-]{14,})--([_.a-zA-Z0-9-]+)$/); + + local ($t, $f) = ($1, $2); + local $origTime = $t; + $t =~ s/T/ /; # 1999-01-02T13:53:12 => 1999-01-02 13:53:12 + + # Open the list of file names under which these files are known + # at the remote system. + open(I, '< ' . $sessionDir . '/' . $trans . '/+Names'); + local @Names = ; + + # Open the list of "safe" file names under which these files + # are known to our file system. + open(I, '< ' . $sessionDir . '/' . $trans . '/+safeNames'); + local @safeNames = ; + + # Create a list of real file names whith appropriate links to the + # "safe" file names for subsequent file fetching. + local @markedNames = (); + for(my $i = 0; $i <= $#Names; $i++) { + local $_ = "$Names[$i]"; + @markedNames = (@markedNames, $_); + } + + open(I, '< ' . $sessionDir . '/' . $trans . '/+ExitCode'); + local $ec = int(); + + if($ec == 0) { + $results = "" + . "Compiled OK
\n"; + } else { + $results = "" + . "Error during compilation: $ec
\n"; + } + + $results .= "" + . (($ec == 0) ? '1. ' : '') + . "" + . "Show compiler log"; + if($ec == 0) { + $results .= "
\n" + . "2. " + . "Fetch results (.tgz)"; + } + + $history .= + "$t" + . "" + . join(", ", @markedNames) + . "" + . "" + . $results + . "" + . ""; + + last unless(++$CountHistoryItems < 5); +} +if($history) { + $history = "

History

" + . "
" + . "\n" + . "" + . "" + . "" + . "" + . "\n" + . $history . "
TimeFiles processedResult

\n"; +} + +$content = + "
\n" +. "

ASN.1 Input

\n" +. "$form\n" +. "		\n$history" + . "Privacy Note 1: this page is tailored " + . "to your browser using a cryprographically strong cookie. " + . "Other users will see different data. " + . "However, the page is not secure against malicious users " + . "if they are able to intercept your non-SSL Web traffic." + . "
Privacy Note 2: The author reserves the right to collect any information directly or indirectly supplied by the user of this system. This information may only be used by the author or contributors to enhance the software product. No data is ever given, sold, or otherwise distributed to the third-parties." + . "
Privacy Note 3: In no event shall the author or contributors be liable for any damages, however caused, even if advised of the possibility of such damage." + . "" +. "
"; + +$ua = $ENV{HTTP_USER_AGENT}; +$ua =~ s/\\/\\\\/; +$ua =~ s/"/\\"/; +print LOG "\tUA=\"$ua\""; +print LOG "\n"; # Finalize logging record + +PRINTOUT: + +print header() unless($HTTPHeaderGenerated); + +# If environment has never been set up completely, remove it. +if($EnvironmentSetOK != 1 && $TMPDIR ne "/") { + system("rm -rf $TMPDIR/ >/dev/null 2>&1"); +} + +print< + + +Online ASN.1 Compiler + + + +$homePath + +$content + +
+
+The ASN.1 Compiler + Copyright © 2003, 2004 +Lev Walkin <vlm@lionet.info> +
+ + +EOM diff --git a/configure b/configure index 41f15bd2..6f313bbf 100755 --- a/configure +++ b/configure @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot PATH MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CONFIGURE_DEPENDS CPLUSPLUS_FOUND_TRUE CPLUSPLUS_FOUND_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT ADD_CFLAGS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CONFIGURE_DEPENDS CPLUSPLUS_FOUND_TRUE CPLUSPLUS_FOUND_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT ADD_CFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1881,7 +1881,7 @@ fi # Define the identity of the package. PACKAGE=asn1c - VERSION=0.9.5 + VERSION=0.9.6 cat >>confdefs.h <<_ACEOF @@ -2008,8 +2008,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - - echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. @@ -3693,7 +3691,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3696 "configure"' > conftest.$ac_ext + echo '#line 3694 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5265,7 +5263,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5268:" \ +echo "$as_me:5266:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6299,11 +6297,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6302: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6300: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6306: \$? = $ac_status" >&5 + echo "$as_me:6304: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6532,11 +6530,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6535: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6533: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6539: \$? = $ac_status" >&5 + echo "$as_me:6537: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6592,11 +6590,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6595: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6593: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6599: \$? = $ac_status" >&5 + echo "$as_me:6597: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8776,7 +8774,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11054: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11060: \$? = $ac_status" >&5 + echo "$as_me:11058: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11113,11 +11111,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11116: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11114: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11120: \$? = $ac_status" >&5 + echo "$as_me:11118: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12474,7 +12472,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13400: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13406: \$? = $ac_status" >&5 + echo "$as_me:13404: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13459,11 +13457,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13462: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13460: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13466: \$? = $ac_status" >&5 + echo "$as_me:13464: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15493,11 +15491,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15496: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15494: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15500: \$? = $ac_status" >&5 + echo "$as_me:15498: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15726,11 +15724,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15729: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15727: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15733: \$? = $ac_status" >&5 + echo "$as_me:15731: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15786,11 +15784,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15789: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15787: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15793: \$? = $ac_status" >&5 + echo "$as_me:15791: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17970,7 +17968,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -23030,6 +23028,7 @@ do "libasn1compiler/Makefile" ) CONFIG_FILES="$CONFIG_FILES libasn1compiler/Makefile" ;; "libasn1parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES libasn1parser/Makefile" ;; "libasn1print/Makefile" ) CONFIG_FILES="$CONFIG_FILES libasn1print/Makefile" ;; + "asn1c/webcgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES asn1c/webcgi/Makefile" ;; "asn1c/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES asn1c/tests/Makefile" ;; "libasn1fix/Makefile" ) CONFIG_FILES="$CONFIG_FILES libasn1fix/Makefile" ;; "skeletons/Makefile" ) CONFIG_FILES="$CONFIG_FILES skeletons/Makefile" ;; @@ -23037,6 +23036,7 @@ do "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "asn1c/Makefile" ) CONFIG_FILES="$CONFIG_FILES asn1c/Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "asn1c.spec" ) CONFIG_FILES="$CONFIG_FILES asn1c.spec" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; @@ -23157,7 +23157,6 @@ s,@mkdir_p@,$mkdir_p,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@am__leading_dot@,$am__leading_dot,;t t -s,@PATH@,$PATH,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t diff --git a/configure.in b/configure.in index c3cddb79..0c3e8dd3 100644 --- a/configure.in +++ b/configure.in @@ -3,9 +3,7 @@ AC_INIT(libasn1parser/asn1p_y.y) AC_CANONICAL_BUILD AC_CANONICAL_TARGET AC_PREREQ(2.53) -AM_INIT_AUTOMAKE(asn1c, 0.9.5) - -AC_SUBST(PATH) +AM_INIT_AUTOMAKE(asn1c, 0.9.6) AM_MAINTAINER_MODE @@ -91,6 +89,7 @@ skeletons/tests/Makefile \ libasn1compiler/Makefile \ libasn1parser/Makefile \ libasn1print/Makefile \ +asn1c/webcgi/Makefile \ asn1c/tests/Makefile \ libasn1fix/Makefile \ skeletons/Makefile \ @@ -98,6 +97,7 @@ examples/Makefile \ tests/Makefile \ asn1c/Makefile \ doc/Makefile \ +asn1c.spec \ Makefile \ ) diff --git a/doc/Makefile.in b/doc/Makefile.in index c19ee0c7..7d105e25 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -107,7 +107,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ diff --git a/examples/Makefile.in b/examples/Makefile.in index 72259e20..aea3168b 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -108,7 +108,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ diff --git a/libasn1compiler/Makefile.in b/libasn1compiler/Makefile.in index 73403835..7eaf562d 100644 --- a/libasn1compiler/Makefile.in +++ b/libasn1compiler/Makefile.in @@ -134,7 +134,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ diff --git a/libasn1fix/Makefile.in b/libasn1fix/Makefile.in index 24a1b21f..b4488095 100644 --- a/libasn1fix/Makefile.in +++ b/libasn1fix/Makefile.in @@ -153,7 +153,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ diff --git a/libasn1parser/Makefile.in b/libasn1parser/Makefile.in index ecc0c71a..ef80e29b 100644 --- a/libasn1parser/Makefile.in +++ b/libasn1parser/Makefile.in @@ -142,7 +142,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ @@ -448,9 +447,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f asn1p_l.c -rm -f asn1p_y.c -rm -f asn1p_y.h + -rm -f asn1p_l.c clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ diff --git a/libasn1print/Makefile.in b/libasn1print/Makefile.in index 487d9dca..86a6a693 100644 --- a/libasn1print/Makefile.in +++ b/libasn1print/Makefile.in @@ -124,7 +124,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ diff --git a/skeletons/Makefile.in b/skeletons/Makefile.in index 9216769b..15a236b1 100644 --- a/skeletons/Makefile.in +++ b/skeletons/Makefile.in @@ -117,7 +117,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ diff --git a/skeletons/tests/Makefile.in b/skeletons/tests/Makefile.in index af415621..0587cec7 100644 --- a/skeletons/tests/Makefile.in +++ b/skeletons/tests/Makefile.in @@ -161,7 +161,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 3e5a431a..0cdc97dd 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -103,7 +103,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH = @PATH@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@