--- /dev/null
+^gl/
+^lib/gllib/
+^lib/glm4/
--- /dev/null
+^gl/
+^src/asn1Coding.c
+^src/asn1Decoding.c
--- /dev/null
+^doc/cyclo/
+^gl/
+^lib/ASN1.c
.DEFAULT_GOAL := bootstrap
endif
+local-checks-to-skip = sc_prohibit_strcmp sc_prohibit_have_config_h \
+ sc_require_config_h sc_require_config_h_first \
+ sc_trailing_blank sc_GPL_version sc_immutable_NEWS \
+ sc_copyright_check
+
autoreconf:
test -f ./configure || autoreconf --install
\input texinfo @c -*-texinfo-*-
-@comment $Id$
@comment %**start of header
@setfilename libtasn1.info
@include version.texi
# Extra options to supply to gtkdoc-scan.
# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--ignore-decorators=ASN1_API
+SCAN_OPTIONS=--deprecated-guards=ASN1_DISABLE_DEPRECATED
# Extra options to supply to gtkdoc-mkdb.
# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
# Header files to ignore when scanning. Use base file name, no paths
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=errors.h int.h parser_aux.h structure.h element.h gstr.h \
- config.h
+IGNORE_HFILES=int.h parser_aux.h structure.h element.h gstr.h
# Images to copy into HTML directory.
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
####################################
if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN = $(LIBTOOL) --mode=execute
else
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = sh -c
+GTKDOC_RUN =
endif
# We set GPATH here; this gives us semantics for GNU make
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-EXTRA_DIST = \
+EXTRA_DIST = \
$(content_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-SCANOBJ_FILES = \
- $(DOC_MODULE).args \
+SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
$(DOC_MODULE).interfaces \
$(DOC_MODULE).prerequisites \
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@echo 'gtk-doc: Scanning header files'
@-chmod -R u+w $(srcdir)
- cd $(srcdir) && \
+ @cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
test -f $$i || touch $$i ; \
done \
fi
- touch scan-build.stamp
+ @touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo 'gtk-doc: Rebuilding template files'
@-chmod -R u+w $(srcdir)
- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- touch tmpl-build.stamp
+ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+ @touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
-tmpl/*.sgml:
+$(srcdir)/tmpl/*.sgml:
@true
-
#### xml ####
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo 'gtk-doc: Building XML'
@-chmod -R u+w $(srcdir)
- cd $(srcdir) && \
+ @cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
- touch sgml-build.stamp
+ @touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
- mkdir $(srcdir)/html
- mkhtml_options=""; \
+ @rm -rf $(srcdir)/html
+ @mkdir $(srcdir)/html
+ @mkhtml_options=""; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
if test "$(?)" = "0"; then \
mkhtml_options=--path="$(srcdir)"; \
- fi
+ fi; \
cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo 'gtk-doc: Fixing cross-references'
- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- touch html-build.stamp
+ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ @touch html-build.stamp
##############
cd $(srcdir) && rm -rf xml html
install-data-local:
- -installfiles=`echo $(srcdir)/html/*`; \
+ @installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+ if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+ fi; \
+ $(mkinstalldirs) $${installdir} ; \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ $(INSTALL_DATA) $$i $${installdir}; \
done; \
- which gtkdoc-rebase >/dev/null && \
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+ if test -n "$(DOC_MODULE_VERSION)"; then \
+ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
fi
-
uninstall-local:
- rm -f $(DESTDIR)$(TARGET_DIR)/*
+ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+ fi; \
+ rm -rf $${installdir}
#
# Require gtk-doc when making dist
-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
cd $(distdir) && rm -f $(DISTCLEANFILES)
- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
* asn1_check_version - check for library version
* @req_version: Required version number, or NULL.
*
- * Check that the the version of the library is at minimum the
+ * Check that the version of the library is at minimum the
* requested one and return the version string; return %NULL if the
* condition is not satisfied. If a %NULL is passed to this function,
* no check is done, but the version string is simply returned.
# valgrind.m4 serial 1
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
else
opt_valgrind_tests=no
VALGRIND=
- fi
+ fi
AC_MSG_CHECKING([whether self tests are run under valgrind])
AC_ARG_ENABLE(valgrind-tests,
- AS_HELP_STRING([--enable-valgrind-tests],
- [run self tests under valgrind]),
+ AS_HELP_STRING([--enable-valgrind-tests],
+ [run self tests under valgrind]),
opt_valgrind_tests=$enableval)
AC_MSG_RESULT($opt_valgrind_tests)
])
int
main (int argc, char *argv[])
{
- static struct option long_options[] = {
+ static const struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'},
{"check", no_argument, 0, 'c'},
case 'h': /* HELP */
printf ("%s\n", help_man);
- if (outputFileName)
- free (outputFileName);
+ free (outputFileName);
exit (0);
break;
case 'v': /* VERSION */
version_etc (stdout, program_name, PACKAGE, VERSION,
"Fabio Fiorina", NULL);
- if (outputFileName)
- free (outputFileName);
+ free (outputFileName);
exit (0);
break;
case 'c': /* CHECK SYNTAX */
argv[optind - 1]);
printf ("%s\n", help_man);
- if (outputFileName)
- free (outputFileName);
+ free (outputFileName);
exit (1);
break;
default:
" input file with assignments missing.\n\n");
printf ("%s\n", help_man);
- if (outputFileName)
- free (outputFileName);
+ free (outputFileName);
exit (1);
}
"asn1Coding: input file with assignments missing.\n\n");
printf ("%s\n", help_man);
- if (outputFileName)
- free (outputFileName);
+ free (outputFileName);
exit (1);
}
{
printf ("asn1Coding: %s\n", errorDescription);
- if (der)
- free (der);
+ free (der);
asn1_delete_structure (&definitions);
asn1_delete_structure (&structure);
if (outputFile == NULL)
{
printf ("asn1Coding: output file '%s' not available\n", outputFileName);
- if (der)
- free (der);
+ free (der);
free (inputFileAsnName);
free (inputFileAssignmentName);
free (outputFileName);
fclose (outputFile);
printf ("\nWriting: done.\n");
- if (der)
- free (der);
+ free (der);
free (inputFileAsnName);
free (inputFileAssignmentName);
int
main (int argc, char *argv[])
{
- static struct option long_options[] = {
+ static const struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'},
{"check", no_argument, 0, 'c'},
int
main (int argc, char *argv[])
{
- static struct option long_options[] = {
+ static const struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'},
{"check", no_argument, 0, 'c'},
case 'h': /* HELP */
printf ("%s\n", help_man);
- if (outputFileName)
- free (outputFileName);
- if (vectorName)
- free (vectorName);
+ free (outputFileName);
+ free (vectorName);
exit (0);
break;
case 'v': /* VERSION */
version_etc (stdout, program_name, PACKAGE, VERSION,
"Fabio Fiorina", NULL);
- if (outputFileName)
- free (outputFileName);
- if (vectorName)
- free (vectorName);
+ free (outputFileName);
+ free (vectorName);
exit (0);
break;
case 'c': /* CHECK SYNTAX */
argv[optind - 1]);
printf ("%s\n", help_man);
- if (outputFileName)
- free (outputFileName);
- if (vectorName)
- free (vectorName);
+ free (outputFileName);
+ free (vectorName);
exit (1);
break;
default:
fprintf (stderr, "asn1Parser: input file name missing.\n\n");
printf ("%s\n", help_man);
- if (outputFileName)
- free (outputFileName);
- if (vectorName)
- free (vectorName);
+ free (outputFileName);
+ free (vectorName);
exit (1);
}
else
free (inputFileName);
- if (outputFileName)
- free (outputFileName);
- if (vectorName)
- free (vectorName);
+ free (outputFileName);
+ free (vectorName);
if (parse_result != ASN1_SUCCESS)
exit (1);
id-at-facsimileTelephoneNumber AttributeType ::= {id-at 23}
X520facsimileTelephoneNumber ::= PrintableString
-id-at-pseudonym AttributeType ::= {id-at 65}
+id-at-pseudonym AttributeType ::= {id-at 65}
X520pseudonym ::= DirectoryString
-id-at-name AttributeType ::= {id-at 41}
+id-at-name AttributeType ::= {id-at 41}
X520name ::= DirectoryString
-id-at-streetAddress AttributeType ::= {id-at 9}
+id-at-streetAddress AttributeType ::= {id-at 9}
X520streetAddress ::= DirectoryString
id-at-postalAddress AttributeType ::= {id-at 16}
pkcs-12 OBJECT IDENTIFIER ::= {pkcs 12}
pkcs-12-PFX ::= SEQUENCE {
- version INTEGER {v3(3)},
- authSafe pkcs-7-ContentInfo,
- macData pkcs-12-MacData OPTIONAL
+ version INTEGER {v3(3)},
+ authSafe pkcs-7-ContentInfo,
+ macData pkcs-12-MacData OPTIONAL
}
pkcs-12-PbeParams ::= SEQUENCE {
}
pkcs-12-MacData ::= SEQUENCE {
- mac pkcs-7-DigestInfo,
+ mac pkcs-7-DigestInfo,
macSalt OCTET STRING,
iterations INTEGER DEFAULT 1
-- Note: The default is for historical reasons and its use is
pkcs-12-SafeContents ::= SEQUENCE OF pkcs-12-SafeBag
pkcs-12-SafeBag ::= SEQUENCE {
- bagId OBJECT IDENTIFIER,
- bagValue [0] EXPLICIT ANY DEFINED BY badId,
- bagAttributes SET OF pkcs-12-PKCS12Attribute OPTIONAL
+ bagId OBJECT IDENTIFIER,
+ bagValue [0] EXPLICIT ANY DEFINED BY badId,
+ bagAttributes SET OF pkcs-12-PKCS12Attribute OPTIONAL
}
-- Bag types
-- DER-encoded X.509 certificate stored in OCTET STRING
pkcs-12-CRLBag ::= SEQUENCE {
- crlId OBJECT IDENTIFIER,
- crlValue [0] EXPLICIT ANY DEFINED BY crlId
+ crlId OBJECT IDENTIFIER,
+ crlValue [0] EXPLICIT ANY DEFINED BY crlId
}
-- x509CRL BAG-TYPE ::=