Imported Upstream version 1.3.1upstream/1.3.1

43 files changed, 1969 insertions, 1399 deletions

diff --git a/AUTHORS b/AUTHORS
index 395e93f..e479889 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,6 @@
 Program: Libksba
+Download: ftp://ftp.gnupg.org/gcrypt/libksba/
+Repository: git://git.gnupg.org/libksba.git
 Maintainer: Werner Koch <wk@gnupg.org>
 Bug reports: http://bugs.gnupg.org
 Security related bug reports: <security@gnupg.org>
diff --git a/ChangeLog b/ChangeLog
index 74eec69..33a97f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,105 @@
+2014-09-18  Werner Koch  <wk@gnupg.org>
+
+	Release 1.3.1.
+	* configure.ac: Set LT version to C19/A11/R2.
+
+2014-07-22  Dmitry Eremin-Solenikov  <dbaryshkov@gmail.com>
+
+	Fix two memory leaks in cert-basic test.
+	* tests/cert-basic.c (one_file): always free public key and der2.
+
+	Enable optional valgrind for testsuite.
+	* configure.ac: Enable gnulib valgrind module.
+	* gl/m4/gnulib.m4: Enable valgrind module.
+	* tests/Makefile.am: Enable valgrind as LOG_COMPILER.
+	* gl/m4/valgrind-tests.m4: New
+
+	Fix memory leak in crl parsing code.
+	* src/crl.c (store_one_entry_extension): Free memory at oid variable -
+	  otherwise libksba leaks memory on crl parsing.
+
+	Adapt mkoidtbl script to newer dumpasn1 database format.
+	* tests/mkoidtbl.awk: optionally parse oid at OID line.
+
+	Reuse common test functions in cert-basic test.
+	* tests/cert-basic.c (xmalloc, print_hex, print_sexp, print_time,
+	  print_dn): Drop.
+
+	tests: fix print_sexp and print_sexp_hex functions.
+	* tests/t-common.h (print_sexp, print_sexp_hex): advance pointer on
+	  closing brace.
+
+	tests: Pass -no-install to libtool.
+	* tests/Makefile.am: add AM_LDFLAGS = -no-install
+
+2014-04-15  Werner Koch  <wk@gnupg.org>
+
+	tests: Fix warning about unused var.
+	* tests/t-dnparser.c (main): Drop unneeded var INPUTLEN.
+
+	Fix possible segv if NULL is passed as cert.
+	* src/cert.c (ksba_cert_get_digest_algo): Fix !cert case.
+
+2014-01-10  Werner Koch  <wk@gnupg.org>
+
+	Remove cruft.
+	* autogen.rc: Remove cruft.
+
+	Use the generic autogen.sh script.
+	* Makefile.am (EXTRA_DIST): Add autogen.rc.
+	* autogen.rc: New.
+	* autogen.sh: Update from current GnuPG.
+	* ltmain.sh: Move to build-aux/.
+	* compile: Ditto.
+	* config.guess: Ditto.
+	* config.sub: Ditto.
+	* depcomp: Ditto.
+	* doc/mdate-sh: Ditto.
+	* doc/texinfo.tex: Ditto.
+	* install-sh: Ditto.
+	* missing: Ditto.
+	* ylwrap: Ditto.
+	* configure.ac (AC_CONFIG_AUX_DIR): New.
+
+2014-01-08  Werner Koch  <wk@gnupg.org>
+
+	Add --enable-silent-rules stuff.
+	* configure.ac: Add AM_SILENT_RULES.
+
+	Fix libtool 2.4.2 to correctly detect .def files.
+	* ltmain.sh (sed_uncomment_deffile): New.
+	(orig_export_symbols): Uncomment def file before testing for EXPORTS.
+	* m4/libtool.m4: Do the same for the generated code.
+
+2013-12-10  David 'Digit' Turner  <digit@google.com>
+
+	Update libtool to support Android.
+	* m4/libtool.m4: Add "linux*android*" case.  Taken from the libtool
+	repository.
+
+2013-12-10  Werner Koch  <wk@gnupg.org>
+
+	Add build support for ppc64le.
+	* config.guess, config.sub: Update to latest version (2013-11-29).
+	* m4/libtool.m4: Add patches for ppc64le.
+
+	Fix duplicate definition of TRUE and FALSE in grammar file.
+	* src/asn1-parse.y (YYPRINT): Define.
+	(%token-table): Define.
+	(TRUE,FALSE,BOOLEAN): Prefix these tokens with "ksba_" to avoid name
+	conflicts.
+	(key_word, key_word_token): Remove arrays.
+	(%token): Add literal strings to almost all tokens.
+	(yylex): Use yytname array for keyword lookup.
+
+2012-11-16  Werner Koch  <wk@gnupg.org>
+
+	Improve parsing of the GIT revision number.
+	* configure.ac (mmm4_revision): Use git rev-parse.
+
+	Fix non-portable use of chmod in autogen.sh.
+	* autogen.sh: Remove option -c from chmod.
+
 2012-09-27  Werner Koch  <wk@gnupg.org>
 
 	Release 1.3.0.
diff --git a/Makefile.am b/Makefile.am
index 5f9f9de..c797e4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
-EXTRA_DIST = autogen.sh COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3      \
+EXTRA_DIST = autogen.sh autogen.rc \
+             COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3                 \
              ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 	\
              tests/ChangeLog-2011 			     		\
              build-aux/git-log-footer build-aux/git-log-fix
diff --git a/Makefile.in b/Makefile.in
index f20a445..47618f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,11 +72,15 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	THANKS TODO compile config.guess config.sub depcomp install-sh \
-	ltmain.sh missing mkinstalldirs ylwrap
+	THANKS TODO build-aux/compile build-aux/config.guess \
+	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+	build-aux/ltmain.sh build-aux/mdate-sh build-aux/missing \
+	build-aux/texinfo.tex build-aux/ylwrap mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
-	$(top_srcdir)/gl/m4/gnulib.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/gl/m4/gnulib.m4 \
+	$(top_srcdir)/gl/m4/valgrind-tests.m4 \
+	$(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/gnupg-typedef.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -86,10 +90,16 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -156,6 +166,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -232,6 +243,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALGRIND = @VALGRIND@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -292,7 +304,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 
 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 GITLOG_TO_CHANGELOG = gitlog-to-changelog
-EXTRA_DIST = autogen.sh COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3      \
+EXTRA_DIST = autogen.sh autogen.rc \
+             COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3                 \
              ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 	\
              tests/ChangeLog-2011 			     		\
              build-aux/git-log-footer build-aux/git-log-fix
diff --git a/NEWS b/NEWS
index f0c6f37..4da0134 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Noteworthy changes in version 1.3.1 (2014-09-18)
+------------------------------------------------
+
+ * Fixed memory leak in CRL parsing.
+
+ * Build fixes for Windows, Android, and ppc64el.
+
+
 Noteworthy changes in version 1.3.0 (2012-09-27)
 ------------------------------------------------
 
diff --git a/VERSION b/VERSION
index f0bb29e..3a3cd8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.0
+1.3.1
diff --git a/aclocal.m4 b/aclocal.m4
index b705fdd..79832c5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -910,6 +910,63 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
 # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1058,6 +1115,7 @@ AC_SUBST([am__untar])
 
 m4_include([gl/m4/alloca.m4])
 m4_include([gl/m4/gnulib.m4])
+m4_include([gl/m4/valgrind-tests.m4])
 m4_include([m4/autobuild.m4])
 m4_include([m4/gnupg-typedef.m4])
 m4_include([m4/gpg-error.m4])
diff --git a/autogen.rc b/autogen.rc
new file mode 100644
index 0000000..850d4e7
--- /dev/null
+++ b/autogen.rc
@@ -0,0 +1,29 @@
+# autogen.sh configuration for GnuPG                           -*- sh -*-
+
+case "$myhost:$myhostsub" in
+  w32:ce)
+    extraoptions=
+    ;;
+  w32:)
+    extraoptions=
+    ;;
+esac
+
+case "$myhost" in
+  w32)
+    configure_opts="
+      --with-gpg-error-prefix=@SYSROOT@
+      "
+    ;;
+
+  amd64)
+    configure_opts="
+      --with-gpg-error-prefix=@SYSROOT@
+     "
+    ;;
+esac
+
+
+extra_aclocal_flags="-I gl/m4"
+
+final_info="./configure --enable-maintainer-mode && make"
diff --git a/autogen.sh b/autogen.sh
index 17c3380..ea3d5fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,6 @@
 #! /bin/sh
-# Run this to generate all the initial makefiles, etc.
-#
-# Copyright (C) 2003 g10 Code GmbH
+# autogen.sh
+# Copyright (C) 2003, 2014 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,6 +9,13 @@
 # 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.
+#
+# This is a generic script to create the configure script and handle cross
+# build environments.  It requires the presence of a autogen.rc file to
+# configure it for the respective package.  It is maintained as part of
+# GnuPG and source copied by other packages.
+#
+# Version: 2014-01-10
 
 configure_ac="configure.ac"
 
@@ -18,7 +24,7 @@ cvtver () {
 }
 
 check_version () {
-    if [ `("$1" --version || echo "0") | cvtver` -ge "$2" ]; then
+    if [ $(( `("$1" --version || echo "0") | cvtver` >= $2 )) = 1 ]; then
        return 0
     fi
     echo "**Error**: "\`$1\'" not installed or too old." >&2
@@ -28,85 +34,172 @@ check_version () {
     return 1
 }
 
+fatal () {
+    echo "autogen.sh:" "$*" >&2
+    DIE=yes
+}
+
+info () {
+    if [ -z "${SILENT}" ]; then
+      echo "autogen.sh:" "$*"
+    fi
+}
+
+die_p () {
+  if [ "$DIE" = "yes" ]; then
+    echo "autogen.sh: Stop." >&2
+    exit 1
+  fi
+}
+
+replace_sysroot () {
+    configure_opts=$(echo $configure_opts | sed "s#@SYSROOT@#${w32root}#g")
+    extraoptions=$(echo $extraoptions | sed "s#@SYSROOT@#${w32root}#g")
+}
+
+# Allow to override the default tool names
+AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
+AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}
+
+AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX}
+ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
+
+GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
+MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
+
 DIE=no
 FORCE=
+SILENT=
+tmp=$(dirname "$0")
+tsdir=$(cd "${tmp}"; pwd)
+
+if [ -n "${AUTOGEN_SH_SILENT}" ]; then
+  SILENT=" --silent"
+fi
+if test x"$1" = x"--help"; then
+  echo "usage: ./autogen.sh [--silent] [--force] [--build-TYPE] [ARGS]"
+  exit 0
+fi
+if test x"$1" = x"--silent"; then
+  SILENT=" --silent"
+  shift
+fi
 if test x"$1" = x"--force"; then
   FORCE=" --force"
   shift
 fi
 
-# Begin list of optional variables sourced from ~/.gnupg-autogen.rc
+
+# Reject unsafe characters in $HOME, $tsdir and cwd.  We consider spaces
+# as unsafe because it is too easy to get scripts wrong in this regard.
+am_lf='
+'
+case `pwd` in
+  *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
+    fatal "unsafe working directory name" ;;
+esac
+case $tsdir in
+  *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
+    fatal "unsafe source directory: \`$tsdir'" ;;
+esac
+case $HOME in
+  *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
+    fatal "unsafe home directory: \`$HOME'" ;;
+esac
+die_p
+
+
+# List of variables sourced from autogen.rc.  The strings '@SYSROOT@' in
+# these variables are replaced by the actual system root.
+configure_opts=
+extraoptions=
+# List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc
 w32_toolprefixes=
 w32_extraoptions=
 w32ce_toolprefixes=
 w32ce_extraoptions=
+w64_toolprefixes=
+w64_extraoptions=
 amd64_toolprefixes=
 # End list of optional variables sourced from ~/.gnupg-autogen.rc
 # What follows are variables which are sourced but default to
 # environment variables or lacking them hardcoded values.
 #w32root=
 #w32ce_root=
+#w64root=
 #amd64root=
 
-if [ -f "$HOME/.gnupg-autogen.rc" ]; then
-    echo "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
-    . "$HOME/.gnupg-autogen.rc"
-fi
-
 # Convenience option to use certain configure options for some hosts.
 myhost=""
 myhostsub=""
 case "$1" in
     --build-w32)
         myhost="w32"
+        shift
         ;;
     --build-w32ce)
         myhost="w32"
         myhostsub="ce"
+        shift
         ;;
     --build-w64)
         myhost="w32"
         myhostsub="64"
+        shift
+        ;;
+    --build-amd64)
+        myhost="amd64"
+        shift
         ;;
     --build*)
-        echo "**Error**: invalid build option $1" >&2
-        exit 1
+        fatal "**Error**: invalid build option $1"
+        shift
         ;;
     *)
         ;;
 esac
+die_p
+
+
+# Source our configuration
+if [ -f "${tsdir}/autogen.rc" ]; then
+    . "${tsdir}/autogen.rc"
+fi
 
+# Source optional site specific configuration
+if [ -f "$HOME/.gnupg-autogen.rc" ]; then
+    info "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
+    . "$HOME/.gnupg-autogen.rc"
+fi
 
-# ***** W32 build script *******
-# Used to cross-compile for Windows.
+# ******************
+#  W32 build script
+# ******************
 if [ "$myhost" = "w32" ]; then
-    tmp=`dirname $0`
-    tsdir=`cd "$tmp"; pwd`
-    shift
-    if [ ! -f $tsdir/config.guess ]; then
-        echo "$tsdir/config.guess not found" >&2
+    if [ ! -f "$tsdir/build-aux/config.guess" ]; then
+        fatal "$tsdir/build-aux/config.guess not found"
         exit 1
     fi
-    build=`$tsdir/config.guess`
+    build=`$tsdir/build-aux/config.guess`
 
     case $myhostsub in
         ce)
           w32root="$w32ce_root"
           [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
-          toolprefixes="arm-mingw32ce"
-          ;;
-        64)
-          w32root="$w64root"
-          [ -z "$w32root" ] && w32root="$HOME/w64root"
-          toolprefixes="amd64-mingw32msvc"
+          toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
+          extraoptions="$extraoptions $w32ce_extraoptions"
           ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"
-          toolprefixes="i586-mingw32msvc i386-mingw32msvc i686-w64-mingw32"
+          toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
+          toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
+          extraoptions="$extraoptions $w32_extraoptions"
           ;;
     esac
-    echo "Using $w32root as standard install directory" >&2
+    info "Using $w32root as standard install directory"
+    replace_sysroot
 
+    # Locate the cross compiler
     crossbindir=
     for host in $toolprefixes; do
         if ${host}-gcc --version >/dev/null 2>&1 ; then
@@ -116,50 +209,49 @@ if [ "$myhost" = "w32" ]; then
         fi
     done
     if [ -z "$crossbindir" ]; then
-        echo "Cross compiler kit not installed" >&2
-        if [ -z "$sub" ]; then
-          echo "Under Debian GNU/Linux, you may install it using" >&2
-          echo "  apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
+        fatal "cross compiler kit not installed"
+        if [ -z "$myhostsub" ]; then
+          info "Under Debian GNU/Linux, you may install it using"
+          info "  apt-get install mingw32 mingw32-runtime mingw32-binutils"
         fi
-        echo "Stop." >&2
-        exit 1
+        die_p
     fi
 
-
     if [ -f "$tsdir/config.log" ]; then
         if ! head $tsdir/config.log | grep "$host" >/dev/null; then
-            echo "Pease run a 'make distclean' first" >&2
-            exit 1
+            fatal "Please run a 'make distclean' first"
+            die_p
         fi
     fi
 
-    $tsdir/configure --enable-maintainer-mode  --prefix=${w32root}  \
-            --host=${host} --build=${build} \
-            --with-gpg-error-prefix=${w32root}  "$@"
-
-    exit $?
+    $tsdir/configure --enable-maintainer-mode ${SILENT} \
+             --prefix=${w32root}  \
+             --host=${host} --build=${build} \
+             ${configure_opts} ${extraoptions} "$@"
+    rc=$?
+    exit $rc
 fi
 # ***** end W32 build script *******
 
-
 # ***** AMD64 cross build script *******
 # Used to cross-compile for AMD64 (for testing)
-if test "$1" = "--build-amd64"; then
-    tmp=`dirname $0`
-    tsdir=`cd "$tmp"; pwd`
+if [ "$myhost" = "amd64" ]; then
     shift
-    if [ ! -f $tsdir/config.guess ]; then
-        echo "$tsdir/config.guess not found" >&2
+    if [ ! -f $tsdir/build-aux/config.guess ]; then
+        echo "$tsdir/build-aux/config.guess not found" >&2
         exit 1
     fi
-    build=`$tsdir/config.guess`
+    build=`$tsdir/build-aux/config.guess`
 
     [ -z "$amd64root" ] && amd64root="$HOME/amd64root"
-    echo "Using $amd64root as standard install directory" >&2
+    info "Using $amd64root as standard install directory"
+    replace_sysroot
+
+    toolprefixes="$amd64_toolprefixes x86_64-linux-gnu amd64-linux-gnu"
 
     # Locate the cross compiler
     crossbindir=
-    for host in x86_64-linux-gnu amd64-linux-gnu; do
+    for host in $toolprefixes ; do
         if ${host}-gcc --version >/dev/null 2>&1 ; then
             crossbindir=/usr/${host}/bin
             conf_CC="CC=${host}-gcc"
@@ -179,18 +271,16 @@ if test "$1" = "--build-amd64"; then
         fi
     fi
 
-    $tsdir/configure --enable-maintainer-mode --prefix=${amd64root}  \
+    $tsdir/configure --enable-maintainer-mode ${SILENT} \
+             --prefix=${amd64root}  \
              --host=${host} --build=${build} \
-             --with-gpg-error-prefix=${amd64root}
-
+             ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc
 fi
 # ***** end AMD64 cross build script *******
 
 
-
-
 # Grep the required versions from configure.ac
 autoconf_vers=`sed -n '/^AC_PREREQ(/ {
 s/^.*(\(.*\))/\1/p
@@ -204,31 +294,22 @@ q
 }' ${configure_ac}`
 automake_vers_num=`echo "$automake_vers" | cvtver`
 
-#gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
-#s/^.*(\(.*\))/\1/p
-#q
-#}' ${configure_ac}`
-#gettext_vers_num=`echo "$gettext_vers" | cvtver`
-
+if [ -d "${tsdir}/po" ]; then
+  gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
+s/^.*\[\(.*\)])/\1/p
+q
+}' ${configure_ac}`
+  gettext_vers_num=`echo "$gettext_vers" | cvtver`
+else
+  gettext_vers="n/a"
+fi
 
-if [ -z "$autoconf_vers" -o -z "$automake_vers" ]
+if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ]
 then
   echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2
   exit 1
 fi
 
-# Allow to override the default tool names
-AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
-AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}
-
-AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX}
-ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
-
-#GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
-#MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
-
-DIE=no
-
 
 if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
     check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
@@ -236,51 +317,71 @@ fi
 if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
   check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
 fi
-#if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
-#  check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
-#fi
+if [ "$gettext_vers" != "n/a" ]; then
+  if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
+    check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
+  fi
+fi
 
-if test "$DIE" = "yes"; then
+if [ "$DIE" = "yes" ]; then
     cat <<EOF
 
 Note that you may use alternative versions of the tools by setting
-the corresponding environment variables; see README.CVS for details.
+the corresponding environment variables; see README.GIT for details.
 
 EOF
-    exit 1
+    die_p
 fi
 
 # Check the git setup.
 if [ -d .git ]; then
+  CP="cp -a"
+  [ -z "${SILENT}" ] && CP="$CP -v"
   if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
-    cat <<EOF >&2
+    [ -z "${SILENT}" ] && cat <<EOF
 *** Activating trailing whitespace git pre-commit hook. ***
     For more information see this thread:
       http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
     To deactivate this pre-commit hook again move .git/hooks/pre-commit
     and .git/hooks/pre-commit.sample out of the way.
 EOF
-      cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
-      chmod -c +x  .git/hooks/pre-commit
+      $CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
+      chmod +x  .git/hooks/pre-commit
+  fi
+
+  if [ "$gettext_vers" != "n/a" ]; then
+    tmp=$(git config --get filter.cleanpo.clean)
+    if [ "$tmp" != \
+          "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
+    then
+      info "*** Adding GIT filter.cleanpo.clean configuration."
+      git config --add filter.cleanpo.clean \
+        "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
+    fi
   fi
   if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
-    cat <<EOF >&2
+      [ -z "${SILENT}" ] && cat <<EOF
 *** Activating commit log message check hook. ***
 EOF
-      cp -av build-aux/git-hooks/commit-msg .git/hooks/commit-msg
-      chmod -c +x  .git/hooks/commit-msg
+      $CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
+      chmod +x  .git/hooks/commit-msg
   fi
 fi
 
-echo "Running aclocal -I m4 -I gl/m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
-$ACLOCAL -I m4 -I gl/m4 $ACLOCAL_FLAGS
-echo "Running autoheader..."
+aclocal_flags="-I m4"
+if [ -n "${extra_aclocal_flags}" ]; then
+  aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}"
+fi
+if [ -n "${ACLOCAL_FLAGS}" ]; then
+  aclocal_flags="${aclocal_flags} ${ACLOCAL_FLAGS}"
+fi
+info "Running $ACLOCAL ${aclocal_flags} ..."
+$ACLOCAL ${aclocal_flags}
+info "Running autoheader..."
 $AUTOHEADER
-echo "Running automake --gnu ..."
+info "Running automake --gnu ..."
 $AUTOMAKE --gnu;
-echo "Running autoconf${FORCE} ..."
+info "Running autoconf${FORCE} ..."
 $AUTOCONF${FORCE}
 
-echo "You may now run:
-  ./configure --enable-maintainer-mode && make
-"
+info "You may now run:${am_lf}  ${final_info}"
diff --git a/compile b/build-aux/compile
index 1b1d232..1b1d232 100755
--- a/compile
+++ b/build-aux/compile
diff --git a/config.guess b/build-aux/config.guess
index ad5f74a..9afd676 100755
--- a/config.guess
+++ b/build-aux/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-07-31'
+timestamp='2013-11-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-07-31'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -306,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -859,21 +874,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -886,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -957,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1208,6 +1227,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1234,19 +1256,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
diff --git a/config.sub b/build-aux/config.sub
index b15df57..61cb4bc 100755
--- a/config.sub
+++ b/build-aux/config.sub
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-07-31'
+timestamp='2013-10-01'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-07-31'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +116,7 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -259,10 +252,12 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -270,10 +265,11 @@ case $basic_machine in
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -291,16 +287,17 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -328,7 +325,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -370,13 +367,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -385,11 +382,13 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -407,12 +406,13 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -788,7 +788,7 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw64)
@@ -796,7 +796,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -832,7 +832,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1023,7 +1023,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1350,7 +1354,7 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1364,7 +1368,7 @@ case $os in
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1496,9 +1500,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1547,6 +1548,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1590,6 +1594,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/depcomp b/build-aux/depcomp
index e5f9736..e5f9736 100755
--- a/depcomp
+++ b/build-aux/depcomp
diff --git a/install-sh b/build-aux/install-sh
index 6781b98..6781b98 100755
--- a/install-sh
+++ b/build-aux/install-sh
diff --git a/ltmain.sh b/build-aux/ltmain.sh
index c7d06c3..859599a 100644
--- a/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -411,6 +411,10 @@ sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
 # (escaped) backslashes.  A very naive implementation.
 lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
 
+# Sed substitution to remove simple comments and empty
+# lines from a Windows .def file.
+sed_uncomment_deffile='/^;/d; /^[ ]*$/d'
+
 # Re-`\' parameter expansions in output of double_quote_subst that were
 # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
 # in input to double_quote_subst, that '$' was protected from expansion.
@@ -8143,7 +8147,7 @@ EOF
 	cygwin* | mingw* | cegcc*)
 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	    if test "x`$SED "$sed_uncomment_deffile" $export_symbols | $SED 1q`" != xEXPORTS; then
 	      # and it's NOT already a .def file. Must figure out
 	      # which of the given symbols are data symbols and tag
 	      # them as such. So, trigger use of export_symbols_cmds.
@@ -9658,4 +9662,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # sh-indentation:2
 # End:
 # vi:sw=2
-
diff --git a/doc/mdate-sh b/build-aux/mdate-sh
index 83d2700..83d2700 100755
--- a/doc/mdate-sh
+++ b/build-aux/mdate-sh
diff --git a/missing b/build-aux/missing
index 1c8ff70..1c8ff70 100755
--- a/missing
+++ b/build-aux/missing
diff --git a/doc/texinfo.tex b/build-aux/texinfo.tex
index d2b264d..8c2ee1d 100644
--- a/doc/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -354,7 +354,7 @@
                % We don't want .vr (or whatever) entries like this:
                % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
                % "\acronym" won't work when it's read back in;
-               % it needs to be 
+               % it needs to be
                % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
@@ -705,7 +705,7 @@
 \def\?{?\spacefactor=\endofsentencespacefactor\space}
 
 % @frenchspacing on|off  says whether to put extra space after punctuation.
-% 
+%
 \def\onword{on}
 \def\offword{off}
 %
@@ -1260,7 +1260,7 @@ where each line of input produces a line of output.}
 % that's what we do).
 
 % double active backslashes.
-% 
+%
 {\catcode`\@=0 \catcode`\\=\active
  @gdef@activebackslashdouble{%
    @catcode`@\=@active
@@ -1272,11 +1272,11 @@ where each line of input produces a line of output.}
 % us) handles it with this amazing macro to replace tokens, with minor
 % changes for Texinfo.  It is included here under the GPL by permission
 % from the author, Heiko Oberdiek.
-% 
+%
 % #1 is the tokens to replace.
 % #2 is the replacement.
 % #3 is the control sequence with the string.
-% 
+%
 \def\HyPsdSubst#1#2#3{%
   \def\HyPsdReplace##1#1##2\END{%
     ##1%
@@ -1542,7 +1542,7 @@ output) for that.)}
       % tried to figure out what each command should do in the context
       % of @url.  for now, just make @/ a no-op, that's the only one
       % people have actually reported a problem with.
-      % 
+      %
       \normalturnoffactive
       \def\@{@}%
       \let\/=\empty
@@ -1941,7 +1941,7 @@ end
 
 % Definitions for a main text size of 11pt.  This is the default in
 % Texinfo.
-% 
+%
 \def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
@@ -2074,7 +2074,7 @@ end
 % section, chapter, etc., sizes following suit.  This is for the GNU
 % Press printing of the Emacs 22 manual.  Maybe other manuals in the
 % future.  Used with @smallbook, which sets the leading to 12pt.
-% 
+%
 \def\definetextfontsizex{%
 % Text fonts (10pt).
 \def\textnominalsize{10pt}
@@ -2165,7 +2165,7 @@ end
 \setfont\secsf\sfbshape{12}{1000}{OT1}
 \let\secbf\secrm
 \setfont\secsc\scbshape{10}{\magstep1}{OT1}
-\font\seci=cmmi12 
+\font\seci=cmmi12
 \font\secsy=cmsy10 scaled \magstep1
 \def\sececsize{1200}
 
@@ -2209,7 +2209,7 @@ end
 % We provide the user-level command
 %   @fonttextsize 10
 % (or 11) to redefine the text font size.  pt is assumed.
-% 
+%
 \def\xword{10}
 \def\xiword{11}
 %
@@ -2219,7 +2219,7 @@ end
   %
   % Set \globaldefs so that documents can use this inside @tex, since
   % makeinfo 4.8 does not support it, but we need it nonetheless.
-  % 
+  %
  \begingroup \globaldefs=1
   \ifx\textsizearg\xword \definetextfontsizex
   \else \ifx\textsizearg\xiword \definetextfontsizexi
@@ -2505,7 +2505,7 @@ end
 % each of the four underscores in __typeof__.  This is undesirable in
 % some manuals, especially if they don't have long identifiers in
 % general.  @allowcodebreaks provides a way to control this.
-% 
+%
 \newif\ifallowcodebreaks  \allowcodebreakstrue
 
 \def\keywordtrue{true}
@@ -2636,7 +2636,7 @@ end
 % @acronym for "FBI", "NATO", and the like.
 % We print this one point size smaller, since it's intended for
 % all-uppercase.
-% 
+%
 \def\acronym#1{\doacronym #1,,\finish}
 \def\doacronym#1,#2,#3\finish{%
   {\selectfonts\lsize #1}%
@@ -2648,7 +2648,7 @@ end
 
 % @abbr for "Comput. J." and the like.
 % No font change, but don't do end-of-sentence spacing.
-% 
+%
 \def\abbr#1{\doabbr #1,,\finish}
 \def\doabbr#1,#2,#3\finish{%
   {\plainfrenchspacing #1}%
@@ -2667,43 +2667,43 @@ end
 % Theiling, which support regular, slanted, bold and bold slanted (and
 % "outlined" (blackboard board, sort of) versions, which we don't need).
 % It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
-% 
+%
 % Although only regular is the truly official Euro symbol, we ignore
 % that.  The Euro is designed to be slightly taller than the regular
 % font height.
-% 
+%
 % feymr - regular
 % feymo - slanted
 % feybr - bold
 % feybo - bold slanted
-% 
+%
 % There is no good (free) typewriter version, to my knowledge.
 % A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
 % Hmm.
-% 
+%
 % Also doesn't work in math.  Do we need to do math with euro symbols?
 % Hope not.
-% 
-% 
+%
+%
 \def\euro{{\eurofont e}}
 \def\eurofont{%
   % We set the font at each command, rather than predefining it in
   % \textfonts and the other font-switching commands, so that
   % installations which never need the symbol don't have to have the
   % font installed.
-  % 
+  %
   % There is only one designed size (nominal 10pt), so we always scale
   % that to the current nominal size.
-  % 
+  %
   % By the way, simply using "at 1em" works for cmr10 and the like, but
   % does not work for cmbx10 and other extended/shrunken fonts.
-  % 
+  %
   \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
   %
-  \ifx\curfontstyle\bfstylename 
+  \ifx\curfontstyle\bfstylename
     % bold:
     \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
-  \else 
+  \else
     % regular:
     \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
   \fi
@@ -2756,7 +2756,7 @@ end
 % Laurent Siebenmann reports \Orb undefined with:
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
 % so we'll define it if necessary.
-% 
+%
 \ifx\Orb\undefined
 \def\Orb{\mathhexbox20D}
 \fi
@@ -3105,7 +3105,7 @@ end
     % cause the example and the item to crash together.  So we use this
     % bizarre value of 10001 as a signal to \aboveenvbreak to insert
     % \parskip glue after all.  Section titles are handled this way also.
-    % 
+    %
     \penalty 10001
     \endgroup
     \itemxneedsnegativevskipfalse
@@ -3901,7 +3901,7 @@ end
   % processing continues to some further point.  On the other hand, it
   % seems \endinput does not hurt in the printed index arg, since that
   % is still getting written without apparent harm.
-  % 
+  %
   % Sample source (mac-idx3.tex, reported by Graham Percival to
   % help-texinfo, 22may06):
   % @macro funindex {WORD}
@@ -3909,12 +3909,12 @@ end
   % @end macro
   % ...
   % @funindex commtest
-  % 
+  %
   % The above is not enough to reproduce the bug, but it gives the flavor.
-  % 
+  %
   % Sample whatsit resulting:
   % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
-  % 
+  %
   % So:
   \let\endinput = \empty
   %
@@ -4170,11 +4170,11 @@ end
   % makeinfo does not expand macros in the argument to @deffn, which ends up
   % writing an index entry, and texindex isn't prepared for an index sort entry
   % that starts with \.
-  % 
+  %
   % Since macro invocations are followed by braces, we can just redefine them
   % to take a single TeX argument.  The case of a macro invocation that
   % goes to end-of-line is not handled.
-  % 
+  %
   \macrolist
 }
 
@@ -4302,7 +4302,7 @@ end
     % to re-insert the same penalty (values >10000 are used for various
     % signals); since we just inserted a non-discardable item, any
     % following glue (such as a \parskip) would be a breakpoint.  For example:
-    % 
+    %
     %   @deffn deffn-whatever
     %   @vindex index-whatever
     %   Description.
@@ -5368,11 +5368,11 @@ end
   % glue accumulate.  (Not a breakpoint because it's preceded by a
   % discardable item.)
   \vskip-\parskip
-  % 
+  %
   % This is purely so the last item on the list is a known \penalty >
   % 10000.  This is so \startdefun can avoid allowing breakpoints after
   % section headings.  Otherwise, it would insert a valid breakpoint between:
-  % 
+  %
   %   @section sec-whatever
   %   @deffn def-whatever
   \penalty 10001
@@ -5430,7 +5430,7 @@ end
 % These characters do not print properly in the Computer Modern roman
 % fonts, so we must take special care.  This is more or less redundant
 % with the Texinfo input format setup at the end of this file.
-% 
+%
 \def\activecatcodes{%
   \catcode`\"=\active
   \catcode`\$=\active
@@ -5480,7 +5480,7 @@ end
 
 % redefined for the two-volume lispref.  We always output on
 % \jobname.toc even if this is redefined.
-% 
+%
 \def\tocreadfilename{\jobname.toc}
 
 % Normal (long) toc.
@@ -6035,8 +6035,8 @@ end
 % from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
 % the default, but it works for pasting with more pdf viewers (at least
 % evince), the lilypond developers report.  xpdf does work with the
-% regular 0x27.  
-% 
+% regular 0x27.
+%
 \def\codequoteright{%
   \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
     \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
@@ -6048,7 +6048,7 @@ end
 % and a similar option for the left quote char vs. a grave accent.
 % Modern fonts display ASCII 0x60 as a grave accent, so some people like
 % the code environments to do likewise.
-% 
+%
 \def\codequoteleft{%
   \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
     \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
@@ -6579,7 +6579,7 @@ end
 % This does \let #1 = #2, with \csnames; that is,
 %   \let \csname#1\endcsname = \csname#2\endcsname
 % (except of course we have to play expansion games).
-% 
+%
 \def\cslet#1#2{%
   \expandafter\let
   \csname#1\expandafter\endcsname
@@ -7737,7 +7737,7 @@ end
 %
 % If they passed de_DE, and txi-de_DE.tex doesn't exist,
 % try txi-de.tex.
-% 
+%
 \def\documentlanguagetrywithoutunderscore#1_#2\finish{%
   \openin 1 txi-#1.tex
   \ifeof 1
@@ -7793,7 +7793,7 @@ should work if nowhere else does.}
      \setnonasciicharscatcode\active
      \lattwochardefs
   %
-  \else \ifx \declaredencoding \latone 
+  \else \ifx \declaredencoding \latone
      \setnonasciicharscatcode\active
      \latonechardefs
   %
@@ -7805,7 +7805,7 @@ should work if nowhere else does.}
      \setnonasciicharscatcode\active
      \utfeightchardefs
   %
-  \else 
+  \else
     \message{Unknown document encoding #1, ignoring.}%
   %
   \fi % utfeight
@@ -7817,7 +7817,7 @@ should work if nowhere else does.}
 
 % A message to be logged when using a character that isn't available
 % the default font encoding (OT1).
-% 
+%
 \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
 
 % Take account of \c (plain) vs. \, (Texinfo) difference.
@@ -7830,21 +7830,21 @@ should work if nowhere else does.}
 %
 % Latin1 (ISO-8859-1) character definitions.
 \def\latonechardefs{%
-  \gdef^^a0{~} 
+  \gdef^^a0{~}
   \gdef^^a1{\exclamdown}
-  \gdef^^a2{\missingcharmsg{CENT SIGN}} 
+  \gdef^^a2{\missingcharmsg{CENT SIGN}}
   \gdef^^a3{{\pounds}}
   \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
   \gdef^^a5{\missingcharmsg{YEN SIGN}}
-  \gdef^^a6{\missingcharmsg{BROKEN BAR}} 
+  \gdef^^a6{\missingcharmsg{BROKEN BAR}}
   \gdef^^a7{\S}
-  \gdef^^a8{\"{}} 
-  \gdef^^a9{\copyright} 
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\copyright}
   \gdef^^aa{\ordf}
-  \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} 
+  \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}}
   \gdef^^ac{$\lnot$}
-  \gdef^^ad{\-} 
-  \gdef^^ae{\registeredsymbol} 
+  \gdef^^ad{\-}
+  \gdef^^ae{\registeredsymbol}
   \gdef^^af{\={}}
   %
   \gdef^^b0{\textdegree}
@@ -7871,7 +7871,7 @@ should work if nowhere else does.}
   \gdef^^c2{\^A}
   \gdef^^c3{\~A}
   \gdef^^c4{\"A}
-  \gdef^^c5{\ringaccent A} 
+  \gdef^^c5{\ringaccent A}
   \gdef^^c6{\AE}
   \gdef^^c7{\cedilla C}
   \gdef^^c8{\`E}
@@ -8012,7 +8012,7 @@ should work if nowhere else does.}
   \gdef^^d6{\"O}
   \gdef^^d7{$\times$}
   \gdef^^d8{\v R}
-  \gdef^^d9{\ringaccent U} 
+  \gdef^^d9{\ringaccent U}
   \gdef^^da{\'U}
   \gdef^^db{\H U}
   \gdef^^dc{\"U}
@@ -8056,11 +8056,11 @@ should work if nowhere else does.}
 }
 
 % UTF-8 character definitions.
-% 
+%
 % This code to support UTF-8 is based on LaTeX's utf8.def, with some
 % changes for Texinfo conventions.  It is included here under the GPL by
 % permission from Frank Mittelbach and the LaTeX team.
-% 
+%
 \newcount\countUTFx
 \newcount\countUTFy
 \newcount\countUTFz
@@ -8900,7 +8900,7 @@ should work if nowhere else does.}
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
 % the literal character `\'.
-% 
+%
 @def@normalturnoffactive{%
   @let\=@normalbackslash
   @let"=@normaldoublequote
diff --git a/ylwrap b/build-aux/ylwrap
index 7278b6a..279f306 100755
--- a/ylwrap
+++ b/build-aux/ylwrap
@@ -135,19 +135,19 @@ if test $ret -eq 0; then
     # Handle y_tab.c and y_tab.h output by DOS
     if test $y_tab_nodot = "yes"; then
       if test $from = "y.tab.c"; then
-    	from="y_tab.c"
+        from="y_tab.c"
       else
-    	if test $from = "y.tab.h"; then
-    	  from="y_tab.h"
-    	fi
+        if test $from = "y.tab.h"; then
+          from="y_tab.h"
+        fi
       fi
     fi
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
       # otherwise prepend `../'.
       case "$2" in
-    	[\\/]* | ?:[\\/]*) target="$2";;
-    	*) target="../$2";;
+        [\\/]* | ?:[\\/]*) target="$2";;
+        *) target="../$2";;
       esac
 
       # We do not want to overwrite a header file if it hasn't
diff --git a/configure b/configure
index b1d9db2..b7e7dfc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libksba 1.3.0.
+# Generated by GNU Autoconf 2.69 for libksba 1.3.1.
 #
 # Report bugs to <http://bugs.gnupg.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libksba'
 PACKAGE_TARNAME='libksba'
-PACKAGE_VERSION='1.3.0'
-PACKAGE_STRING='libksba 1.3.0'
+PACKAGE_VERSION='1.3.1'
+PACKAGE_STRING='libksba 1.3.1'
 PACKAGE_BUGREPORT='http://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -645,6 +645,7 @@ KSBA_CONFIG_HOST
 KSBA_CONFIG_API_VERSION
 KSBA_CONFIG_CFLAGS
 KSBA_CONFIG_LIBS
+VALGRIND
 ALLOCA_H
 ALLOCA
 LTALLOCA
@@ -660,6 +661,10 @@ HAVE_W32_SYSTEM_TRUE
 CC_FOR_BUILD
 YFLAGS
 YACC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 LIBKSBA_LT_REVISION
 LIBKSBA_LT_AGE
 LIBKSBA_LT_CURRENT
@@ -788,10 +793,12 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_maintainer_mode
+enable_silent_rules
 enable_optimization
 enable_ld_version_script
 with_libgpg_error_prefix
 with_gpg_error_prefix
+enable_valgrind_tests
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1345,7 +1352,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libksba 1.3.0 to adapt to many kinds of systems.
+\`configure' configures libksba 1.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1415,7 +1422,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libksba 1.3.0:";;
+     short | recursive ) echo "Configuration of libksba 1.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1432,10 +1439,13 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --disable-optimization  disable compiler optimization
   --enable-ld-version-script
                           enable/disable use of linker version script.
                           (default is system dependent)
+  --enable-valgrind-tests run self tests under valgrind
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1533,7 +1543,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libksba configure 1.3.0
+libksba configure 1.3.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2139,7 +2149,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libksba $as_me 1.3.0, which was
+It was created by libksba $as_me 1.3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2495,7 +2505,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Please remember to document interface changes in the NEWS file.
 LIBKSBA_LT_CURRENT=19
 LIBKSBA_LT_AGE=11
-LIBKSBA_LT_REVISION=1
+LIBKSBA_LT_REVISION=2
 #-------------------
 # If the API is changed in an incompatible way: increment the next counter.
 KSBA_CONFIG_API_VERSION=1
@@ -2507,11 +2517,8 @@ NEED_GPG_ERROR_VERSION=1.8
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
-
-am__api_version='1.11'
-
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2527,7 +2534,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2539,6 +2546,9 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
+
+am__api_version='1.11'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -6775,7 +6785,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+         powerpc64le-*)
+           LD="${LD-ld} -m elf32lppclinux"
+           ;;
+         powerpc64-*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -6794,7 +6807,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+         powerpcle-*)
+           LD="${LD-ld} -m elf64lppc"
+           ;;
+         powerpc-*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -9228,7 +9244,7 @@ _LT_EOF
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	archive_expsym_cmds='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
 	  cp $export_symbols $output_objdir/$soname.def;
 	else
 	  echo EXPORTS > $output_objdir/$soname.def;
@@ -9689,7 +9705,7 @@ fi
 	shrext_cmds=".dll"
 	# FIXME: Setting linknames here is a bad hack.
 	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	archive_expsym_cmds='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
 	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
 	  else
 	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
@@ -10928,6 +10944,26 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
 # This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux # correct to gnu/linux during the next big refactor
@@ -12217,6 +12253,45 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -14665,6 +14740,77 @@ $as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 
 
+  # Check whether --enable-valgrind-tests was given.
+if test "${enable_valgrind_tests+set}" = set; then :
+  enableval=$enable_valgrind_tests; opt_valgrind_tests=$enableval
+else
+  opt_valgrind_tests=yes
+fi
+
+
+  # Run self-tests under valgrind?
+  if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then
+    for ac_prog in valgrind
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_VALGRIND+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$VALGRIND"; then
+  ac_cv_prog_VALGRIND="$VALGRIND" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_VALGRIND="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+VALGRIND=$ac_cv_prog_VALGRIND
+if test -n "$VALGRIND"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VALGRIND" >&5
+$as_echo "$VALGRIND" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$VALGRIND" && break
+done
+
+  fi
+
+  OPTS="-q --error-exitcode=1 --leak-check=full"
+
+  if test -n "$VALGRIND" \
+     && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
+    opt_valgrind_tests=yes
+    VALGRIND="$VALGRIND $OPTS"
+  else
+    opt_valgrind_tests=no
+    VALGRIND=
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether self tests are run under valgrind" >&5
+$as_echo_n "checking whether self tests are run under valgrind... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $opt_valgrind_tests" >&5
+$as_echo "$opt_valgrind_tests" >&6; }
+
+
 
 # To be used in ksba-config
 KSBA_CONFIG_LIBS="-lksba"
@@ -14690,12 +14836,12 @@ fi
 if test "$have_w32_system" = yes; then
    BUILD_TIMESTAMP=`date --iso-8601=minutes`
       BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-      BUILD_FILEVERSION="${BUILD_FILEVERSION}60036"
+      BUILD_FILEVERSION="${BUILD_FILEVERSION}17527"
 fi
 
 
 
-BUILD_REVISION="ea84874"
+BUILD_REVISION="447784c"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15253,7 +15399,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libksba $as_me 1.3.0, which was
+This file was extended by libksba $as_me 1.3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15319,7 +15465,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libksba config.status 1.3.0
+libksba config.status 1.3.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17317,6 +17463,7 @@ fi
 echo "
         Libksba v${VERSION} has been configured as follows:
 
+        Revision:  447784c  (17527)
         Platform:  $host
 
 "
diff --git a/configure.ac b/configure.ac
index 08a2552..f556319 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,14 @@ min_automake_version="1.10"
 # bump the version number immediately after the release and do another
 # commit and push so that the git magic is able to work.  See below
 # for the LT versions.
-m4_define(mym4_version, [1.3.0])
+m4_define(mym4_version, [1.3.1])
 
 # Below is m4 magic to extract and compute the revision number, the
 # decimalized short revision number, a beta version string, and a flag
 # indicating a development version (mym4_isgit). Note that the m4
 # processing is done by autoconf and not during the configure run.
-m4_define([mym4_revision], m4_esyscmd([git branch -v 2>/dev/null \
-          | awk '/^\* / {printf "%s",$3}']))
+m4_define([mym4_revision],
+          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
 m4_define([mym4_revision_dec],
           m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
 m4_define([mym4_betastring],
@@ -52,7 +52,7 @@ AC_INIT([libksba],[mym4_full_version],[http://bugs.gnupg.org])
 # Please remember to document interface changes in the NEWS file.
 LIBKSBA_LT_CURRENT=19
 LIBKSBA_LT_AGE=11
-LIBKSBA_LT_REVISION=1
+LIBKSBA_LT_REVISION=2
 #-------------------
 # If the API is changed in an incompatible way: increment the next counter.
 KSBA_CONFIG_API_VERSION=1
@@ -64,6 +64,7 @@ NEED_GPG_ERROR_VERSION=1.8
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/ksba.h])
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AM_CONFIG_HEADER(config.h)
@@ -110,6 +111,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AM_SILENT_RULES
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
@@ -360,7 +362,7 @@ AC_CHECK_FUNCS([memmove strchr strtol strtoul stpcpy gmtime_r getenv])
 # GNUlib checks
 gl_SOURCE_BASE(gl)
 gl_M4_BASE(gl/m4)
-gl_MODULES(alloca)
+gl_MODULES(alloca valgrind-tests)
 gl_INIT
 
 # To be used in ksba-config
@@ -409,6 +411,7 @@ AC_OUTPUT
 echo "
         Libksba v${VERSION} has been configured as follows:
 
+        Revision:  mym4_revision  (mym4_revision_dec)
         Platform:  $host
 
 "
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 180289c..92aad6c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -71,10 +71,12 @@ host_triplet = @host@
 subdir = doc
 DIST_COMMON = $(ksba_TEXINFOS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
-	$(srcdir)/version.texi mdate-sh texinfo.tex
+	$(srcdir)/version.texi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
-	$(top_srcdir)/gl/m4/gnulib.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/gl/m4/gnulib.m4 \
+	$(top_srcdir)/gl/m4/valgrind-tests.m4 \
+	$(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/gnupg-typedef.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -82,14 +84,21 @@ am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 INFO_DEPS = $(srcdir)/ksba.info
-am__TEXINFO_TEX_DIR = $(srcdir)
+TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
+am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
 DVIS = ksba.dvi
 PDFS = ksba.pdf
 PSS = ksba.ps
@@ -138,6 +147,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -214,6 +224,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALGRIND = @VALGRIND@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -366,7 +377,7 @@ ksba.html: ksba.texi $(srcdir)/version.texi $(ksba_TEXINFOS)
 $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
 $(srcdir)/stamp-vti: ksba.texi $(top_srcdir)/configure
 	@(dir=.; test -f ./ksba.texi || dir=$(srcdir); \
-	set `$(SHELL) $(srcdir)/mdate-sh $$dir/ksba.texi`; \
+	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/ksba.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
diff --git a/doc/gpl.texi b/doc/gpl.texi
index 244ba13..d13e9e4 100644
--- a/doc/gpl.texi
+++ b/doc/gpl.texi
@@ -659,12 +659,15 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
+@end enumerate
+
 @iftex
 @heading END OF TERMS AND CONDITIONS
 @end iftex
 @ifinfo
 @center END OF TERMS AND CONDITIONS
 @end ifinfo
+
 @unnumberedsec How to Apply These Terms to Your New Programs
 
 If you develop a new program, and you want it to be of the greatest
@@ -675,8 +678,10 @@ terms.
 To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
-@smallexample
+the ``copyright'' line and a pointer to where the full notice is
+found.
+
+@example
 @var{one line to give the program's name and a brief idea of what it does.}
 Copyright (C) @var{year} @var{name of author}
 
@@ -692,17 +697,21 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
-@end smallexample
+@end example
 
+@noindent
 Also add information on how to contact you by electronic and paper mail.
 
+@noindent
 If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
 @smallexample
 @var{program} Copyright (C) @var{year} @var{name of author}
-This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
-This is free software, and you are welcome to redistribute it under certain conditions; type @samp{show c} for details.
+This program comes with ABSOLUTELY NO WARRANTY; for details
+type @samp{show w}.  This is free software, and you are
+welcome to redistribute it under certain conditions;
+type @samp{show c} for details.
 @end smallexample
 
 The hypothetical commands @samp{show w} and @samp{show c} should show
@@ -721,5 +730,3 @@ library, you may consider it more useful to permit linking proprietary
 applications with the library.  If this is what you want to do, use
 the GNU Lesser General Public License instead of this License.  But
 first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
-@end enumerate
diff --git a/doc/ksba.info b/doc/ksba.info
index 153d7e8..07176ba 100644
--- a/doc/ksba.info
+++ b/doc/ksba.info
@@ -1,5 +1,5 @@
-This is /home/wk/w/libksba/doc/ksba.info, produced by makeinfo version
-4.13 from /home/wk/w/libksba/doc/ksba.texi.
+This is /home/wk/s/libksba/doc/ksba.info, produced by makeinfo version
+4.13 from /home/wk/s/libksba/doc/ksba.texi.
 
 INFO-DIR-SECTION GNU libraries
 START-INFO-DIR-ENTRY
@@ -9,8 +9,8 @@ END-INFO-DIR-ENTRY
    This file documents the KSBA library to access X.509 and CMS data
 structures.
 
-   This is edition 1.3.0, last updated 24 February 2011, of `The KSBA
-Reference Manual', for Version 1.3.0.
+   This is edition 1.3.1, last updated 15 March 2013, of `The KSBA
+Reference Manual', for Version 1.3.1.
 
    Copyright (C) 2002, 2003, 2004 g10 Code GmbH
 
@@ -26,8 +26,8 @@ File: ksba.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Main Menu
 *********
 
-This is edition 1.3.0, last updated 24 February 2011, of `The KSBA
-Reference Manual', for Version 1.3.0 of the KSBA library.
+This is edition 1.3.1, last updated 15 March 2013, of `The KSBA
+Reference Manual', for Version 1.3.1 of the KSBA library.
 
    Copyright (C) 2002, 2003, 2004 g10 Code GmbH
 
@@ -1698,64 +1698,65 @@ modification follow.
      connection with the Program, unless a warranty or assumption of
      liability accompanies a copy of the Program in return for a fee.
 
-                        END OF TERMS AND CONDITIONS
+
+                      END OF TERMS AND CONDITIONS
 How to Apply These Terms to Your New Programs
 =============================================
 
-     If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these
 terms.
 
-     To do so, attach the following notices to the program.  It is
-safest to attach them to the start of each source file to most
-effectively state the exclusion of warranty; and each file should have
-at least the "copyright" line and a pointer to where the full notice is
-found.
-          ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
-          Copyright (C) YEAR NAME OF AUTHOR
+   To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+     ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
+     Copyright (C) YEAR NAME OF AUTHOR
 
-          This program is free software: you can redistribute it and/or modify
-          it under the terms of the GNU General Public License as published by
-          the Free Software Foundation, either version 3 of the License, or (at
-          your option) any later version.
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or (at
+     your option) any later version.
 
-          This program is distributed in the hope that it will be useful, but
-          WITHOUT ANY WARRANTY; without even the implied warranty of
-          MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-          General Public License for more details.
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
 
-          You should have received a copy of the GNU General Public License
-          along with this program.  If not, see `http://www.gnu.org/licenses/'.
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-     Also add information on how to contact you by electronic and paper
-mail.
+Also add information on how to contact you by electronic and paper mail.
 
-     If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
+If the program does terminal interaction, make it output a short notice
+like this when it starts in an interactive mode:
 
-          PROGRAM Copyright (C) YEAR NAME OF AUTHOR
-          This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-          This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+     PROGRAM Copyright (C) YEAR NAME OF AUTHOR
+     This program comes with ABSOLUTELY NO WARRANTY; for details
+     type `show w'.  This is free software, and you are
+     welcome to redistribute it under certain conditions;
+     type `show c' for details.
 
-     The hypothetical commands `show w' and `show c' should show the
+   The hypothetical commands `show w' and `show c' should show the
 appropriate parts of the General Public License.  Of course, your
 program's commands might be different; for a GUI interface, you would
 use an "about box".
 
-     You should also get your employer (if you work as a programmer) or
+   You should also get your employer (if you work as a programmer) or
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  For more information on this, and how to apply and follow
 the GNU GPL, see `http://www.gnu.org/licenses/'.
 
-     The GNU General Public License does not permit incorporating your
+   The GNU General Public License does not permit incorporating your
 program into proprietary programs.  If your program is a subroutine
 library, you may consider it more useful to permit linking proprietary
 applications with the library.  If this is what you want to do, use the
 GNU Lesser General Public License instead of this License.  But first,
 please read `http://www.gnu.org/philosophy/why-not-lgpl.html'.
 
-
 
 File: ksba.info,  Node: Concept Index,  Next: Function and Data Index,  Prev: Copying,  Up: Top
 
@@ -1848,33 +1849,33 @@ Function and Data Index
 
 
 Tag Table:
-Node: Top792
-Node: Introduction2827
-Node: Getting Started3105
-Node: Features3971
-Node: Overview5062
-Node: Preparation5311
-Node: Header5794
-Node: Version Check6390
-Node: Building the source7481
-Node: Certificate Handling9325
-Node: Creating certificates10306
-Node: Retrieving attributes12762
-Node: Setting attributes26410
-Node: User data26675
-Node: CMS28596
-Node: CMS Basics29056
-Node: CMS Parser31118
-Node: CRLs35084
-Node: PKCS1035367
-Node: Utilities35634
-Node: Names36038
-Node: OIDs38347
-Node: DNs38551
-Node: Error Handling39686
-Node: Component Labels41040
-Node: Copying42530
-Node: Concept Index80161
-Node: Function and Data Index80309
+Node: Top789
+Node: Introduction2821
+Node: Getting Started3099
+Node: Features3965
+Node: Overview5056
+Node: Preparation5305
+Node: Header5788
+Node: Version Check6384
+Node: Building the source7475
+Node: Certificate Handling9319
+Node: Creating certificates10300
+Node: Retrieving attributes12756
+Node: Setting attributes26404
+Node: User data26669
+Node: CMS28590
+Node: CMS Basics29050
+Node: CMS Parser31112
+Node: CRLs35078
+Node: PKCS1035361
+Node: Utilities35628
+Node: Names36032
+Node: OIDs38341
+Node: DNs38545
+Node: Error Handling39680
+Node: Component Labels41034
+Node: Copying42524
+Node: Concept Index80067
+Node: Function and Data Index80215
 
 End Tag Table
diff --git a/doc/stamp-vti b/doc/stamp-vti
index f00e86f..0bc4e0e 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 24 February 2011
-@set UPDATED-MONTH February 2011
-@set EDITION 1.3.0
-@set VERSION 1.3.0
+@set UPDATED 15 March 2013
+@set UPDATED-MONTH March 2013
+@set EDITION 1.3.1
+@set VERSION 1.3.1
diff --git a/doc/version.texi b/doc/version.texi
index f00e86f..0bc4e0e 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 24 February 2011
-@set UPDATED-MONTH February 2011
-@set EDITION 1.3.0
-@set VERSION 1.3.0
+@set UPDATED 15 March 2013
+@set UPDATED-MONTH March 2013
+@set EDITION 1.3.1
+@set VERSION 1.3.1
diff --git a/gl/Makefile.am b/gl/Makefile.am
index 3e407d1..f3b46e0 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -9,7 +9,7 @@
 #
 # Generated by gnulib-tool.
 # Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --libtool  alloca alloca-opt
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --libtool  alloca alloca-opt valgrind-tests
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
diff --git a/gl/Makefile.in b/gl/Makefile.in
index 1f44970..2cf5302 100644
--- a/gl/Makefile.in
+++ b/gl/Makefile.in
@@ -25,7 +25,7 @@
 #
 # Generated by gnulib-tool.
 # Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --libtool  alloca alloca-opt
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --libtool  alloca alloca-opt valgrind-tests
 
 VPATH = @srcdir@
 am__make_dryrun = \
@@ -67,7 +67,9 @@ subdir = gl
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in alloca.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
-	$(top_srcdir)/gl/m4/gnulib.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/gl/m4/gnulib.m4 \
+	$(top_srcdir)/gl/m4/valgrind-tests.m4 \
+	$(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/gnupg-typedef.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -75,7 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -83,18 +85,34 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgnu_la_DEPENDENCIES = @LTLIBOBJS@ @LTALLOCA@
 am_libgnu_la_OBJECTS = dummyobj.lo
 libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgnu_la_SOURCES)
 DIST_SOURCES = $(libgnu_la_SOURCES)
 am__can_run_installinfo = \
@@ -109,6 +127,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -185,6 +204,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALGRIND = @VALGRIND@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -296,7 +316,7 @@ clean-noinstLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) $(EXTRA_libgnu_la_DEPENDENCIES) 
-	$(LINK)  $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK)  $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -305,13 +325,13 @@ distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c $<
+	$(AM_V_CC)$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/gl/m4/gnulib.m4 b/gl/m4/gnulib.m4
index 074e76e..7a975be 100644
--- a/gl/m4/gnulib.m4
+++ b/gl/m4/gnulib.m4
@@ -21,6 +21,7 @@ LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
 changequote([, ])dnl
 AC_SUBST(LTALLOCA)
   gl_FUNC_ALLOCA
+  gl_VALGRIND_TESTS
 ])
 
 dnl Usage: gl_MODULES(module1 module2 ...)
diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
new file mode 100644
index 0000000..66f81fb
--- /dev/null
+++ b/gl/m4/valgrind-tests.m4
@@ -0,0 +1,37 @@
+# valgrind-tests.m4 serial 3
+dnl Copyright (C) 2008-2013 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.
+
+dnl From Simon Josefsson
+
+# gl_VALGRIND_TESTS()
+# -------------------
+# Check if valgrind is available, and set VALGRIND to it if available.
+AC_DEFUN([gl_VALGRIND_TESTS],
+[
+  AC_ARG_ENABLE(valgrind-tests,
+    AS_HELP_STRING([--enable-valgrind-tests],
+                   [run self tests under valgrind]),
+    [opt_valgrind_tests=$enableval], [opt_valgrind_tests=yes])
+
+  # Run self-tests under valgrind?
+  if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then
+    AC_CHECK_PROGS(VALGRIND, valgrind)
+  fi
+
+  OPTS="-q --error-exitcode=1 --leak-check=full"
+
+  if test -n "$VALGRIND" \
+     && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
+    opt_valgrind_tests=yes
+    VALGRIND="$VALGRIND $OPTS"
+  else
+    opt_valgrind_tests=no
+    VALGRIND=
+  fi
+
+  AC_MSG_CHECKING([whether self tests are run under valgrind])
+  AC_MSG_RESULT($opt_valgrind_tests)
+])
diff --git a/m4/Makefile.in b/m4/Makefile.in
index c790725..5e05e41 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -54,7 +54,9 @@ subdir = m4
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
-	$(top_srcdir)/gl/m4/gnulib.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/gl/m4/gnulib.m4 \
+	$(top_srcdir)/gl/m4/valgrind-tests.m4 \
+	$(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/gnupg-typedef.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -62,10 +64,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -78,6 +86,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -154,6 +163,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALGRIND = @VALGRIND@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4bedbd3..1d62b05 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1326,7 +1326,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+         powerpc64le-*)
+           LD="${LD-ld} -m elf32lppclinux"
+           ;;
+         powerpc64-*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1345,7 +1348,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+         powerpcle-*)
+           LD="${LD-ld} -m elf64lppc"
+           ;;
+         powerpc-*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -2638,6 +2644,26 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
 # This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux # correct to gnu/linux during the next big refactor
@@ -4773,7 +4799,7 @@ _LT_EOF
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
 	  cp $export_symbols $output_objdir/$soname.def;
 	else
 	  echo EXPORTS > $output_objdir/$soname.def;
@@ -5150,7 +5176,7 @@ _LT_EOF
 	shrext_cmds=".dll"
 	# FIXME: Setting linknames here is a bad hack.
 	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
 	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
 	  else
 	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
@@ -6149,7 +6175,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	  shrext_cmds=".dll"
 	  # FIXME: Setting linknames here is a bad hack.
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
 	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
 	    else
 	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
@@ -6190,7 +6216,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	    # If the export-symbols file already is a .def file (1st line
 	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED \"$sed_uncomment_deffile\" $export_symbols | $SED 1q`" = xEXPORTS; then
 	      cp $export_symbols $output_objdir/$soname.def;
 	    else
 	      echo EXPORTS > $output_objdir/$soname.def;
diff --git a/src/Makefile.in b/src/Makefile.in
index 96acf9e..bae5094 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -80,7 +80,9 @@ DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/versioninfo.rc.in asn1-parse.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
-	$(top_srcdir)/gl/m4/gnulib.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/gl/m4/gnulib.m4 \
+	$(top_srcdir)/gl/m4/valgrind-tests.m4 \
+	$(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/gnupg-typedef.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -88,7 +90,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ksba-config versioninfo.rc
 CONFIG_CLEAN_VPATH_FILES =
@@ -129,7 +131,10 @@ am_libksba_la_OBJECTS = visibility.lo reader.lo writer.lo \
 	crl.lo certreq.lo ocsp.lo keyinfo.lo oid.lo name.lo dn.lo \
 	time.lo version.lo util.lo asn1-tables.lo
 libksba_la_OBJECTS = $(am_libksba_la_OBJECTS)
-libksba_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+libksba_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libksba_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(noinst_PROGRAMS)
@@ -141,28 +146,44 @@ am_ber_dump_OBJECTS = ber_dump-ber-dump.$(OBJEXT) \
 ber_dump_OBJECTS = $(am_ber_dump_OBJECTS)
 am__DEPENDENCIES_2 =
 ber_dump_DEPENDENCIES = $(am__DEPENDENCIES_2) ../gl/libgnu.la
-ber_dump_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(ber_dump_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+ber_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ber_dump_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 @MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
 YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
-YLWRAP = $(top_srcdir)/ylwrap
+LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
+AM_V_YACC = $(am__v_YACC_@AM_V@)
+am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
+am__v_YACC_0 = @echo "  YACC  " $@;
+YLWRAP = $(top_srcdir)/build-aux/ylwrap
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libksba_la_SOURCES) $(ber_dump_SOURCES)
 DIST_SOURCES = $(libksba_la_SOURCES) $(ber_dump_SOURCES)
 am__can_run_installinfo = \
@@ -179,6 +200,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -255,6 +277,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALGRIND = @VALGRIND@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -446,7 +469,7 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libksba.la: $(libksba_la_OBJECTS) $(libksba_la_DEPENDENCIES) $(EXTRA_libksba_la_DEPENDENCIES) 
-	$(libksba_la_LINK) -rpath $(libdir) $(libksba_la_OBJECTS) $(libksba_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libksba_la_LINK) -rpath $(libdir) $(libksba_la_OBJECTS) $(libksba_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -458,7 +481,7 @@ clean-noinstPROGRAMS:
 	rm -f $$list
 ber-dump$(EXEEXT): $(ber_dump_OBJECTS) $(ber_dump_DEPENDENCIES) $(EXTRA_ber_dump_DEPENDENCIES) 
 	@rm -f ber-dump$(EXEEXT)
-	$(ber_dump_LINK) $(ber_dump_OBJECTS) $(ber_dump_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(ber_dump_LINK) $(ber_dump_OBJECTS) $(ber_dump_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
@@ -535,154 +558,154 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writer.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 ber_dump-ber-dump.o: ber-dump.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-dump.o -MD -MP -MF $(DEPDIR)/ber_dump-ber-dump.Tpo -c -o ber_dump-ber-dump.o `test -f 'ber-dump.c' || echo '$(srcdir)/'`ber-dump.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-ber-dump.Tpo $(DEPDIR)/ber_dump-ber-dump.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ber-dump.c' object='ber_dump-ber-dump.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-dump.o -MD -MP -MF $(DEPDIR)/ber_dump-ber-dump.Tpo -c -o ber_dump-ber-dump.o `test -f 'ber-dump.c' || echo '$(srcdir)/'`ber-dump.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-ber-dump.Tpo $(DEPDIR)/ber_dump-ber-dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ber-dump.c' object='ber_dump-ber-dump.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-dump.o `test -f 'ber-dump.c' || echo '$(srcdir)/'`ber-dump.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-dump.o `test -f 'ber-dump.c' || echo '$(srcdir)/'`ber-dump.c
 
 ber_dump-ber-dump.obj: ber-dump.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-dump.obj -MD -MP -MF $(DEPDIR)/ber_dump-ber-dump.Tpo -c -o ber_dump-ber-dump.obj `if test -f 'ber-dump.c'; then $(CYGPATH_W) 'ber-dump.c'; else $(CYGPATH_W) '$(srcdir)/ber-dump.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-ber-dump.Tpo $(DEPDIR)/ber_dump-ber-dump.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ber-dump.c' object='ber_dump-ber-dump.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-dump.obj -MD -MP -MF $(DEPDIR)/ber_dump-ber-dump.Tpo -c -o ber_dump-ber-dump.obj `if test -f 'ber-dump.c'; then $(CYGPATH_W) 'ber-dump.c'; else $(CYGPATH_W) '$(srcdir)/ber-dump.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-ber-dump.Tpo $(DEPDIR)/ber_dump-ber-dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ber-dump.c' object='ber_dump-ber-dump.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-dump.obj `if test -f 'ber-dump.c'; then $(CYGPATH_W) 'ber-dump.c'; else $(CYGPATH_W) '$(srcdir)/ber-dump.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-dump.obj `if test -f 'ber-dump.c'; then $(CYGPATH_W) 'ber-dump.c'; else $(CYGPATH_W) '$(srcdir)/ber-dump.c'; fi`
 
 ber_dump-ber-decoder.o: ber-decoder.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-decoder.o -MD -MP -MF $(DEPDIR)/ber_dump-ber-decoder.Tpo -c -o ber_dump-ber-decoder.o `test -f 'ber-decoder.c' || echo '$(srcdir)/'`ber-decoder.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-ber-decoder.Tpo $(DEPDIR)/ber_dump-ber-decoder.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ber-decoder.c' object='ber_dump-ber-decoder.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-decoder.o -MD -MP -MF $(DEPDIR)/ber_dump-ber-decoder.Tpo -c -o ber_dump-ber-decoder.o `test -f 'ber-decoder.c' || echo '$(srcdir)/'`ber-decoder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-ber-decoder.Tpo $(DEPDIR)/ber_dump-ber-decoder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ber-decoder.c' object='ber_dump-ber-decoder.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-decoder.o `test -f 'ber-decoder.c' || echo '$(srcdir)/'`ber-decoder.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-decoder.o `test -f 'ber-decoder.c' || echo '$(srcdir)/'`ber-decoder.c
 
 ber_dump-ber-decoder.obj: ber-decoder.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-decoder.obj -MD -MP -MF $(DEPDIR)/ber_dump-ber-decoder.Tpo -c -o ber_dump-ber-decoder.obj `if test -f 'ber-decoder.c'; then $(CYGPATH_W) 'ber-decoder.c'; else $(CYGPATH_W) '$(srcdir)/ber-decoder.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-ber-decoder.Tpo $(DEPDIR)/ber_dump-ber-decoder.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ber-decoder.c' object='ber_dump-ber-decoder.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-decoder.obj -MD -MP -MF $(DEPDIR)/ber_dump-ber-decoder.Tpo -c -o ber_dump-ber-decoder.obj `if test -f 'ber-decoder.c'; then $(CYGPATH_W) 'ber-decoder.c'; else $(CYGPATH_W) '$(srcdir)/ber-decoder.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-ber-decoder.Tpo $(DEPDIR)/ber_dump-ber-decoder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ber-decoder.c' object='ber_dump-ber-decoder.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-decoder.obj `if test -f 'ber-decoder.c'; then $(CYGPATH_W) 'ber-decoder.c'; else $(CYGPATH_W) '$(srcdir)/ber-decoder.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-decoder.obj `if test -f 'ber-decoder.c'; then $(CYGPATH_W) 'ber-decoder.c'; else $(CYGPATH_W) '$(srcdir)/ber-decoder.c'; fi`
 
 ber_dump-ber-help.o: ber-help.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-help.o -MD -MP -MF $(DEPDIR)/ber_dump-ber-help.Tpo -c -o ber_dump-ber-help.o `test -f 'ber-help.c' || echo '$(srcdir)/'`ber-help.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-ber-help.Tpo $(DEPDIR)/ber_dump-ber-help.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ber-help.c' object='ber_dump-ber-help.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-help.o -MD -MP -MF $(DEPDIR)/ber_dump-ber-help.Tpo -c -o ber_dump-ber-help.o `test -f 'ber-help.c' || echo '$(srcdir)/'`ber-help.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-ber-help.Tpo $(DEPDIR)/ber_dump-ber-help.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ber-help.c' object='ber_dump-ber-help.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-help.o `test -f 'ber-help.c' || echo '$(srcdir)/'`ber-help.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-help.o `test -f 'ber-help.c' || echo '$(srcdir)/'`ber-help.c
 
 ber_dump-ber-help.obj: ber-help.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-help.obj -MD -MP -MF $(DEPDIR)/ber_dump-ber-help.Tpo -c -o ber_dump-ber-help.obj `if test -f 'ber-help.c'; then $(CYGPATH_W) 'ber-help.c'; else $(CYGPATH_W) '$(srcdir)/ber-help.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-ber-help.Tpo $(DEPDIR)/ber_dump-ber-help.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ber-help.c' object='ber_dump-ber-help.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-ber-help.obj -MD -MP -MF $(DEPDIR)/ber_dump-ber-help.Tpo -c -o ber_dump-ber-help.obj `if test -f 'ber-help.c'; then $(CYGPATH_W) 'ber-help.c'; else $(CYGPATH_W) '$(srcdir)/ber-help.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-ber-help.Tpo $(DEPDIR)/ber_dump-ber-help.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ber-help.c' object='ber_dump-ber-help.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-help.obj `if test -f 'ber-help.c'; then $(CYGPATH_W) 'ber-help.c'; else $(CYGPATH_W) '$(srcdir)/ber-help.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-ber-help.obj `if test -f 'ber-help.c'; then $(CYGPATH_W) 'ber-help.c'; else $(CYGPATH_W) '$(srcdir)/ber-help.c'; fi`
 
 ber_dump-reader.o: reader.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-reader.o -MD -MP -MF $(DEPDIR)/ber_dump-reader.Tpo -c -o ber_dump-reader.o `test -f 'reader.c' || echo '$(srcdir)/'`reader.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-reader.Tpo $(DEPDIR)/ber_dump-reader.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='reader.c' object='ber_dump-reader.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-reader.o -MD -MP -MF $(DEPDIR)/ber_dump-reader.Tpo -c -o ber_dump-reader.o `test -f 'reader.c' || echo '$(srcdir)/'`reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-reader.Tpo $(DEPDIR)/ber_dump-reader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='reader.c' object='ber_dump-reader.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-reader.o `test -f 'reader.c' || echo '$(srcdir)/'`reader.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-reader.o `test -f 'reader.c' || echo '$(srcdir)/'`reader.c
 
 ber_dump-reader.obj: reader.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-reader.obj -MD -MP -MF $(DEPDIR)/ber_dump-reader.Tpo -c -o ber_dump-reader.obj `if test -f 'reader.c'; then $(CYGPATH_W) 'reader.c'; else $(CYGPATH_W) '$(srcdir)/reader.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-reader.Tpo $(DEPDIR)/ber_dump-reader.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='reader.c' object='ber_dump-reader.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-reader.obj -MD -MP -MF $(DEPDIR)/ber_dump-reader.Tpo -c -o ber_dump-reader.obj `if test -f 'reader.c'; then $(CYGPATH_W) 'reader.c'; else $(CYGPATH_W) '$(srcdir)/reader.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-reader.Tpo $(DEPDIR)/ber_dump-reader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='reader.c' object='ber_dump-reader.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-reader.obj `if test -f 'reader.c'; then $(CYGPATH_W) 'reader.c'; else $(CYGPATH_W) '$(srcdir)/reader.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-reader.obj `if test -f 'reader.c'; then $(CYGPATH_W) 'reader.c'; else $(CYGPATH_W) '$(srcdir)/reader.c'; fi`
 
 ber_dump-writer.o: writer.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-writer.o -MD -MP -MF $(DEPDIR)/ber_dump-writer.Tpo -c -o ber_dump-writer.o `test -f 'writer.c' || echo '$(srcdir)/'`writer.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-writer.Tpo $(DEPDIR)/ber_dump-writer.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='writer.c' object='ber_dump-writer.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-writer.o -MD -MP -MF $(DEPDIR)/ber_dump-writer.Tpo -c -o ber_dump-writer.o `test -f 'writer.c' || echo '$(srcdir)/'`writer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-writer.Tpo $(DEPDIR)/ber_dump-writer.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='writer.c' object='ber_dump-writer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-writer.o `test -f 'writer.c' || echo '$(srcdir)/'`writer.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-writer.o `test -f 'writer.c' || echo '$(srcdir)/'`writer.c
 
 ber_dump-writer.obj: writer.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-writer.obj -MD -MP -MF $(DEPDIR)/ber_dump-writer.Tpo -c -o ber_dump-writer.obj `if test -f 'writer.c'; then $(CYGPATH_W) 'writer.c'; else $(CYGPATH_W) '$(srcdir)/writer.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-writer.Tpo $(DEPDIR)/ber_dump-writer.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='writer.c' object='ber_dump-writer.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-writer.obj -MD -MP -MF $(DEPDIR)/ber_dump-writer.Tpo -c -o ber_dump-writer.obj `if test -f 'writer.c'; then $(CYGPATH_W) 'writer.c'; else $(CYGPATH_W) '$(srcdir)/writer.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-writer.Tpo $(DEPDIR)/ber_dump-writer.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='writer.c' object='ber_dump-writer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-writer.obj `if test -f 'writer.c'; then $(CYGPATH_W) 'writer.c'; else $(CYGPATH_W) '$(srcdir)/writer.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-writer.obj `if test -f 'writer.c'; then $(CYGPATH_W) 'writer.c'; else $(CYGPATH_W) '$(srcdir)/writer.c'; fi`
 
 ber_dump-asn1-parse.o: asn1-parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-asn1-parse.o -MD -MP -MF $(DEPDIR)/ber_dump-asn1-parse.Tpo -c -o ber_dump-asn1-parse.o `test -f 'asn1-parse.c' || echo '$(srcdir)/'`asn1-parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-asn1-parse.Tpo $(DEPDIR)/ber_dump-asn1-parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='asn1-parse.c' object='ber_dump-asn1-parse.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-asn1-parse.o -MD -MP -MF $(DEPDIR)/ber_dump-asn1-parse.Tpo -c -o ber_dump-asn1-parse.o `test -f 'asn1-parse.c' || echo '$(srcdir)/'`asn1-parse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-asn1-parse.Tpo $(DEPDIR)/ber_dump-asn1-parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='asn1-parse.c' object='ber_dump-asn1-parse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-asn1-parse.o `test -f 'asn1-parse.c' || echo '$(srcdir)/'`asn1-parse.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-asn1-parse.o `test -f 'asn1-parse.c' || echo '$(srcdir)/'`asn1-parse.c
 
 ber_dump-asn1-parse.obj: asn1-parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-asn1-parse.obj -MD -MP -MF $(DEPDIR)/ber_dump-asn1-parse.Tpo -c -o ber_dump-asn1-parse.obj `if test -f 'asn1-parse.c'; then $(CYGPATH_W) 'asn1-parse.c'; else $(CYGPATH_W) '$(srcdir)/asn1-parse.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-asn1-parse.Tpo $(DEPDIR)/ber_dump-asn1-parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='asn1-parse.c' object='ber_dump-asn1-parse.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-asn1-parse.obj -MD -MP -MF $(DEPDIR)/ber_dump-asn1-parse.Tpo -c -o ber_dump-asn1-parse.obj `if test -f 'asn1-parse.c'; then $(CYGPATH_W) 'asn1-parse.c'; else $(CYGPATH_W) '$(srcdir)/asn1-parse.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-asn1-parse.Tpo $(DEPDIR)/ber_dump-asn1-parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='asn1-parse.c' object='ber_dump-asn1-parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-asn1-parse.obj `if test -f 'asn1-parse.c'; then $(CYGPATH_W) 'asn1-parse.c'; else $(CYGPATH_W) '$(srcdir)/asn1-parse.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-asn1-parse.obj `if test -f 'asn1-parse.c'; then $(CYGPATH_W) 'asn1-parse.c'; else $(CYGPATH_W) '$(srcdir)/asn1-parse.c'; fi`
 
 ber_dump-asn1-func.o: asn1-func.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-asn1-func.o -MD -MP -MF $(DEPDIR)/ber_dump-asn1-func.Tpo -c -o ber_dump-asn1-func.o `test -f 'asn1-func.c' || echo '$(srcdir)/'`asn1-func.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-asn1-func.Tpo $(DEPDIR)/ber_dump-asn1-func.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='asn1-func.c' object='ber_dump-asn1-func.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-asn1-func.o -MD -MP -MF $(DEPDIR)/ber_dump-asn1-func.Tpo -c -o ber_dump-asn1-func.o `test -f 'asn1-func.c' || echo '$(srcdir)/'`asn1-func.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-asn1-func.Tpo $(DEPDIR)/ber_dump-asn1-func.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='asn1-func.c' object='ber_dump-asn1-func.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-asn1-func.o `test -f 'asn1-func.c' || echo '$(srcdir)/'`asn1-func.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-asn1-func.o `test -f 'asn1-func.c' || echo '$(srcdir)/'`asn1-func.c
 
 ber_dump-asn1-func.obj: asn1-func.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-asn1-func.obj -MD -MP -MF $(DEPDIR)/ber_dump-asn1-func.Tpo -c -o ber_dump-asn1-func.obj `if test -f 'asn1-func.c'; then $(CYGPATH_W) 'asn1-func.c'; else $(CYGPATH_W) '$(srcdir)/asn1-func.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-asn1-func.Tpo $(DEPDIR)/ber_dump-asn1-func.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='asn1-func.c' object='ber_dump-asn1-func.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-asn1-func.obj -MD -MP -MF $(DEPDIR)/ber_dump-asn1-func.Tpo -c -o ber_dump-asn1-func.obj `if test -f 'asn1-func.c'; then $(CYGPATH_W) 'asn1-func.c'; else $(CYGPATH_W) '$(srcdir)/asn1-func.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-asn1-func.Tpo $(DEPDIR)/ber_dump-asn1-func.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='asn1-func.c' object='ber_dump-asn1-func.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-asn1-func.obj `if test -f 'asn1-func.c'; then $(CYGPATH_W) 'asn1-func.c'; else $(CYGPATH_W) '$(srcdir)/asn1-func.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-asn1-func.obj `if test -f 'asn1-func.c'; then $(CYGPATH_W) 'asn1-func.c'; else $(CYGPATH_W) '$(srcdir)/asn1-func.c'; fi`
 
 ber_dump-oid.o: oid.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-oid.o -MD -MP -MF $(DEPDIR)/ber_dump-oid.Tpo -c -o ber_dump-oid.o `test -f 'oid.c' || echo '$(srcdir)/'`oid.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-oid.Tpo $(DEPDIR)/ber_dump-oid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='oid.c' object='ber_dump-oid.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-oid.o -MD -MP -MF $(DEPDIR)/ber_dump-oid.Tpo -c -o ber_dump-oid.o `test -f 'oid.c' || echo '$(srcdir)/'`oid.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-oid.Tpo $(DEPDIR)/ber_dump-oid.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='oid.c' object='ber_dump-oid.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-oid.o `test -f 'oid.c' || echo '$(srcdir)/'`oid.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-oid.o `test -f 'oid.c' || echo '$(srcdir)/'`oid.c
 
 ber_dump-oid.obj: oid.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-oid.obj -MD -MP -MF $(DEPDIR)/ber_dump-oid.Tpo -c -o ber_dump-oid.obj `if test -f 'oid.c'; then $(CYGPATH_W) 'oid.c'; else $(CYGPATH_W) '$(srcdir)/oid.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-oid.Tpo $(DEPDIR)/ber_dump-oid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='oid.c' object='ber_dump-oid.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-oid.obj -MD -MP -MF $(DEPDIR)/ber_dump-oid.Tpo -c -o ber_dump-oid.obj `if test -f 'oid.c'; then $(CYGPATH_W) 'oid.c'; else $(CYGPATH_W) '$(srcdir)/oid.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-oid.Tpo $(DEPDIR)/ber_dump-oid.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='oid.c' object='ber_dump-oid.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-oid.obj `if test -f 'oid.c'; then $(CYGPATH_W) 'oid.c'; else $(CYGPATH_W) '$(srcdir)/oid.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-oid.obj `if test -f 'oid.c'; then $(CYGPATH_W) 'oid.c'; else $(CYGPATH_W) '$(srcdir)/oid.c'; fi`
 
 ber_dump-util.o: util.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-util.o -MD -MP -MF $(DEPDIR)/ber_dump-util.Tpo -c -o ber_dump-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-util.Tpo $(DEPDIR)/ber_dump-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='ber_dump-util.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-util.o -MD -MP -MF $(DEPDIR)/ber_dump-util.Tpo -c -o ber_dump-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-util.Tpo $(DEPDIR)/ber_dump-util.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util.c' object='ber_dump-util.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
 
 ber_dump-util.obj: util.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-util.obj -MD -MP -MF $(DEPDIR)/ber_dump-util.Tpo -c -o ber_dump-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ber_dump-util.Tpo $(DEPDIR)/ber_dump-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='ber_dump-util.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -MT ber_dump-util.obj -MD -MP -MF $(DEPDIR)/ber_dump-util.Tpo -c -o ber_dump-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ber_dump-util.Tpo $(DEPDIR)/ber_dump-util.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util.c' object='ber_dump-util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ber_dump_CFLAGS) $(CFLAGS) -c -o ber_dump-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
 
 .y.c:
-	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
+	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/src/asn1-parse.c b/src/asn1-parse.c
index e84e13d..a9f46cf 100644
--- a/src/asn1-parse.c
+++ b/src/asn1-parse.c
@@ -1,10 +1,8 @@
+/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -67,7 +65,7 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 189 of yacc.c  */
+/* Line 268 of yacc.c  */
 #line 42 "asn1-parse.y"
 
 #ifndef BUILD_GENTOOLS
@@ -93,10 +91,14 @@
    this.  Let's hope that this macros works. */
 #define yyparse _ksba_asn1_yyparse
 
-/*#define YYDEBUG 1*/
-#define YYERROR_VERBOSE = 1
+/* #define YYDEBUG 1 */
+#define YYERROR_VERBOSE 1
 #define MAX_STRING_LENGTH 129
 
+/* Dummy print so that yytoknum will be defined.  */
+#define YYPRINT(F, N, L)  do { } while (0);
+
+
 /* constants used in the grammar */
 enum {
   CONST_EXPLICIT = 1,
@@ -117,8 +119,8 @@ struct parser_control_s {
 
 
 
-/* Line 189 of yacc.c  */
-#line 122 "/home/wk/w/libksba/src/asn1-parse.c"
+/* Line 268 of yacc.c  */
+#line 124 "asn1-parse.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -135,7 +137,7 @@ struct parser_control_s {
 
 /* Enabling the token table.  */
 #ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+# define YYTOKEN_TABLE 1
 #endif
 
 
@@ -157,30 +159,30 @@ struct parser_control_s {
      BIT = 267,
      UNIVERSAL = 268,
      PRIVATE = 269,
-     APPLICATION = 270,
-     DEFAULT = 271,
-     CHOICE = 272,
-     OF = 273,
-     OBJECT = 274,
-     STR_IDENTIFIER = 275,
-     BOOLEAN = 276,
-     TRUE = 277,
-     FALSE = 278,
-     TOKEN_NULL = 279,
-     ANY = 280,
-     DEFINED = 281,
+     DEFAULT = 270,
+     CHOICE = 271,
+     OF = 272,
+     OBJECT = 273,
+     STR_IDENTIFIER = 274,
+     ksba_BOOLEAN = 275,
+     ksba_TRUE = 276,
+     ksba_FALSE = 277,
+     APPLICATION = 278,
+     ANY = 279,
+     DEFINED = 280,
+     SET = 281,
      BY = 282,
-     SET = 283,
-     EXPLICIT = 284,
-     IMPLICIT = 285,
-     DEFINITIONS = 286,
-     TAGS = 287,
-     BEGIN = 288,
-     END = 289,
-     UTCTime = 290,
-     GeneralizedTime = 291,
-     FROM = 292,
-     IMPORTS = 293,
+     EXPLICIT = 283,
+     IMPLICIT = 284,
+     DEFINITIONS = 285,
+     TAGS = 286,
+     ksba_BEGIN = 287,
+     ksba_END = 288,
+     UTCTime = 289,
+     GeneralizedTime = 290,
+     FROM = 291,
+     IMPORTS = 292,
+     TOKEN_NULL = 293,
      ENUMERATED = 294,
      UTF8STRING = 295,
      NUMERICSTRING = 296,
@@ -204,30 +206,30 @@ struct parser_control_s {
 #define BIT 267
 #define UNIVERSAL 268
 #define PRIVATE 269
-#define APPLICATION 270
-#define DEFAULT 271
-#define CHOICE 272
-#define OF 273
-#define OBJECT 274
-#define STR_IDENTIFIER 275
-#define BOOLEAN 276
-#define TRUE 277
-#define FALSE 278
-#define TOKEN_NULL 279
-#define ANY 280
-#define DEFINED 281
+#define DEFAULT 270
+#define CHOICE 271
+#define OF 272
+#define OBJECT 273
+#define STR_IDENTIFIER 274
+#define ksba_BOOLEAN 275
+#define ksba_TRUE 276
+#define ksba_FALSE 277
+#define APPLICATION 278
+#define ANY 279
+#define DEFINED 280
+#define SET 281
 #define BY 282
-#define SET 283
-#define EXPLICIT 284
-#define IMPLICIT 285
-#define DEFINITIONS 286
-#define TAGS 287
-#define BEGIN 288
-#define END 289
-#define UTCTime 290
-#define GeneralizedTime 291
-#define FROM 292
-#define IMPORTS 293
+#define EXPLICIT 283
+#define IMPLICIT 284
+#define DEFINITIONS 285
+#define TAGS 286
+#define ksba_BEGIN 287
+#define ksba_END 288
+#define UTCTime 289
+#define GeneralizedTime 290
+#define FROM 291
+#define IMPORTS 292
+#define TOKEN_NULL 293
 #define ENUMERATED 294
 #define UTF8STRING 295
 #define NUMERICSTRING 296
@@ -244,8 +246,8 @@ struct parser_control_s {
 typedef union YYSTYPE
 {
 
-/* Line 214 of yacc.c  */
-#line 94 "asn1-parse.y"
+/* Line 293 of yacc.c  */
+#line 98 "asn1-parse.y"
 
   unsigned int constant;
   char str[MAX_STRING_LENGTH];
@@ -253,8 +255,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 214 of yacc.c  */
-#line 258 "/home/wk/w/libksba/src/asn1-parse.c"
+/* Line 293 of yacc.c  */
+#line 260 "asn1-parse.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -264,8 +266,8 @@ typedef union YYSTYPE
 
 /* Copy the second part of user declarations.  */
 
-/* Line 264 of yacc.c  */
-#line 100 "asn1-parse.y"
+/* Line 343 of yacc.c  */
+#line 104 "asn1-parse.y"
 
 static AsnNode new_node (struct parser_control_s *parsectl, node_type_t type);
 #define NEW_NODE(a)  (new_node (PARSECTL, (a)))
@@ -281,8 +283,8 @@ static int yylex (YYSTYPE *lvalp, void *parm);
 static void yyerror (const char *s);
 
 
-/* Line 264 of yacc.c  */
-#line 286 "/home/wk/w/libksba/src/asn1-parse.c"
+/* Line 343 of yacc.c  */
+#line 288 "asn1-parse.c"
 
 #ifdef short
 # undef short
@@ -332,7 +334,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -385,11 +387,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -412,24 +414,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -458,23 +460,7 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -494,10 +480,30 @@ union yyalloc
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   201
+#define YYLAST   202
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  57
@@ -579,12 +585,12 @@ static const yytype_int8 yyrhs[] =
       -1,     5,    49,    61,    50,    -1,    64,    -1,    65,    51,
       64,    -1,     5,    -1,    66,     5,    -1,    62,    -1,     5,
       49,     4,    50,    -1,    67,    -1,    68,    67,    -1,    13,
-      -1,    14,    -1,    15,    -1,    52,     4,    53,    -1,    52,
-      69,     4,    53,    -1,    70,    -1,    70,    29,    -1,    70,
-      30,    -1,    16,    63,    -1,    16,    22,    -1,    16,    23,
+      -1,    14,    -1,    23,    -1,    52,     4,    53,    -1,    52,
+      69,     4,    53,    -1,    70,    -1,    70,    28,    -1,    70,
+      29,    -1,    15,    63,    -1,    15,    21,    -1,    15,    22,
       -1,     7,    -1,     7,    54,    65,    55,    -1,    73,    49,
-      62,    56,    56,    62,    50,    -1,    21,    -1,    35,    -1,
-      36,    -1,     8,    49,    62,    50,    -1,     8,    49,    62,
+      62,    56,    56,    62,    50,    -1,    20,    -1,    34,    -1,
+      35,    -1,     8,    49,    62,    50,    -1,     8,    49,    62,
       56,    56,    62,    50,    -1,    76,    -1,    49,    76,    50,
       -1,     9,    10,    -1,     9,    10,    77,    -1,    40,    -1,
       40,    77,    -1,    41,    -1,    41,    77,    -1,    42,    -1,
@@ -594,39 +600,39 @@ static const yytype_int8 yyrhs[] =
       -1,    83,    -1,    84,    -1,    85,    -1,     5,    49,     4,
       50,    -1,    87,    -1,    88,    51,    87,    -1,    12,    10,
       -1,    12,    10,    54,    88,    55,    -1,    39,    54,    88,
-      55,    -1,    19,    20,    -1,     5,    -1,     5,    77,    -1,
+      55,    -1,    18,    19,    -1,     5,    -1,     5,    77,    -1,
       73,    -1,    90,    -1,    74,    -1,    86,    -1,    75,    -1,
       78,    -1,    89,    -1,    97,    -1,    91,    -1,    99,    -1,
-     100,    -1,    98,    -1,    24,    -1,    92,    -1,    71,    92,
+     100,    -1,    98,    -1,    38,    -1,    92,    -1,    71,    92,
       -1,    93,    -1,    93,    72,    -1,    93,     6,    -1,     5,
       94,    -1,    95,    -1,    96,    51,    95,    -1,    11,    54,
-      96,    55,    -1,    11,    18,    92,    -1,    11,    77,    18,
-      92,    -1,    28,    54,    96,    55,    -1,    28,    18,    92,
-      -1,    28,    77,    18,    92,    -1,    17,    54,    96,    55,
-      -1,    25,    -1,    25,    26,    27,     5,    -1,     5,     3,
-      93,    -1,     5,    19,    20,     3,    54,    68,    55,    -1,
+      96,    55,    -1,    11,    17,    92,    -1,    11,    77,    17,
+      92,    -1,    26,    54,    96,    55,    -1,    26,    17,    92,
+      -1,    26,    77,    17,    92,    -1,    16,    54,    96,    55,
+      -1,    24,    -1,    24,    25,    27,     5,    -1,     5,     3,
+      93,    -1,     5,    18,    19,     3,    54,    68,    55,    -1,
        5,     5,     3,    54,    68,    55,    -1,     5,     7,     3,
        4,    -1,   101,    -1,   102,    -1,   103,    -1,   104,   103,
-      -1,     5,    54,    68,    55,    -1,    -1,    38,    66,    37,
-       5,    68,    -1,    29,    -1,    30,    -1,   105,    31,   107,
-      32,     3,    33,   106,   104,    34,    -1
+      -1,     5,    54,    68,    55,    -1,    -1,    37,    66,    36,
+       5,    68,    -1,    28,    -1,    29,    -1,   105,    30,   107,
+      31,     3,    32,   106,   104,    33,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   180,   180,   181,   184,   185,   188,   195,   196,   199,
-     200,   203,   204,   207,   212,   220,   221,   228,   233,   244,
-     249,   257,   259,   266,   267,   268,   271,   277,   285,   287,
-     292,   299,   304,   309,   316,   320,   326,   337,   343,   347,
-     353,   359,   368,   372,   378,   382,   390,   391,   398,   399,
-     406,   408,   415,   417,   424,   425,   432,   434,   441,   442,
-     451,   452,   453,   454,   455,   456,   457,   463,   471,   475,
-     482,   486,   494,   502,   508,   513,   520,   521,   522,   523,
-     524,   525,   526,   527,   528,   529,   530,   531,   532,   538,
-     542,   553,   557,   564,   571,   578,   580,   587,   592,   597,
-     606,   611,   616,   625,   632,   636,   648,   655,   662,   671,
-     680,   681,   684,   686,   693,   702,   703,   716,   717,   720
+       0,   185,   185,   186,   189,   190,   193,   200,   201,   204,
+     205,   208,   209,   212,   217,   225,   226,   233,   238,   249,
+     254,   262,   264,   271,   272,   273,   276,   282,   290,   292,
+     297,   304,   309,   314,   321,   325,   331,   342,   348,   352,
+     358,   364,   373,   377,   383,   387,   395,   396,   403,   404,
+     411,   413,   420,   422,   429,   430,   437,   439,   446,   447,
+     456,   457,   458,   459,   460,   461,   462,   468,   476,   480,
+     487,   491,   499,   507,   513,   518,   525,   526,   527,   528,
+     529,   530,   531,   532,   533,   534,   535,   536,   537,   543,
+     547,   558,   562,   569,   576,   583,   585,   592,   597,   602,
+     611,   616,   621,   630,   637,   641,   653,   660,   667,   676,
+     685,   686,   689,   691,   698,   707,   708,   721,   722,   725
 };
 #endif
 
@@ -636,23 +642,25 @@ static const yytype_uint16 yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "\"::=\"", "NUM", "IDENTIFIER",
-  "OPTIONAL", "INTEGER", "SIZE", "OCTET", "STRING", "SEQUENCE", "BIT",
-  "UNIVERSAL", "PRIVATE", "APPLICATION", "DEFAULT", "CHOICE", "OF",
-  "OBJECT", "STR_IDENTIFIER", "BOOLEAN", "TRUE", "FALSE", "TOKEN_NULL",
-  "ANY", "DEFINED", "BY", "SET", "EXPLICIT", "IMPLICIT", "DEFINITIONS",
-  "TAGS", "BEGIN", "END", "UTCTime", "GeneralizedTime", "FROM", "IMPORTS",
-  "ENUMERATED", "UTF8STRING", "NUMERICSTRING", "PRINTABLESTRING",
-  "TELETEXSTRING", "IA5STRING", "UNIVERSALSTRING", "BMPSTRING", "'+'",
-  "'-'", "'('", "')'", "','", "'['", "']'", "'{'", "'}'", "'.'", "$accept",
-  "input", "pos_num", "neg_num", "pos_neg_num", "num_identifier",
-  "pos_neg_identifier", "constant", "constant_list", "identifier_list",
-  "obj_constant", "obj_constant_list", "class", "tag_type", "tag",
-  "default", "integer_def", "boolean_def", "Time", "size_def2", "size_def",
-  "octet_string_def", "utf8_string_def", "numeric_string_def",
-  "printable_string_def", "teletex_string_def", "ia5_string_def",
-  "universal_string_def", "bmp_string_def", "string_def", "bit_element",
-  "bit_element_list", "bit_string_def", "enumerated_def", "object_def",
-  "type_assig_right", "type_assig_right_tag",
+  "\"OPTIONAL\"", "\"INTEGER\"", "\"SIZE\"", "\"OCTET\"", "\"STRING\"",
+  "\"SEQUENCE\"", "\"BIT\"", "\"UNIVERSAL\"", "\"PRIVATE\"", "\"DEFAULT\"",
+  "\"CHOICE\"", "\"OF\"", "\"OBJECT\"", "\"IDENTIFIER\"", "\"BOOLEAN\"",
+  "\"TRUE\"", "\"FALSE\"", "\"APPLICATION\"", "\"ANY\"", "\"DEFINED\"",
+  "\"SET\"", "\"BY\"", "\"EXPLICIT\"", "\"IMPLICIT\"", "\"DEFINITIONS\"",
+  "\"TAGS\"", "\"BEGIN\"", "\"END\"", "\"UTCTime\"", "\"GeneralizedTime\"",
+  "\"FROM\"", "\"IMPORTS\"", "\"NULL\"", "\"ENUMERATED\"",
+  "\"UTF8String\"", "\"NumericString\"", "\"PrintableString\"",
+  "\"TeletexString\"", "\"IA5String\"", "\"UniversalString\"",
+  "\"BMPString\"", "'+'", "'-'", "'('", "')'", "','", "'['", "']'", "'{'",
+  "'}'", "'.'", "$accept", "input", "pos_num", "neg_num", "pos_neg_num",
+  "num_identifier", "pos_neg_identifier", "constant", "constant_list",
+  "identifier_list", "obj_constant", "obj_constant_list", "class",
+  "tag_type", "tag", "default", "integer_def", "boolean_def", "Time",
+  "size_def2", "size_def", "octet_string_def", "utf8_string_def",
+  "numeric_string_def", "printable_string_def", "teletex_string_def",
+  "ia5_string_def", "universal_string_def", "bmp_string_def", "string_def",
+  "bit_element", "bit_element_list", "bit_string_def", "enumerated_def",
+  "object_def", "type_assig_right", "type_assig_right_tag",
   "type_assig_right_tag_default", "type_assig", "type_assig_list",
   "sequence_def", "set_def", "choise_def", "any_def", "type_def",
   "constant_def", "type_constant", "type_constant_list", "definitions_id",
@@ -708,8 +716,8 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     2,     4,     0,     5,     1,     1,     9
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -718,7 +726,7 @@ static const yytype_uint8 yydefact[] =
        0,     0,    20,   115,     0,     0,    17,     0,     0,   110,
      111,   112,     0,    18,     0,     0,     0,     0,     0,   119,
      113,     0,    74,    34,     0,     0,     0,     0,     0,    37,
-      88,   104,     0,    38,    39,     0,    46,    48,    50,    52,
+     104,     0,    38,    39,    88,     0,    46,    48,    50,    52,
       54,    56,    58,     0,    28,     0,    76,    78,    80,    81,
       60,    61,    62,    63,    64,    65,    66,    79,    82,    77,
       84,    89,   106,    83,    87,    85,    86,     0,     0,     0,
@@ -749,123 +757,128 @@ static const yytype_int16 yydefgoto[] =
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -144
+#define YYPACT_NINF -120
 static const yytype_int16 yypact[] =
 {
-    -144,    38,  -144,   -18,    18,  -144,   105,     0,  -144,    12,
-    -144,  -144,     1,  -144,  -144,    39,    63,  -144,  -144,    71,
-      56,    60,  -144,    57,   109,   123,  -144,    23,    83,  -144,
-    -144,  -144,    21,  -144,   125,    80,   132,   133,   117,  -144,
-    -144,   105,    16,    84,   134,    15,   135,    88,   128,  -144,
-    -144,   126,    19,  -144,  -144,    95,    16,    16,    16,    16,
-      16,    16,    16,    31,    82,   122,   102,  -144,  -144,  -144,
-    -144,  -144,  -144,  -144,  -144,  -144,  -144,  -144,  -144,  -144,
-    -144,  -144,  -144,  -144,  -144,  -144,  -144,    99,   150,   152,
-     105,   107,   151,  -144,  -144,     4,    16,   122,   155,   153,
-     116,   155,  -144,   145,   122,   155,   156,   168,  -144,  -144,
-    -144,  -144,  -144,  -144,  -144,   124,  -144,  -144,  -144,   171,
-    -144,  -144,  -144,   113,   105,  -144,   127,   113,   129,   131,
-       3,  -144,    -3,  -144,  -144,    80,  -144,     8,   122,   168,
-      25,   173,  -144,    43,   122,   136,  -144,    45,  -144,   130,
-    -144,   120,     7,   105,   -25,  -144,     3,  -144,   178,   180,
-    -144,  -144,   137,     4,  -144,    26,  -144,   155,  -144,  -144,
-      52,  -144,  -144,  -144,  -144,   182,   168,  -144,  -144,   138,
-    -144,    17,  -144,   139,   140,  -144,  -144,  -144,  -144,  -144,
-      35,  -144,  -144,  -144,   141,  -144,   113,  -144,   113,  -144,
-    -144,  -144,  -144,  -144,  -144,  -144,   142,   143,  -144,  -144
+    -120,    26,  -120,   -31,     7,  -120,    42,    67,  -120,    31,
+    -120,  -120,     1,  -120,  -120,    54,   105,  -120,  -120,    49,
+      70,    93,  -120,    90,   124,   126,  -120,    22,   100,  -120,
+    -120,  -120,    38,  -120,   130,    48,   134,   136,   125,  -120,
+    -120,    42,    24,    89,   135,    13,   138,    95,   140,  -120,
+     137,    16,  -120,  -120,  -120,   106,    24,    24,    24,    24,
+      24,    24,    24,    25,    83,   112,   114,  -120,  -120,  -120,
+    -120,  -120,  -120,  -120,  -120,  -120,  -120,  -120,  -120,  -120,
+    -120,  -120,  -120,  -120,  -120,  -120,  -120,   107,   160,   162,
+      42,   117,   159,  -120,  -120,    20,    24,   112,   163,   153,
+     118,   163,  -120,   144,   112,   163,   156,   169,  -120,  -120,
+    -120,  -120,  -120,  -120,  -120,   122,  -120,  -120,  -120,   172,
+    -120,  -120,  -120,   129,    42,  -120,   123,   129,   128,   131,
+       3,  -120,   -15,  -120,  -120,    48,  -120,    -6,   112,   169,
+      46,   174,  -120,    51,   112,   132,  -120,    53,  -120,   133,
+    -120,   127,     6,    42,   -28,  -120,     3,  -120,   178,   180,
+    -120,  -120,   139,    20,  -120,    29,  -120,   163,  -120,  -120,
+      59,  -120,  -120,  -120,  -120,   181,   169,  -120,  -120,   141,
+    -120,     8,  -120,   142,   143,  -120,  -120,  -120,  -120,  -120,
+      94,  -120,  -120,  -120,   145,  -120,   129,  -120,   129,  -120,
+    -120,  -120,  -120,  -120,  -120,  -120,   146,   149,  -120,  -120
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -144,  -144,  -144,  -144,  -143,  -119,  -144,    33,  -144,  -144,
-     -12,   -40,  -144,  -144,  -144,  -144,  -144,  -144,  -144,    96,
-     -42,  -144,  -144,  -144,  -144,  -144,  -144,  -144,  -144,  -144,
-      13,    58,  -144,  -144,  -144,   -63,    64,  -144,    34,   -35,
-    -144,  -144,  -144,  -144,  -144,  -144,   166,  -144,  -144,  -144,
-    -144,  -144
+    -120,  -120,  -120,  -120,  -114,  -119,  -120,    27,  -120,  -120,
+     -12,   -40,  -120,  -120,  -120,  -120,  -120,  -120,  -120,    96,
+     -42,  -120,  -120,  -120,  -120,  -120,  -120,  -120,  -120,  -120,
+      11,    52,  -120,  -120,  -120,   -63,    57,  -120,    33,    21,
+    -120,  -120,  -120,  -120,  -120,  -120,   170,  -120,  -120,  -120,
+    -120,  -120
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      18,    90,   122,    99,   151,     8,     9,   157,   154,   129,
-     106,     8,     9,   184,   108,   109,   110,   111,   112,   113,
-     114,     8,     9,    91,    91,   182,    28,    91,    33,    13,
-      14,   183,   189,    97,   134,   115,     6,   104,     2,   157,
-     200,   142,   190,     3,   116,   117,   118,   203,   163,     7,
-     158,   159,   164,   130,   133,    39,    17,   201,   202,   167,
-      34,    16,   180,   168,    92,    92,   140,    20,    92,    98,
-     143,    19,   197,   105,    21,   169,   167,   206,    18,   207,
-     171,   174,   158,   159,   152,    42,    35,    43,    36,    44,
-      37,    45,    46,    23,   167,    24,   176,    47,   173,    48,
-     177,    49,    38,   176,    50,    51,    22,   193,    52,     8,
-       9,   120,   121,   181,    26,    53,    54,     8,   150,    55,
-      56,    57,    58,    59,    60,    61,    62,    42,    28,    43,
-      41,    44,    63,    45,    46,    87,    88,    89,    95,    47,
-      18,    48,   101,    49,    96,   100,    50,    51,   102,   107,
-      52,   123,   103,   124,   125,   126,   127,    53,    54,    91,
-     135,    55,    56,    57,    58,    59,    60,    61,    62,    18,
-     139,   138,   141,   145,   144,   149,   179,   148,   172,   155,
-     156,   153,   185,   178,   186,   175,   194,   187,   128,   195,
-     199,   205,   208,   209,   196,   198,   188,   170,    40,   165,
-       0,   192
+      18,    90,   122,    99,   151,     8,     9,   157,   154,   106,
+       8,     9,     8,     9,   108,   109,   110,   111,   112,   113,
+     114,    91,   182,     6,    91,   129,     2,    33,   183,   115,
+      97,     3,    91,   104,   134,   189,   163,     7,   116,   117,
+     164,   142,   184,    28,   190,   167,     8,     9,   118,   168,
+     158,   159,    21,    42,   133,    43,    17,    44,    34,    45,
+      46,   180,    92,   197,    47,    92,    48,    98,    49,   130,
+     105,    39,    50,    92,    51,   169,   203,   206,    18,   207,
+      16,   174,    52,    53,   152,    19,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    13,    14,   167,   157,   200,
+      63,   171,   167,    35,   176,    36,   173,    37,   177,    20,
+     176,   120,   121,   181,   193,   201,   202,    42,    38,    43,
+      22,    44,   140,    45,    46,    23,   143,    24,    47,    26,
+      48,    28,    49,     8,   150,    41,    50,    87,    51,    88,
+      18,   158,   159,    95,    89,    96,    52,    53,   100,   101,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,   102,
+     107,   124,   103,   123,   125,   126,   127,    91,   135,    18,
+     138,   141,   139,   144,   145,   148,   149,   153,   155,   172,
+     156,   175,   185,   179,   186,   194,   178,   195,   128,   187,
+     188,   170,   165,   199,     0,   205,   208,   196,   198,   209,
+     192,     0,    40
 };
 
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-120))
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+
 static const yytype_int16 yycheck[] =
 {
-      12,    41,    65,    45,   123,     4,     5,     4,   127,     5,
-      52,     4,     5,   156,    56,    57,    58,    59,    60,    61,
-      62,     4,     5,     8,     8,    50,     5,     8,     5,    29,
-      30,    56,     6,    18,    97,     4,    54,    18,     0,     4,
-       5,   104,    16,     5,    13,    14,    15,   190,    51,    31,
-      47,    48,    55,    49,    96,    34,    55,    22,    23,    51,
-      37,    49,    55,    55,    49,    49,   101,     4,    49,    54,
-     105,    32,    55,    54,     3,   138,    51,   196,    90,   198,
-      55,   144,    47,    48,   124,     5,     3,     7,     5,     9,
-       7,    11,    12,    33,    51,    38,    51,    17,    55,    19,
-      55,    21,    19,    51,    24,    25,    50,    55,    28,     4,
-       5,    29,    30,   153,     5,    35,    36,     4,     5,    39,
-      40,    41,    42,    43,    44,    45,    46,     5,     5,     7,
-       5,     9,    52,    11,    12,     3,     3,    20,    54,    17,
-     152,    19,    54,    21,    10,    10,    24,    25,    20,    54,
-      28,    49,    26,    54,     4,     3,    49,    35,    36,     8,
-       5,    39,    40,    41,    42,    43,    44,    45,    46,   181,
-      54,    18,    27,     5,    18,     4,    56,    53,     5,    50,
-      49,    54,     4,    53,     4,    49,     4,    50,    92,   176,
-      50,    50,    50,    50,    56,    56,   163,   139,    32,   135,
-      -1,   167
+      12,    41,    65,    45,   123,     4,     5,     4,   127,    51,
+       4,     5,     4,     5,    56,    57,    58,    59,    60,    61,
+      62,     8,    50,    54,     8,     5,     0,     5,    56,     4,
+      17,     5,     8,    17,    97,     6,    51,    30,    13,    14,
+      55,   104,   156,     5,    15,    51,     4,     5,    23,    55,
+      47,    48,     3,     5,    96,     7,    55,     9,    36,    11,
+      12,    55,    49,    55,    16,    49,    18,    54,    20,    49,
+      54,    33,    24,    49,    26,   138,   190,   196,    90,   198,
+      49,   144,    34,    35,   124,    31,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    28,    29,    51,     4,     5,
+      52,    55,    51,     3,    51,     5,    55,     7,    55,     4,
+      51,    28,    29,   153,    55,    21,    22,     5,    18,     7,
+      50,     9,   101,    11,    12,    32,   105,    37,    16,     5,
+      18,     5,    20,     4,     5,     5,    24,     3,    26,     3,
+     152,    47,    48,    54,    19,    10,    34,    35,    10,    54,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    19,
+      54,    54,    25,    49,     4,     3,    49,     8,     5,   181,
+      17,    27,    54,    17,     5,    53,     4,    54,    50,     5,
+      49,    49,     4,    56,     4,     4,    53,   176,    92,    50,
+     163,   139,   135,    50,    -1,    50,    50,    56,    56,    50,
+     167,    -1,    32
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    58,     0,     5,   105,   108,    54,    31,     4,     5,
-      62,    67,    68,    29,    30,   107,    49,    55,    67,    32,
-       4,     3,    50,    33,    38,   106,     5,    66,     5,   101,
-     102,   103,   104,     5,    37,     3,     5,     7,    19,    34,
-     103,     5,     5,     7,     9,    11,    12,    17,    19,    21,
-      24,    25,    28,    35,    36,    39,    40,    41,    42,    43,
+       0,    58,     0,     5,   105,   108,    54,    30,     4,     5,
+      62,    67,    68,    28,    29,   107,    49,    55,    67,    31,
+       4,     3,    50,    32,    37,   106,     5,    66,     5,   101,
+     102,   103,   104,     5,    36,     3,     5,     7,    18,    33,
+     103,     5,     5,     7,     9,    11,    12,    16,    18,    20,
+      24,    26,    34,    35,    38,    39,    40,    41,    42,    43,
       44,    45,    46,    52,    70,    71,    73,    74,    75,    78,
       79,    80,    81,    82,    83,    84,    85,    86,    89,    90,
-      91,    92,    93,    97,    98,    99,   100,     3,     3,    20,
-      68,     8,    49,    76,    77,    54,    10,    18,    54,    77,
-      10,    54,    20,    26,    18,    54,    77,    54,    77,    77,
-      77,    77,    77,    77,    77,     4,    13,    14,    15,    69,
-      29,    30,    92,    49,    54,     4,     3,    49,    76,     5,
-      49,    64,    65,    77,    92,     5,    95,    96,    18,    54,
-      96,    27,    92,    96,    18,     5,    87,    88,    53,     4,
+      91,    92,    93,    97,    98,    99,   100,     3,     3,    19,
+      68,     8,    49,    76,    77,    54,    10,    17,    54,    77,
+      10,    54,    19,    25,    17,    54,    77,    54,    77,    77,
+      77,    77,    77,    77,    77,     4,    13,    14,    23,    69,
+      28,    29,    92,    49,    54,     4,     3,    49,    76,     5,
+      49,    64,    65,    77,    92,     5,    95,    96,    17,    54,
+      96,    27,    92,    96,    17,     5,    87,    88,    53,     4,
        5,    62,    68,    54,    62,    50,    49,     4,    47,    48,
       59,    60,    61,    51,    55,    93,    94,    51,    55,    92,
       88,    55,     5,    55,    92,    49,    51,    55,    53,    56,
       55,    68,    50,    56,    61,     4,     4,    50,    64,     6,
-      16,    72,    95,    55,     4,    87,    56,    55,    56,    50,
-       5,    22,    23,    61,    63,    50,    62,    62,    50,    50
+      15,    72,    95,    55,     4,    87,    56,    55,    56,    50,
+       5,    21,    22,    61,    63,    50,    62,    62,    50,    50
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -880,9 +893,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -892,7 +914,6 @@ do								\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
@@ -934,19 +955,10 @@ while (YYID (0))
 #endif
 
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
+/* This macro is provided for backward compatibility. */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
 
 
@@ -1138,7 +1150,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -1241,115 +1252,142 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
-    {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                if (! (yysize <= yysize1
+                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  return 2;
+                yysize = yysize1;
+              }
+        }
+    }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
+  yysize1 = yysize + yystrlen (yyformat);
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    return 2;
+  yysize = yysize1;
 
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1382,6 +1420,7 @@ yydestruct (yymsg, yytype, yyvaluep)
     }
 }
 
+
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -1398,12 +1437,9 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1590,7 +1626,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1621,8 +1657,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1677,22 +1713,22 @@ yyreduce:
     {
         case 4:
 
-/* Line 1455 of yacc.c  */
-#line 184 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 189 "asn1-parse.y"
     { strcpy((yyval.str),(yyvsp[(1) - (1)].str)); }
     break;
 
   case 5:
 
-/* Line 1455 of yacc.c  */
-#line 185 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 190 "asn1-parse.y"
     { strcpy((yyval.str),(yyvsp[(2) - (2)].str)); }
     break;
 
   case 6:
 
-/* Line 1455 of yacc.c  */
-#line 189 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 194 "asn1-parse.y"
     {
                   strcpy((yyval.str),"-");
                   strcat((yyval.str),(yyvsp[(2) - (2)].str));
@@ -1701,50 +1737,50 @@ yyreduce:
 
   case 7:
 
-/* Line 1455 of yacc.c  */
-#line 195 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 200 "asn1-parse.y"
     { strcpy((yyval.str),(yyvsp[(1) - (1)].str)); }
     break;
 
   case 8:
 
-/* Line 1455 of yacc.c  */
-#line 196 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 201 "asn1-parse.y"
     { strcpy((yyval.str),(yyvsp[(1) - (1)].str)); }
     break;
 
   case 9:
 
-/* Line 1455 of yacc.c  */
-#line 199 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 204 "asn1-parse.y"
     {strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
     break;
 
   case 10:
 
-/* Line 1455 of yacc.c  */
-#line 200 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 205 "asn1-parse.y"
     {strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
     break;
 
   case 11:
 
-/* Line 1455 of yacc.c  */
-#line 203 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 208 "asn1-parse.y"
     {strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
     break;
 
   case 12:
 
-/* Line 1455 of yacc.c  */
-#line 204 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 209 "asn1-parse.y"
     {strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
     break;
 
   case 13:
 
-/* Line 1455 of yacc.c  */
-#line 208 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 213 "asn1-parse.y"
     {
                           (yyval.node) = NEW_NODE (TYPE_CONSTANT);
                           set_str_value ((yyval.node), (yyvsp[(2) - (3)].str));
@@ -1753,8 +1789,8 @@ yyreduce:
 
   case 14:
 
-/* Line 1455 of yacc.c  */
-#line 213 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 218 "asn1-parse.y"
     {
                           (yyval.node) = NEW_NODE (TYPE_CONSTANT);
                           set_name ((yyval.node), (yyvsp[(1) - (4)].str));
@@ -1764,15 +1800,15 @@ yyreduce:
 
   case 15:
 
-/* Line 1455 of yacc.c  */
-#line 220 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 225 "asn1-parse.y"
     { (yyval.node)=(yyvsp[(1) - (1)].node); }
     break;
 
   case 16:
 
-/* Line 1455 of yacc.c  */
-#line 222 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 227 "asn1-parse.y"
     {
                     (yyval.node) = (yyvsp[(1) - (3)].node);
                     append_right ((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
@@ -1781,8 +1817,8 @@ yyreduce:
 
   case 17:
 
-/* Line 1455 of yacc.c  */
-#line 229 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 234 "asn1-parse.y"
     {
                           (yyval.node) = NEW_NODE (TYPE_IDENTIFIER);
                           set_name((yyval.node),(yyvsp[(1) - (1)].str));
@@ -1791,8 +1827,8 @@ yyreduce:
 
   case 18:
 
-/* Line 1455 of yacc.c  */
-#line 234 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 239 "asn1-parse.y"
     {
                           AsnNode node;
 
@@ -1805,8 +1841,8 @@ yyreduce:
 
   case 19:
 
-/* Line 1455 of yacc.c  */
-#line 245 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 250 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_CONSTANT);
                    set_str_value ((yyval.node), (yyvsp[(1) - (1)].str));
@@ -1815,8 +1851,8 @@ yyreduce:
 
   case 20:
 
-/* Line 1455 of yacc.c  */
-#line 250 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 255 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_CONSTANT);
                    set_name ((yyval.node), (yyvsp[(1) - (4)].str));
@@ -1826,15 +1862,15 @@ yyreduce:
 
   case 21:
 
-/* Line 1455 of yacc.c  */
-#line 258 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 263 "asn1-parse.y"
     { (yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 22:
 
-/* Line 1455 of yacc.c  */
-#line 260 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 265 "asn1-parse.y"
     {
                           (yyval.node)=(yyvsp[(1) - (2)].node);
                           append_right ((yyval.node), (yyvsp[(2) - (2)].node));
@@ -1843,29 +1879,29 @@ yyreduce:
 
   case 23:
 
-/* Line 1455 of yacc.c  */
-#line 266 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 271 "asn1-parse.y"
     { (yyval.constant) = CLASS_UNIVERSAL;   }
     break;
 
   case 24:
 
-/* Line 1455 of yacc.c  */
-#line 267 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 272 "asn1-parse.y"
     { (yyval.constant) = CLASS_PRIVATE;     }
     break;
 
   case 25:
 
-/* Line 1455 of yacc.c  */
-#line 268 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 273 "asn1-parse.y"
     { (yyval.constant) = CLASS_APPLICATION; }
     break;
 
   case 26:
 
-/* Line 1455 of yacc.c  */
-#line 272 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 277 "asn1-parse.y"
     {
                   (yyval.node) = NEW_NODE (TYPE_TAG);
                   (yyval.node)->flags.class = CLASS_CONTEXT;
@@ -1875,8 +1911,8 @@ yyreduce:
 
   case 27:
 
-/* Line 1455 of yacc.c  */
-#line 278 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 283 "asn1-parse.y"
     {
                   (yyval.node) = NEW_NODE (TYPE_TAG);
                   (yyval.node)->flags.class = (yyvsp[(2) - (4)].constant);
@@ -1886,15 +1922,15 @@ yyreduce:
 
   case 28:
 
-/* Line 1455 of yacc.c  */
-#line 286 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 291 "asn1-parse.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); }
     break;
 
   case 29:
 
-/* Line 1455 of yacc.c  */
-#line 288 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 293 "asn1-parse.y"
     {
            (yyval.node) = (yyvsp[(1) - (2)].node);
            (yyval.node)->flags.explicit = 1;
@@ -1903,8 +1939,8 @@ yyreduce:
 
   case 30:
 
-/* Line 1455 of yacc.c  */
-#line 293 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 298 "asn1-parse.y"
     {
            (yyval.node) = (yyvsp[(1) - (2)].node);
            (yyval.node)->flags.implicit = 1;
@@ -1913,8 +1949,8 @@ yyreduce:
 
   case 31:
 
-/* Line 1455 of yacc.c  */
-#line 300 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 305 "asn1-parse.y"
     {
                  (yyval.node) = NEW_NODE (TYPE_DEFAULT);
                  set_str_value ((yyval.node), (yyvsp[(2) - (2)].str));
@@ -1923,8 +1959,8 @@ yyreduce:
 
   case 32:
 
-/* Line 1455 of yacc.c  */
-#line 305 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 310 "asn1-parse.y"
     {
                  (yyval.node) = NEW_NODE (TYPE_DEFAULT);
                  (yyval.node)->flags.is_true = 1;
@@ -1933,8 +1969,8 @@ yyreduce:
 
   case 33:
 
-/* Line 1455 of yacc.c  */
-#line 310 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 315 "asn1-parse.y"
     {
                  (yyval.node) = NEW_NODE (TYPE_DEFAULT);
                  (yyval.node)->flags.is_false = 1;
@@ -1943,8 +1979,8 @@ yyreduce:
 
   case 34:
 
-/* Line 1455 of yacc.c  */
-#line 317 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 322 "asn1-parse.y"
     {
                  (yyval.node) = NEW_NODE (TYPE_INTEGER);
                }
@@ -1952,8 +1988,8 @@ yyreduce:
 
   case 35:
 
-/* Line 1455 of yacc.c  */
-#line 321 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 326 "asn1-parse.y"
     {
                  (yyval.node) = NEW_NODE (TYPE_INTEGER);
                  (yyval.node)->flags.has_list = 1;
@@ -1963,8 +1999,8 @@ yyreduce:
 
   case 36:
 
-/* Line 1455 of yacc.c  */
-#line 327 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 332 "asn1-parse.y"
     {
                  (yyval.node) = NEW_NODE (TYPE_INTEGER);
                  (yyval.node)->flags.has_min_max = 1;
@@ -1977,8 +2013,8 @@ yyreduce:
 
   case 37:
 
-/* Line 1455 of yacc.c  */
-#line 338 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 343 "asn1-parse.y"
     {
                 (yyval.node) = NEW_NODE (TYPE_BOOLEAN);
               }
@@ -1986,8 +2022,8 @@ yyreduce:
 
   case 38:
 
-/* Line 1455 of yacc.c  */
-#line 344 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 349 "asn1-parse.y"
     {
             (yyval.node) = NEW_NODE (TYPE_UTC_TIME);
           }
@@ -1995,8 +2031,8 @@ yyreduce:
 
   case 39:
 
-/* Line 1455 of yacc.c  */
-#line 348 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 353 "asn1-parse.y"
     {
             (yyval.node) = NEW_NODE (TYPE_GENERALIZED_TIME);
           }
@@ -2004,8 +2040,8 @@ yyreduce:
 
   case 40:
 
-/* Line 1455 of yacc.c  */
-#line 354 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 359 "asn1-parse.y"
     {
                (yyval.node) = NEW_NODE (TYPE_SIZE);
                (yyval.node)->flags.one_param = 1;
@@ -2015,8 +2051,8 @@ yyreduce:
 
   case 41:
 
-/* Line 1455 of yacc.c  */
-#line 360 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 365 "asn1-parse.y"
     {
                (yyval.node) = NEW_NODE (TYPE_SIZE);
                (yyval.node)->flags.has_min_max = 1;
@@ -2027,8 +2063,8 @@ yyreduce:
 
   case 42:
 
-/* Line 1455 of yacc.c  */
-#line 369 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 374 "asn1-parse.y"
     {
                (yyval.node)=(yyvsp[(1) - (1)].node);
              }
@@ -2036,8 +2072,8 @@ yyreduce:
 
   case 43:
 
-/* Line 1455 of yacc.c  */
-#line 373 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 378 "asn1-parse.y"
     {
                (yyval.node)=(yyvsp[(2) - (3)].node);
              }
@@ -2045,8 +2081,8 @@ yyreduce:
 
   case 44:
 
-/* Line 1455 of yacc.c  */
-#line 379 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 384 "asn1-parse.y"
     {
                        (yyval.node) = NEW_NODE (TYPE_OCTET_STRING);
                      }
@@ -2054,8 +2090,8 @@ yyreduce:
 
   case 45:
 
-/* Line 1455 of yacc.c  */
-#line 383 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 388 "asn1-parse.y"
     {
                        (yyval.node) = NEW_NODE (TYPE_OCTET_STRING);
                        (yyval.node)->flags.has_size = 1;
@@ -2065,15 +2101,15 @@ yyreduce:
 
   case 46:
 
-/* Line 1455 of yacc.c  */
-#line 390 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 395 "asn1-parse.y"
     { (yyval.node) = NEW_NODE (TYPE_UTF8_STRING); }
     break;
 
   case 47:
 
-/* Line 1455 of yacc.c  */
-#line 392 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 397 "asn1-parse.y"
     {
                        (yyval.node) = NEW_NODE (TYPE_UTF8_STRING);
                        (yyval.node)->flags.has_size = 1;
@@ -2083,15 +2119,15 @@ yyreduce:
 
   case 48:
 
-/* Line 1455 of yacc.c  */
-#line 398 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 403 "asn1-parse.y"
     { (yyval.node) = NEW_NODE (TYPE_NUMERIC_STRING); }
     break;
 
   case 49:
 
-/* Line 1455 of yacc.c  */
-#line 400 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 405 "asn1-parse.y"
     {
                        (yyval.node) = NEW_NODE (TYPE_NUMERIC_STRING);
                        (yyval.node)->flags.has_size = 1;
@@ -2101,15 +2137,15 @@ yyreduce:
 
   case 50:
 
-/* Line 1455 of yacc.c  */
-#line 407 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 412 "asn1-parse.y"
     { (yyval.node) = NEW_NODE (TYPE_PRINTABLE_STRING); }
     break;
 
   case 51:
 
-/* Line 1455 of yacc.c  */
-#line 409 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 414 "asn1-parse.y"
     {
                           (yyval.node) = NEW_NODE (TYPE_PRINTABLE_STRING);
                           (yyval.node)->flags.has_size = 1;
@@ -2119,15 +2155,15 @@ yyreduce:
 
   case 52:
 
-/* Line 1455 of yacc.c  */
-#line 416 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 421 "asn1-parse.y"
     { (yyval.node) = NEW_NODE (TYPE_TELETEX_STRING); }
     break;
 
   case 53:
 
-/* Line 1455 of yacc.c  */
-#line 418 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 423 "asn1-parse.y"
     {
                        (yyval.node) = NEW_NODE (TYPE_TELETEX_STRING);
                        (yyval.node)->flags.has_size = 1;
@@ -2137,15 +2173,15 @@ yyreduce:
 
   case 54:
 
-/* Line 1455 of yacc.c  */
-#line 424 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 429 "asn1-parse.y"
     { (yyval.node) = NEW_NODE (TYPE_IA5_STRING); }
     break;
 
   case 55:
 
-/* Line 1455 of yacc.c  */
-#line 426 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 431 "asn1-parse.y"
     {
                        (yyval.node) = NEW_NODE (TYPE_IA5_STRING);
                        (yyval.node)->flags.has_size = 1;
@@ -2155,15 +2191,15 @@ yyreduce:
 
   case 56:
 
-/* Line 1455 of yacc.c  */
-#line 433 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 438 "asn1-parse.y"
     { (yyval.node) = NEW_NODE (TYPE_UNIVERSAL_STRING); }
     break;
 
   case 57:
 
-/* Line 1455 of yacc.c  */
-#line 435 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 440 "asn1-parse.y"
     {
                            (yyval.node) = NEW_NODE (TYPE_UNIVERSAL_STRING);
                            (yyval.node)->flags.has_size = 1;
@@ -2173,15 +2209,15 @@ yyreduce:
 
   case 58:
 
-/* Line 1455 of yacc.c  */
-#line 441 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 446 "asn1-parse.y"
     { (yyval.node) = NEW_NODE (TYPE_BMP_STRING); }
     break;
 
   case 59:
 
-/* Line 1455 of yacc.c  */
-#line 443 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 448 "asn1-parse.y"
     {
                        (yyval.node) = NEW_NODE (TYPE_BMP_STRING);
                        (yyval.node)->flags.has_size = 1;
@@ -2191,8 +2227,8 @@ yyreduce:
 
   case 67:
 
-/* Line 1455 of yacc.c  */
-#line 464 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 469 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_CONSTANT);
                    set_name ((yyval.node), (yyvsp[(1) - (4)].str));
@@ -2202,8 +2238,8 @@ yyreduce:
 
   case 68:
 
-/* Line 1455 of yacc.c  */
-#line 472 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 477 "asn1-parse.y"
     {
                         (yyval.node)=(yyvsp[(1) - (1)].node);
                       }
@@ -2211,8 +2247,8 @@ yyreduce:
 
   case 69:
 
-/* Line 1455 of yacc.c  */
-#line 476 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 481 "asn1-parse.y"
     {
                         (yyval.node)=(yyvsp[(1) - (3)].node);
                         append_right ((yyval.node), (yyvsp[(3) - (3)].node));
@@ -2221,8 +2257,8 @@ yyreduce:
 
   case 70:
 
-/* Line 1455 of yacc.c  */
-#line 483 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 488 "asn1-parse.y"
     {
                      (yyval.node) = NEW_NODE (TYPE_BIT_STRING);
                    }
@@ -2230,8 +2266,8 @@ yyreduce:
 
   case 71:
 
-/* Line 1455 of yacc.c  */
-#line 487 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 492 "asn1-parse.y"
     {
                      (yyval.node) = NEW_NODE (TYPE_BIT_STRING);
                      (yyval.node)->flags.has_list = 1;
@@ -2241,8 +2277,8 @@ yyreduce:
 
   case 72:
 
-/* Line 1455 of yacc.c  */
-#line 495 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 500 "asn1-parse.y"
     {
                      (yyval.node) = NEW_NODE (TYPE_ENUMERATED);
                      (yyval.node)->flags.has_list = 1;
@@ -2252,8 +2288,8 @@ yyreduce:
 
   case 73:
 
-/* Line 1455 of yacc.c  */
-#line 503 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 508 "asn1-parse.y"
     {
                      (yyval.node) = NEW_NODE (TYPE_OBJECT_ID);
                    }
@@ -2261,8 +2297,8 @@ yyreduce:
 
   case 74:
 
-/* Line 1455 of yacc.c  */
-#line 509 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 514 "asn1-parse.y"
     {
                       (yyval.node) = NEW_NODE (TYPE_IDENTIFIER);
                       set_str_value ((yyval.node), (yyvsp[(1) - (1)].str));
@@ -2271,8 +2307,8 @@ yyreduce:
 
   case 75:
 
-/* Line 1455 of yacc.c  */
-#line 514 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 519 "asn1-parse.y"
     {
                       (yyval.node) = NEW_NODE (TYPE_IDENTIFIER);
                       (yyval.node)->flags.has_size = 1;
@@ -2283,85 +2319,85 @@ yyreduce:
 
   case 76:
 
-/* Line 1455 of yacc.c  */
-#line 520 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 525 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 77:
 
-/* Line 1455 of yacc.c  */
-#line 521 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 526 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 78:
 
-/* Line 1455 of yacc.c  */
-#line 522 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 527 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 79:
 
-/* Line 1455 of yacc.c  */
-#line 523 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 528 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 81:
 
-/* Line 1455 of yacc.c  */
-#line 525 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 530 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 82:
 
-/* Line 1455 of yacc.c  */
-#line 526 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 531 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 83:
 
-/* Line 1455 of yacc.c  */
-#line 527 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 532 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 84:
 
-/* Line 1455 of yacc.c  */
-#line 528 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 533 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 85:
 
-/* Line 1455 of yacc.c  */
-#line 529 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 534 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 86:
 
-/* Line 1455 of yacc.c  */
-#line 530 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 535 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 87:
 
-/* Line 1455 of yacc.c  */
-#line 531 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 536 "asn1-parse.y"
     {(yyval.node)=(yyvsp[(1) - (1)].node);}
     break;
 
   case 88:
 
-/* Line 1455 of yacc.c  */
-#line 533 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 538 "asn1-parse.y"
     {
                       (yyval.node) = NEW_NODE(TYPE_NULL);
                     }
@@ -2369,8 +2405,8 @@ yyreduce:
 
   case 89:
 
-/* Line 1455 of yacc.c  */
-#line 539 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 544 "asn1-parse.y"
     {
                              (yyval.node) = (yyvsp[(1) - (1)].node);
                            }
@@ -2378,8 +2414,8 @@ yyreduce:
 
   case 90:
 
-/* Line 1455 of yacc.c  */
-#line 543 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 548 "asn1-parse.y"
     {
 /*                               $2->flags.has_tag = 1; */
 /*                               $$ = $2; */
@@ -2392,8 +2428,8 @@ yyreduce:
 
   case 91:
 
-/* Line 1455 of yacc.c  */
-#line 554 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 559 "asn1-parse.y"
     {
                                    (yyval.node) = (yyvsp[(1) - (1)].node);
                                  }
@@ -2401,8 +2437,8 @@ yyreduce:
 
   case 92:
 
-/* Line 1455 of yacc.c  */
-#line 558 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 563 "asn1-parse.y"
     {
                                    (yyvsp[(1) - (2)].node)->flags.has_default = 1;
                                    (yyval.node) = (yyvsp[(1) - (2)].node);
@@ -2413,8 +2449,8 @@ yyreduce:
 
   case 93:
 
-/* Line 1455 of yacc.c  */
-#line 565 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 570 "asn1-parse.y"
     {
                                    (yyvsp[(1) - (2)].node)->flags.is_optional = 1;
                                    (yyval.node) = (yyvsp[(1) - (2)].node);
@@ -2423,8 +2459,8 @@ yyreduce:
 
   case 94:
 
-/* Line 1455 of yacc.c  */
-#line 572 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 577 "asn1-parse.y"
     {
                  set_name ((yyvsp[(2) - (2)].node), (yyvsp[(1) - (2)].str));
                  (yyval.node) = (yyvsp[(2) - (2)].node);
@@ -2433,15 +2469,15 @@ yyreduce:
 
   case 95:
 
-/* Line 1455 of yacc.c  */
-#line 579 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 584 "asn1-parse.y"
     { (yyval.node)=(yyvsp[(1) - (1)].node); }
     break;
 
   case 96:
 
-/* Line 1455 of yacc.c  */
-#line 581 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 586 "asn1-parse.y"
     {
                       (yyval.node)=(yyvsp[(1) - (3)].node);
                       append_right ((yyval.node), (yyvsp[(3) - (3)].node));
@@ -2450,8 +2486,8 @@ yyreduce:
 
   case 97:
 
-/* Line 1455 of yacc.c  */
-#line 588 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 593 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_SEQUENCE);
                    set_down ((yyval.node), (yyvsp[(3) - (4)].node));
@@ -2460,8 +2496,8 @@ yyreduce:
 
   case 98:
 
-/* Line 1455 of yacc.c  */
-#line 593 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 598 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_SEQUENCE_OF);
                    set_down ((yyval.node), (yyvsp[(3) - (3)].node));
@@ -2470,8 +2506,8 @@ yyreduce:
 
   case 99:
 
-/* Line 1455 of yacc.c  */
-#line 598 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 603 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_SEQUENCE_OF);
                    (yyval.node)->flags.has_size = 1;
@@ -2482,8 +2518,8 @@ yyreduce:
 
   case 100:
 
-/* Line 1455 of yacc.c  */
-#line 607 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 612 "asn1-parse.y"
     {
                (yyval.node) = NEW_NODE (TYPE_SET);
                set_down ((yyval.node), (yyvsp[(3) - (4)].node));
@@ -2492,8 +2528,8 @@ yyreduce:
 
   case 101:
 
-/* Line 1455 of yacc.c  */
-#line 612 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 617 "asn1-parse.y"
     {
                (yyval.node) = NEW_NODE (TYPE_SET_OF);
                set_down ((yyval.node), (yyvsp[(3) - (3)].node));
@@ -2502,8 +2538,8 @@ yyreduce:
 
   case 102:
 
-/* Line 1455 of yacc.c  */
-#line 617 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 622 "asn1-parse.y"
     {
                (yyval.node) = NEW_NODE (TYPE_SET_OF);
                (yyval.node)->flags.has_size = 1;
@@ -2514,8 +2550,8 @@ yyreduce:
 
   case 103:
 
-/* Line 1455 of yacc.c  */
-#line 626 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 631 "asn1-parse.y"
     {
                   (yyval.node) = NEW_NODE (TYPE_CHOICE);
                   set_down ((yyval.node), (yyvsp[(3) - (4)].node));
@@ -2524,8 +2560,8 @@ yyreduce:
 
   case 104:
 
-/* Line 1455 of yacc.c  */
-#line 633 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 638 "asn1-parse.y"
     {
                (yyval.node) = NEW_NODE (TYPE_ANY);
              }
@@ -2533,8 +2569,8 @@ yyreduce:
 
   case 105:
 
-/* Line 1455 of yacc.c  */
-#line 637 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 642 "asn1-parse.y"
     {
                AsnNode node;
 
@@ -2548,8 +2584,8 @@ yyreduce:
 
   case 106:
 
-/* Line 1455 of yacc.c  */
-#line 649 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 654 "asn1-parse.y"
     {
                set_name ((yyvsp[(3) - (3)].node), (yyvsp[(1) - (3)].str));
                (yyval.node) = (yyvsp[(3) - (3)].node);
@@ -2558,8 +2594,8 @@ yyreduce:
 
   case 107:
 
-/* Line 1455 of yacc.c  */
-#line 656 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 661 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_OBJECT_ID);
                    (yyval.node)->flags.assignment = 1;
@@ -2570,8 +2606,8 @@ yyreduce:
 
   case 108:
 
-/* Line 1455 of yacc.c  */
-#line 663 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 668 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_OBJECT_ID);
                    (yyval.node)->flags.assignment = 1;
@@ -2584,8 +2620,8 @@ yyreduce:
 
   case 109:
 
-/* Line 1455 of yacc.c  */
-#line 672 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 677 "asn1-parse.y"
     {
                    (yyval.node) = NEW_NODE (TYPE_INTEGER);
                    (yyval.node)->flags.assignment = 1;
@@ -2596,29 +2632,29 @@ yyreduce:
 
   case 110:
 
-/* Line 1455 of yacc.c  */
-#line 680 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 685 "asn1-parse.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); }
     break;
 
   case 111:
 
-/* Line 1455 of yacc.c  */
-#line 681 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 686 "asn1-parse.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); }
     break;
 
   case 112:
 
-/* Line 1455 of yacc.c  */
-#line 685 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 690 "asn1-parse.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); }
     break;
 
   case 113:
 
-/* Line 1455 of yacc.c  */
-#line 687 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 692 "asn1-parse.y"
     {
                          (yyval.node) = (yyvsp[(1) - (2)].node);
                          append_right ((yyval.node), (yyvsp[(2) - (2)].node));
@@ -2627,8 +2663,8 @@ yyreduce:
 
   case 114:
 
-/* Line 1455 of yacc.c  */
-#line 694 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 699 "asn1-parse.y"
     {
                      (yyval.node) = NEW_NODE (TYPE_OBJECT_ID);
                      set_down ((yyval.node), (yyvsp[(3) - (4)].node));
@@ -2638,15 +2674,15 @@ yyreduce:
 
   case 115:
 
-/* Line 1455 of yacc.c  */
-#line 702 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 707 "asn1-parse.y"
     { (yyval.node)=NULL;}
     break;
 
   case 116:
 
-/* Line 1455 of yacc.c  */
-#line 704 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 709 "asn1-parse.y"
     {
                   AsnNode node;
 
@@ -2661,22 +2697,22 @@ yyreduce:
 
   case 117:
 
-/* Line 1455 of yacc.c  */
-#line 716 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 721 "asn1-parse.y"
     { (yyval.constant) = CONST_EXPLICIT; }
     break;
 
   case 118:
 
-/* Line 1455 of yacc.c  */
-#line 717 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 722 "asn1-parse.y"
     { (yyval.constant) = CONST_IMPLICIT; }
     break;
 
   case 119:
 
-/* Line 1455 of yacc.c  */
-#line 723 "asn1-parse.y"
+/* Line 1806 of yacc.c  */
+#line 728 "asn1-parse.y"
     {
                  AsnNode node;
 
@@ -2712,10 +2748,21 @@ yyreduce:
 
 
 
-/* Line 1455 of yacc.c  */
-#line 2717 "/home/wk/w/libksba/src/asn1-parse.c"
+/* Line 1806 of yacc.c  */
+#line 2753 "asn1-parse.c"
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -2743,6 +2790,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -2750,37 +2801,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -2839,7 +2889,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -2898,8 +2948,13 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -2924,32 +2979,9 @@ yyreturn:
 
 
 
-/* Line 1675 of yacc.c  */
-#line 756 "asn1-parse.y"
-
+/* Line 2067 of yacc.c  */
+#line 761 "asn1-parse.y"
 
-const char *key_word[]={
-  "::=","OPTIONAL","INTEGER","SIZE","OCTET","STRING"
-  ,"SEQUENCE","BIT","UNIVERSAL","PRIVATE","OPTIONAL"
-  ,"DEFAULT","CHOICE","OF","OBJECT","IDENTIFIER"
-  ,"BOOLEAN","TRUE","FALSE","APPLICATION","ANY","DEFINED"
-  ,"SET","BY","EXPLICIT","IMPLICIT","DEFINITIONS","TAGS"
-  ,"BEGIN","END","UTCTime","GeneralizedTime","FROM"
-  ,"IMPORTS","NULL","ENUMERATED"
-  ,"UTF8String","NumericString","PrintableString","TeletexString"
-  ,"IA5String","UniversalString","BMPString"
-};
-const int key_word_token[]={
-   ASSIG,OPTIONAL,INTEGER,SIZE,OCTET,STRING
-  ,SEQUENCE,BIT,UNIVERSAL,PRIVATE,OPTIONAL
-  ,DEFAULT,CHOICE,OF,OBJECT,STR_IDENTIFIER
-  ,BOOLEAN,TRUE,FALSE,APPLICATION,ANY,DEFINED
-  ,SET,BY,EXPLICIT,IMPLICIT,DEFINITIONS,TAGS
-  ,BEGIN,END,UTCTime,GeneralizedTime,FROM
-  ,IMPORTS,TOKEN_NULL,ENUMERATED
-  ,UTF8STRING,NUMERICSTRING,PRINTABLESTRING,TELETEXSTRING
-  ,IA5STRING,UNIVERSALSTRING,BMPSTRING
-};
 
 
 /*************************************************************/
@@ -2963,6 +2995,7 @@ yylex (YYSTYPE *lvalp, void *parm)
 {
   int c,counter=0,k;
   char string[MAX_STRING_LENGTH];
+  size_t len;
   FILE *fp = PARSECTL->fp;
 
   if (!PARSECTL->lineno)
@@ -3039,15 +3072,13 @@ yylex (YYSTYPE *lvalp, void *parm)
         }
 
       /* Is STRING a keyword? */
-      for (k=0; k<(sizeof(key_word)/sizeof(char*));k++ )
+      len = strlen (string);
+      for (k = 0; k < YYNTOKENS; k++)
         {
-          if (!strcmp(string,key_word[k]))
-            {
-              if (PARSECTL->debug)
-                fprintf (stderr,"%d: yylex found keyword `%s'\n",
-                         PARSECTL->lineno, string);
-              return key_word_token[k];
-            }
+          if (yytname[k] && yytname[k][0] == '\"'
+              && !strncmp (yytname[k] + 1, string, len)
+              && yytname[k][len + 1] == '\"' && !yytname[k][len + 2])
+            return yytoknum[k];
         }
 
       /* STRING is an IDENTIFIER */
@@ -3190,7 +3221,7 @@ ksba_asn_parse_file (const char *file_name, ksba_asn_tree_t *result, int debug)
   parsectl.result_parse = gpg_error (GPG_ERR_SYNTAX);
   parsectl.parse_tree = NULL;
   parsectl.all_nodes = NULL;
-  /*yydebug = 1;*/
+  /* yydebug = 1; */
   if ( yyparse ((void*)&parsectl) || parsectl.result_parse )
     { /* error */
       fprintf (stderr, "%s:%d: parse error\n",
diff --git a/src/asn1-parse.y b/src/asn1-parse.y
index eedaa0a..2f739c0 100755
--- a/src/asn1-parse.y
+++ b/src/asn1-parse.y
@@ -63,10 +63,14 @@
    this.  Let's hope that this macros works. */
 #define yyparse _ksba_asn1_yyparse
 
-/*#define YYDEBUG 1*/
-#define YYERROR_VERBOSE = 1
+/* #define YYDEBUG 1 */
+#define YYERROR_VERBOSE 1
 #define MAX_STRING_LENGTH 129
 
+/* Dummy print so that yytoknum will be defined.  */
+#define YYPRINT(F, N, L)  do { } while (0);
+
+
 /* constants used in the grammar */
 enum {
   CONST_EXPLICIT = 1,
@@ -112,51 +116,52 @@ static int yylex (YYSTYPE *lvalp, void *parm);
 static void yyerror (const char *s);
 %}
 
-%token ASSIG "::="
+%token-table
+
+%token ASSIG           "::="
 %token <str> NUM
 %token <str> IDENTIFIER
-%token OPTIONAL
-%token INTEGER
-%token SIZE
-%token OCTET
-%token STRING
-%token SEQUENCE
-%token BIT
-%token UNIVERSAL
-%token PRIVATE
-%token APPLICATION
-%token OPTIONAL
-%token DEFAULT
-%token CHOICE
-%token OF
-%token OBJECT
-%token STR_IDENTIFIER
-%token BOOLEAN
-%token TRUE
-%token FALSE
-%token TOKEN_NULL
-%token ANY
-%token DEFINED
-%token BY
-%token SET
-%token EXPLICIT
-%token IMPLICIT
-%token DEFINITIONS
-%token TAGS
-%token BEGIN
-%token END
-%token UTCTime
-%token GeneralizedTime
-%token FROM
-%token IMPORTS
-%token ENUMERATED
-%token UTF8STRING
-%token NUMERICSTRING
-%token PRINTABLESTRING
-%token TELETEXSTRING
-%token IA5STRING
-%token UNIVERSALSTRING
-%token BMPSTRING
+%token OPTIONAL        "OPTIONAL"
+%token INTEGER         "INTEGER"
+%token SIZE            "SIZE"
+%token OCTET           "OCTET"
+%token STRING          "STRING"
+%token SEQUENCE        "SEQUENCE"
+%token BIT             "BIT"
+%token UNIVERSAL       "UNIVERSAL"
+%token PRIVATE         "PRIVATE"
+%token DEFAULT         "DEFAULT"
+%token CHOICE          "CHOICE"
+%token OF              "OF"
+%token OBJECT          "OBJECT"
+%token STR_IDENTIFIER  "IDENTIFIER"
+%token ksba_BOOLEAN    "BOOLEAN"
+%token ksba_TRUE       "TRUE"
+%token ksba_FALSE      "FALSE"
+%token APPLICATION     "APPLICATION"
+%token ANY             "ANY"
+%token DEFINED         "DEFINED"
+%token SET             "SET"
+%token BY              "BY"
+%token EXPLICIT        "EXPLICIT"
+%token IMPLICIT        "IMPLICIT"
+%token DEFINITIONS     "DEFINITIONS"
+%token TAGS            "TAGS"
+%token ksba_BEGIN      "BEGIN"
+%token ksba_END        "END"
+%token UTCTime         "UTCTime"
+%token GeneralizedTime "GeneralizedTime"
+%token FROM            "FROM"
+%token IMPORTS         "IMPORTS"
+%token TOKEN_NULL      "NULL"
+%token ENUMERATED      "ENUMERATED"
+%token UTF8STRING      "UTF8String"
+%token NUMERICSTRING   "NumericString"
+%token PRINTABLESTRING "PrintableString"
+%token TELETEXSTRING   "TeletexString"
+%token IA5STRING       "IA5String"
+%token UNIVERSALSTRING "UniversalString"
+%token BMPSTRING       "BMPString"
 
 
 
@@ -301,12 +306,12 @@ default :  DEFAULT pos_neg_identifier
                  $$ = NEW_NODE (TYPE_DEFAULT);
                  set_str_value ($$, $2);
                }
-         | DEFAULT TRUE
+         | DEFAULT ksba_TRUE
                {
                  $$ = NEW_NODE (TYPE_DEFAULT);
                  $$->flags.is_true = 1;
                }
-         | DEFAULT FALSE
+         | DEFAULT ksba_FALSE
                {
                  $$ = NEW_NODE (TYPE_DEFAULT);
                  $$->flags.is_false = 1;
@@ -334,7 +339,7 @@ integer_def: INTEGER
                }
 ;
 
-boolean_def: BOOLEAN
+boolean_def: ksba_BOOLEAN
               {
                 $$ = NEW_NODE (TYPE_BOOLEAN);
               }
@@ -718,8 +723,8 @@ explicit_implicit :  EXPLICIT  { $$ = CONST_EXPLICIT; }
 ;
 
 definitions: definitions_id
-             DEFINITIONS explicit_implicit TAGS "::=" BEGIN imports_def
-             type_constant_list END
+             DEFINITIONS explicit_implicit TAGS "::=" ksba_BEGIN imports_def
+             type_constant_list ksba_END
                {
                  AsnNode node;
 
@@ -755,29 +760,6 @@ definitions: definitions_id
 
 %%
 
-const char *key_word[]={
-  "::=","OPTIONAL","INTEGER","SIZE","OCTET","STRING"
-  ,"SEQUENCE","BIT","UNIVERSAL","PRIVATE","OPTIONAL"
-  ,"DEFAULT","CHOICE","OF","OBJECT","IDENTIFIER"
-  ,"BOOLEAN","TRUE","FALSE","APPLICATION","ANY","DEFINED"
-  ,"SET","BY","EXPLICIT","IMPLICIT","DEFINITIONS","TAGS"
-  ,"BEGIN","END","UTCTime","GeneralizedTime","FROM"
-  ,"IMPORTS","NULL","ENUMERATED"
-  ,"UTF8String","NumericString","PrintableString","TeletexString"
-  ,"IA5String","UniversalString","BMPString"
-};
-const int key_word_token[]={
-   ASSIG,OPTIONAL,INTEGER,SIZE,OCTET,STRING
-  ,SEQUENCE,BIT,UNIVERSAL,PRIVATE,OPTIONAL
-  ,DEFAULT,CHOICE,OF,OBJECT,STR_IDENTIFIER
-  ,BOOLEAN,TRUE,FALSE,APPLICATION,ANY,DEFINED
-  ,SET,BY,EXPLICIT,IMPLICIT,DEFINITIONS,TAGS
-  ,BEGIN,END,UTCTime,GeneralizedTime,FROM
-  ,IMPORTS,TOKEN_NULL,ENUMERATED
-  ,UTF8STRING,NUMERICSTRING,PRINTABLESTRING,TELETEXSTRING
-  ,IA5STRING,UNIVERSALSTRING,BMPSTRING
-};
-
 
 /*************************************************************/
 /*  Function: yylex                                          */
@@ -790,6 +772,7 @@ yylex (YYSTYPE *lvalp, void *parm)
 {
   int c,counter=0,k;
   char string[MAX_STRING_LENGTH];
+  size_t len;
   FILE *fp = PARSECTL->fp;
 
   if (!PARSECTL->lineno)
@@ -866,15 +849,13 @@ yylex (YYSTYPE *lvalp, void *parm)
         }
 
       /* Is STRING a keyword? */
-      for (k=0; k<(sizeof(key_word)/sizeof(char*));k++ )
+      len = strlen (string);
+      for (k = 0; k < YYNTOKENS; k++)
         {
-          if (!strcmp(string,key_word[k]))
-            {
-              if (PARSECTL->debug)
-                fprintf (stderr,"%d: yylex found keyword `%s'\n",
-                         PARSECTL->lineno, string);
-              return key_word_token[k];
-            }
+          if (yytname[k] && yytname[k][0] == '\"'
+              && !strncmp (yytname[k] + 1, string, len)
+              && yytname[k][len + 1] == '\"' && !yytname[k][len + 2])
+            return yytoknum[k];
         }
 
       /* STRING is an IDENTIFIER */
@@ -1017,7 +998,7 @@ ksba_asn_parse_file (const char *file_name, ksba_asn_tree_t *result, int debug)
   parsectl.result_parse = gpg_error (GPG_ERR_SYNTAX);
   parsectl.parse_tree = NULL;
   parsectl.all_nodes = NULL;
-  /*yydebug = 1;*/
+  /* yydebug = 1; */
   if ( yyparse ((void*)&parsectl) || parsectl.result_parse )
     { /* error */
       fprintf (stderr, "%s:%d: parse error\n",
diff --git a/src/cert.c b/src/cert.c
index 9ce7ea7..7f19dc1 100644
--- a/src/cert.c
+++ b/src/cert.c
@@ -443,10 +443,8 @@ ksba_cert_get_digest_algo (ksba_cert_t cert)
   size_t nread;
 
   if (!cert)
-    {
-       cert->last_error = gpg_error (GPG_ERR_INV_VALUE);
-       return NULL;
-    }
+    return NULL;  /* Ooops (can't set cert->last_error :-().  */
+
   if (!cert->initialized)
     {
        cert->last_error = gpg_error (GPG_ERR_NO_DATA);
diff --git a/src/crl.c b/src/crl.c
index a4b1776..87a3fa3 100644
--- a/src/crl.c
+++ b/src/crl.c
@@ -1150,6 +1150,8 @@ store_one_entry_extension (ksba_crl_t crl,
   else if (critical)
     err = gpg_error (GPG_ERR_UNKNOWN_CRIT_EXTN);
 
+  xfree (oid);
+
   return err;
 }
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3680049..ae2ad4e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,6 +42,7 @@ CLEANFILES = oidtranstbl.h
 TESTS = cert-basic t-crl-parser t-dnparser
 
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+AM_LDFLAGS = -no-install
 
 noinst_HEADERS = t-common.h
 noinst_PROGRAMS = $(TESTS) t-cms-parser t-crl-parser t-dnparser t-ocsp t-oid
@@ -59,3 +60,5 @@ oidtranstbl.h: Makefile mkoidtbl.awk
                  /usr/share ; do \
           if test -f $$i/dumpasn1.cfg; then f=$$i/dumpasn1.cfg; break; fi; \
         done; $(AWK) -f $(srcdir)/mkoidtbl.awk $$f >$@
+
+LOG_COMPILER = $(VALGRIND)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c165755..b2e1709 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -79,7 +79,9 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
-	$(top_srcdir)/gl/m4/gnulib.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/gl/m4/gnulib.m4 \
+	$(top_srcdir)/gl/m4/valgrind-tests.m4 \
+	$(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/gnupg-typedef.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -87,7 +89,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -99,6 +101,9 @@ cert_basic_OBJECTS = cert-basic.$(OBJEXT)
 cert_basic_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 cert_basic_DEPENDENCIES = ../src/libksba.la $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
 t_cms_parser_SOURCES = t-cms-parser.c
 t_cms_parser_OBJECTS = t-cms-parser.$(OBJEXT)
 t_cms_parser_LDADD = $(LDADD)
@@ -120,18 +125,31 @@ t_oid_OBJECTS = t-oid.$(OBJEXT)
 t_oid_LDADD = $(LDADD)
 t_oid_DEPENDENCIES = ../src/libksba.la $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = cert-basic.c t-cms-parser.c t-crl-parser.c t-dnparser.c \
 	$(t_ocsp_SOURCES) t-oid.c
 DIST_SOURCES = cert-basic.c t-cms-parser.c t-crl-parser.c t-dnparser.c \
@@ -151,6 +169,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -227,6 +246,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALGRIND = @VALGRIND@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -300,9 +320,11 @@ EXTRA_DIST = $(test_certs) samples/README mkoidtbl.awk
 BUILT_SOURCES = oidtranstbl.h
 CLEANFILES = oidtranstbl.h
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+AM_LDFLAGS = -no-install
 noinst_HEADERS = t-common.h
 LDADD = ../src/libksba.la $(GPG_ERROR_LIBS)
 t_ocsp_SOURCES = t-ocsp.c sha1.c
+LOG_COMPILER = $(VALGRIND)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -349,22 +371,22 @@ clean-noinstPROGRAMS:
 	rm -f $$list
 cert-basic$(EXEEXT): $(cert_basic_OBJECTS) $(cert_basic_DEPENDENCIES) $(EXTRA_cert_basic_DEPENDENCIES) 
 	@rm -f cert-basic$(EXEEXT)
-	$(LINK) $(cert_basic_OBJECTS) $(cert_basic_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(cert_basic_OBJECTS) $(cert_basic_LDADD) $(LIBS)
 t-cms-parser$(EXEEXT): $(t_cms_parser_OBJECTS) $(t_cms_parser_DEPENDENCIES) $(EXTRA_t_cms_parser_DEPENDENCIES) 
 	@rm -f t-cms-parser$(EXEEXT)
-	$(LINK) $(t_cms_parser_OBJECTS) $(t_cms_parser_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_cms_parser_OBJECTS) $(t_cms_parser_LDADD) $(LIBS)
 t-crl-parser$(EXEEXT): $(t_crl_parser_OBJECTS) $(t_crl_parser_DEPENDENCIES) $(EXTRA_t_crl_parser_DEPENDENCIES) 
 	@rm -f t-crl-parser$(EXEEXT)
-	$(LINK) $(t_crl_parser_OBJECTS) $(t_crl_parser_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_crl_parser_OBJECTS) $(t_crl_parser_LDADD) $(LIBS)
 t-dnparser$(EXEEXT): $(t_dnparser_OBJECTS) $(t_dnparser_DEPENDENCIES) $(EXTRA_t_dnparser_DEPENDENCIES) 
 	@rm -f t-dnparser$(EXEEXT)
-	$(LINK) $(t_dnparser_OBJECTS) $(t_dnparser_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_dnparser_OBJECTS) $(t_dnparser_LDADD) $(LIBS)
 t-ocsp$(EXEEXT): $(t_ocsp_OBJECTS) $(t_ocsp_DEPENDENCIES) $(EXTRA_t_ocsp_DEPENDENCIES) 
 	@rm -f t-ocsp$(EXEEXT)
-	$(LINK) $(t_ocsp_OBJECTS) $(t_ocsp_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_ocsp_OBJECTS) $(t_ocsp_LDADD) $(LIBS)
 t-oid$(EXEEXT): $(t_oid_OBJECTS) $(t_oid_DEPENDENCIES) $(EXTRA_t_oid_DEPENDENCIES) 
 	@rm -f t-oid$(EXEEXT)
-	$(LINK) $(t_oid_OBJECTS) $(t_oid_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_oid_OBJECTS) $(t_oid_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -381,25 +403,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-oid.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/tests/cert-basic.c b/tests/cert-basic.c
index a70867f..91b394e 100644
--- a/tests/cert-basic.c
+++ b/tests/cert-basic.c
@@ -28,6 +28,7 @@
 #include "../src/keyinfo.h"
 
 #include "oidtranstbl.h"
+#include "t-common.h"
 
 #ifdef __MINGW32CE__
 #define getenv(a) (NULL)
@@ -54,127 +55,6 @@ static int verbose;
 static int errorcount = 0;
 
 
-static void *
-xmalloc (size_t n)
-{
-  char *p = ksba_malloc (n);
-  if (!p)
-    {
-      fprintf (stderr, "out of core\n");
-      exit (1);
-    }
-  return p;
-}
-
-
-void
-print_hex (const unsigned char *p, size_t n)
-{
-  if (!p)
-    fputs ("none", stdout);
-  else
-    {
-      for (; n; n--, p++)
-        printf ("%02X", *p);
-    }
-}
-
-
-
-static void
-print_sexp (ksba_const_sexp_t p)
-{
-  int level = 0;
-
-  if (!p)
-    fputs ("[none]", stdout);
-  else
-    {
-      for (;;)
-        {
-          if (*p == '(')
-            {
-              putchar (*p);
-              p++;
-              level++;
-            }
-          else if (*p == ')')
-            {
-              putchar (*p);
-              p++;
-              if (--level <= 0 )
-                return;
-            }
-          else if (!digitp (p))
-            {
-              fputs ("[invalid s-exp]", stdout);
-              return;
-            }
-          else
-            {
-              char *endp;
-              unsigned long n, i;
-              int need_hex;
-
-              n = strtoul (p, &endp, 10);
-              p = endp;
-              if (*p != ':')
-                {
-                  fputs ("[invalid s-exp]", stdout);
-                  return;
-                }
-              p++;
-              for (i=0; i < n; i++)
-                if ( !((p[i] >='A' && p[i] <= 'Z')
-                       || (p[i] >='a' && p[i] <='z')
-                       || (p[i] >='0' && p[i] <='9')
-                       || p[i] == '-'
-                       || p[i] == '.'))
-                  break;
-              need_hex = (i<n);
-              if (!n /* n==0 is not allowed, but anyway.  */
-                  || (!need_hex
-                      && !((*p >='A' && *p <= 'Z') || (*p >='a' && *p <='z'))))
-                printf ("%lu:", n);
-
-              if (need_hex)
-                {
-                  putchar('#');
-                  for (; n; n--, p++)
-                    printf ("%02X", *p);
-                  putchar('#');
-                }
-              else
-                {
-                  for (; n; n--, p++)
-                    putchar (*p);
-                }
-              putchar(' ');
-            }
-        }
-    }
-}
-
-static void
-print_time (ksba_isotime_t t)
-{
-  if (!t || !*t)
-    fputs ("none", stdout);
-  else
-    printf ("%.4s-%.2s-%.2s %.2s:%.2s:%s", t, t+4, t+6, t+9, t+11, t+13);
-}
-
-static void
-print_dn (char *p)
-{
-
-  if (!p)
-    fputs ("error", stdout);
-  else
-    printf ("`%s'", p);
-}
-
-
 static void
 print_names (int indent, ksba_name_t name)
 {
@@ -640,11 +520,15 @@ one_file (const char *fname)
                              __FILE__, __LINE__);
                     errorcount++;
                     xfree (der2);
+                  } else {
+                    /* Don't leak memory if everything is ok. */
+                    xfree (der2);
                   }
                 xfree (tmp);
               }
             xfree (der);
           }
+        ksba_free (public);
       }
   }
 #endif
diff --git a/tests/mkoidtbl.awk b/tests/mkoidtbl.awk
index 70aae33..f6f827f 100644
--- a/tests/mkoidtbl.awk
+++ b/tests/mkoidtbl.awk
@@ -28,11 +28,15 @@ BEGIN {
 }
 
 /^[ \t]*#/ { next }
-/^OID/     { flush() }
+/^OID/     { flush()
+             oid = substr($0, index($0, "=") + 2)
+             gsub (/[ \t]+/, ".", oid)
+}
 /^Comment/ { comment = substr($0, index($0, "=") + 2 )
              gsub(/\r/, "", comment)
              gsub (/\\/, "\\\\", comment)
              gsub (/"/, "\\\"", comment)
+             gsub (/\(\?\?\?\)/, "(?)", comment)
 }
 /^Description/ {
   desc = substr($0, index($0, "=") + 2)
@@ -40,11 +44,11 @@ BEGIN {
   if (match (desc, /\([0-9 \t]+\)/) > 2) {
     oid = substr(desc, RSTART+1, RLENGTH-2 )
     desc = substr(desc, 1, RSTART-1);
-    gsub (/[ \t]+/, ".", oid)
-    gsub (/\\/, "\\\\", desc)
-    gsub (/"/, "\\\"", desc)
-    sub (/[ \t]*$/, "", desc)
   }
+  gsub (/[ \t]+/, ".", oid)
+  gsub (/\\/, "\\\\", desc)
+  gsub (/"/, "\\\"", desc)
+  sub (/[ \t]*$/, "", desc)
 }
 
 END { flush();  print "  { NULL, NULL, NULL }\n};"  }
diff --git a/tests/t-common.h b/tests/t-common.h
index 71512a9..cf82f3e 100644
--- a/tests/t-common.h
+++ b/tests/t-common.h
@@ -110,6 +110,7 @@ print_sexp (ksba_const_sexp_t p)
           else if (*p == ')')
             {
               putchar (*p);
+              p++;
               if (--level <= 0 )
                 return;
             }
@@ -176,6 +177,7 @@ print_sexp_hex (ksba_const_sexp_t p)
           else if (*p == ')')
             {
               putchar (*p);
+              p++;
               if (--level <= 0 )
                 return;
             }
diff --git a/tests/t-dnparser.c b/tests/t-dnparser.c
index 2457767..c8d4b0d 100644
--- a/tests/t-dnparser.c
+++ b/tests/t-dnparser.c
@@ -133,14 +133,13 @@ int
 main (int argc, char **argv)
 {
   char inputbuf[4096];
-  int inputlen;
   unsigned char *buf;
   size_t len;
   gpg_error_t err;
 
   if (argc == 2 && !strcmp (argv[1], "--to-str") )
     { /* Read the DER encoded DN from stdin write the string to stdout */
-      inputlen = fread (inputbuf, 1, sizeof inputbuf, stdin);
+      fread (inputbuf, 1, sizeof inputbuf, stdin);
       if (!feof (stdin))
         fail ("read error or input too large");
 
@@ -149,7 +148,7 @@ main (int argc, char **argv)
     }
   else if (argc == 2 && !strcmp (argv[1], "--to-der") )
     { /* Read the String from stdin write the DER encoding to stdout */
-      inputlen = fread (inputbuf, 1, sizeof inputbuf, stdin);
+      fread (inputbuf, 1, sizeof inputbuf, stdin);
       if (!feof (stdin))
         fail ("read error or input too large");