diff --git a/Makefile.am b/Makefile.am
index 680fe1be1..b59e9e3ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,229 +1,229 @@
 # Makefile.am - main makefile for GnuPG
 #     	Copyright (C) 2001, 2004, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
 # GnuPG 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.
 #
 # GnuPG 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 <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
 # Location of the released tarball archives.  Note that this is an
 # internal archive and before uploading this to the public server,
 # manual tests should be run and the git release tat set and pushed.
 # Adjust as needed.
 RELEASE_ARCHIVE_DIR  = wk@vigenere:tarballs/gnupg/v2.2
 
 # The key used to sign the released sources.  Adjust as needed.
 RELEASE_SIGNING_KEY  = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 
 
 # Autoconf flags.
 ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \
   --enable-all-tests --enable-symcryptrun --enable-g13 \
   --enable-gpgtar --enable-wks-tools --disable-ntbtls
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
 EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
 	     ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011     \
 	     VERSION README.GIT build-aux/gitlog-to-changelog              \
 	     COPYING.GPL2 COPYING.LGPL21 COPYING.LGPL3      \
              COPYING.CC0 COPYING.other                      \
 	     build-aux/git-log-fix build-aux/git-log-footer \
 	     build-aux/getswdb.sh                           \
 	     build-aux/speedo.mk                            \
              build-aux/speedo/zlib.pc			    \
              build-aux/speedo/w32/inst-options.ini	    \
              build-aux/speedo/w32/inst.nsi		    \
              build-aux/speedo/w32/pkg-copyright.txt	    \
              build-aux/speedo/w32/g4wihelp.c		    \
              build-aux/speedo/w32/pango.modules		    \
              build-aux/speedo/w32/gdk-pixbuf-loaders.cache  \
              build-aux/speedo/w32/exdll.h		    \
              build-aux/speedo/w32/README.txt		    \
              build-aux/speedo/w32/gnupg-logo-150x57.bmp	    \
              build-aux/speedo/w32/gnupg-logo-164x314.bmp    \
              build-aux/speedo/patches/atk-1.32.0.patch	    \
              build-aux/speedo/patches/libiconv-1.14.patch   \
              build-aux/speedo/patches/pango-1.29.4.patch    \
              build-aux/speedo/patches/sqlite.patch
 
 
 DISTCLEANFILES = g10defs.h
 
 if BUILD_GPG
 gpg = g10
 else
 gpg =
 endif
 if BUILD_GPGSM
 sm = sm
 else
 sm =
 endif
 if BUILD_AGENT
 agent = agent
 else
 agent =
 endif
 if BUILD_SCDAEMON
 scd = scd
 else
 scd =
 endif
 if BUILD_G13
 g13 = g13
 else
 g13 =
 endif
 if BUILD_DIRMNGR
 dirmngr = dirmngr
 else
 dirmngr =
 endif
 if BUILD_DOC
 doc = doc
 else
 doc =
 endif
 
 SUBDIRS = m4 common kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
           tools po ${doc} tests
 
 dist_doc_DATA = README
 
 
 dist-hook: gen-ChangeLog
 
 distcheck-hook:
 	set -e; ( \
 	pref="#+macro: gnupg22_" ;\
 	reldate="$$(date -u +%Y-%m-%d)" ;\
         echo "$${pref}ver  $(PACKAGE_VERSION)"  ;\
         echo "$${pref}date $${reldate}" ;\
         list='$(DIST_ARCHIVES)'; for i in $$list; do \
 	  case "$$i" in *.tar.bz2) \
             echo "$${pref}size $$(wc -c <$$i|awk '{print int($$1/1024)}')k" ;\
 	    echo "$${pref}sha1 $$(sha1sum <$$i|cut -d' ' -f1)" ;\
 	    echo "$${pref}sha2 $$(sha256sum <$$i|cut -d' ' -f1)" ;;\
 	  esac;\
 	done ) | tee $(distdir).swdb
 
 
 if HAVE_W32_SYSTEM
 install-data-hook:
 	set -e; \
 	for i in $$($(top_srcdir)/build-aux/potomo \
                      --get-linguas $(top_srcdir)/po) ; do \
            $(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \
            rm -f "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" \
                                                  2>/dev/null || true; \
            $(top_srcdir)/build-aux/potomo $(top_srcdir)/po/$$i.po \
               "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \
 	done
 endif
 
 
 gen_start_date = 2011-12-01T06:00:00
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 	if test -e $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
 	    $(GITLOG_TO_CHANGELOG) --append-dot --tear-off		\
 	    --amend=build-aux/git-log-fix 				\
 	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
           cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;  \
 	  rm -f $(distdir)/ChangeLog;					\
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
 	fi
 
 
 stowinstall:
 	$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/gnupg
 
 TESTS_ENVIRONMENT = \
 	LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
 	PATH=$(abs_top_builddir)/tests/gpgscm:$(PATH) \
 	abs_top_srcdir=$(abs_top_srcdir) \
 	objdir=$(abs_top_builddir) \
 	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
 
 .PHONY: check-all release sign-release
 check-all:
 	$(TESTS_ENVIRONMENT) \
 	  $(abs_top_builddir)/tests/gpgscm/gpgscm \
 	  $(abs_srcdir)/tests/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 # Names of to help the release target.
 RELEASE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 RELEASE_W32_STEM_NAME = $(PACKAGE_TARNAME)-w32-$(PACKAGE_VERSION)
 
 release:
 	+(set -e;\
 	 if [ "$(abs_top_builddir)" = "$(abs_top_srcdir)" ]; then \
            echo "error: build directory must not be the source directory" >&2;\
 	   exit 2;\
          fi ;\
 	 echo "/* Build started at $$(date -uIseconds) */" ;\
 	 cd $(top_srcdir); \
 	 ./autogen.sh --force; \
 	 cd $(abs_top_builddir); \
 	 rm -rf dist; mkdir dist ; cd dist ; \
 	 $(abs_top_srcdir)/configure --enable-maintainer-mode; \
 	 $(MAKE) distcheck TESTFLAGS=--parallel; \
 	 $(TAR) xjf $(RELEASE_NAME).tar.bz2 ;\
 	 $(MAKE) -f  $(RELEASE_NAME)/build-aux/speedo.mk w32-release ;\
 	 echo "/* Build finished at $$(date -uIseconds) */" ;\
          echo "/*" ;\
-	 echo " * Please run the final step interactivly:" ;\
+	 echo " * Please run the final step interactively:" ;\
 	 echo " *   make sign-release" ;\
 	 echo " */" ;\
 	) 2>&1 | tee "$(RELEASE_NAME).buildlog"
 
 sign-release:
 	 +(set -e; \
 	  cd dist; \
 	  release_w32_name="$(RELEASE_W32_STEM_NAME)_$$(date -u +%Y%m%d)" ;\
 	  files1="$(RELEASE_NAME).tar.bz2 \
                   $${release_w32_name}.tar.xz \
                   $${release_w32_name}.exe" ;\
 	  files2="$(RELEASE_NAME).tar.bz2.sig \
 		  $(RELEASE_NAME).swdb \
 		  $(RELEASE_NAME).buildlog \
 		  $${release_w32_name}.tar.xz.sig \
 		  $${release_w32_name}.exe.sig    \
 		  $${release_w32_name}.exe.swdb" ;\
 	  $(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk w32-sign-installer ;\
 	  echo "/* Signing the source tarball ..." ;\
 	  gpg -sbu $(RELEASE_SIGNING_KEY) $(RELEASE_NAME).tar.bz2 ;\
 	  echo "/* Signing the W32 source tarball ..." ;\
 	  gpg -sbu $(RELEASE_SIGNING_KEY) $${release_w32_name}.tar.xz ;\
 	  echo "/* Signing the W32 installer ..." ;\
 	  gpg -sbu $(RELEASE_SIGNING_KEY) $${release_w32_name}.exe ;\
 	  cat $(RELEASE_NAME).swdb >swdb.snippet;\
 	  echo '#+macro: gnupg22_branch  STABLE-BRANCH-2-2' >>swdb.snippet;\
 	  cat  $${release_w32_name}.exe.swdb >>swdb.snippet;\
 	  echo >>swdb.snippet ;\
 	  sha1sum $${files1} >>swdb.snippet ;\
           cat "../$(RELEASE_NAME).buildlog" swdb.snippet \
                | gzip >$(RELEASE_NAME).buildlog ;\
           echo "Release created - copying it to the local archive ..." ;\
 	  scp -p $${files1} $${files2} $(RELEASE_ARCHIVE_DIR)/ || true;\
 	  echo '/*' ;\
 	  echo ' * All done; for checksums see dist/swdb.snippet' ;\
 	  echo ' */' ;\
          )
diff --git a/NEWS b/NEWS
index 27f78b14c..245cc7044 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3954 +1,3954 @@
 Noteworthy changes in version 2.3.0 (unreleased)
 ------------------------------------------------
 
   Changes also found in 2.2.9:
 
   * dirmngr: Fix recursive resolver mode and other bugs in the libdns
     code.  [#3374,#3803,#3610]
 
   * dirmngr: When using libgpg-error 1.32 or later a GnuPG build with
     NTBTLS support (e.g. the standard Windows installer) does not
     anymore block for dozens of seconds before returning data.
 
   * gpg: Fix bug in --show-keys which actually imported revocation
     certificates.  [#4017]
 
   * gpg: Ignore too long user-ID and comment packets.  [#4022]
 
   * gpg: Fix crash due to bad German translation.  Improved printf
     format compile time check.
 
   * gpg: Handle missing ISSUER sub packet gracefully in the presence of
     the new ISSUER_FPR.  [#4046]
 
   * gpg: Allow decryption using several passphrases in most cases.
     [#3795,#4050]
 
   * gpg: Command --show-keys now enables the list options
     show-unusable-uids, show-unusable-subkeys, show-notations and
     show-policy-urls by default.
 
   * gpg: Command --show-keys now prints revocation certificates. [#4018]
 
   * gpg: Add revocation reason to the "rev" and "rvs" records of the
     option --with-colons.  [#1173]
 
   * gpg: Export option export-clean does now remove certain expired
     subkeys; export-minimal removes all expired subkeys.  [#3622]
 
   * gpg: New "usage" property for the drop-subkey filters.  [#4019]
 
   Release-info: https://dev.gnupg.org/T4036
   See-also: gnupg-announce/2018q3/000427.html
 
   Changes also found in 2.2.8:
 
   * gpg: Decryption of messages not using the MDC mode will now lead
     to a hard failure even if a legacy cipher algorithm was used.  The
     option --ignore-mdc-error can be used to turn this failure into a
     warning.  Take care: Never use that option unconditionally or
     without a prior warning.
 
   * gpg: The MDC encryption mode is now always used regardless of the
     cipher algorithm or any preferences.  For testing --rfc2440 can be
     used to create a message without an MDC.
 
   * gpg: Sanitize the diagnostic output of the original file name in
     verbose mode.  [#4012,CVE-2018-12020]
 
   * gpg: Detect suspicious multiple plaintext packets in a more
     reliable way.  [#4000]
 
   * gpg: Fix the duplicate key signature detection code.  [#3994]
 
   * gpg: The options --no-mdc-warn, --force-mdc, --no-force-mdc,
     --disable-mdc and --no-disable-mdc have no more effect.
 
   * gpg: New command --show-keys.
 
   * agent: Add DBUS_SESSION_BUS_ADDRESS and a few other envvars to the
     list of startup environment variables.  [#3947]
 
   See-also: gnupg-announce/2018q2/000425.html
 
   Changes also found in 2.2.7:
 
   * gpg: New option --no-symkey-cache to disable the passphrase cache
     for symmetrical en- and decryption.
 
   * gpg: The ERRSIG status now prints the fingerprint if that is part
     of the signature.
 
   * gpg: Relax emitting of FAILURE status lines
 
   * gpg: Add a status flag to "sig" lines printed with --list-sigs.
 
   * gpg: Fix "Too many open files" when using --multifile.  [#3951]
 
   * ssh: Return an error for unknown ssh-agent flags.  [#3880]
 
   * dirmngr: Fix a regression since 2.1.16 which caused corrupted CRL
     caches under Windows.  [#2448,#3923]
 
   * dirmngr: Fix a CNAME problem with pools and TLS.  Also use a fixed
     mapping of keys.gnupg.net to sks-keyservers.net.  [#3755]
 
   * dirmngr: Try resurrecting dead hosts earlier (from 3 to 1.5 hours).
 
   * dirmngr: Fallback to CRL if no default OCSP responder is configured.
 
   * dirmngr: Implement CRL fetching via https.  Here a redirection to
-    http is explictly allowed.
+    http is explicitly allowed.
 
   * dirmngr: Make LDAP searching and CRL fetching work under Windows.
     This stopped working with 2.1.  [#3937]
 
   * agent,dirmngr: New sub-command "getenv" for "getinfo" to ease
     debugging.
 
   See-also: gnupg-announce/2018q2/000424.html
 
   Changes also found in 2.2.6:
 
   * gpg,gpgsm: New option --request-origin to pretend requests coming
     from a browser or a remote site.
 
   * gpg: Fix race condition on trustdb.gpg updates due to too early
     released lock.  [#3839]
 
   * gpg: Emit FAILURE status lines in almost all cases.  [#3872]
 
   * gpg: Implement --dry-run for --passwd to make checking a key's
     passphrase straightforward.
 
   * gpg: Make sure to only accept a certification capable key for key
     signatures.  [#3844]
 
   * gpg: Better user interaction in --card-edit for the factory-reset
     sub-command.
 
   * gpg: Improve changing key attributes in --card-edit by adding an
     explicit "key-attr" sub-command.  [#3781]
 
   * gpg: Print the keygrips in the --card-status.
 
   * scd: Support KDF DO setup.  [#3823]
 
   * scd: Fix some issues with PC/SC on Windows.  [#3825]
 
   * scd: Fix suspend/resume handling in the CCID driver.
 
   * agent: Evict cached passphrases also via a timer.  [#3829]
 
   * agent: Use separate passphrase caches depending on the request
     origin.  [#3858]
 
   * ssh: Support signature flags.  [#3880]
 
   * dirmngr: Handle failures related to missing IPv6 support
     gracefully.  [#3331]
 
   * Fix corner cases related to specified home directory with
     drive letter on Windows.  [#3720]
 
   * Allow the use of UNC directory names as homedir.  [#3818]
 
   See-also: gnupg-announce/2018q2/000421.html
 
   Changes also found in 2.2.5:
 
   * gpg: Allow the use of the "cv25519" and "ed25519" short names in
     addition to the canonical curve names in --batch --gen-key.
 
   * gpg: Make sure to print all secret keys with option --list-only
     and --decrypt.  [#3718]
 
   * gpg: Fix the use of future-default with --quick-add-key for
     signing keys.  [#3747]
 
   * gpg: Select a secret key by checking availability under gpg-agent.
     [#1967]
 
   * gpg: Fix reversed prompt texts for --only-sign-text-ids.  [#3787]
 
   * gpg,gpgsm: Fix detection of bogus keybox blobs on 32 bit systems.
     [#3770]
 
   * gpgsm: Fix regression since 2.1 in --export-secret-key-raw which
     got $d mod (q-1)$ wrong.  Note that most tools automatically fixup
     that parameter anyway.
 
   * ssh: Fix a regression in getting the client'd PID on *BSD and
     macOS.
 
   * scd: Support the KDF Data Object of the OpenPGP card 3.3.  [#3152]
 
   * scd: Fix a regression in the internal CCID driver for certain card
     readers.  [#3508]
 
   * scd: Fix a problem on NetBSD killing scdaemon on gpg-agent
     shutdown.  [#3778]
 
   * dirmngr: Improve returned error description on failure of DNS
     resolving.  [#3756]
 
   * wks: Implement command --install-key for gpg-wks-server.
 
   * Add option STATIC=1 to the Speedo build system to allow a build
     with statically linked versions of the core GnuPG libraries.  Also
     use --enable-wks-tools by default by Speedo builds for Unix.
 
   See-also: gnupg-announce/2018q1/000420.html
 
   Changes also found in 2.2.4:
 
   * gpg: Change default preferences to prefer SHA512.
 
   * gpg: Print a warning when more than 150 MiB are encrypted using a
     cipher with 64 bit block size.
 
   * gpg: Print a warning if the MDC feature has not been used for a
     message.
 
   * gpg: Fix regular expression of domain addresses in trust
     signatures. [#2923]
 
   * agent: New option --auto-expand-secmem to help with high numbers
     of concurrent connections.  Requires libgcrypt 1.8.2 for having
     an effect.  [#3530]
 
   * dirmngr: Cache responses of WKD queries.
 
   * gpgconf: Add option --status-fd.
 
   * wks: Add commands --check and --remove-key to gpg-wks-server.
 
   * Increase the backlog parameter of the daemons to 64 and add
     option --listen-backlog.
 
   * New configure option --enable-run-gnupg-user-socket to first try a
     socket directory which is not removed by systemd at session end.
 
   See-also: gnupg-announce/2017q4/000419.html
 
   Changes also found in 2.2.3:
 
   * gpgsm: Fix initial keybox creation on Windows. [#3507]
 
   * dirmngr: Fix crash in case of a CRL loading error. [#3510]
 
   * Fix the name of the Windows registry key. [Git#4f5afaf1fd]
 
   * gpgtar: Fix wrong behaviour of --set-filename. [#3500]
 
   * gpg: Silence AKL retrieval messages. [#3504]
 
   * agent: Use clock or clock_gettime for calibration. [#3056]
 
   * agent: Improve robustness of the shutdown pending
     state. [Git#7ffedfab89]
 
   See-also: gnupg-announce/2017q4/000417.html
 
   Changes also found in 2.2.2:
 
   * gpg: Avoid duplicate key imports by concurrently running gpg
     processes. [#3446]
 
   * gpg: Fix creating on-disk subkey with on-card primary key. [#3280]
 
   * gpg: Fix validity retrieval for multiple keyrings. [Debian#878812]
 
   * gpg: Fix --dry-run and import option show-only for secret keys.
 
   * gpg: Print "sec" or "sbb" for secret keys with import option
     import-show. [#3431]
 
   * gpg: Make import less verbose. [#3397]
 
   * gpg: Add alias "Key-Grip" for parameter "Keygrip" and new
     parameter "Subkey-Grip" to unattended key generation.  [#3478]
 
   * gpg: Improve "factory-reset" command for OpenPGP cards.  [#3286]
 
   * gpg: Ease switching Gnuk tokens into ECC mode by using the magic
     keysize value 25519.
 
   * gpgsm: Fix --with-colon listing in crt records for fields > 12.
 
   * gpgsm: Do not expect X.509 keyids to be unique.  [#1644]
 
   * agent: Fix stucked Pinentry when using --max-passphrase-days. [#3190]
 
   * agent: New option --s2k-count.  [#3276 (workaround)]
 
   * dirmngr: Do not follow https-to-http redirects. [#3436]
 
   * dirmngr: Reduce default LDAP timeout from 100 to 15 seconds. [#3487]
 
   * gpgconf: Ignore non-installed components for commands
     --apply-profile and --apply-defaults. [#3313]
 
   * Add configure option --enable-werror.  [#2423]
 
   See-also: gnupg-announce/2017q4/000416.html
 
   Changes also found in 2.2.1:
 
   * gpg: Fix formatting of the user id in batch mode key generation
     if only "name-email" is given.
 
   * gpgv: Fix annoying "not suitable for" warnings.
 
   * wks: Convey only the newest user id to the provider.  This is the
     case if different names are used with the same addr-spec.
 
   * wks: Create a complying user id for provider policy mailbox-only.
 
   * wks: Add workaround for posteo.de.
 
   * scd: Fix the use of large ECC keys with an OpenPGP card.
 
   * dirmngr: Use system provided root certificates if no specific HKP
     certificates are configured.  If build with GNUTLS, this was
     already the case.
 
   See-also: gnupg-announce/2017q3/000415.html
 
   Release dates of 2.2.x versions:
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   Version 2.2.1 (2017-09-19)
   Version 2.2.2 (2017-11-07)
   Version 2.2.3 (2017-11-20)
   Version 2.2.4 (2017-12-20)
   Version 2.2.5 (2018-02-22)
   Version 2.2.6 (2018-04-09)
   Version 2.2.7 (2018-05-02)
   Version 2.2.8 (2018-06-08)
   Version 2.2.9 (2018-07-12)
 
 
 Noteworthy changes in version 2.2.0 (2017-08-28)
 ------------------------------------------------
 
   This is the new long term stable branch.  This branch will only see
   bug fixes and no new features.
 
   * gpg: Reverted change in 2.1.23 so that --no-auto-key-retrieve is
     again the default.
 
   * Fixed a few minor bugs.
 
   See-also: gnupg-announce/2017q3/000413.html
 
 
 Noteworthy changes in version 2.1.23 (2017-08-09)
 -------------------------------------------------
 
   * gpg: "gpg" is now installed as "gpg" and not anymore as "gpg2".
     If needed, the new configure option --enable-gpg-is-gpg2 can be
     used to revert this.
 
   * gpg: Options --auto-key-retrieve and --auto-key-locate "local,wkd"
     are now used by default.  Note: this enables keyserver and Web Key
     Directory operators to notice when a signature from a locally
     non-available key is being verified for the first time or when
     you intend to encrypt to a mail address without having the key
     locally.  This new behaviour will eventually make key discovery
     much easier and mostly automatic.  Disable this by adding
       no-auto-key-retrieve
       auto-key-locate local
     to your gpg.conf.
 
   * agent: Option --no-grab is now the default.  The new option --grab
     allows to revert this.
 
   * gpg: New import option "show-only".
 
   * gpg: New option --disable-dirmngr to entirely disable network
     access for gpg.
 
   * gpg,gpgsm: Tweaked DE-VS compliance behaviour.
 
   * New configure flag --enable-all-tests to run more extensive tests
     during "make check".
 
   * gpgsm: The keygrip is now always printed in colon mode as
     documented in the man page.
 
   * Fixed connection timeout problem under Windows.
 
   See-also: gnupg-announce/2017q3/000412.html
 
 
 Noteworthy changes in version 2.1.22 (2017-07-28)
 -------------------------------------------------
 
   * gpg: Extend command --quick-set-expire to allow for setting the
     expiration time of subkeys.
 
   * gpg: By default try to repair keys during import.  New sub-option
     no-repair-keys for --import-options.
 
   * gpg,gpgsm: Improved checking and reporting of DE-VS compliance.
 
   * gpg: New options --key-origin and --with-key-origin.  Store the
     time of the last key update from keyservers, WKD, or DANE.
 
   * agent: New option --ssh-fingerprint-digest.
 
   * dimngr: Lower timeouts on keyserver connection attempts and made
     it configurable.
 
   * dirmngr: Tor will now automatically be detected and used.  The
     option --no-use-tor disables Tor detection.
 
   * dirmngr: Now detects a changed /etc/resolv.conf.
 
   * agent,dirmngr: Initiate shutdown on removal of the GnuPG home
     directory.
 
   * gpg: Avoid caching passphrase for failed symmetric encryption.
 
   * agent: Support for unprotected ssh keys.
 
   * dirmngr: Fixed name resolving on systems using only v6
     nameservers.
 
   * dirmngr: Allow the use of TLS over http proxies.
 
   * w32: Change directory of the daemons after startup.
 
   * wks: New man pages for client and server.
 
   * Many other bug fixes.
 
   See-also: gnupg-announce/2017q3/000411.html
 
 
 Noteworthy changes in version 2.1.21 (2017-05-15)
 -------------------------------------------------
 
   * gpg,gpgsm: Fix corruption of old style keyring.gpg files.  This
     bug was introduced with version 2.1.20.  Note that the default
     pubring.kbx format was not affected.
 
   * gpg,dirmngr: Removed the skeleton config file support.  The
     system's standard methods for providing default configuration
     files should be used instead.
 
   * w32: The Windows installer now allows installation of GnuPG
     without Administrator permissions.
 
   * gpg: Fixed import filter property match bug.
 
   * scd: Removed Linux support for Cardman 4040 PCMCIA reader.
 
   * scd: Fixed some corner case bugs in resume/suspend handling.
 
   * Many minor bug fixes and code cleanup.
 
   See-also: gnupg-announce/2017q2/000405.html
 
 
 Noteworthy changes in version 2.1.20 (2017-04-03)
 -------------------------------------------------
 
   * gpg: New properties 'expired', 'revoked', and 'disabled' for the
     import and export filters.
 
   * gpg: New command --quick-set-primary-uid.
 
   * gpg: New compliance field for the --with-colon key listing.
 
   * gpg: Changed the key parser to generalize the processing of local
     meta data packets.
 
   * gpg: Fixed assertion failure in the TOFU trust model.
 
   * gpg: Fixed exporting of zero length user ID packets.
 
   * scd: Improved support for multiple readers.
 
   * scd: Fixed timeout handling for key generation.
 
   * agent: New option --enable-extended-key-format.
 
   * dirmngr: Do not add a keyserver to a new dirmngr.conf.  Dirmngr
     uses a default keyserver.
 
   * dimngr: Do not treat TLS warning alerts as severe error when
     building with GNUTLS.
 
   * dirmngr: Actually take /etc/hosts in account.
 
   * wks: Fixed client problems on Windows.  Published keys are now set
     to world-readable.
 
   * tests: Fixed creation of temporary directories.
 
   * A socket directory for a non standard GNUGHOME is now created on
     the fly under /run/user.  Thus "gpgconf --create-socketdir" is now
     optional.  The use of "gpgconf --remove-socketdir" to clean up
     obsolete socket directories is however recommended to avoid
     cluttering /run/user with useless directories.
 
   * Fixed build problems on some platforms.
 
   See-also: gnupg-announce/2017q2/000404.html
 
 
 Noteworthy changes in version 2.1.19 (2017-03-01)
 -------------------------------------------------
 
   * gpg: Print a warning if Tor mode is requested but the Tor daemon
     is not running.
 
   * gpg: New status code DECRYPTION_KEY to print the actual private
     key used for decryption.
 
   * gpgv: New options --log-file and --debug.
 
   * gpg-agent: Revamp the prompts to ask for card PINs.
 
   * scd: Support for multiple card readers.
 
   * scd: Removed option --debug-disable-ticker.  Ticker is used
     only when it is required to watch removal of device/card.
 
   * scd: Improved detection of card inserting and removal.
 
   * dirmngr: New option --disable-ipv4.
 
   * dirmngr: New option --no-use-tor to explicitly disable the use of
     Tor.
 
   * dirmngr: The option --allow-version-check is now required even if
     the option --use-tor is also used.
 
   * dirmngr: Handle a missing nsswitch.conf gracefully.
 
   * dirmngr: Avoid PTR lookups for keyserver pools.  The are only done
     for the debug command "keyserver --hosttable".
 
   * dirmngr: Rework the internal certificate cache to support classes
     of certificates.  Load system provided certificates on startup.
     Add options --tls, --no-crl, and --systrust to the "VALIDATE"
     command.
 
   * dirmngr: Add support for the ntbtls library.
 
   * wks: Create mails with a "WKS-Phase" header.  Fix detection of
     Draft-2 mode.
 
   * The Windows installer is now build with limited TLS support.
 
   * Many other bug fixes and new regression tests.
 
   See-also: gnupg-announce/2017q1/000402.html
 
 
 Noteworthy changes in version 2.1.18 (2017-01-23)
 -------------------------------------------------
 
   * gpg: Remove bogus subkey signature while cleaning a key (with
     export-clean, import-clean, or --edit-key's sub-command clean)
 
   * gpg: Allow freezing the clock with --faked-system-time.
 
   * gpg: New --export-option flag "backup", new --import-option flag
     "restore".
 
   * gpg-agent: Fixed long delay due to a regression in the progress
     callback code.
 
   * scd: Lots of code cleanup and internal changes.
 
   * scd: Improved the internal CCID driver.
 
   * dirmngr: Fixed problem with the DNS glue code (removal of the
     trailing dot in domain names).
 
   * dirmngr: Make sure that Tor is actually enabled after changing the
     conf file and sending SIGHUP or "gpgconf --reload dirmngr".
 
   * dirmngr: Fixed Tor access to IPv6 addresses.  Note that current
     versions of Tor may require that the flag "IPv6Traffic" is used
     with the option "SocksPort" in torrc to actually allow IPv6
     traffic.
 
   * dirmngr: Fixed HKP for literally given IPv6 addresses.
 
   * dirmngr: Enabled reverse DNS lookups via Tor.
 
   * dirmngr: Added experimental SRV record lookup for WKD.
     See commit 88dc3af3d4ae1afe1d5e136bc4c38bc4e7d4cd10 for details.
 
   * dirmngr: For HKP use "pgpkey-hkps" and "pgpkey-hkp" in SRV record
     lookups.  Avoid SRV record lookup when a port is explicitly
     specified.  This fixes a regression from the 1.4 and 2.0 behavior.
 
   * dirmngr: Gracefully handle a missing /etc/nsswitch.conf.  Ignore
     negation terms (e.g. "[!UNAVAIL=return]" instead of bailing out.
 
   * dirmngr: Better debug output for flags "dns" and "network".
 
   * dirmngr: On reload mark all known HKP servers alive.
 
   * gpgconf: Allow keyword "all" for --launch, --kill, and --reload.
 
   * tools: gpg-wks-client now ignores a missing policy file on the
     server.
 
   * Avoid unnecessary ambiguity error message in the option parsing.
 
   * Further improvements of the regression test suite.
 
   * Fixed building with --disable-libdns configure option.
 
   * Fixed a crash running the tests on 32 bit architectures.
 
   * Fixed spurious failures on BSD system in the spawn functions.
     This affected for example gpg-wks-client and gpgconf.
 
   See-also: gnupg-announce/2017q1/000401.html
 
 
 Noteworthy changes in version 2.1.17 (2016-12-20)
 -------------------------------------------------
 
  * gpg: By default new keys expire after 2 years.
 
  * gpg: New command --quick-set-expire to conveniently change the
    expiration date of keys.
 
  * gpg: Option and command names have been changed for easier
    comprehension.  The old names are still available as aliases.
 
  * gpg: Improved the TOFU trust model.
 
  * gpg: New option --default-new-key-algo.
 
  * scd: Support OpenPGP card V3 for RSA.
 
  * dirmngr: Support for the ADNS library has been removed.  Instead
    William Ahern's Libdns is now source included and used on all
    platforms.  This enables Tor support on all platforms.  The new
    option --standard-resolver can be used to disable this code at
    runtime.  In case of build problems the new configure option
    --disable-libdns can be used to build without Libdns.
 
  * dirmngr: Lazily launch ldap reaper thread.
 
  * tools: New options --check and --status-fd for gpg-wks-client.
 
  * The UTF-8 byte order mark is now skipped when reading conf files.
 
  * Fixed many bugs and regressions.
 
  * Major improvements to the test suite.  For example it is possible
    to run the external test suite of GPGME.
 
  See-also: gnupg-announce/2016q4/000400.html
 
 
 Noteworthy changes in version 2.1.16 (2016-11-18)
 -------------------------------------------------
 
  * gpg: New algorithm for selecting the best ranked public key when
    using a mail address with -r, -R, or --locate-key.
 
  * gpg: New option --with-tofu-info to print a new "tfs" record in
    colon formatted key listings.
 
  * gpg: New option --compliance as an alternative way to specify
    options like --rfc2440, --rfc4880, et al.
 
  * gpg: Many changes to the TOFU implementation.
 
  * gpg: Improve usability of --quick-gen-key.
 
  * gpg: In --verbose mode print a diagnostic when a pinentry is
    launched.
 
  * gpg: Remove code which warns for old versions of gnome-keyring.
 
  * gpg: New option --override-session-key-fd.
 
  * gpg: Option --output does now work with --verify.
 
  * gpgv: New option --output to allow saving the verified data.
 
  * gpgv: New option --enable-special-filenames.
 
  * agent, dirmngr: New --supervised mode for use by systemd and alike.
 
  * agent: By default listen on all available sockets using standard
    names.
 
  * agent: Invoke scdaemon with --homedir.
 
  * dirmngr: On Linux now detects the removal of its own socket and
    terminates.
 
  * scd: Support ECC key generation.
 
  * scd: Support more card readers.
 
  * dirmngr: New option --allow-version-check to download a software
    version database in the background.
 
  * dirmngr: Use system provided CAs if no --hkp-cacert is given.
 
  * dirmngr: Use a default keyserver if none is explicitly set
 
  * gpgconf: New command --query-swdb to check software versions
    against an copy of an online database.
 
  * gpgconf: Print the socket directory with --list-dirs.
 
  * tools: The WKS tools now support draft version -02.
 
  * tools: Always build gpg-wks-client and install under libexec.
 
  * tools: New option --supported for gpg-wks-client.
 
  * The log-file option now accepts a value "socket://" to log to the
    socket named "S.log" in the standard socket directory.
 
  * Provide fake pinentries for use by tests cases of downstream
    developers.
 
  * Fixed many bugs and regressions.
 
  * Many changes and improvements for the test suite.
 
  See-also: gnupg-announce/2016q4/000398.html
 
 
 Noteworthy changes in version 2.1.15 (2016-08-18)
 -------------------------------------------------
 
  * gpg: Remove the --tofu-db-format option and support for the split
    TOFU database.
 
  * gpg: Add option --sender to prepare for coming features.
 
  * gpg: Add option --input-size-hint to help progress indicators.
 
  * gpg: Extend the PROGRESS status line with the counted unit.
 
  * gpg: Avoid publishing the GnuPG version by default with --armor.
 
  * gpg: Properly ignore legacy keys in the keyring cache.
 
  * gpg: Always print fingerprint records in --with-colons mode.
 
  * gpg: Make sure that keygrips are printed for each subkey in
    --with-colons mode.
 
  * gpg: New import filter "drop-sig".
 
  * gpgsm: Fix a bug in the machine-readable key listing.
 
  * gpg,gpgsm: Block signals during keyring updates to limits the
    effects of a Ctrl-C at the wrong time.
 
  * g13: Add command --umount and other fixes for dm-crypt.
 
  * agent: Fix regression in SIGTERM handling.
 
  * agent: Cleanup of the ssh-agent code.
 
  * agent: Allow import of overly long keys.
 
  * scd: Fix problems with card removal.
 
  * dirmngr: Remove all code for running as a system service.
 
  * tools: Make gpg-wks-client conforming to the specs.
 
  * tests: Improve the output of the new regression test tool.
 
  * tests: Distribute the standalone test runner.
 
  * tests: Run each test in a clean environment.
 
  * Spelling and grammar fixes.
 
  See-also: gnupg-announce/2016q3/000396.html
 
 
 Noteworthy changes in version 2.1.14 (2016-07-14)
 -------------------------------------------------
 
  * gpg: Removed options --print-dane-records and --print-pka-records.
    The new export options "export-pka" and "export-dane" can instead
    be used with the export command.
 
  * gpg: New options --import-filter and --export-filter.
 
  * gpg: New import options "import-show" and "import-export".
 
  * gpg: New option --no-keyring.
 
  * gpg: New command --quick-revuid.
 
  * gpg: New options -f/--recipient-file and -F/--hidden-recipient-file
    to directly specify encryption keys.
 
  * gpg: New option --mimemode to indicate that the content is a MIME
    part.  Does only enable --textmode right now.
 
  * gpg: New option --rfc4880bis to allow experiments with proposed
    changes to the current OpenPGP specs.
 
  * gpg: Fix regression in the "fetch" sub-command of --card-edit.
 
  * gpg: Fix regression since 2.1 in option --try-all-secrets.
 
  * gpgv: Change default options for extra security.
 
  * gpgsm: No more root certificates are installed by default.
 
  * agent: "updatestartuptty" does now affect more environment
    variables.
 
  * scd: The option --homedir does now work with scdaemon.
 
  * scd: Support some more GEMPlus card readers.
 
  * gpgtar: Fix handling of '-' as file name.
 
  * gpgtar: New commands --create and --extract.
 
  * gpgconf: Tweak for --list-dirs to better support shell scripts.
 
  * tools: Add programs gpg-wks-client and gpg-wks-server to implement
    a Web Key Service.  The configure option --enable-wks-tools is
    required to build them; they should be considered Beta software.
 
  * tests: Complete rework of the openpgp part of the test suite.  The
    test scripts have been changed from Bourne shell scripts to Scheme
    programs.  A customized scheme interpreter (gpgscm) is included.
    This change was triggered by the need to run the test suite on
    non-Unix platforms.
 
  * The rendering of the man pages has been improved.
 
  See-also: gnupg-announce/2016q3/000393.html
 
 
 Noteworthy changes in version 2.1.13 (2016-06-16)
 -------------------------------------------------
 
  * gpg: New command --quick-addkey.  Extend the --quick-gen-key
    command.
 
  * gpg: New --keyid-format "none" which is now also the default.
 
  * gpg: New option --with-subkey-fingerprint.
 
  * gpg: Include Signer's UID subpacket in signatures if the secret key
    has been specified using a mail address and the new option
    --disable-signer-uid is not used.
 
  * gpg: Allow unattended deletion of a secret key.
 
  * gpg: Allow export of non-passphrase protected secret keys.
 
  * gpg: New status lines KEY_CONSIDERED and NOTATION_FLAGS.
 
  * gpg: Change status line TOFU_STATS_LONG to use '~' as
    a non-breaking-space character.
 
  * gpg: Speedup key listings in Tofu mode.
 
  * gpg: Make sure that the current and total values of a PROGRESS
    status line are small enough.
 
  * gpgsm: Allow the use of AES192 and SERPENT ciphers.
 
  * dirmngr: Adjust WKD lookup to current specs.
 
  * dirmngr: Fallback to LDAP v3 if v2 is is not supported.
 
  * gpgconf: New commands --create-socketdir and --remove-socketdir,
    new option --homedir.
 
  * If a /run/user/$UID directory exists, that directory is now used
    for IPC sockets instead of the GNUPGHOME directory.  This fixes
    problems with NFS and too long socket names and thus avoids the
    need for redirection files.
 
  * The Speedo build systems now uses the new versions.gnupg.org server
    to retrieve the default package versions.
 
  * Fix detection of libusb on FreeBSD.
 
  * Speedup fd closing after a fork.
 
  See-also: gnupg-announce/2016q2/000390.html
 
 
 Noteworthy changes in version 2.1.12 (2016-05-04)
 -------------------------------------------------
 
  * gpg: New --edit-key sub-command "change-usage" for testing
    purposes.
 
  * gpg: Out of order key-signatures are now systematically detected
    and fixed by --edit-key.
 
  * gpg: Improved detection of non-armored messages.
 
  * gpg: Removed the extra prompt needed to create Curve25519 keys.
 
  * gpg: Improved user ID selection for --quick-sign-key.
 
  * gpg: Use the root CAs provided by the system with --fetch-key.
 
  * gpg: Add support for the experimental Web Key Directory key
    location service.
 
  * gpg: Improve formatting of Tofu messages and emit new Tofu specific
    status lines.
 
  * gpgsm: Add option --pinentry-mode to support a loopback pinentry.
 
  * gpgsm: A new pubring.kbx is now created with the header blob so
    that gpg can detect that the keybox format needs to be used.
 
  * agent: Add read support for the new private key protection format
    openpgp-s2k-ocb-aes.
 
  * agent: Add read support for the new extended private key format.
 
  * agent: Default to --allow-loopback-pinentry and add option
    --no-allow-loopback-pinentry.
 
  * scd: Changed to use the new libusb 1.0 API for the internal CCID
    driver.
 
  * dirmngr: The dirmngr-client does now auto-detect the PEM format.
 
  * g13: Add experimental support for dm-crypt.
 
  * w32: Tofu support is now available with the Speedo build method.
 
  * w32: Removed the need for libiconv.dll.
 
  * The man pages for gpg and gpgv are now installed under the correct
    name (gpg2 or gpg - depending on a configure option).
 
  * Lots of internal cleanups and bug fixes.
 
  See-also: gnupg-announce/2016q2/000387.html
 
 
 Noteworthy changes in version 2.1.11 (2016-01-26)
 -------------------------------------------------
 
  * gpg: New command --export-ssh-key to replace the gpgkey2ssh tool.
 
  * gpg: Allow to generate mail address only keys with --gen-key.
 
  * gpg: "--list-options show-usage" is now the default.
 
  * gpg: Make lookup of DNS CERT records holding an URL work.
 
  * gpg: Emit PROGRESS status lines during key generation.
 
- * gpg: Don't check for ambigious or non-matching key specification in
+ * gpg: Don't check for ambiguous or non-matching key specification in
    the config file or given to --encrypt-to.  This feature will return
    in 2.3.x.
 
  * gpg: Lock keybox files while updating them.
 
  * gpg: Solve rare error on Windows during keyring and Keybox updates.
 
  * gpg: Fix possible keyring corruption. (bug#2193)
 
  * gpg: Fix regression of "bkuptocard" sub-command in --edit-key and
    remove "checkbkupkey" sub-command introduced with 2.1.  (bug#2169)
 
  * gpg: Fix internal error in gpgv when using default keyid-format.
 
  * gpg: Fix --auto-key-retrieve to work with dirmngr.conf configured
    keyservers. (bug#2147).
 
  * agent: New option --pinentry-timeout.
 
  * scd: Improve unplugging of USB readers under Windows.
 
  * scd: Fix regression for generating RSA keys on card.
 
  * dirmmgr: All configured keyservers are now searched.
 
  * dirmngr: Install CA certificate for hkps.pool.sks-keyservers.net.
-   Use this certiticate even if --hkp-cacert is not used.
+   Use this certificate even if --hkp-cacert is not used.
 
  * gpgtar: Add actual encryption code.  gpgtar does now fully replace
    gpg-zip.
 
  * gpgtar: Fix filename encoding problem on Windows.
 
  * Print a warning if a GnuPG component is using an older version of
    gpg-agent, dirmngr, or scdaemon.
 
  See-also: gnupg-announce/2016q1/000383.html
 
 
 Noteworthy changes in version 2.1.10 (2015-12-04)
 -------------------------------------------------
 
  * gpg: New trust models "tofu" and "tofu+pgp".
 
  * gpg: New command --tofu-policy.  New options --tofu-default-policy
    and --tofu-db-format.
 
  * gpg: New option --weak-digest to specify hash algorithms which
    should be considered weak.
 
  * gpg: Allow the use of multiple --default-key options; take the last
    available key.
 
  * gpg: New option --encrypt-to-default-key.
 
  * gpg: New option --unwrap to only strip the encryption layer.
 
  * gpg: New option --only-sign-text-ids to exclude photo IDs from key
    signing.
 
- * gpg: Check for ambigious or non-matching key specification in the
+ * gpg: Check for ambiguous or non-matching key specification in the
    config file or given to --encrypt-to.
 
  * gpg: Show the used card reader with --card-status.
 
  * gpg: Print export statistics and an EXPORTED status line.
 
  * gpg: Allow selecting subkeys by keyid in --edit-key.
 
  * gpg: Allow updating the expiration time of multiple subkeys at
    once.
 
  * dirmngr: New option --use-tor.  For full support this requires
    libassuan version 2.4.2 and a patched version of libadns
    (e.g. adns-1.4-g10-7 as used by the standard Windows installer).
 
  * dirmngr: New option --nameserver to specify the nameserver used in
    Tor mode.
 
  * dirmngr: Keyservers may again be specified by IP address.
 
  * dirmngr: Fixed problems in resolving keyserver pools.
 
  * dirmngr: Fixed handling of premature termination of TLS streams so
    that large numbers of keys can be refreshed via hkps.
 
  * gpg: Fixed a regression in --locate-key [since 2.1.9].
 
  * gpg: Fixed another bug for keyrings with legacy keys.
 
  * gpgsm: Allow combinations of usage flags in --gen-key.
 
  * Make tilde expansion work with most options.
 
  * Many other cleanups and bug fixes.
 
  See-also: gnupg-announce/2015q4/000381.html
 
 
 Noteworthy changes in version 2.1.9 (2015-10-09)
 ------------------------------------------------
 
  * gpg: Allow fetching keys via OpenPGP DANE (--auto-key-locate).  New
    option --print-dane-records.  [Update: --print-dane-records replaced
    in 2.1.4.]
 
  * gpg: Fix for a problem with PGP-2 keys in a keyring.
 
  * gpg: Fail with an error instead of a warning if a modern cipher
    algorithm is used without a MDC.
 
  * agent: New option --pinentry-invisible-char.
 
  * agent: Always do a RSA signature verification after creation.
 
  * agent: Fix a regression in ssh-add-ing Ed25519 keys.
 
  * agent: Fix ssh fingerprint computation for nistp384 and EdDSA.
 
  * agent: Fix crash during passphrase entry on some platforms.
 
  * scd: Change timeout to fix problems with some 2.1 cards.
 
  * dirmngr: Displayed name is now Key Acquirer.
 
  * dirmngr: Add option --keyserver.  Deprecate that option for gpg.
    Install a dirmngr.conf file from a skeleton for new installations.
 
  See-also: gnupg-announce/2015q4/000380.html
 
 
 Noteworthy changes in version 2.1.8 (2015-09-10)
 ------------------------------------------------
 
  * gpg: Sending very large keys to the keyservers works again.
 
  * gpg: Validity strings in key listings are now again translatable.
 
  * gpg: Emit FAILURE status lines to help GPGME.
 
  * gpg: Does not anymore link to Libksba to reduce dependencies.
 
  * gpgsm: Export of secret keys via Assuan is now possible.
 
  * agent: Raise the maximum passphrase length from 100 to 255 bytes.
 
  * agent: Fix regression using EdDSA keys with ssh.
 
  * Does not anymore use a build timestamp by default.
 
  * The fallback encoding for broken locale settings changed
    from Latin-1 to UTF-8.
 
  * Many code cleanups and improved internal documentation.
 
  * Various minor bug fixes.
 
  See-also: gnupg-announce/2015q3/000379.html
 
 
 Noteworthy changes in version 2.1.7 (2015-08-11)
 ------------------------------------------------
 
  * gpg: Support encryption with Curve25519 if Libgcrypt 1.7 is used.
 
  * gpg: In the --edit-key menu: Removed the need for "toggle", changed
    how secret keys are indicated, new commands "fpr *" and "grip".
 
  * gpg: More fixes related to legacy keys in a keyring.
 
  * gpgv: Does now also work with a "trustedkeys.kbx" file.
 
  * scd: Support some feature from the OpenPGP card 3.0 specs.
 
  * scd: Improved ECC support
 
  * agent: New option --force for the DELETE_KEY command.
 
  * w32: Look for the Pinentry at more places.
 
  * Dropped deprecated gpgsm-gencert.sh
 
  * Various other bug fixes.
 
  See-also: gnupg-announce/2015q3/000371.html
 
 
 Noteworthy changes in version 2.1.6 (2015-07-01)
 ------------------------------------------------
 
  * agent: New option --verify for the PASSWD command.
 
  * gpgsm: Add command option "offline" as an alternative to
    --disable-dirmngr.
 
  * gpg: Do not prompt multiple times for a password in pinentry
    loopback mode.
 
  * Allow the use of debug category names with --debug.
 
  * Using gpg-agent and gpg/gpgsm with different locales will now show
    the correct translations in Pinentry.
 
  * gpg: Improve speed of --list-sigs and --check-sigs.
 
  * gpg: Make --list-options show-sig-subpackets work again.
 
  * gpg: Fix an export problem for old keyrings with PGP-2 keys.
 
  * scd: Support PIN-pads on more readers.
 
  * dirmngr: Properly cleanup zombie LDAP helper processes and avoid
    hangs on dirmngr shutdown.
 
  * Various other bug fixes.
 
  See-also: gnupg-announce/2015q3/000370.html
 
 
 Noteworthy changes in version 2.1.5 (2015-06-11)
 ------------------------------------------------
 
  * Support for an external passphrase cache.
 
  * Support for the forthcoming version 3 OpenPGP smartcard.
 
  * Manuals now show the actual used file names.
 
  * Prepared for improved integration with Emacs.
 
  * Code cleanups and minor bug fixes.
 
  See-also: gnupg-announce/2015q2/000369.html
 
 
 Noteworthy changes in version 2.1.4 (2015-05-12)
 ------------------------------------------------
 
  * gpg: Add command --quick-adduid to non-interactively add a new user
    id to an existing key.
 
  * gpg: Do no enable honor-keyserver-url by default.  Make it work if
    enabled.
 
  * gpg: Display the serial number in the --card-status output again.
 
  * agent: Support for external password managers.
    Add option --no-allow-external-cache.
 
  * scdaemon: Improved handling of extended APDUs.
 
  * Make HTTP proxies work again.
 
  * All network access including DNS as been moved to Dirmngr.
 
  * Allow building without LDAP support.
 
  * Fixed lots of smaller bugs.
 
  See-also: gnupg-announce/2015q2/000366.html
 
 
 Noteworthy changes in version 2.1.3 (2015-04-11)
 ------------------------------------------------
 
  * gpg: LDAP keyservers are now supported by 2.1.
 
  * gpg: New option --with-icao-spelling.
 
  * gpg: New option --print-pka-records.  Changed the PKA method to use
    CERT records and hashed names.  [Update: --print-pka-records
    replaced in 2.1.14.]
 
  * gpg: New command --list-gcrypt-config.  New parameter "curve"
    for --list-config.
 
  * gpg: Print a NEWSIG status line like gpgsm always did.
 
  * gpg: Print MPI values with --list-packets and --verbose.
 
  * gpg: Write correct MPI lengths with ECC keys.
 
  * gpg: Skip legacy PGP-2 keys while searching.
 
  * gpg: Improved searching for mail addresses when using a keybox.
 
  * gpgsm: Changed default algos to AES-128 and SHA-256.
 
  * gpgtar: Fixed extracting files with sizes of a multiple of 512.
 
  * dirmngr: Fixed SNI handling for hkps pools.
 
  * dirmngr: extra-certs and trusted-certs are now always loaded from
    the sysconfig dir instead of the homedir.
 
  * Fixed possible problems due to compiler optimization, two minor
    regressions, and other bugs.
 
  See-also: gnupg-announce/2015q2/000365.html
 
 
 Noteworthy changes in version 2.1.2 (2015-02-11)
 ------------------------------------------------
 
  * gpg: The parameter 'Passphrase' for batch key generation works
    again.
 
  * gpg: Using a passphrase option in batch mode now has the expected
    effect on --quick-gen-key.
 
  * gpg: Improved reporting of unsupported PGP-2 keys.
 
  * gpg: Added support for algo names when generating keys using
    --command-fd.
 
  * gpg: Fixed DoS based on bogus and overlong key packets.
 
  * agent: When setting --default-cache-ttl the value
    for --max-cache-ttl is adjusted to be not lower than the former.
 
  * agent: Fixed problems with the new --extra-socket.
 
  * agent: Made --allow-loopback-pinentry changeable with gpgconf.
 
  * agent: Fixed importing of unprotected openpgp keys.
 
  * agent: Now tries to use a fallback pinentry if the standard
    pinentry is not installed.
 
  * scd: Added support for ECDH.
 
  * Fixed several bugs related to bogus keyrings and improved some
    other code.
 
  See-also: gnupg-announce/2015q1/000361.html
 
 
 Noteworthy changes in version 2.1.1 (2014-12-16)
 ------------------------------------------------
 
  * gpg: Detect faulty use of --verify on detached signatures.
 
  * gpg: New import option "keep-ownertrust".
 
  * gpg: New sub-command "factory-reset" for --card-edit.
 
  * gpg: A stub key for smartcards is now created by --card-status.
 
  * gpg: Fixed regression in --refresh-keys.
 
- * gpg: Fixed regresion in %g and %p codes for --sig-notation.
+ * gpg: Fixed regression in %g and %p codes for --sig-notation.
 
  * gpg: Fixed best matching hash algo detection for ECDSA and EdDSA.
 
  * gpg: Improved perceived speed of secret key listisngs.
 
  * gpg: Print number of skipped PGP-2 keys on import.
 
  * gpg: Removed the option aliases --throw-keyid and --notation-data;
    use --throw-keyids and --set-notation instead.
 
  * gpg: New import option "keep-ownertrust".
 
  * gpg: Skip too large keys during import.
 
  * gpg,gpgsm: New option --no-autostart to avoid starting gpg-agent or
    dirmngr.
 
  * gpg-agent: New option --extra-socket to provide a restricted
    command set for use with remote clients.
 
  * gpgconf --kill does not anymore start a service only to kill it.
 
  * gpg-pconnect-agent: Add convenience option --uiserver.
 
  * Fixed keyserver access for Windows.
 
  * Fixed build problems on Mac OS X
 
  * The Windows installer does now install development files
 
  * More translations (but most of them are not complete).
 
  * To support remotely mounted home directories, the IPC sockets may
    now be redirected.  This feature requires Libassuan 2.2.0.
 
  * Improved portability and the usual bunch of bug fixes.
 
  See-also: gnupg-announce/2014q4/000360.html
 
 
 Noteworthy changes in version 2.1.0 (2014-11-06)
 ------------------------------------------------
 
  This release introduces a lot of changes.  Most of them are internal
  and thus not user visible.  However, some long standing behavior has
  slightly changed and it is strongly suggested that an existing
  "~/.gnupg" directory is backed up before this version is used.
 
  A verbose description of the major new features and changes can be
  found in the file doc/whats-new-in-2.1.txt.
 
  * gpg: All support for v3 (PGP 2) keys has been dropped.  All
    signatures are now created as v4 signatures.  v3 keys will be
    removed from the keyring.
 
  * gpg: With pinentry-0.9.0 the passphrase "enter again" prompt shows
    up in the same window as the "new passphrase" prompt.
 
  * gpg: Allow importing keys with duplicated long key ids.
 
  * dirmngr: May now be build without support for LDAP.
 
  * For a complete list of changes see the lists of changes for the
    2.1.0 beta versions below.  Note that all relevant fixes from
    versions 2.0.14 to 2.0.26 are also applied to this version.
 
 
  [Noteworthy changes in version 2.1.0-beta864 (2014-10-03)]
 
  * gpg: Removed the GPG_AGENT_INFO related code.  GnuPG does now
    always use a fixed socket name in its home directory.
 
  * gpg: Renamed --gen-key to --full-gen-key and re-added a --gen-key
    command with less choices.
 
  * gpg: Use SHA-256 for all signature types also on RSA keys.
 
  * gpg: Default keyring is now created with a .kbx suffix.
 
- * gpg: Add a shortcut to the key capabilies menu (e.g. "=e" sets the
+ * gpg: Add a shortcut to the key capabilities menu (e.g. "=e" sets the
    encryption capabilities).
 
  * gpg: Fixed obsolete options parsing.
 
  * Further improvements for the alternative speedo build system.
 
 
  [Noteworthy changes in version 2.1.0-beta834 (2014-09-18)]
 
  * gpg: Improved passphrase caching.
 
  * gpg: Switched to algorithm number 22 for EdDSA.
 
  * gpg: Removed CAST5 from the default preferences.
 
  * gpg: Order SHA-1 last in the hash preferences.
 
  * gpg: Changed default cipher for --symmetric to AES-128.
 
  * gpg: Fixed export of ECC keys and import of EdDSA keys.
 
  * dirmngr: Fixed the KS_FETCH command.
 
  * The speedo build system now downloads related packages and works
    for non-Windows platforms.
 
 
  [Noteworthy changes in version 2.1.0-beta783 (2014-08-14)]
 
  * gpg: Add command --quick-gen-key.
 
  * gpg: Make --quick-sign-key promote local key signatures.
 
  * gpg: Added "show-usage" sub-option to --list-options.
 
  * gpg: Screen keyserver responses to avoid importing unwanted keys
    from rogue servers.
 
  * gpg: Removed the option --pgp2 and --rfc1991 and the ability to
    create PGP-2 compatible messages.
 
  * gpg: Removed options --compress-keys and --compress-sigs.
 
  * gpg: Cap attribute packets at 16MB.
 
  * gpg: Improved output of --list-packets.
 
  * gpg: Make with-colons output of --search-keys work again.
 
  * gpgsm: Auto-create the ".gnupg" directory like gpg does.
 
  * agent: Fold new passphrase warning prompts into one.
 
  * scdaemon: Add support for the Smartcard-HSM card.
 
  * scdaemon: Remove the use of the pcsc-wrapper.
 
 
  [Noteworthy changes in version 2.1.0-beta751 (2014-07-03)]
 
  * gpg: Create revocation certificates during key generation.
 
  * gpg: Create exported secret keys and revocation certifciates with
    mode 0700
 
  * gpg: The validity of user ids is now shown by default.  To revert
    this add "list-options no-show-uid-validity" to gpg.conf.
 
  * gpg: Make export of secret keys work again.
 
  * gpg: The output of --list-packets does now print the offset of the
    packet and information about the packet header.
 
  * gpg: Avoid DoS due to garbled compressed data packets. [CVE-2014-4617]
 
  * gpg: Print more specific reason codes with the INV_RECP status.
 
  * gpg: Cap RSA and Elgamal keysize at 4096 bit also for unattended
    key generation.
 
  * scdaemon: Support reader Gemalto IDBridge CT30 and pinpad of SCT
    cyberJack go.
 
  * The speedo build system has been improved.  It is now also possible
    to build a partly working installer for Windows.
 
 
  [Noteworthy changes in version 2.1.0-beta442 (2014-06-05)]
 
  * gpg: Changed the format of key listings.  To revert to the old
    format the option --legacy-list-mode is available.
 
  * gpg: Add experimental signature support using curve Ed25519 and
    with a patched Libgcrypt also encryption support with Curve25519.
    [Update: this encryption support has been removed from 2.1.0 until
    we have agreed on a suitable format.]
 
  * gpg: Allow use of Brainpool curves.
 
  * gpg: Accepts a space separated fingerprint as user ID.  This
    allows to copy and paste the fingerprint from the key listing.
 
  * gpg: The hash algorithm is now printed for signature records in key
    listings.
 
  * gpg: Reject signatures made using the MD5 hash algorithm unless the
    new option --allow-weak-digest-algos or --pgp2 are given.
 
  * gpg: Print a warning if the Gnome-Keyring-Daemon intercepts the
    communication with the gpg-agent.
 
  * gpg: New option --pinentry-mode.
 
  * gpg: Fixed decryption using an OpenPGP card.
 
  * gpg: Fixed bug with deeply nested compressed packets.
 
  * gpg: Only the major version number is by default included in the
    armored output.
 
  * gpg: Do not create a trustdb file if --trust-model=always is used.
 
  * gpg: Protect against rogue keyservers sending secret keys.
 
  * gpg: The format of the fallback key listing ("gpg KEYFILE") is now
    more aligned to the regular key listing ("gpg -k").
 
  * gpg: The option--show-session-key prints its output now before the
    decryption of the bulk message starts.
 
  * gpg: New %U expando for the photo viewer.
 
  * gpg,gpgsm: New option --with-secret.
 
  * gpgsm: By default the users are now asked via the Pinentry whether
    they trust an X.509 root key.  To prohibit interactive marking of
    such keys, the new option --no-allow-mark-trusted may be used.
 
  * gpgsm: New commands to export a secret RSA key in PKCS#1 or PKCS#8
    format.
 
  * gpgsm: Improved handling of re-issued CA certificates.
 
  * agent: The included ssh agent does now support ECDSA keys.
 
  * agent: New option --enable-putty-support to allow gpg-agent on
    Windows to act as a Pageant replacement with full smartcard support.
 
  * scdaemon: New option --enable-pinpad-varlen.
 
  * scdaemon: Various fixes for pinpad equipped card readers.
 
  * scdaemon: Rename option --disable-pinpad (was --disable-keypad).
 
  * scdaemon: Better support fo CCID readers.  Now, internal CCID
    driver supports readers with no auto configuration feature.
 
  * dirmngr: Removed support for the original HKP keyserver which is
    not anymore used by any site.
 
  * dirmngr: Improved support for keyserver pools.
 
  * tools: New option --dirmngr for gpg-connect-agent.
 
  * The GNU Pth library has been replaced by the new nPth library.
 
  * Support installation as portable application under Windows.
 
  * All kind of other improvements - see the git log.
 
 
  [Noteworthy changes in version 2.1.0beta3 (2011-12-20)]
 
  * gpg: Fixed regression in the secret key export function.
 
  * gpg: Allow generation of card keys up to 4096 bit.
 
  * gpgsm: Preliminary support for the validation model "steed".
 
  * gpgsm: Improved certificate creation.
 
  * agent: Support the SSH confirm flag.
 
  * agent: New option to select a passphrase mode.  The loopback
    mode may be used to bypass Pinentry.
 
  * agent: The Assuan commands KILLAGENT and KILLSCD are working again.
 
  * scdaemon: Does not anymore block after changing a card (regression
    fix).
 
- * tools: gpg-connect-agent does now proberly display the help output
+ * tools: gpg-connect-agent does now properly display the help output
    for "SCD HELP" commands.
 
 
  [Noteworthy changes in version 2.1.0beta2 (2011-03-08)]
 
  * gpg: ECC support as described by draft-jivsov-openpgp-ecc-06.txt
    [Update: now known as RFC-6637].
 
  * gpg: Print "AES128" instead of "AES".  This change introduces a
    little incompatibility for tools using "gpg --list-config".  We
    hope that these tools are written robust enough to accept this new
    algorithm name as well.
 
  * gpgsm: New feature to create certificates from a parameter file.
    Add prompt to the --gen-key UI to create self-signed certificates.
 
  * agent: TMPDIR is now also honored when creating a socket using
    the --no-standard-socket option and with symcryptrun's temp files.
 
  * scdaemon: Fixed a bug where scdaemon sends a signal to gpg-agent
    running in non-daemon mode.
 
  * dirmngr: Fixed CRL loading under W32 (bug#1010).
 
  * Dirmngr has taken over the function of the keyserver helpers.  Thus
    we now have a specified direct interface to keyservers via Dirmngr.
    LDAP, DNS and mail backends are not yet implemented.
 
  * Fixed TTY management for pinentries and session variable update
    problem.
 
 
  [Noteworthy changes in version 2.1.0beta1 (2010-10-26)]
 
  * gpg: secring.gpg is not anymore used but all secret key operations
    are delegated to gpg-agent.  The import command moves secret keys
    to the agent.
 
  * gpg: The OpenPGP import command is now able to merge secret keys.
 
  * gpg: Encrypted OpenPGP messages with trailing data (e.g. other
    OpenPGP packets) are now correctly parsed.
 
  * gpg: Given sufficient permissions Dirmngr is started automagically.
 
  * gpg: Fixed output of "gpgconf --check-options".
 
  * gpg: Removed options --export-options(export-secret-subkey-passwd)
    and --simple-sk-checksum.
 
  * gpg: New options --try-secret-key.
 
  * gpg: Support DNS lookups for SRV, PKA and CERT on W32.
 
  * gpgsm: The --audit-log feature is now more complete.
 
  * gpgsm: The default for --include-cert is now to include all
    certificates in the chain except for the root certificate.
 
  * gpgsm: New option --ignore-cert-extension.
 
  * g13: The G13 tool for disk encryption key management has been
    added.
 
  * agent: If the agent's --use-standard-socket option is active, all
    tools try to start and daemonize the agent on the fly.  In the past
    this was only supported on W32; on non-W32 systems the new
    configure option --disable-standard-socket may now be used to
    disable this new default.
 
  * agent: New and changed passphrases are now created with an
    iteration count requiring about 100ms of CPU work.
 
  * dirmngr: Dirmngr is now a part of this package.  It is now also
    expected to run as a system service and the configuration
    directories are changed to the GnuPG name space. [Update: 2.1.0
    starts dirmngr on demand as user daemon.]
 
  * Support for Windows CE. [Update: This has not been tested for the
    2.1.0 release]
 
  * Numerical values may now be used as an alternative to the
    debug-level keywords.
 
  See-also: gnupg-announce/2014q4/000358.html
 
 
 Version 2.0.28 (2015-06-02)
 Version 2.0.27 (2015-02-18)
 Version 2.0.26 (2014-08-12)
 Version 2.0.25 (2014-06-30)
 Version 2.0.24 (2014-06-24)
 Version 2.0.23 (2014-06-03)
 Version 2.0.22 (2013-10-04)
 Version 2.0.21 (2013-08-19)
 Version 2.0.20 (2013-05-10)
 Version 2.0.19 (2012-03-27)
 Version 2.0.18 (2011-08-04)
 Version 2.0.17 (2011-01-13)
 Version 2.0.16 (2010-07-19)
 Version 2.0.15 (2010-03-09)
 Version 2.0.14 (2009-12-21)
 
 
 Noteworthy changes in version 2.0.13 (2009-09-04)
 -------------------------------------------------
 
  * GPG now generates 2048 bit RSA keys by default.  The default hash
    algorithm preferences has changed to prefer SHA-256 over SHA-1.
    2048 bit DSA keys are now generated to use a 256 bit hash algorithm
 
  * The envvars XMODIFIERS, GTK_IM_MODULE and QT_IM_MODULE are now
    passed to the Pinentry to make SCIM work.
 
  * The GPGSM command --gen-key features a --batch mode and implements
    all features of gpgsm-gencert.sh in standard mode.
 
  * New option --re-import for GPGSM's IMPORT server command.
 
  * Enhanced writing of existing keys to OpenPGP v2 cards.
 
  * Add hack to the internal CCID driver to allow the use of some
    Omnikey based card readers with 2048 bit keys.
 
- * GPG now repeatly asks the user to insert the requested OpenPGP
+ * GPG now repeatedly asks the user to insert the requested OpenPGP
    card.  This can be disabled with --limit-card-insert-tries=1.
 
  * Minor bug fixes.
 
  See-also: gnupg-announce/2009q3/000294.html
 
 
 Noteworthy changes in version 2.0.12 (2009-06-17)
 -------------------------------------------------
 
  * GPGSM now always lists ephemeral certificates if specified by
    fingerprint or keygrip.
 
  * New command "KEYINFO" for GPG_AGENT.  GPGSM now also returns
    information about smartcards.
 
  * Made sure not to leak file descriptors if running gpg-agent with a
    command.  Restore the signal mask to solve a problem in Mono.
 
  * Changed order of the confirmation questions for root certificates
    and store negative answers in trustlist.txt.
 
  * Better synchronization of concurrent smartcard sessions.
 
  * Support 2048 bit OpenPGP cards.
 
  * Support Telesec Netkey 3 cards.
 
  * The gpg-protect-tool now uses gpg-agent via libassuan.  Under
    Windows the Pinentry will now be put into the foreground.
 
  * Changed code to avoid a possible Mac OS X system freeze.
 
  See-also: gnupg-announce/2009q2/000288.html
 
 
 Noteworthy changes in version 2.0.11 (2009-03-03)
 -------------------------------------------------
 
  * Fixed a problem in SCDAEMON which caused unexpected card resets.
 
  * SCDAEMON is now aware of the Geldkarte.
 
  * The SCDAEMON option --allow-admin is now used by default.
 
  * GPGCONF now restarts SCdaemon if necessary.
 
  * The default cipher algorithm in GPGSM is now again 3DES.  This is
    due to interoperability problems with Outlook 2003 which still
    can't cope with AES.
 
  See-also: gnupg-announce/2009q1/000287.html
 
 
 Noteworthy changes in version 2.0.10 (2009-01-12)
 -------------------------------------------------
 
  * [gpg] New keyserver helper gpg2keys_kdns as generic DNS CERT
    lookup.  Run with --help for a short description.  Requires the
    ADNS library.
 
  * [gpg] New mechanisms "local" and "nodefault" for --auto-key-locate.
    Fixed a few problems with this option.
 
  * [gpg] New command --locate-keys.
 
  * [gpg] New options --with-sig-list and --with-sig-check.
 
  * [gpg] The option "-sat" is no longer an alias for --clearsign.
 
  * [gpg] The option --fixed-list-mode is now implicitly used and obsolete.
 
  * [gpg] New control statement %ask-passphrase for the unattended key
    generation.
 
  * [gpg] The algorithm to compute the SIG_ID status has been changed.
 
  * [gpgsm] Now uses AES by default.
 
  * [gpgsm] Made --output option work with --export-secret-key-p12.
 
  * [gpg-agent] Terminate process if the own listening socket is not
    anymore served by ourself.
 
  * [scdaemon] Made it more robust on W32.
 
  * [gpg-connect-agent] Accept commands given as command line arguments.
 
  * [w32] Initialized the socket subsystem for all keyserver helpers.
 
  * [w32] The sysconf directory has been moved from a subdirectory of
    the installation directory to %CSIDL_COMMON_APPDATA%/GNU/etc/gnupg.
 
  * [w32] The gnupg2.nls directory is not anymore used.  The standard
    locale directory is now used.
 
  * [w32] Fixed a race condition between gpg and gpgsm in the use of
    temporary file names.
 
  * The gpg-preset-passphrase mechanism works again.  An arbitrary
    string may now be used for a custom cache ID.
 
  * Admin PINs are cached again (bug in 2.0.9).
 
  * Support for version 2 OpenPGP cards.
 
  * Libgcrypt 1.4 is now required.
 
  See-also: gnupg-announce/2009q1/000284.html
 
 
 Noteworthy changes in version 2.0.9 (2008-03-26)
 ------------------------------------------------
 
  * Gpgsm always tries to locate missing certificates from a running
    Dirmngr's cache.
 
  * Tweaks for Windows.
 
  * The Admin PIN for OpenPGP cards may now be entered with the pinpad.
 
  * Improved certificate chain construction.
 
  * Extended the PKITS framework.
 
- * Fixed a bug in the ambigious name detection.
+ * Fixed a bug in the ambiguous name detection.
 
  * Fixed possible memory corruption while importing OpenPGP keys (bug
    introduced with 2.0.8). [CVE-2008-1530]
 
  * Minor bug fixes.
 
 
 
 Noteworthy changes in version 2.0.8 (2007-12-20)
 ------------------------------------------------
 
  * Enhanced gpg-connect-agent with a small scripting language.
 
  * New option --list-config for gpgconf.
 
  * Fixed a crash in gpgconf.
 
  * Gpg-agent now supports the passphrase quality bar of the latest
    Pinentry.
 
  * The envvars XAUTHORITY and PINENTRY_USER_DATA are now passed to the
    Pinentry.
 
  * Fixed the auto creation of the key stub for smartcards.
 
  * Fixed a rare bug in decryption using the OpenPGP card.
 
  * Creating DSA2 keys is now possible.
 
  * New option --extra-digest-algo for gpgsm to allow verification of
    broken signatures.
 
  * Allow encryption with legacy Elgamal sign+encrypt keys with option
    --rfc2440.
 
  * Windows is now a supported platform.
 
  * Made sure that under Windows the file permissions of the socket are
    taken into account.  This required a change of our socket emulation
    code and changed the IPC protocol under Windows.
 
  See-also: gnupg-announce/2007q4/000267.html
 
 
 Noteworthy changes in version 2.0.7 (2007-09-10)
 ------------------------------------------------
 
  * Fixed encryption problem if duplicate certificates are in the
    keybox.
 
  * Made it work on Windows Vista.  Note that the entire Windows port
    is still considered Beta.
 
  * Add new options min-passphrase-nonalpha, check-passphrase-pattern,
    enforce-passphrase-constraints and max-passphrase-days to
    gpg-agent.
 
  * Add command --check-components to gpgconf.  Gpgconf now uses the
    installed versions of the programs and does not anymore search via
    PATH for them.
 
  See-also: gnupg-announce/2007q3/000259.html
 
 
 Noteworthy changes in version 2.0.6 (2007-08-16)
 ------------------------------------------------
 
  * GPGSM does now grok --default-key.
 
  * GPGCONF is now aware of --default-key and --encrypt-to.
 
  * GPGSM does again correctly print the serial number as well the the
    various keyids.  This was broken since 2.0.4.
 
  * New option --validation-model and support for the chain-model.
 
  * Improved Windows support.
 
  See-also: gnupg-announce/2007q3/000258.html
 
 
 Noteworthy changes in version 2.0.5 (2007-07-05)
 ------------------------------------------------
 
  * Switched license to GPLv3.
 
  * Basic support for Windows.  Run "./autogen.sh --build-w32" to build
    it.  As usual the mingw cross compiling toolchain is required.
 
  * Fixed bug when using the --p12-charset without --armor.
 
  * The command --gen-key may now be used instead of the
    gpgsm-gencert.sh script.
 
  * Changed key generation to reveal less information about the
    machine.  Bug fixes for gpg2's card key generation.
 
  See-also: gnupg-announce/2007q3/000255.html
 
 
 Noteworthy changes in version 2.0.4 (2007-05-09)
 ------------------------------------------------
 
  * The server mode key listing commands are now also working for
    systems without the funopen/fopencookie API.
 
  * PKCS#12 import now tries several encodings in case the passphrase
    was not utf-8 encoded.  New option --p12-charset for gpgsm.
 
  * Improved the libgcrypt logging support in all modules.
 
  See-also: gnupg-announce/2007q2/000254.html
 
 
 Noteworthy changes in version 2.0.3 (2007-03-08)
 ------------------------------------------------
 
  * By default, do not allow processing multiple plaintexts in a single
    stream.  Many programs that called GnuPG were assuming that GnuPG
    did not permit this, and were thus not using the plaintext boundary
    status tags that GnuPG provides.  This change makes GnuPG reject
    such messages by default which makes those programs safe again.
    --allow-multiple-messages returns to the old behavior. [CVE-2007-1263].
 
  * New --verify-option show-primary-uid-only.
 
  * gpgconf may now reads a global configuration file to select which
    options are changeable by a frontend.  The new applygnupgdefaults
    tool may be used by an admin to set default options for all users.
 
  * The PIN pad of the Cherry XX44 keyboard is now supported.  The
    DINSIG and the NKS applications are now also aware of PIN pads.
 
  See-also: gnupg-announce/2007q1/000252.html
 
 
 Noteworthy changes in version 2.0.2 (2007-01-31)
 ------------------------------------------------
 
  * Fixed a serious and exploitable bug in processing encrypted
    packages. [CVE-2006-6235].
 
  * Added --passphrase-repeat to set the number of times GPG will
    prompt for a new passphrase to be repeated.  This is useful to help
    memorize a new passphrase.  The default is 1 repetition.
 
  * Using a PIN pad does now also work for the signing key.
 
  * A warning is displayed by gpg-agent if a new passphrase is too
    short.  New option --min-passphrase-len defaults to 8.
 
  * The status code BEGIN_SIGNING now shows the used hash algorithms.
 
  See-also: gnupg-announce/2007q1/000249.html
 
 
 Noteworthy changes in version 2.0.1 (2006-11-28)
 ------------------------------------------------
 
  * Experimental support for the PIN pads of the SPR 532 and the Kaan
    Advanced card readers.  Add "disable-keypad" scdaemon.conf if you
    don't want it.  Does currently only work for the OpenPGP card and
    its authentication and decrypt keys.
 
  * Fixed build problems on some some platforms and crashes on amd64.
 
  * Fixed a buffer overflow in gpg2. [bug#728,CVE-2006-6169]
 
  See-also: gnupg-announce/2006q4/000242.html
 
 
 Noteworthy changes in version 2.0.0 (2006-11-11)
 ------------------------------------------------
 
  * First stable version of a GnuPG integrating OpenPGP and S/MIME.
 
  See-also: gnupg-announce/2006q4/000239.html
 
 
 Noteworthy changes in version 1.9.95 (2006-11-06)
 -------------------------------------------------
 
  * Minor bug fixes.
 
 
 Noteworthy changes in version 1.9.94 (2006-10-24)
 -------------------------------------------------
 
  * Keys for gpgsm may now be specified using a keygrip.  A keygrip is
    indicated by a prefixing it with an ampersand.
 
  * gpgconf now supports switching the CMS cipher algo (e.g. to AES).
 
  * New command --gpgconf-test for all major tools. This may be used to
    check whether the configuration file is sane.
 
 
 Noteworthy changes in version 1.9.93 (2006-10-18)
 -------------------------------------------------
 
  * In --with-validation mode gpgsm will now also ask whether a root
    certificate should be trusted.
 
  * Link to Pth only if really necessary.
 
  * Fixed a pubring corruption bug in gpg2 occurring when importing
    signatures or keys with insane lengths.
 
  * Fixed v3 keyID calculation bug in gpg2.
 
  * More tweaks for certificates without extensions.
 
 
 Noteworthy changes in version 1.9.92 (2006-10-11)
 -------------------------------------------------
 
  * Bug fixes.
 
  See-also: gnupg-announce/2006q4/000236.html
 
 
 Noteworthy changes in version 1.9.91 (2006-10-04)
 -------------------------------------------------
 
  * New "relax" flag for trustlist.txt to allow root CA certificates
    without BasicContraints.
 
  * [gpg2] Removed the -k PGP 2 compatibility hack.  -k is now an
    alias for --list-keys.
 
  * [gpg2] Print a warning if "-sat" is used instead of "--clearsign".
 
 
 Noteworthy changes in version 1.9.90 (2006-09-25)
 -------------------------------------------------
 
  * Made readline work for gpg.
 
  * Cleanups und minor bug fixes.
 
  * Included translations from gnupg 1.4.5.
 
 
 Noteworthy changes in version 1.9.23 (2006-09-18)
 -------------------------------------------------
 
  * Regular man pages for most tools are now build directly from the
    Texinfo source.
 
  * The gpg code from 1.4.5 has been fully merged into this release.
    The configure option --enable-gpg is still required to build this
    gpg part.  For production use of OpenPGP the gpg version 1.4.5 is
    still recommended.  Note, that gpg will be installed under the name
    gpg2 to allow coexisting with an 1.4.x gpg.
 
  * API change in gpg-agent's pkdecrypt command.  Thus an older gpgsm
    may not be used with the current gpg-agent.
 
  * The scdaemon will now call a script on reader status changes.
 
  * gpgsm now allows file descriptor passing for "INPUT", "OUTPUT" and
    "MESSAGE".
 
  * The gpgsm server may now output a key listing to the output file
    handle. This needs to be enabled using "OPTION list-to-output=1".
 
  * The --output option of gpgsm has now an effect on list-keys.
 
  * New gpgsm commands --dump-chain and list-chain.
 
  * gpg-connect-agent has new options to utilize descriptor passing.
 
  * A global trustlist may now be used.  See doc/examples/trustlist.txt.
 
  * When creating a new pubring.kbx keybox common certificates are
    imported.
 
 
 Noteworthy changes in version 1.9.22 (2006-07-27)
 -------------------------------------------------
 
  * Enhanced pkcs#12 support to allow import from simple keyBags.
 
  * Exporting to pkcs#12 now create bag attributes so that Mozilla is
    able to import the files.
 
  * Fixed uploading of certain keys to the smart card.
 
 
 Noteworthy changes in version 1.9.21 (2006-06-20)
 -------------------------------------------------
 
  * New command APDU for scdaemon to allow using it for general card
    access.  Might be used through gpg-connect-agent by using the SCD
    prefix command.
 
  * Support for the CardMan 4040 PCMCIA reader (Linux 2.6.15 required).
 
  * Scdaemon does not anymore reset cards at the end of a connection.
 
  * Kludge to allow use of Bundesnetzagentur issued X.509 certificates.
 
  * Added --hash=xxx option to scdaemon's PKSIGN command.
 
  * Pkcs#12 files are now created with a MAC.  This is for better
    interoperability.
 
  * Collected bug fixes and minor other changes.
 
 
 Noteworthy changes in version 1.9.20 (2005-12-20)
 -------------------------------------------------
 
  * Importing pkcs#12 files created be recent versions of Mozilla works
    again.
 
  * Basic support for qualified signatures.
 
  * New debug tool gpgparsemail.
 
 
 Noteworthy changes in version 1.9.19 (2005-09-12)
 -------------------------------------------------
 
  * The Belgian eID card is now supported for signatures and ssh.
    Other pkcs#15 cards should work as well.
 
  * Fixed bug in --export-secret-key-p12 so that certificates are again
    included.
 
 
 Noteworthy changes in version 1.9.18 (2005-08-01)
 -------------------------------------------------
 
  * [gpgsm] Now allows for more than one email address as well as URIs
    and dnsNames in certificate request generation.  A keygrip may be
    given to create a request from an existing key.
 
  * A couple of minor bug fixes.
 
 
 Noteworthy changes in version 1.9.17 (2005-06-20)
 -------------------------------------------------
 
  * gpg-connect-agent has now features to handle Assuan INQUIRE
    commands.
 
  * Internal changes for OpenPGP cards. New Assuan command WRITEKEY.
 
  * GNU Pth is now a hard requirement.
 
  * [scdaemon] Support for OpenSC has been removed.  Instead a new and
    straightforward pkcs#15 modules has been written.  As of now it
    does allows only signing using TCOS cards but we are going to
    enhance it to match all the old capabilities.
 
  * [gpg-agent] New option --write-env-file and Assuan command
    UPDATESTARTUPTTY.
 
  * [gpg-agent] New option --default-cache-ttl-ssh to set the TTL for
    SSH passphrase caching independent from the other passphrases.
 
 
 Noteworthy changes in version 1.9.16 (2005-04-21)
 -------------------------------------------------
 
  * gpg-agent does now support the ssh-agent protocol and thus allows
    to use the pinentry as well as the OpenPGP smartcard with ssh.
 
  * New tool gpg-connect-agent as a general client for the gpg-agent.
 
  * New tool symcryptrun as a wrapper for certain encryption tools.
 
  * The gpg tool is not anymore build by default because those gpg
    versions available in the gnupg 1.4 series are far more matured.
 
 
 Noteworthy changes in version 1.9.15 (2005-01-13)
 -------------------------------------------------
 
  * Fixed passphrase caching bug.
 
  * Better support for CCID readers; the reader from Cherry RS 6700 USB
    does now work.
 
 
 Noteworthy changes in version 1.9.14 (2004-12-22)
 -------------------------------------------------
 
  * [gpg-agent] New option --use-standard-socket to allow the use of a
    fixed socket.  gpgsm falls back to this socket if GPG_AGENT_INFO
    has not been set.
 
  * Ported to MS Windows with some functional limitations.
 
  * New tool gpg-preset-passphrase.
 
 
 Noteworthy changes in version 1.9.13 (2004-12-03)
 -------------------------------------------------
 
  * [gpgsm] New option --prefer-system-dirmngr.
 
  * Minor cleanups and debugging aids.
 
 
 Noteworthy changes in version 1.9.12 (2004-10-22)
 -------------------------------------------------
 
  * [scdaemon] Partly rewrote the PC/SC code.
 
  * Removed the sc-investigate tool.  It is now in a separate package
    available at ftp://ftp.g10code.com/g10code/gscutils/ .
 
  * [gpg-agent] Fixed logging problem.
 
 
 Noteworthy changes in version 1.9.11 (2004-10-01)
 -------------------------------------------------
 
  * When using --import along with --with-validation, the imported
    certificates are validated and only imported if they are fully
    valid.
 
  * [gpg-agent] New option --max-cache-ttl.
 
  * [gpg-agent] When used without --daemon or --server, gpg-agent now
    check whether a agent is already running and usable.
 
  * Fixed some i18n problems.
 
 
 Noteworthy changes in version 1.9.10 (2004-07-22)
 -------------------------------------------------
 
  * Fixed a serious bug in the checking of trusted root certificates.
 
  * New configure option --enable-agent-pnly allows to build and
    install just the agent.
 
  * Fixed a problem with the log file handling.
 
 
 Noteworthy changes in version 1.9.9 (2004-06-08)
 ------------------------------------------------
 
  * [gpg-agent] The new option --allow-mark-trusted is now required to
    allow gpg-agent to add a key to the trustlist.txt after user
    confirmation.
 
  * Creating PKCS#10 requests does now honor the key usage.
 
 
 Noteworthy changes in version 1.9.8 (2004-04-29)
 ------------------------------------------------
 
  * [scdaemon] Overhauled the internal CCID driver.
 
  * [scdaemon] Status files named ~/.gnupg/reader_<n>.status are now
    written when using the internal CCID driver.
 
  * [gpgsm] New commands --dump-{,secret,external}-keys to show a very
    detailed view of the certificates.
 
  * The keybox gets now compressed after 3 hours and ephemeral
    stored certificates are deleted after about a day.
 
  * [gpg] Usability fixes for --card-edit.  Note, that this has already
    been ported back to gnupg-1.3
 
 
 Noteworthy changes in version 1.9.7 (2004-04-06)
 ------------------------------------------------
 
  * Instrumented the modules for gpgconf.
 
  * Added support for DINSIG card applications.
 
  * Include the smimeCapabilities attribute with signed messages.
 
  * Now uses the gettext domain "gnupg2" to avoid conflicts with gnupg
    versions < 1.9.
 
 
 Noteworthy changes in version 1.9.6 (2004-03-06)
 ------------------------------------------------
 
  * Code cleanups and bug fixes.
 
 
 Noteworthy changes in version 1.9.5 (2004-02-21)
 ------------------------------------------------
 
  * gpg-protect-tool gets now installed into libexec as it ought to be.
    Cleaned up the build system to better comply with the coding
    standards.
 
  * [gpgsm] The --import command is now able to autodetect pkcs#12
    files and import secret and private keys from this file format.
    A new command --export-secret-key-p12 is provided to allow
    exporting of secret keys in PKCS\#12 format.
 
  * [gpgsm] The pinentry will now present a description of the key for
    whom the passphrase is requested.
 
  * [gpgsm] New option --with-validation to check the validity of key
    while listing it.
 
  * New option --debug-level={none,basic,advanced,expert,guru} to map
    the debug flags to sensitive levels on a per program base.
 
 
 Noteworthy changes in version 1.9.4 (2004-01-30)
 ------------------------------------------------
 
  * Added support for the Telesec NKS 2.0 card application.
 
  * Added simple tool addgnupghome to create .gnupg directories from
    /etc/skel/.gnupg.
 
  * Various minor bug fixes and cleanups; mainly gpgsm and gpg-agent
    related.
 
 
 Noteworthy changes in version 1.9.3 (2003-12-23)
 ------------------------------------------------
 
  * New gpgsm options --{enable,disable}-ocsp to validate keys using
    OCSP. This option requires a not yet released DirMngr version.
    Default is disabled.
 
  * The --log-file option may now be used to print logs to a socket.
    Prefix the socket name with "socket://" to enable this.  This does
    not work on all systems and falls back to stderr if there is a
    problem with the socket.
 
  * The options --encrypt-to and --no-encrypt-to now work the same in
    gpgsm as in gpg.  Note, they are also used in server mode.
 
  * Duplicated recipients are now silently removed in gpgsm.
 
 
 Noteworthy changes in version 1.9.2 (2003-11-17)
 ------------------------------------------------
 
  * On card key generation is no longer done using the --gen-key
    command but from the menu provided by the new --card-edit command.
 
  * PINs are now properly cached and there are only 2 PINs visible.
-   The 3rd PIN (CHV2) is internally syncronized with the regular PIN.
+   The 3rd PIN (CHV2) is internally synchronized with the regular PIN.
 
  * All kind of other internal stuff.
 
 
 Noteworthy changes in version 1.9.1 (2003-09-06)
 ------------------------------------------------
 
  * Support for OpenSC is back. scdaemon supports a --disable-opensc to
    disable OpenSC use at runtime, so that PC/SC or ct-API can still be
    used directly.
 
  * Rudimentary support for the SCR335 smartcard reader using an
    internal driver.  Requires current libusb from CVS.
 
  * Bug fixes.
 
 
 Noteworthy changes in version 1.9.0 (2003-08-05)
 ------------------------------------------------
 
       ====== PLEASE SEE README-alpha =======
 
  * gpg has been renamed to gpg2 and gpgv to gpgv2.  This is a
    temporary change to allow co-existing with stable gpg versions.
 
  * ~/.gnupg/gpg.conf-1.9.0 is fist tried as config file before the
    usual gpg.conf.
 
  * Removed the -k, -kv and -kvv commands.  -k is now an alias to
    --list-keys.  New command -K as alias for --list-secret-keys.
 
  * Removed --run-as-shm-coprocess feature.
 
  * gpg does now also use libgcrypt, libgpg-error is required.
 
  * New gpgsm commands --call-dirmngr and --call-protect-tool.
 
  * Changing a passphrase is now possible using "gpgsm --passwd"
 
  * The content-type attribute is now recognized and created.
 
  * The agent does now reread certain options on receiving a HUP.
 
  * The pinentry is now forked for each request so that clients with
    different environments are supported.  When running in daemon mode
    and --keep-display is not used the DISPLAY variable is ignored.
 
  * Merged stuff from the newpg branch and started this new
    development branch.
 
 
 Version 1.4.19 (2015-02-27)
 Version 1.4.18 (2014-06-30)
 Version 1.4.17 (2014-06-23)
 Version 1.4.16 (2013-12-18)
 Version 1.4.15 (2013-10-04)
 Version 1.4.14 (2013-07-25)
 Version 1.4.13 (2012-12-20)
 Version 1.4.12 (2012-01-30)
 Version 1.4.11 (2010-10-18)
 Version 1.4.10 (2009-09-02)
 Version 1.4.9 (2008-03-26)
 Version 1.4.8 (2007-12-20)
 Version 1.4.7 (2007-03-05)
 Version 1.4.6 (2006-12-06)
 Version 1.4.5 (2006-08-01)
 Version 1.4.4 (2006-06-25)
 Version 1.4.3 (2006-04-03)
 Version 1.4.2 (2005-07-26)
 Version 1.4.1 (2005-03-15)
 Version 1.4.0 (2004-12-16)
 
 
 Noteworthy changes in version 1.3.2 (2003-05-27)
 ------------------------------------------------
 
     * New "--gnupg" option (set by default) that disables --openpgp,
       and the various --pgpX emulation options.  This replaces
       --no-openpgp, and --no-pgpX, and also means that GnuPG has
       finally grown a --gnupg option to make GnuPG act like GnuPG.
 
     * A bug in key validation has been fixed.  This bug only affects
       keys with more than one user ID (photo IDs do not count here),
       and results in all user IDs on a given key being treated with
       the validity of the most-valid user ID on that key.
 
     * Notation names that do not contain a '@' are no longer allowed
       unless --expert is set.  This is to help prevent pollution of
       the (as yet unused) IETF notation namespace.
 
     * Multiple trust models are now supported via the --trust-model
       option.  The options are "pgp" (web-of-trust plus trust
       signatures), "classic" (web-of-trust only), and "always"
       (identical to the --always-trust option).
 
     * The --personal-{cipher|digest|compression}-preferences are now
       consulted to get default algorithms before resorting to the
       last-ditch defaults of --s2k-cipher-algo, SHA1, and ZIP
       respectively.  This allows a user to set algorithms to use in a
       safe manner so they are used when legal to do so, without
       forcing them on for all messages.
 
     * New --primary-keyring option to designate the keyring that the
       user wants new keys imported into.
 
     * --s2k-digest-algo is now used for all password mangling.
       Earlier versions used both --s2k-digest-algo and --digest-algo
       for passphrase mangling.
 
     * Handling of --hidden-recipient or --throw-keyid messages is now
       easier - the user only needs to give their passphrase once, and
       GnuPG will try it against all of the available secret keys.
 
     * Care is taken to prevent compiler optimization from removing
       memory wiping code.
 
     * New option --no-mangle-dos-filenames so that filenames are not
       truncated in the W32 version.
 
     * A "convert-from-106" script has been added.  This is a simple
       script that automates the conversion from a 1.0.6 or earlier
       version of GnuPG to a 1.0.7 or later version.
 
     * Disabled keys are now skipped when selecting keys for
       encryption.  If you are using the --with-colons key listings to
       detect disabled keys, please see doc/DETAILS for a minor format
       change in this release.
 
     * Minor trustdb changes to make the trust calculations match
       common usage.
 
     * New command "revuid" in the --edit-key menu to revoke a user ID.
       This is a simpler interface to the old method (which still
       works) of revoking the user ID self-signature.
 
     * Status VALIDSIG does now also print the primary key's
       fingerprint, as well as the signature version, pubkey algorithm,
       hash algorithm, and signature class.
 
     * Add read-only support for the SHA-256 hash, and optional
       read-only support for the SHA-384 and SHA-512 hashes.
 
     * New option --enable-progress-filter for use with frontends.
 
     * DNS SRV records are used in HKP keyserver lookups to allow
       administrators to load balance and select keyserver ports
       automatically.  This is as specified in
       draft-shaw-openpgp-hkp-00.txt.
 
     * When using the "keyid!" syntax during a key export, only that
       specified key is exported.  If the key in question is a subkey,
       the primary key plus only that subkey is exported.
 
     * configure --disable-xxx options to disable individual algorithms
       at build time.  This can be used to build a smaller gpg binary
       for embedded uses where space is tight.  See the README file for
       the algorithms that can be used with this option, or use
       --enable-minimal to build the smallest gpg possible (disables
       all optional algorithms, disables keyserver access, and disables
       photo IDs).
 
     * The keyserver no-modify flag on a key can now be displayed and
       modified.
 
     * Note that the TIGER/192 digest algorithm is in the process of
       being dropped from the OpenPGP standard.  While this release of
       GnuPG still contains it, it is disabled by default.  To ensure
       you will still be able to use your messages with future versions
       of GnuPG and other OpenPGP programs, please do not use this
       algorithm.
 
     See-also: gnupg-announce/2003q2/000153.html
 
 
 Noteworthy changes in version 1.3.1 (2002-11-12)
 ------------------------------------------------
 
     * Trust signature support.  This is based on the Maurer trust
       model where a user can specify the trust level along with the
       signature with multiple levels so users can delegate
       certification ability to other users, possibly restricted by a
       regular expression on the user ID.  Note that full trust
       signature support requires a regular expression parsing library.
       The regexp code from glibc 2.3.1 is included for those platforms
       that don't have working regexp functions available.  The
       configure option --disable-regex may be used to disable any
       regular expression code, which will make GnuPG ignore any trust
       signature with a regular expression included.
 
     * Two new commands --hidden-recipient (-R) and --hidden-encrypt-to
       encrypt to a user, but hide the identity of that user.  This is
       the same functionality as --throw-keyid, but can be used on a
       per-user basis.
 
     * Full algorithm names (e.g. "3DES", "SHA1", "ZIP") can now be
       used interchangeably with the short algorithm names (e.g. "S2",
       "H2", "Z1") anywhere algorithm names are used in GnuPG.
 
 
 Noteworthy changes in version 1.3.0 (2002-10-18)
 ------------------------------------------------
 
     * The last piece of internal keyserver support has been removed,
       and now all keyserver access is done via the keyserver plugins.
       There is also a newer keyserver protocol used between GnuPG and
       the plugins, so plugins from earlier versions of GnuPG may not
       work properly.
 
     * The HKP keyserver plugin supports the new machine-readable key
       listing format for those keyservers that provide it.
 
     * When using a HKP keyserver with multiple DNS records (such as
       wwwkeys.pgp.net which has the addresses of multiple servers
       around the world), try all records until one succeeds.  Note
       that it depends on the LDAP library used whether the LDAP
       keyserver plugin does this as well.
 
     * The library dependencies for OpenLDAP seem to change fairly
       frequently, and GnuPG's configure script cannot guess all the
       combinations.  Use ./configure LDAPLIBS="-L libdir -l libs" to
       override the script and use the libraries selected.
 
     * Secret keys generated with --export-secret-subkeys are now
       indicated in key listings with a '#' after the "sec", and in
       --with-colons listings by showing no capabilities (no lowercase
       characters).
 
     * --trusted-key has been un-obsoleted, as it is useful for adding
       ultimately trusted keys from the config file.  It is identical
       to using --edit and "trust" to change a key to ultimately
       trusted.
 
     * Translations other than de are no longer distributed with the
       development branch.  This is due to the frequent text changes
       during development, which cause the translations to rapidly go
       out of date.
 
 
 Version 1.2.8 (2006-12-07)
 Version 1.2.7 (2004-12-27)
 Version 1.2.6 (2004-08-25)
 Version 1.2.5 (2004-07-26)
 Version 1.2.4 (2003-12-23)
 Version 1.2.3 (2003-08-21)
 Version 1.2.2 (2003-05-01)
 Version 1.2.1 (2002-10-25)
 Version 1.2.0 (2002-09-21)
 
 
 Noteworthy changes in version 1.1.92 (2002-09-11)
 -------------------------------------------------
 
     * [IMPORTANT] The default configuration file is now
       ~/.gnupg/gpg.conf.  If an old ~/.gnupg/options is found it will
       still be used.  This change is required to have a more
       consistent naming scheme with forthcoming tools.
 
     * The use of MDCs have increased.  A MDC will be used if the
       recipients directly request it, if the recipients have AES,
       AES192, AES256, or TWOFISH in their cipher preferences, or if
       the chosen cipher has a blocksize not equal to 64 bits
       (currently this is also AES, AES192, AES256, and TWOFISH).
 
     * GnuPG will no longer automatically disable compression when
       processing an already-compressed file unless a MDC is being
       used.  This is to give the message a certain amount of
       resistance to the chosen-ciphertext attack while communicating
       with other programs (most commonly PGP earlier than version 7.x)
       that do not support MDCs.
 
     * The option --interactive now has the desired effect when
       importing keys.
 
     * The file permission and ownership checks on files have been
       clarified.  Specifically, the homedir (usually ~/.gnupg) is
       checked to protect everything within it.  If the user specifies
       keyrings outside this homedir, they are presumed to be shared
       keyrings and therefore *not* checked.  Configuration files
       specified with the --options option and the IDEA cipher
       extension specified with --load-extension are checked, along
       with their enclosing directories.
 
     * The configure option --with-static-rnd=auto allows to build gpg
       with all available entropy gathering modules included.  At
       runtime the best usable one will be selected from the list
       linux, egd, unix.  This is also the default for systems lacking
       a /dev/random device.
 
     * The default character set is now taken from the current locale;
       it can still be overridden by the --charset option.  Using the
       option -vvv shows the used character set.
 
     * [REMOVED] --emulate-checksum-bug and --emulate-3des-s2k-bug have
       been removed.
 
 
 Noteworthy changes in version 1.1.91 (2002-08-04)
 -------------------------------------------------
 
     * All modules are now linked statically; the --load-extension
       option is in general not useful anymore.  The only exception is
       to specify the deprecated idea cipher.
 
     * The IDEA plugin has changed.  Previous versions of the IDEA
       plugin will no longer work with GnuPG.  However, the current
       version of the plugin will work with earlier GnuPG versions.
 
     * When using --batch with one of the --delete-key commands, the
       key must be specified by fingerprint.  See the man page for
       details.
 
     * There are now various ways to restrict the ability GnuPG has to
       exec external programs (for the keyserver helpers or photo ID
       viewers).  Read the README file for the complete list.
 
     * New export option to leave off attribute packets (photo IDs)
       during export.  This is useful when exporting to HKP keyservers
       which do not understand attribute packets.
 
     * New import option to repair during import the HKP keyserver
       mangling multiple subkeys bug.  Note that this cannot completely
       repair the damaged key as some crucial data is removed by the
       keyserver, but it does at least give you back one subkey.  This
       is on by default for keyserver --recv-keys, and off by default
       for regular --import.
 
     * The keyserver helper programs now live in
       /usr/[local/]libexec/gnupg by default.  If you are upgrading
       from 1.0.7, you might want to delete your old copies in
       /usr/[local/]bin.  If you use an OS that does not use libexec
       for whatever reason, use configure --libexecdir=/usr/local/lib
       to place the keyserver helpers there.
 
     * The LDAP keyserver handler now works properly with very old
       (version 1) LDAP keyservers.
 
 
 Noteworthy changes in version 1.1.90 (2002-07-01)
 -------------------------------------------------
 
     * New commands: --personal-cipher-preferences,
       --personal-digest-preferences, and
       --personal-compress-preferences allow the user to specify which
       algorithms are to be preferred.  Note that this does not permit
       using an algorithm that is not present in the recipient's
       preferences (which would violate the OpenPGP standard).  This
       just allows sorting the preferences differently.
 
     * New "group" command to refer to several keys with one name.
 
     * A warning is issued if the user forces the use of an algorithm
       that is not listed in the recipient's preferences.
 
     * Full revocation key (aka "designated revoker") support.
 
     * The preferred hash algorithms on a key are consulted when
       encrypting a signed message to that key.  Note that this is
       disabled by default by a SHA1 preference in
       --personal-digest-preferences.
 
     * --cert-digest-algo allows the user to specify the hash algorithm
       to use when signing a key rather than the default SHA1 (or MD5
       for PGP2 keys).  Do not use this feature unless you fully
       understand the implications of this.
 
     * --pgp7 mode automatically sets all necessary options to ensure
       that the resulting message will be usable by a user of PGP 7.x.
 
     * New --attribute-fd command for frontends and scripts to get the
       contents of attribute packets (i.e. photos)
 
     * In expert mode, the user can now re-sign a v3 key with a v4
       self-signature.  This does not change the v3 key into a v4 key,
       but it does allow the user to use preferences, primary ID flags,
       etc.
 
     * Significantly improved photo ID support on non-unixlike
       platforms.
 
     * The version number has jumped ahead to 1.1.90 to skip over the
       old version 1.1 and to get ready for the upcoming 1.2.
 
     * ElGamal sign and encrypt is not anymore allowed in the key
       generation dialog unless in expert mode.  RSA sign and encrypt
       has been added with the same restrictions.
 
     * [W32] Keyserver access does work with Windows NT.
 
 
 Noteworthy changes in version 1.0.7 (2002-04-29)
 ------------------------------------------------
 
     * Secret keys are now stored and exported in a new format which
       uses SHA-1 for integrity checks.  This format renders the
       Rosa/Klima attack useless.  Other OpenPGP implementations might
       not yet support this, so the option --simple-sk-checksum creates
       the old vulnerable format.
 
     * The default cipher algorithm for encryption is now CAST5,
       default hash algorithm is SHA-1.  This will give us better
       interoperability with other OpenPGP implementations.
 
     * Symmetric encrypted messages now use a fixed file size if
       possible.  This is a tradeoff: it breaks PGP 5, but fixes PGP 2,
       6, and 7.  Note this was only an issue with RFC-1991 style
       symmetric messages.
 
     * Photographic user ID support.  This uses an external program to
       view the images.
 
     * Enhanced keyserver support via keyserver "plugins".  GnuPG comes
       with plugins for the NAI LDAP keyserver as well as the HKP email
       keyserver.  It retains internal support for the HKP HTTP
       keyserver.
 
     * Nonrevocable signatures are now supported.  If a user signs a
       key nonrevocably, this signature cannot be taken back so be
       careful!
 
     * Multiple signature classes are usable when signing a key to
       specify how carefully the key information (fingerprint, photo
       ID, etc) was checked.
 
     * --pgp2 mode automatically sets all necessary options to ensure
       that the resulting message will be usable by a user of PGP 2.x.
 
     * --pgp6 mode automatically sets all necessary options to ensure
       that the resulting message will be usable by a user of PGP 6.x.
 
     * Signatures may now be given an expiration date.  When signing a
       key with an expiration date, the user is prompted whether they
       want their signature to expire at the same time.
 
     * Revocation keys (designated revokers) are now supported if
       present.  There is currently no way to designate new keys as
       designated revokers.
 
     * Permissions on the .gnupg directory and its files are checked
       for safety.
 
     * --expert mode enables certain silly things such as signing a
       revoked user id, expired key, or revoked key.
 
     * Some fixes to build cleanly under Cygwin32.
 
     * New tool gpgsplit to split OpenPGP data formats into packets.
 
     * New option --preserve-permissions.
 
     * Subkeys created in the future are not used for encryption or
       signing unless the new option --ignore-valid-from is used.
 
     * Revoked user-IDs are not listed unless signatures are listed too
       or we are in verbose mode.
 
     * There is no default comment string with ascii armors anymore
       except for revocation certificates and --enarmor mode.
 
     * The command "primary" in the edit menu can be used to change the
       primary UID, "setpref" and "updpref" can be used to change the
       preferences.
 
     * Fixed the preference handling; since 1.0.5 they were erroneously
       matched against against the latest user ID and not the given one.
 
     * RSA key generation.
 
     * Merged Stefan's patches for RISC OS in.  See comments in
       scripts/build-riscos.
 
     * It is now possible to sign and conventional encrypt a message (-cs).
 
     * The MDC feature flag is supported and can be set by using
       the "updpref" edit command.
 
     * The status messages GOODSIG and BADSIG are now returning the primary
       UID, encoded using %XX escaping (but with spaces left as spaces,
       so that it should not break too much)
 
     * Support for GDBM based keyrings has been removed.
 
     * The entire keyring management has been revamped.
 
     * The way signature stati are store has changed so that v3
       signatures can be supported. To increase the speed of many
       operations for existing keyrings you can use the new
       --rebuild-keydb-caches command.
 
     * The entire key validation process (trustdb) has been revamped.
       See the man page entries for --update-trustdb, --check-trustdb
       and --no-auto-check-trustdb.
 
     * --trusted-keys is again obsolete, --edit can be used to set the
       ownertrust of any key to ultimately trusted.
 
     * A subkey is never used to sign keys.
 
     * Read only keyrings are now handled as expected.
 
     See-also: gnupg-announce/2002q2/000135.html
 
 
 Noteworthy changes in version 1.0.6 (2001-05-29)
 ------------------------------------------------
 
     * Security fix for a format string bug in the tty code.
 
     * Fixed format string bugs in all PO files.
 
     * Removed Russian translation due to too many bugs.  The FTP
       server has an unofficial but better translation in the contrib
       directory.
 
     * Fixed expire time calculation and keyserver access.
 
     * The usual set of minor bug fixes and enhancements.
 
     * non-writable keyrings are now correctly handled.
 
     See-also: gnupg-announce/2001q2/000123.html
 
 
 Noteworthy changes in version 1.0.5 (2001-04-29)
 ------------------------------------------------
 
     * WARNING: The semantics of --verify have changed to address a
       problem with detached signature detection. --verify now ignores
       signed material given on stdin unless this is requested by using
       a "-" as the name for the file with the signed material.  Please
       check all your detached signature handling applications and make
       sure that they don't pipe the signed material to stdin without
       using a filename together with "-" on the the command line.
 
     * WARNING: Corrected hash calculation for input data larger than
       512M - it was just wrong, so you might notice bad signature in
       some very big files.  It may be wise to keep an old copy of
       GnuPG around.
 
     * Secret keys are no longer imported unless you use the new option
       --allow-secret-key-import.  This is a kludge and future versions will
       handle it in another way.
 
     * New command "showpref" in the --edit-key menu to show an easier
       to understand preference listing.
 
     * There is now the notation of a primary user ID.  For example, it
       is printed with a signature verification as the first user ID;
       revoked user IDs are not printed there anymore.  In general the
       primary user ID is the one with the latest self-signature.
 
     * New --charset=utf-8 to bypass all internal conversions.
 
     * Large File Support (LFS) is now working.
 
     * New options: --ignore-crc-error, --no-sig-create-check,
       --no-sig-cache, --fixed-list-mode, --no-expensive-trust-checks,
       --enable-special-filenames and --use-agent.  See man page.
 
     * New command --pipemode, which can be used to run gpg as a
       co-process.  Currently only the verification of detached
       signatures are working.  See doc/DETAILS.
 
     * Keyserver support for the W32 version.
 
     * Rewritten key selection code so that GnuPG can better cope with
       multiple subkeys, expire dates and so.  The drawback is that it
       is slower.
 
     * A whole lot of bug fixes.
 
     * The verification status of self-signatures are now cached. To
       increase the speed of key list operations for existing keys you
       can do the following in your GnuPG homedir (~/.gnupg):
          cp pubring.gpg pubring.gpg.save && gpg --export-all >x && \
          rm pubring.gpg && gpg --import x
       Only v4 keys (i.e not the old RSA keys) benefit from this caching.
 
     * New translations: Estonian, Turkish.
 
     See-also: gnupg-announce/2001q2/000122.html
 
 
 Noteworthy changes in version 1.0.4 (2000-10-17)
 ------------------------------------------------
 
     * Fixed a serious bug which could lead to false signature verification
       results when more than one signature is fed to gpg.  This is the
       primary reason for releasing this version.
 
     * New utility gpgv which is a stripped down version of gpg to
       be used to verify signatures against a list of trusted keys.
 
     * Rijndael (AES) is now supported and listed with top preference.
 
     * --with-colons now works with --print-md[s].
 
     See-also: gnupg-announce/2000q4/000082.html
 
 
 Noteworthy changes in version 1.0.3 (2000-09-18)
 ------------------------------------------------
 
     * Fixed problems with piping to/from other MS-Windows software
 
     * Expiration time of the primary key can be changed again.
 
     * Revoked user IDs are now marked in the output of --list-key
 
     * New options --show-session-key and --override-session-key
       to help the British folks to somewhat minimize the danger
       of this Orwellian RIP bill.
 
     * New options --merge-only and --try-all-secrets.
 
     * New configuration option --with-egd-socket.
 
     * The --trusted-key option is back after it left us with 0.9.5
 
     * RSA is supported. Key generation does not yet work but will come
       soon.
 
     * CAST5 and SHA-1 are now the default algorithms to protect the key
       and for symmetric-only encryption. This should solve a couple
       of compatibility problems because the old algorithms are optional
       according to RFC2440
 
     * Twofish and MDC enhanced encryption is now used.  PGP 7 supports
       this.  Older versions of GnuPG don't support it, so they should be
       upgraded to at least 1.0.2
 
     See-also: gnupg-announce/2000q3/000075.html
 
 
 Noteworthy changes in version 1.0.2 (2000-07-12)
 ----------------------------------------------
 
     * Fixed expiration handling of encryption keys.
 
     * Add an experimental feature to do unattended key generation.
 
     * The user is now asked for the reason of revocation as required
       by the new OpenPGP draft.
 
     * There is a ~/.gnupg/random_seed file now which saves the
       state of the internal RNG and increases system performance
       somewhat.  This way the full entropy source is only used in
       cases were it is really required.
       Use the option --no-random-seed-file to disable this feature.
 
     * New options --ignore-time-conflict and --lock-never.
 
     * Some fixes for the W32 version.
 
     * The entropy.dll is not anymore used by the W32 version but replaced
       by code derived from Cryptlib.
 
     * Encryption is now much faster: About 2 times for 1k bit keys
       and 8 times for 4k keys.
 
     * New encryption keys are generated in a way which allows a much
       faster decryption.
 
     * New command --export-secret-subkeys which outputs the
       the _primary_ key with it's secret parts deleted.  This is
       useful for automated decryption/signature creation as it
       allows to keep the real secret primary key offline and
       thereby protecting the key certificates and allowing to
       create revocations for the subkeys.  See the FAQ for a
       procedure to install such secret keys.
 
     * Keygeneration now writes to the first writeable keyring or
       as default to the one in the homedirectory.  Prior versions
       ignored all --keyring options.
 
     * New option --command-fd to take user input from a file descriptor;
       to be used with --status-fd by software which uses GnuPG as a backend.
 
     * There is a new status PROGRESS which is used to show progress during
       key generation.
 
     * Support for the new MDC encryption packets.  To create them either
       --force-mdc must be use or cipher algorithm with a blocksize other
       than 64 bits is to be used.  --openpgp currently disables MDC packets
       entirely.  This option should not yet be used.
 
     * New option --no-auto-key-retrieve to disable retrieving of
       a missing public key from a keyserver, when a keyserver has been set.
 
     * Danish translation
 
     See-also: gnupg-announce/2000q3/000069.html
 
 
 Noteworthy changes in version 1.0.1 (1999-12-16)
 -----------------------------------
 
     * New command --verify-files.  New option --fast-list-mode.
 
     * $http_proxy is now used when --honor-http-proxy is set.
 
     * Fixed some minor bugs and the problem with conventional encrypted
       packets which did use the gpg v3 partial length headers.
 
-    * Add Indonesian and Portugese translations.
+    * Add Indonesian and Portuguese translations.
 
     * Fixed a bug with symmetric-only encryption using the non-default 3DES.
       The option --emulate-3des-s2k-bug may be used to decrypt documents
       which have been encrypted this way; this should be done immediately
       as this workaround will be remove in 1.1
 
     * Can now handle (but not display) PGP's photo IDs. I don't know the
       format of that packet but after stripping a few bytes from the start
       it looks like a JPEG (at least my test data).  Handling of this
       package is required because otherwise it would mix up the
       self signatures and you can't import those keys.
 
     * Passing non-ascii user IDs on the commandline should now work in all
       cases.
 
     * New keys are now generated with an additional preference to Blowfish.
 
     * Removed the GNU Privacy Handbook from the distribution as it will go
       into a separate one.
 
     See-also: gnupg-announce/1999q4/000050.html
 
 
 Noteworthy changes in version 1.0.0 (1999-09-07)
 -----------------------------------
 
     * Add a very preliminary version of the GNU Privacy Handbook to
       the distribution (lynx doc/gph/index.html).
 
     * Changed the version number to GnuPG 2001 ;-)
 
     See-also: gnupg-announce/1999q3/000037.html
 
 
 Noteworthy changes in version 0.9.11 (1999-09-03)
 ------------------------------------
 
     * UTF-8 strings are now correctly printed (if --charset is set correctly).
       Output of --with-colons remains C-style escaped UTF-8.
 
     * Workaround for a problem with PGP 5 detached signature in textmode.
 
     * Fixed a problem when importing new subkeys (duplicated signatures).
 
     See-also: gnupg-announce/1999q3/000036.html
 
 
 Noteworthy changes in version 0.9.10 (1999-07-23)
 ------------------------------------
 
     * Some strange new options to help pgpgpg
 
     * Cleaned up the dox a bit.
 
     See-also: gnupg-announce/1999q3/000034.html
 
 
 Noteworthy changes in version 0.9.9
 -----------------------------------
 
     * New options --[no-]utf8-strings.
 
     * New edit-menu commands "enable" and "disable" for entire keys.
 
     * You will be asked for a filename if gpg cannot deduce one.
 
     * Changes to support libtool which is needed for the development
       of libgcrypt.
 
     * New script tools/lspgpot to help transferring assigned
       trustvalues from PGP to GnuPG.
 
     * New commands --lsign-key and made --sign-key a shortcut for --edit
       and sign.
 
     * New options (#122--126 ;-) --[no-]default-recipient[-self],
       --disable-{cipher,pubkey}-algo. See the man page.
 
     * Enhanced info output in case of multiple recipients and fixed exit code.
 
     * New option --allow-non-selfsigned-uid to work around a problem with
       the German IN way of separating signing and encryption keys.
 
     See-also: gnupg-announce/1999q3/000028.html
 
 
 Noteworthy changes in version 0.9.8 (1999-06-26)
 -----------------------------------
 
     * New subcommand "delsig" in the edit menu.
 
     * The name of the output file is not anymore the one which is
       embedded in the processed message, but the used filename with
       the extension stripped.  To revert to the old behaviour you can
       use the option --use-embedded-filename.
 
     * Another hack to cope with pgp2 generated detached signatures.
 
     * latin-2 character set works (--charset=iso-8859-2).
 
     * New option --with-key-data to list the public key parameters.
       New option -N to insert notations and a --set-policy-url.
-      A couple of other options to allow reseting of options.
+      A couple of other options to allow resetting of options.
 
     * Better support for HPUX.
 
     See-also: gnupg-announce/1999q2/000016.html
 
 
 Noteworthy changes in version 0.9.7 (1999-05-23)
 -----------------------------------
 
     * Add some work arounds for a bugs in pgp 2 which led to bad signatures
       when used with canonical texts in some cases.
 
     * Enhanced some status outputs.
 
     See-also: gnupg-announce/1999q2/000000.html
 
 
 Noteworthy changes in version 0.9.6 (1999-05-06)
 -----------------------------------
 
     * Twofish is now statically linked by default. The experimental 128 bit
       version is now disabled.	Full support will be available as soon as
       the OpenPGP WG has decided on an interpretation of rfc2440.
 
     * Dropped support for the ancient Blowfish160 which is not OpenPGP.
 
     * Merged gpgm and gpg into one binary.
 
     * Add "revsig" and "revkey" commands to the edit menu.  It is now
       possible to revoke signature and subkeys.
 
 
 Noteworthy changes in version 0.9.5 (1999-03-20)
 -----------------------------------
 
     * New command "lsign" in the keyedit menu to create non-exportable
       signatures.  Removed --trusted-keys option.
 
     * A bunch of changes to the key validation code.
 
     * --list-trust-path now has an optional --with-colons format.
 
     * New command --recv-keys to import keys from an keyserver.
 
 
 Noteworthy changes in version 0.9.4 (1999-03-08)
 -----------------------------------
 
     * New configure option --enable-static-rnd=[egd|linux|unix|none]
       to select a random gathering module for static linking.
 
     * The original text is now verbatim copied to a cleartext signed message.
 
     * Bugfixes but there are still a couple of bugs.
 
 
 Noteworthy changes in version 0.9.3 (1999-02-19)
 -----------------------------------
 
     * Changed the internal design of getkey which now allows a
       efficient lookup of multiple keys and add a word match mode.
 
     * New options --[no-]encrypt-to.
 
     * Some changes to the configure stuff.  Switched to automake 1.4.
       Removed intl/ from CVS, autogen.sh now uses gettextize.
 
     * Preferences now include Twofish. Removed preference to Blowfish with
       a special hack to suppress the "not listed in preferences" warning;
       this is to allow us to switch completely to Twofish in the near future.
 
     * Changed the locking stuff.
 
     * Print all user ids of a good signature.
 
 
 Noteworthy changes in version 0.9.2 (1999-01-01)
 -----------------------------------
 
     * add some additional time warp checks.
 
     * Option --keyserver and command --send-keys to utilize HKP servers.
 
     * Upgraded to zlib 1.1.3 and fixed an inflate bug
 
     * More cleanup on the cleartext signatures.
 
 
 Noteworthy changes in version 0.9.1 (1999-01-01)
 -----------------------------------
 
     * Polish language support.
 
     * When querying the passphrase, the key ID of the primary key is
       displayed along with the one of the used secondary key.
 
     * Fixed a bug occurring when decrypting pgp 5 encrypted messages,
       fixed an infinite loop bug in the 3DES code and in the code
       which looks for trusted signatures.
 
     * Fixed a bug in the mpi library which caused signatures not to
       compare okay.
 
     * Rewrote the handling of cleartext signatures; the code is now
       better maintainable (I hope so).
 
     * New status output VALIDSIG only for valid signatures together
       with the fingerprint of the signer's key.
 
 
 Noteworthy changes in version 0.9.0 (1998-12-23)
 -----------------------------------
 
     * --export does now only exports rfc2440 compatible keys; the
       old behaviour is available with --export-all.
       Generation of v3 ElGamal (sign and encrypt) keys is not longer
       supported.
 
     * Fixed the uncompress bug.
 
     * Rewrote the rndunix module. There are two environment variables
       used for debugging now: GNUPG_RNDUNIX_DBG give the file to write
       debugging information (use "-" for stdout) and if GNUPG_RNDUNIX_DBGALL
       is set, all programs which are only tried are also printed.
 
     * New option --escape-from-lines to "dash-escape" "From " lines to
       prevent mailers to change them to ">From ".  This is not enabled by
       default because it is not in compliance with rfc2440 - however, you
       should turn it on.
 
 
 Noteworthy changes in version 0.4.5 (1998-12-08)
 -----------------------------------
 
     * The keyrings and the trustdb is now locked, so that
       other GnuPG processes won't damage these files.  You
       may want to put the option --lock-once into your options file.
 
     * The latest self-signatures are now used; this enables --import
       to see updated preferences etc.
 
     * Import of subkeys should now work.
 
     * Random gathering modules may now be loaded as extensions. Add
       such a module for most Unices but it is very experimental!
 
     * Brazilian language support.
 
 
 Noteworthy changes in version 0.4.4 (1998-11-20)
 -----------------------------------
 
     * Fixed the way the key expiration time is stored. If you have
       an expiration time on your key you should fix it with --edit-key
       and the command "expire".  I apologize for this inconvenience.
 
     * Add option --charset to support "koi8-r" encoding of user ids.
       (Not yet tested).
 
     * Preferences should now work again. You should run
       "gpgm --check-trustdb \*" to rebuild all preferences.
 
     * Checking of certificates should now work but this needs a lot
       of testing.  Key validation values are now cached in the
       trustdb; they should be recalculated as needed, but you may
       use --check-trustdb or --update-trustdb to do this.
 
     * Spanish translation by Urko Lusa.
 
     * Patch files are from now on signed.  See the man page
       for the new option --not-dash-escaped.
 
     * New syntax: --edit-key <userID> [<commands>]
       If you run it without --batch the commands are executed and then
       you are put into normal mode unless you use "quit" or "save" as
       one of the commands.  When in batch mode, the program quits after
       the last command, so you have to use "save" if you did some changes.
       It does not yet work completely, but may be used to list so the
       keys etc.
 
 
 Noteworthy changes in version 0.4.3 (1998-11-08)
 -----------------------------------
 
     * Fixed the gettext configure bug.
 
     * Kludge for RSA keys: keyid and length of a RSA key are
       correctly reported, but you get an error if you try to use
       this key (If you do not have the non-US version).
 
     * Experimental support for keyrings stored in a GDBM database.
       This is *much* faster than a standard keyring.  You will notice
       that the import gets slower with time; the reason is that all
       new keys are used to verify signatures of previous inserted
       keys.  Use "--keyring gnupg-gdbm:<name-of-gdbm-file>".  This is
       not (yet) supported for secret keys.
 
     * A Russian language file in the distribution (alternatives are in
       the contrib directory of the FTP servers)
 
     * commandline option processing now works as expected for GNU programs
       with the exception that you can't mix options and normal arguments.
 
     * Now --list-key lists all matching keys.  This is needed in some
       other places too.
 
 
 Noteworthy changes in version 0.4.2 (1998-10-18)
 -----------------------------------
 
     * This is only a snapshot: There are still a few bugs.
 
     * Fixed this huge memory leak.
 
     * Redesigned the trust database:  You should run "gpgm --check-trustdb".
       New command --update-trustdb, which adds new key from the public
       keyring into your trustdb
 
     * Fixed a bug in the armor code, leading to invalid packet errors.
       (a workaround for this was to use --no-armor).  The shorten line
       length (64 instead of 72) fixes a problem with pgp5 and keyservers.
 
     * comment packets are not anymore generated. "--export" filters
       them out.  One Exception:  The comment packets in a secret keyring
       are still used because they carry the factorization of the public
       prime product.
 
     * --import now only looks for KEYBLOCK headers, so you can now simply
       remove the "- " in front of such a header if someone accidentally signed
       such a message or the keyblock is part of a cleartext signed message.
 
     * --with-colons now lists the key expiration time and not anymore
       the valid period.
 
     * Some keyblocks created with old releases have a wrong sequence
       of packets, so that the keyservers don't accept these keys.
       Simply using "--edit-key" fixes the problem.
 
     * New option --force-v3-sigs to generate signed messages which are
       compatible to PGP 5.
 
     * Add some code to support DLD (for non ELF systems) - but this is
       not tested because my BSD box is currently broken.
 
     * New command "expire" in the edit-key menu.
 
 
 
 Noteworthy changes in version 0.4.1 (1998-10-07)
 -----------------------------------
 
     * A secondary key is used when the primary key is specified but cannot
       be used for the operation (if it is a sign-only key).
 
     * GNUPG can now handle concatenated armored messages:  There is still a
       bug if different kinds of messages are mixed.
 
     * Iterated+Salted passphrases now work.  If want to be sure that PGP5
       is able to handle them you may want to use the options
 	"--s2k-mode 3 --s2k-cipher-algo cast5 --s2k-digest-algo sha1"
       when changing a passphrase.
 
     * doc/OpenPGP talks about OpenPGP compliance, doc/HACKING gives
       a few hints about the internal structure.
 
     * Checked gnupg against the August 1998 draft (07) and I believe
       it is in compliance with this document (except for one point).
 
     * Fixed some bugs in the import merging code and rewrote some
       code for the trustdb.
 
 
 Noteworthy changes in version 0.4.0 (1998-09-18)
 -----------------------------------
 
     * Triple DES is now supported.  Michael Roth did this piece of
       needed work.  We have now all the coded needed to be OpenPGP
       compliant.
 
     * Added a simple rpm spec file (see INSTALL).
 
     * detached and armored signatures are now using "PGP SIGNATURE",
       except when --rfc1991 is used.
 
     * All times which are not in the yyyy-mm-dd format are now printed
       in local time.
 
 
 Noteworthy changes in version 0.3.5 (1998-09-14)
 -----------------------------------
 
     * New option --throw-keyid to create anonymous enciphered messages.
       If gpg detects such a message it tires all available secret keys
       in turn so decode it.  This is a gnupg extension and not in OpenPGP
       but it has been discussed there and afaik some products use this
       scheme too (Suggested by Nimrod Zimmerman).
 
     * Fixed a bug with 5 byte length headers.
 
     * --delete-[secret-]key is now also available in gpgm.
 
     * cleartext signatures are not anymore converted to LF only.
 
     * Fixed a trustdb problem.	Run "gpgm --check-trustdb" to fix old
       trust dbs.
 
     * Building in another directory should now work.
 
     * Weak key detection mechanism (Niklas Hernaeus).
 
 
 Noteworthy changes in version 0.3.4 (1998-08-11)
 -----------------------------------
 
     * New options --comment and --set-filename; see g10/OPTIONS
 
     * yes/no, y/n localized.
 
     * Fixed some bugs.
 
 
 Noteworthy changes in version 0.3.3 (1998-08-08)
 -----------------------------------
 
     * IMPORTANT: I found yet another bug in the way the secret keys
       are encrypted - I did it the way pgp 2.x did it, but OpenPGP
       and pgp 5.x specify another (in some aspects simpler) method.
       To convert your secret keys you have to do this:
 	1. Build the new release but don't install it and keep
 	   a copy of the old program.
 	2. Disable the network, make sure that you are the only
 	   user, be sure that there are no Trojan horses etc ....
 	3. Use your old gpg (version 0.3.1 or 0.3.2) and set the
 	   passphrases of ALL your secret keys to empty!
 	   (gpg --change-passphrase your-user-id).
 	4. Save your ownertrusts (see the next point)
 	5. rm ~/.gnupg/trustdb.gpg
 	6. install the new version of gpg (0.3.3)
 	7. For every secret key call "gpg --edit-key your-user-id",
 	   enter "passwd" at the prompt, follow the instructions and
 	   change your password back, enter "save" to store it.
 	8. Restore the ownertrust (see next point).
 
     * The format of the trust database has changed; you must delete
       the old one, so gnupg can create a new one.
       IMPORTANT: Use version 0.3.1 or .2 to save your assigned ownertrusts
       ("gpgm --list-ownertrust >saved-trust"); then build this new version
       and restore the ownertrust with this new version
       ("gpgm --import-ownertrust saved-trust").  Please note that
       --list-ownertrust has been renamed to --export-ownertrust in this
       release and it does now only export defined ownertrusts.
 
     * The command --edit-key now provides a commandline driven menu
       which can be used for various tasks.  --sign-key is only an
       an alias to --edit-key and maybe removed in future: use the
       command "sign" of this new menu - you can select which user ids
       you want to sign.
 
     * Alternate user ids can now be created an signed.
 
     * Owner trust values can now be changed with --edit-key (trust)
 
     * GNUPG can now run as a coprocess; this enables sophisticated
       frontends.  tools/shmtest.c is a simple sample implementation.
       This needs some more work: all tty_xxx() are to be replaced
       by cpr_xxx() and some changes in the display logics is needed.
 
     * Removed options --gen-prime and --gen-random.
 
     * Removed option --add-key; use --edit-key instead.
 
     * Removed option --change-passphrase; use --edit-key instead.
 
     * Signatures are now checked even if the output file could not
       be created. Command "--verify" tries to find the detached data.
 
     * gpg now disables core dumps.
 
     * compress and symmetric cipher preferences are now used.
       Because there is no 3DES yet, this is replaced by Blowfish.
 
     * We have added the Twofish as an experimental cipher algorithm.
       Many thanks to Matthew Skala for doing this work.
       Twofish is the AES submission from Schneier et al.; see
       "www.counterpane.com/twofish.html" for more information.
 
     * Started with a help system: If you enter a question mark at some
       prompt; you should get a specific help for this prompt.
 
     * There is no more backup copy of the secret keyring.
 
     * A lot of new bugs. I think this release is not as stable as
       the previous one.
 
 
 Noteworthy changes in version 0.3.2 (1998-07-09)
 -----------------------------------
 
     * Fixed some bugs when using --textmode (-seat)
 
     * Now displays the trust status of a positive verified message.
 
     * Keyrings are now scanned in the sequence they are added with
       --[secret-]keyring.  Note that the default keyring is implicitly
       added as the very first one unless --no-default-keyring is used.
 
     * Fixed setuid and dlopen bug.
 
 
 Noteworthy changes in version 0.3.1 (1998-07-06)
 -----------------------------------
 
     * Partial headers are now written in the OpenPGP format if
       a key in a v4 packet is used.
 
     * Removed some unused options, removed the gnupg.sig stuff.
 
     * Key lookup by name now returns a key which can be used for
       the desired action.
 
     * New options --list-ownertrust (gpgm) to make a backup copy
       of the ownertrust values you assigned.
 
     * clear signature headers are now in compliance with OpenPGP.
 
 
 Noteworthy changes in version 0.3.0 (1998-06-25)
 -----------------------------------
 
     * New option --emulate-checksum-bug.  If your passphrase does not
       work anymore, use this option and --change-passphrase to rewrite
       your passphrase.
 
     * More complete v4 key support: Preferences and expiration time
       is set into the self signature.
 
     * Key generation defaults to DSA/ElGamal keys, so that new keys are
       interoperable with pgp5
 
     * DSA key generation is faster and key generation does not anymore
       remove entropy from the random generator (the primes are public
       parameters, so there is really no need for a cryptographic secure
       prime number generator which we had used).
 
     * A complete new structure for representing the key parameters.
 
     * Removed most public key knowledge into the cipher library.
 
     * Support for dynamic loading of new algorithms.
 
     * Moved tiger to an extension module.
 
 
 Noteworthy changes in version 0.2.19 (1998-05-29)
 ------------------------------------
 
     * Replaced /dev/urandom in checks with new tool mk-tdata.
 
     * Some assembler file cleanups; some more functions for the Alpha.
 
     * Tiger has now the OpenPGP assigned number 6.  Because the OID has
       changed, old signatures using this algorithm can't be verified.
 
     * gnupg now encrypts the compressed packed and not any longer in the
       reverse order; anyway it can decrypt both versions. Thanks to Tom
       for telling me this (not security related) bug.
 
     * --add-key works and you are now able to generate subkeys.
 
     * It is now possible to generate ElGamal keys in v4 packets to create
       valid OpenPGP keys.
 
     * Some new features for better integration into MUAs.
 
 
 Noteworthy changes in version 0.2.18 (1998-05-15)
 ------------------------------------
 
-    * Splitted cipher/random.c, add new option "--disable-dev-random"
+    * Split cipher/random.c, add new option "--disable-dev-random"
       to configure to support the development of a random source for
       other systems. Prepared sourcefiles rand-unix.c, rand-w32.c
       and rand-dummy.c (which is used to allow compilation on systems
       without a random source).
 
     * Fixed a small bug in the key generation (it was possible that 48 bits
       of a key were not taken from the random pool)
 
     * Add key generation for DSA and v4 signatures.
 
     * Add a function trap_unaligned(), so that a SIGBUS is issued on
       Alphas and not the slow emulation code is used. And success: rmd160
       raised a SIGBUS.
 
     * Enhanced the formatting facility of argparse and changed the use of
       \r,\v to @ because gettext does not like it.
 
     * New option "--compress-algo 1" to allow the creation of compressed
       messages which are readable by PGP and "--print-md" (gpgm) to make
       speed measurement easier.
 
 
 Noteworthy changes in version 0.2.17 (1998-05-04)
 ------------------------------------
 
     * Comment packets are now of private type 61.
 
     * Passphrase code still used a 160 bit blowfish key, added a
       silly workaround. Please change your passphrase again - sorry.
 
     * Conventional encryption now uses a type 3 packet to describe the
       used algorithms.
 
     * The new algorithm number for Blowfish is 20, 16 is still used for
       encryption only; for signing it is only used when it is in a v3 packet,
       so that GNUPG keys are still valid.
 
 
 Noteworthy changes in version 0.2.16 (1998-04-28)
 ------------------------------------
 
     * Add experimental support for the TIGER/192 message digest algorithm.
       (But there is only a dummy ASN OID).
 
     * Standard cipher is now Blowfish with 128 bit key in OpenPGP's CFB
       mode. I renamed the old cipher to Blowfish160. Because the OpenPGP
       group refused to assign me a number for Blowfish160, I have to
       drop support for this in the future. You should use
       "--change-passphrase" to recode your current passphrase with 128
       bit Blowfish.
 
 
 Noteworthy changes in version 0.2.15 (1998-04-09)
 ------------------------------------
 
     * Fixed a bug with the old checksum calculation for secret keys.
       If you run the program without --batch, a warning does inform
       you if your secret key needs to be converted; simply use
       --change-passphrase to recalculate the checksum. Please do this
       soon, as the compatible mode will be removed sometime in the future.
 
     * CAST5 works (using the PGP's special CFB mode).
 
     * Again somewhat more PGP 5 compatible.
 
     * Some new test cases
 
 Noteworthy changes in version 0.2.14 (1998-04-02)
 ------------------------------------
 
     * Changed the internal handling of keyrings.
 
     * Add support to list PGP 5 keyrings with subkeys
 
     * Timestamps of signatures are now verified.
 
     * A expiration time can now be specified during key generation.
 
     * Some speedups for Blowfish and SHA-1, rewrote SHA-1 transform.
       Reduced the amount of random bytes needed for key generation in
       some cases.
 
 
 Noteworthy changes in version 0.2.13 (1998-03-10)
 ------------------------------------
 
     * Verify of DSA signatures works.
 
     * Re-implemented the slower random number generator.
 
 
 Noteworthy changes in version 0.2.12 (1998-03-07)
 ------------------------------------
 
     * --delete-key checks that there is no secret key. The new
       option --delete-secret-key maybe used to delete a secret key.
 
     * "-kv" now works as expected. Options "--list-{keys,sigs]"
       and "--check-sigs" are now working.
 
     * New options "--verify" and "--decrypt" to better support integration
       into MUAs (partly done for Mutt).
 
     * New option "--with-colons" to make parsing of key lists easier.
 
 Noteworthy changes in version 0.2.11 (1998-03-02)
 ------------------------------------
 
     * GPG now asks for a recipient's name if option "-r" is not used.
 
     * If there is no good trust path, the program asks whether to use
       the public keys anyway.
 
     * "--delete-key" works for public keys. What semantics shall I use
       when there is a secret key too? Delete the secret key or leave him
       and auto-regenerate the public key, next time the secret key is used?
 
 Noteworthy changes in version 0.2.10 (1998-02-27)
 ------------------------------------
 
     * Code for the alpha is much faster (about 20 times); the data
       was misaligned and the kernel traps this, so nearly all time
       was used by system to trap the misalignments and to write
       syslog messages. Shame on me and thanks to Ralph for
       pointing me at this while drinking some beer yesterday.
 
     * Changed some configure options and add an option
       --disable-m-guard to remove the memory checking code
       and to compile everything with optimization on.
 
     * New environment variable GNUPGHOME, which can be used to set
       another homedir than ~/.gnupg.  Changed default homedir for
       Windoze version to c:/gnupg.
 
     * Fixed detached signatures; detached PGP signatures caused a SEGV.
 
     * The Windoze version works (as usual w/o a strong RNG).
 
 
 Noteworthy changes in version 0.2.9 (1998-02-26)
 -----------------------------------
 
     * Fixed FreeBSD bug.
 
     * Added a simple man page.
 
     * Switched to automake1.2f and a newer gettext.
 
 Noteworthy changes in version 0.2.8 (1998-02-24)
 -----------------------------------
 
     * Changed the name to GNUPG, the binaries are called gpg and gpgm.
       You must rename rename the directory "~/.g10" to ~/.gnupg/, rename
       {pub,sec}ring.g10 to {pub,sec}ring.gpg, trustdb.g10 to trustdb.gpg
       and g10.sig to gnupg.sig.
 
     * New or changed passphrases are now salted.
 
 
 Noteworthy changes in version 0.2.7 (1998-02-18)
 -----------------------------------
 
     * New command "gen-revoke" to create a key revocation certificate.
 
     * New option "homedir" to set the homedir (which defaults to "~/.g10").
       This directory is created if it does not exists (only the last
       part of the name and not the complete hierarchy)
 
     * Command "import" works. (Try: "finger gcrypt@ftp.guug.de|g10 --import")
 
     * New commands "dearmor/enarmor" for g10maint.  These are mainly
       used for internal test purposes.
 
     * Option --version now conforming to the GNU standards and lists
       the available ciphers, message digests and public key algorithms.
 
     * Assembler code for m68k (not tested).
 
     * "make check" works.
 
 Noteworthy changes in version 0.2.6 (1998-02-13)
 -----------------------------------
 
     * Option "--export" works.
 
 
 Noteworthy changes in version 0.2.5 (1998-02-12)
 -----------------------------------
 
     * Added zlib for systems which don't have it.
       Use "./configure --with-zlib" to link with the static version.
 
     * Generalized some more functions and rewrote the encoding of
       message digests into MPIs.
 
     * Enhanced the checkit script
 
 
 Noteworthy changes in version 0.2.4 (1998-02-11)
 -----------------------------------
 
     * nearly doubled the speed of the ElGamal signature verification.
 
     * backup copies of keyrings are created.
 
     * assembler stuff for Pentium; gives about 15% better performance.
 
     * fixed a lot of bugs.
 
 
 Noteworthy changes in version 0.2.3 (1998-02-09)
 -----------------------------------
 
     * Found a bug in the calculation of ELG fingerprints. This is now
       fixed, but all existing fingerprints and keyids for ELG keys
       are not any more valid.
 
     * armor should now work; including clear signed text.
 
     * moved some options to the new program g10maint
 
     * It's now 64 bit clean and runs fine on an alpha--linux.
 
     * Key generation is much faster now.  I fixed this by using not
       so strong random number for the primes (this was a bug because the
       ElGamal primes are public parameters and it does not make sense
       to generate them from strong random).  The real secret is the x value
       which is still generated from strong (okay: /dev/random) random bits.
 
     * added option "--status-fd": see g10/OPTIONS
 
     * We have secure memory on systems which support mlock().
       It is not complete yet, because we do not have signal handler
       which does a cleanup in very case.
       We should also check the ulimit for the user in the case
       that the admin does not have set a limit on locked pages.
 
     * started with internationalization support.
 
     * The logic to handle the web of trust is now implemented. It is
       has some bugs; but I'm going to change the algorithm anyway.
       It works by calculating the trustlevel on the fly.  It may ask
       you to provide trust parameters if the calculated trust probability
       is too low.  I will write a paper which discusses this new approach.
 
     * a couple of changes to the configure script.
 
     * New option "--quick-random" which uses a much quicker random
       number generator.  Keys generated while this option is in effect
       are flags with "INSECURE!" in the user-id.  This is a development
       only option.
 
     * Read support for new version packets (OpenPGP).
 
     * Comment packets are now of correct OpenPGP type 16. Old comment
       packets written by G10 are detected because they always start with
       a hash which is an invalid version byte.
 
     * The string "(INSECURE!)" is appended to a new user-id if this
       is generated on a system without a good random number generator.
 
 
 Version 0.2.2 (1998-02-09)
 Version 0.2.1 (1998-01-28)
 Version 0.2.0 (1998-01-25)
 Version 0.1.3 (1998-01-12)
 Version 0.1.2 (1998-01-07)
 Version 0.1.1 (1998-01-07)
 Version 0.1.0 (1998-01-05)
 Version 0.0.0 (1997-12-20)
 
 
  Copyright (C) 1998-2017 Free Software Foundation, Inc.
  Copyright (C) 1997-2017 Werner Koch
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
 
  This file 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.
diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index 2e48b346e..c7426db9d 100644
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -1,425 +1,425 @@
 keyformat.txt               emacs, please switch to -*- org -*- mode
 -------------
 
 
 Some notes on the format of the secret keys used with gpg-agent.
 
 * Location of keys
 
 The secret keys[1] are stored on a per file basis in a directory below
 the ~/.gnupg home directory.  This directory is named
 
    private-keys-v1.d
 
 and should have permissions 700.
 
 The secret keys are stored in files with a name matching the
 hexadecimal representation of the keygrip[2] and suffixed with ".key".
 
 * Extended Private Key Format
 
 GnuPG 2.3+ will use a new format to store private keys that is both
 more flexible and easier to read and edit by human beings.  The new
 format stores name,value-pairs using the common mail and http header
 convention.  Example (here indented with two spaces):
 
   Description: Key to sign all GnuPG released tarballs.
     The key is actually stored on a smart card.
   Use-for-ssh: yes
   OpenSSH-cert: long base64 encoded string wrapped so that this
     key file can be easily edited with a standard editor.
   Key: (shadowed-private-key
     (rsa
     (n #00AA1AD2A55FD8C8FDE9E1941772D9CC903FA43B268CB1B5A1BAFDC900
     2961D8AEA153424DC851EF13B83AC64FBE365C59DC1BD3E83017C90D4365B4
     83E02859FC13DB5842A00E969480DB96CE6F7D1C03600392B8E08EF0C01FC7
     19F9F9086B25AD39B4F1C2A2DF3E2BE317110CFFF21D4A11455508FE407997
     601260816C8422297C0637BB291C3A079B9CB38A92CE9E551F80AA0EBF4F0E
     72C3F250461E4D31F23A7087857FC8438324A013634563D34EFDDCBF2EA80D
     F9662C9CCD4BEF2522D8BDFED24CEF78DC6B309317407EAC576D889F88ADA0
     8C4FFB480981FB68C5C6CA27503381D41018E6CDC52AAAE46B166BDC10637A
     E186A02BA2497FDC5D1221#)
     (e #00010001#)
     (shadowed t1-v1
      (#D2760001240102000005000011730000# OPENPGP.1)
     )))
 
 GnuPG 2.2 is able to read and update keys using the new format, but
 will not create new files using the new format.  Furthermore, it only
 makes use of the value stored under the name 'Key:'.
 
 Keys in the extended format can be recognized by looking at the first
 byte of the file.  If it starts with a '(' it is a naked S-expression,
 otherwise it is a key in extended format.
 
 ** Names
 
 A name must start with a letter and end with a colon.  Valid
 characters are all ASCII letters, numbers and the hyphen.  Comparison
 of names is done case insensitively.  Names may be used several times
 to represent an array of values.
 
 The name "Key:" is special in that it may occur only once and the
 associated value holds the actual S-expression with the cryptographic
 key.  The S-expression is formatted using the 'Advanced Format'
 (GCRYSEXP_FMT_ADVANCED) that avoids non-printable characters so that
 the file can be easily inspected and edited.  See section 'Private Key
 Format' below for details.
 
 ** Values
 
 Values are UTF-8 encoded strings.  Values can be wrapped at any point,
 and continued in the next line indicated by leading whitespace.  A
 continuation line with one leading space does not introduce a blank so
 that the lines can be effectively concatenated.  A blank line as part
 of a continuation line encodes a newline.
 
 ** Comments
 
 Lines containing only whitespace, and lines starting with whitespace
 followed by '#' are considered to be comments and are ignored.
 
 * Private Key Format
 ** Unprotected Private Key Format
 
 The content of the file is an S-Expression like the ones used with
 Libgcrypt.  Here is an example of an unprotected file:
 
 (private-key
  (rsa
   (n #00e0ce9..[some bytes not shown]..51#)
   (e #010001#)
   (d #046129F..[some bytes not shown]..81#)
   (p #00e861b..[some bytes not shown]..f1#)
   (q #00f7a7c..[some bytes not shown]..61#)
   (u #304559a..[some bytes not shown]..9b#)
  )
  (created-at timestamp)
  (uri http://foo.bar x-foo:whatever_you_want)
  (comment whatever)
 )
 
 "comment", "created-at" and "uri" are optional.  "comment" is
 currently used to keep track of ssh key comments. "created-at" is used
 to keep track of the creation time stamp used with OpenPGP keys; it is
 optional but required for some operations to calculate the fingerprint
 of the key.  This timestamp should be a string with the number of
 seconds since Epoch or an ISO time string (yyyymmddThhmmss).
 
 ** Protected Private Key Format
 
 A protected key is like this:
 
 (protected-private-key
    (rsa
     (n #00e0ce9..[some bytes not shown]..51#)
     (e #010001#)
     (protected mode (parms) encrypted_octet_string)
     (protected-at <isotimestamp>)
    )
    (uri http://foo.bar x-foo:whatever_you_want)
    (comment whatever)
 )
 
 
 In this scheme the encrypted_octet_string is encrypted according to
 the algorithm described after the keyword protected; most protection
 algorithms need some parameters, which are given in a list before the
 encrypted_octet_string.  The result of the decryption process is a
 list of the secret key parameters.  The protected-at expression is
 optional; the isotimestamp is 15 bytes long (e.g. "19610711T172000").
 
 The currently defined protection modes are:
 
 *** openpgp-s2k3-sha1-aes-cbc
 
   This describes an algorithm using AES in CBC mode for
   encryption, SHA-1 for integrity protection and the String to Key
   algorithm 3 from OpenPGP (rfc4880).
 
   Example:
 
   (protected openpgp-s2k3-sha1-aes-cbc
     ((sha1 16byte_salt no_of_iterations) 16byte_iv)
     encrypted_octet_string
   )
 
   The encrypted_octet string should yield this S-Exp (in canonical
   representation) after decryption:
 
   (
    (
     (d #046129F..[some bytes not shown]..81#)
     (p #00e861b..[some bytes not shown]..f1#)
     (q #00f7a7c..[some bytes not shown]..61#)
     (u #304559a..[some bytes not shown]..9b#)
    )
    (hash sha1 #...[hashvalue]...#)
   )
 
   For padding reasons, random bytes are appended to this list - they can
   easily be stripped by looking for the end of the list.
 
   The hash is calculated on the concatenation of the public key and
   secret key parameter lists: i.e. it is required to hash the
   concatenation of these 6 canonical encoded lists for RSA, including
   the parenthesis, the algorithm keyword and (if used) the protected-at
   list.
 
   (rsa
    (n #00e0ce9..[some bytes not shown]..51#)
    (e #010001#)
    (d #046129F..[some bytes not shown]..81#)
    (p #00e861b..[some bytes not shown]..f1#)
    (q #00f7a7c..[some bytes not shown]..61#)
    (u #304559a..[some bytes not shown]..9b#)
    (protected-at "18950523T000000")
   )
 
   After decryption the hash must be recalculated and compared against
   the stored one - If they don't match the integrity of the key is not
   given.
 
 *** openpgp-s2k3-ocb-aes
 
   This describes an algorithm using AES-128 in OCB mode, a nonce
   of 96 bit, a taglen of 128 bit, and the String to Key algorithm 3
   from OpenPGP (rfc4880).
 
   Example:
 
   (protected openpgp-s2k3-ocb-aes
     ((sha1 16byte_salt no_of_iterations) 12byte_nonce)
     encrypted_octet_string
   )
 
   The encrypted_octet string should yield this S-Exp (in canonical
   representation) after decryption:
 
   (
    (
     (d #046129F..[some bytes not shown]..81#)
     (p #00e861b..[some bytes not shown]..f1#)
     (q #00f7a7c..[some bytes not shown]..61#)
     (u #304559a..[some bytes not shown]..9b#)
    )
   )
 
   For padding reasons, random bytes may be appended to this list -
   they can easily be stripped by looking for the end of the list.
 
   The associated data required for this protection mode is the list
   formiing the public key parameters.  For the above example this is
   is this canonical encoded S-expression:
 
   (rsa
    (n #00e0ce9..[some bytes not shown]..51#)
    (e #010001#)
    (protected-at "18950523T000000")
   )
 
 *** openpgp-native
 
   This is a wrapper around the OpenPGP Private Key Transport format
   which resembles the standard OpenPGP format and allows the use of an
   existing key without re-encrypting to the default protection format.
 
   Example:
 
   (protected openpgp-native
     (openpgp-private-key
      (version V)
      (algo PUBKEYALGO)
      (skey _ P1 _ P2 _ P3 ... e PN)
      (csum n)
      (protection PROTTYPE PROTALGO IV S2KMODE S2KHASH S2KSALT S2KCOUNT)))
 
-  Note that the public key paramaters in SKEY are duplicated and
+  Note that the public key parameters in SKEY are duplicated and
   should be identical to their copies in the standard parameter
   elements.  Here is an example of an entire protected private key
   using this format:
 
   (protected-private-key
    (rsa
     (n #00e0ce9..[some bytes not shown]..51#)
     (e #010001#)
     (protected openpgp-native
      (openpgp-private-key
       (version 4)
       (algo rsa)
       (skey _ #00e0ce9..[some bytes not shown]..51#
             _ #010001#
             e #.........................#)
       (protection sha1 aes #aabbccddeeff00112233445566778899#
                   3 sha1 #2596f93e85f41e53# 3:190))))
    (uri http://foo.bar x-foo:whatever_you_want)
    (comment whatever))
 
 ** Shadowed Private Key Format
 
 To keep track of keys stored on IC cards we use a third format for
 private kyes which are called shadow keys as they are only a reference
 to keys stored on a token:
 
 (shadowed-private-key
    (rsa
     (n #00e0ce9..[some bytes not shown]..51#)
     (e #010001#)
     (shadowed protocol (info))
    )
    (uri http://foo.bar x-foo:whatever_you_want)
    (comment whatever)
 )
 
 The currently used protocol is "t1-v1" (token info version 1).  The
 second list with the information has this layout:
 
 (card_serial_number id_string_of_key fixed_pin_length)
 
 FIXED_PIN_LENGTH is optional.  It can be used to store the length of
 the PIN; a value of 0 indicates that this information is not
 available.  The rationale for this field is that some pinpad equipped
 readers don't allow passing a variable length PIN.
 
 More items may be added to the list.
 
 ** OpenPGP Private Key Transfer Format
 
 This format is used to transfer keys between gpg and gpg-agent.
 
 (openpgp-private-key
   (version V)
   (algo PUBKEYALGO)
   (curve CURVENAME)
   (skey _ P1 _ P2 _ P3 ... e PN)
   (csum n)
   (protection PROTTYPE PROTALGO IV S2KMODE S2KHASH S2KSALT S2KCOUNT))
 
 
  * V is the packet version number (3 or 4).
  * PUBKEYALGO is a Libgcrypt algo name
  * CURVENAME is the name of the curve - only used with ECC.
  * P1 .. PN are the parameters; the public parameters are never encrypted
    the secrect key parameters are encrypted if the "protection" list is
    given.  To make this more explicit each parameter is preceded by a
    flag "_" for cleartext or "e" for encrypted text.
  * CSUM is the deprecated 16 bit checksum as defined by OpenPGP.  This
    is an optional element.
  * If PROTTYPE is "sha1" the new style SHA1 checksum is used if it is "sum"
    the old 16 bit checksum (above) is used and if it is "none" no
    protection at all is used.
  * PROTALGO is a Libgcrypt style cipher algorithm name
  * IV is the initialization verctor.
  * S2KMODE is the value from RFC-4880.
  * S2KHASH is a libgcrypt style hash algorithm identifier.
  * S2KSALT is the 8 byte salt
  * S2KCOUNT is the count value from RFC-4880.
 
 ** Persistent Passphrase Format
 
 Note: That this has not yet been implemented.
 
 To allow persistent storage of cached passphrases we use a scheme
 similar to the private-key storage format.  This is a master
 passphrase format where each file may protect several secrets under
 one master passphrase.  It is possible to have several of those files
 each protected by a dedicated master passphrase.  Clear text keywords
 allow listing the available protected passphrases.
 
 The name of the files with these protected secrets have this form:
 pw-<string>.dat.  STRING may be an arbitrary string, as a default name
 for the passphrase storage the name "pw-default.dat" is suggested.
 
 
 (protected-shared-secret
    ((desc descriptive_text)
     (key [key_1] (keyword_1 keyword_2 keyword_n))
     (key [key_2] (keyword_21 keyword_22 keyword_2n))
     (key [key_n] (keyword_n1 keyword_n2 keyword_nn))
     (protected mode (parms) encrypted_octet_string)
     (protected-at <isotimestamp>)
    )
 )
 
 After decryption the encrypted_octet_string yields this S-expression:
 
 (
  (
   (value key_1 value_1)
   (value key_2 value_2)
   (value key_n value_n)
  )
  (hash sha1 #...[hashvalue]...#)
 )
 
 The "descriptive_text" is displayed with the prompt to enter the
 unprotection passphrase.
 
 KEY_1 to KEY_N are unique identifiers for the shared secret, for
 example an URI.  In case this information should be kept confidential
 as well, they may not appear in the unprotected part; however they are
 mandatory in the encrypted_octet_string.  The list of keywords is
-optional.  The oder of the "key" lists and the order of the "value"
-lists mut match, that is the first "key"-list is associated with the
+optional.  The order of the "key" lists and the order of the "value"
+lists must match, that is the first "key"-list is associated with the
 first "value" list in the encrypted_octet_string.
 
 The protection mode etc. is identical to the protection mode as
 described for the private key format.
 
 list of the secret key parameters.  The protected-at expression is
 optional; the isotimestamp is 15 bytes long (e.g. "19610711T172000").
 
 The "hash" in the encrypted_octet_string is calculated on the
 concatenation of the key list and value lists: i.e it is required to
 hash the concatenation of all these lists, including the
 parenthesis and (if used) the protected-at list.
 
 Example:
 
 (protected-shared-secret
    ((desc "List of system passphrases")
     (key "uid-1002" ("Knuth" "Donald Ervin Knuth"))
     (key "uid-1001" ("Dijkstra" "Edsger Wybe Dijkstra"))
     (key)
     (protected mode (parms) encrypted_octet_string)
     (protected-at "20100915T111722")
    )
 )
 
 with "encrypted_octet_string" decoding to:
 
 (
  (
   (value 4:1002 "signal flags at the lock")
   (value 4:1001 "taocp")
   (value 1:0    "premature optimization is the root of all evil")
  )
  (hash sha1 #0102030405060708091011121314151617181920#)
 )
 
 To compute the hash this S-expression (in canoncical format) was
 hashed:
 
    ((desc "List of system passphrases")
     (key "uid-1002" ("Knuth" "Donald Ervin Knuth"))
     (key "uid-1001" ("Dijkstra" "Edsger Wybe Dijkstra"))
     (key)
     (value 4:1002 "signal flags at the lock")
     (value 4:1001 "taocp")
     (value 1:0    "premature optimization is the root of all evil")
     (protected-at "20100915T111722")
    )
 
 * Notes
 
 [1] I usually use the terms private and secret key exchangeable but prefer the
 term secret key because it can be visually be better distinguished
 from the term public key.
 
 [2] The keygrip is a unique identifier for a key pair, it is
 independent of any protocol, so that the same key can be used with
 different protocols.  PKCS-15 calls this a subjectKeyHash; it can be
 calculated using Libgcrypt's gcry_pk_get_keygrip ().
 
 [3] Even when canonical representation are required we will show the
 S-expression here in a more readable representation.
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 1a96e3b57..5ec582357 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1,1299 +1,1299 @@
 # speedo.mk - Speedo rebuilds speedily.
 # Copyright (C) 2008, 2014 g10 Code GmbH
 #
 # speedo 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.
 #
 # speedo 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/>.
 
 # speedo builds gnupg-related packages from GIT and installs them in a
 # user directory, thereby providing a non-obstrusive test environment.
 # speedo does only work with GNU make.  The build system is similar to
 # that of gpg4win.  The following commands are supported:
 #
 #   make -f speedo.mk all  pkg2rep=/dir/with/tarballs
 # or
 #   make -f speedo.mk
 #
 # Builds all packages and installs them under PLAY/inst.  At the end,
 # speedo prints commands that can be executed in the local shell to
 # make use of the installed packages.
 #
 #   make -f speedo.mk clean
 # or
 #   make -f speedo.mk clean-PACKAGE
 #
 # Removes all packages or the package PACKAGE from the installation
 # and build tree.  A subsequent make will rebuild these (and only
 # these) packages.
 #
 #   make -f speedo.mk report
 # or
 #   make -f speedo.mk report-PACKAGE
 #
 # Lists packages and versions.
 #
 
 # We need to know our own name.
 SPEEDO_MK := $(realpath $(lastword $(MAKEFILE_LIST)))
 
 .PHONY : help native native-gui w32-installer w32-source
 .PHONY :      git-native git-native-gui git-w32-installer git-w32-source
 .PHONY :      this-native this-native-gui this-w32-installer this-w32-source
 
 help:
 	@echo 'usage: make -f speedo.mk TARGET'
 	@echo '       with TARGET being one of:'
 	@echo '  help               This help'
 	@echo '  native             Native build of the GnuPG core'
 	@echo '  native-gui         Ditto but with pinentry and GPA'
 	@echo '  w32-installer      Build a Windows installer'
 	@echo '  w32-source         Pack a source archive'
 	@echo '  w32-release        Build a Windows release'
 	@echo '  w32-sign-installer Sign the installer'
 	@echo
 	@echo 'You may append INSTALL_PREFIX=<dir> for native builds.'
 	@echo 'Prepend TARGET with "git-" to build from GIT repos.'
 	@echo 'Prepend TARGET with "this-" to build from the source tarball.'
 	@echo 'Use STATIC=1 to build with statically linked libraries.'
 	@echo 'Use SELFCHECK=0 for a non-released version.'
 	@echo 'Use CUSTOM_SWDB=1 for an already downloaded swdb.lst.'
 
 SPEEDOMAKE := $(MAKE) -f $(SPEEDO_MK) UPD_SWDB=1
 
 native: check-tools
 	$(SPEEDOMAKE) TARGETOS=native WHAT=release WITH_GUI=0 all
 
 git-native: check-tools
 	$(SPEEDOMAKE) TARGETOS=native WHAT=git     WITH_GUI=0 all
 
 this-native: check-tools
 	$(SPEEDOMAKE) TARGETOS=native WHAT=this    WITH_GUI=0 all
 
 native-gui: check-tools
 	$(SPEEDOMAKE) TARGETOS=native WHAT=release WITH_GUI=1 all
 
 git-native-gui: check-tools
 	$(SPEEDOMAKE) TARGETOS=native WHAT=git     WITH_GUI=1 all
 
 this-native-gui: check-tools
 	$(SPEEDOMAKE) TARGETOS=native WHAT=this    WITH_GUI=1 all
 
 w32-installer: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32    WHAT=release WITH_GUI=0 installer
 
 git-w32-installer: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32    WHAT=git     WITH_GUI=0 installer
 
 this-w32-installer: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32    WHAT=this    WITH_GUI=0 \
 	                                           CUSTOM_SWDB=1 installer
 
 w32-source: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32    WHAT=release WITH_GUI=0 dist-source
 
 git-w32-source: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32    WHAT=git     WITH_GUI=0 dist-source
 
 this-w32-source: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32    WHAT=this    WITH_GUI=0 \
 	                                           CUSTOM_SWDB=1 dist-source
 
 w32-release: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32 WHAT=release    WITH_GUI=0 SELFCHECK=0 \
                                                    installer-from-source
 
 w32-sign-installer: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32 WHAT=release    WITH_GUI=0 SELFCHECK=0 \
                                                    sign-installer
 
 w32-release-offline: check-tools
 	$(SPEEDOMAKE) TARGETOS=w32 WHAT=release    WITH_GUI=0 SELFCHECK=0 \
 	  CUSTOM_SWDB=1 pkgrep=${HOME}/b pkg10rep=${HOME}/b  \
 	  installer-from-source
 
 
 # Set this to "git" to build from git,
 #          to "release" from tarballs,
 #          to "this" from the unpacked sources.
 WHAT=git
 
 # Set target to "native" or "w32"
 TARGETOS=
 
 # Set to 1 to build the GUI tools
 WITH_GUI=0
 
 # Set to 1 to use a pre-installed swdb.lst instead of the online version.
 CUSTOM_SWDB=0
 
 # Set to 1 to really download the swdb.
 UPD_SWDB=0
 
 # Set to 0 to skip the GnuPG version self-check
 SELFCHECK=1
 
 # Set to 1 to build with statically linked libraries.
 STATIC=0
 
 # Set to the location of the directory with tarballs of
 # external packages.
 TARBALLS=$(shell pwd)/../tarballs
 
 #  Number of parallel make jobs
 MAKE_J=3
 
 # Name to use for the w32 installer and sources
 INST_NAME=gnupg-w32
 
 # Use this to override the installaion directory for native builds.
 INSTALL_PREFIX=none
 
 # The Authenticode key and cert chain used to sign the Windows installer
 AUTHENTICODE_KEY=${HOME}/.gnupg/g10code-authenticode-key.p12
 AUTHENTICODE_CERTS=${HOME}/.gnupg/g10code-authenticode-certs.pem
 
 
 # Directory names.
 # They must be absolute, as we switch directories pretty often.
 root := $(shell pwd)/PLAY
 sdir := $(root)/src
 bdir := $(root)/build
 bdir6:= $(root)/build-w64
 ifeq ($(INSTALL_PREFIX),none)
 idir := $(root)/inst
 else
 idir := $(abspath $(INSTALL_PREFIX))
 endif
 idir6:= $(root)/inst-w64
 stampdir := $(root)/stamps
 topsrc := $(shell cd $(dir $(SPEEDO_MK)).. && pwd)
 auxsrc := $(topsrc)/build-aux/speedo
 patdir := $(topsrc)/build-aux/speedo/patches
 w32src := $(topsrc)/build-aux/speedo/w32
 
 # =====BEGIN LIST OF PACKAGES=====
 # The packages that should be built.  The order is also the build order.
 # Fixme: Do we need to build pkg-config for cross-building?
 
 speedo_spkgs  = \
 	libgpg-error npth libgcrypt
 
 ifeq ($(TARGETOS),w32)
 speedo_spkgs += \
 	zlib bzip2 sqlite
 ifeq ($(WITH_GUI),1)
 speedo_spkgs += gettext libiconv
 endif
 endif
 
 speedo_spkgs += \
 	libassuan libksba
 
 ifeq ($(TARGETOS),w32)
 speedo_spkgs += \
 	ntbtls
 endif
 
 speedo_spkgs += \
 	gnupg
 
 ifeq ($(TARGETOS),w32)
 ifeq ($(WITH_GUI),1)
 speedo_spkgs += \
 	libffi glib pkg-config
 endif
 endif
 
 ifeq ($(STATIC),0)
 speedo_spkgs += \
 	gpgme
 endif
 
 ifeq ($(TARGETOS),w32)
 ifeq ($(WITH_GUI),1)
 speedo_spkgs += \
 	libpng \
 	gdk-pixbuf atk pixman cairo pango gtk+
 endif
 endif
 
 ifeq ($(TARGETOS),w32)
 
 speedo_spkgs += pinentry
 ifeq ($(WITH_GUI),1)
 speedo_spkgs += gpa gpgex
 endif
 
 else
 
 ifeq ($(WITH_GUI),1)
 speedo_spkgs += pinentry gpa
 endif
 
 endif
 
 
 # =====END LIST OF PACKAGES=====
 
 
 # Packages which are additionally build for 64 bit Windows.  They are
 # only used for gpgex and thus we need to build them only if we want
 # a full installer.
 speedo_w64_spkgs  =
 ifeq ($(WITH_GUI),1)
 speedo_w64_spkgs += libgpg-error libiconv gettext libassuan gpgex
 endif
 
 # Packages which use the gnupg autogen.sh build style
 speedo_gnupg_style = \
 	libgpg-error npth libgcrypt  \
 	libassuan libksba ntbtls gnupg gpgme \
 	pinentry gpa gpgex
 
 # Packages which use only make and no build directory
 speedo_make_only_style = \
 	zlib bzip2
 
 # Get the content of the software DB.
 ifeq ($(CUSTOM_SWDB),1)
 getswdb_options = --skip-download --skip-verify
 else
 getswdb_options =
 endif
 ifeq ($(SELFCHECK),0)
 getswdb_options += --skip-selfcheck
 endif
 ifeq ($(UPD_SWDB),1)
 SWDB := $(shell $(topsrc)/build-aux/getswdb.sh $(getswdb_options) && echo okay)
 ifeq ($(strip $(SWDB)),)
 ifneq ($(WHAT),git)
 $(error Error getting GnuPG software version database)
 endif
 endif
 
 # Version numbers of the released packages
 gnupg_ver_this = $(shell cat $(topsrc)/VERSION)
 
 gnupg_ver        := $(shell awk '$$1=="gnupg24_ver" {print $$2}' swdb.lst)
 
 libgpg_error_ver := $(shell awk '$$1=="libgpg_error_ver" {print $$2}' swdb.lst)
 libgpg_error_sha1:= $(shell awk '$$1=="libgpg_error_sha1" {print $$2}' swdb.lst)
 libgpg_error_sha2:= $(shell awk '$$1=="libgpg_error_sha2" {print $$2}' swdb.lst)
 
 npth_ver  := $(shell awk '$$1=="npth_ver" {print $$2}' swdb.lst)
 npth_sha1 := $(shell awk '$$1=="npth_sha1" {print $$2}' swdb.lst)
 npth_sha2 := $(shell awk '$$1=="npth_sha2" {print $$2}' swdb.lst)
 
 libgcrypt_ver  := $(shell awk '$$1=="libgcrypt_ver" {print $$2}' swdb.lst)
 libgcrypt_sha1 := $(shell awk '$$1=="libgcrypt_sha1" {print $$2}' swdb.lst)
 libgcrypt_sha2 := $(shell awk '$$1=="libgcrypt_sha2" {print $$2}' swdb.lst)
 
 libassuan_ver  := $(shell awk '$$1=="libassuan_ver" {print $$2}' swdb.lst)
 libassuan_sha1 := $(shell awk '$$1=="libassuan_sha1" {print $$2}' swdb.lst)
 libassuan_sha2 := $(shell awk '$$1=="libassuan_sha2" {print $$2}' swdb.lst)
 
 libksba_ver  := $(shell awk '$$1=="libksba_ver" {print $$2}' swdb.lst)
 libksba_sha1 := $(shell awk '$$1=="libksba_sha1" {print $$2}' swdb.lst)
 libksba_sha2 := $(shell awk '$$1=="libksba_sha2" {print $$2}' swdb.lst)
 
 ntbtls_ver  := $(shell awk '$$1=="ntbtls_ver" {print $$2}' swdb.lst)
 ntbtls_sha1 := $(shell awk '$$1=="ntbtls_sha1" {print $$2}' swdb.lst)
 ntbtls_sha2 := $(shell awk '$$1=="ntbtls_sha2" {print $$2}' swdb.lst)
 
 gpgme_ver  := $(shell awk '$$1=="gpgme_ver" {print $$2}' swdb.lst)
 gpgme_sha1 := $(shell awk '$$1=="gpgme_sha1" {print $$2}' swdb.lst)
 gpgme_sha2 := $(shell awk '$$1=="gpgme_sha2" {print $$2}' swdb.lst)
 
 pinentry_ver  := $(shell awk '$$1=="pinentry_ver" {print $$2}' swdb.lst)
 pinentry_sha1 := $(shell awk '$$1=="pinentry_sha1" {print $$2}' swdb.lst)
 pinentry_sha2 := $(shell awk '$$1=="pinentry_sha2" {print $$2}' swdb.lst)
 
 gpa_ver  := $(shell awk '$$1=="gpa_ver" {print $$2}' swdb.lst)
 gpa_sha1 := $(shell awk '$$1=="gpa_sha1" {print $$2}' swdb.lst)
 gpa_sha2 := $(shell awk '$$1=="gpa_sha2" {print $$2}' swdb.lst)
 
 gpgex_ver  := $(shell awk '$$1=="gpgex_ver" {print $$2}' swdb.lst)
 gpgex_sha1 := $(shell awk '$$1=="gpgex_sha1" {print $$2}' swdb.lst)
 gpgex_sha2 := $(shell awk '$$1=="gpgex_sha2" {print $$2}' swdb.lst)
 
 zlib_ver  := $(shell awk '$$1=="zlib_ver" {print $$2}' swdb.lst)
 zlib_sha1 := $(shell awk '$$1=="zlib_sha1_gz" {print $$2}' swdb.lst)
 zlib_sha2 := $(shell awk '$$1=="zlib_sha2_gz" {print $$2}' swdb.lst)
 
 bzip2_ver  := $(shell awk '$$1=="bzip2_ver" {print $$2}' swdb.lst)
 bzip2_sha1 := $(shell awk '$$1=="bzip2_sha1_gz" {print $$2}' swdb.lst)
 bzip2_sha2 := $(shell awk '$$1=="bzip2_sha2_gz" {print $$2}' swdb.lst)
 
 sqlite_ver  := $(shell awk '$$1=="sqlite_ver" {print $$2}' swdb.lst)
 sqlite_sha1 := $(shell awk '$$1=="sqlite_sha1_gz" {print $$2}' swdb.lst)
 sqlite_sha2 := $(shell awk '$$1=="sqlite_sha2_gz" {print $$2}' swdb.lst)
 
 
 $(info Information from the version database)
 $(info GnuPG ..........: $(gnupg_ver) (building $(gnupg_ver_this)))
 $(info Libgpg-error ...: $(libgpg_error_ver))
 $(info Npth ...........: $(npth_ver))
 $(info Libgcrypt ......: $(libgcrypt_ver))
 $(info Libassuan ......: $(libassuan_ver))
 $(info Libksba ........: $(libksba_ver))
 $(info Zlib ...........: $(zlib_ver))
 $(info Bzip2 ..........: $(bzip2_ver))
 $(info SQLite .........: $(sqlite_ver))
 $(info NtbTLS .. ......: $(ntbtls_ver))
 $(info GPGME ..........: $(gpgme_ver))
 $(info Pinentry .......: $(pinentry_ver))
 $(info GPA ............: $(gpa_ver))
 $(info GpgEX.... ......: $(gpgex_ver))
 endif
 
 # Version number for external packages
 pkg_config_ver = 0.23
 libiconv_ver = 1.14
 gettext_ver = 0.18.2.1
 libffi_ver = 3.0.13
 glib_ver = 2.34.3
 libpng_ver = 1.4.12
 gdk_pixbuf_ver = 2.26.5
 atk_ver = 1.32.0
 pango_ver = 1.29.4
 pixman_ver = 0.32.4
 cairo_ver = 1.12.16
 gtk__ver = 2.24.17
 
 # The GIT repository.  Using a local repo is much faster.
 #gitrep = git://git.gnupg.org
 gitrep = ${HOME}/s
 
 # The tarball directories
 pkgrep = ftp://ftp.gnupg.org/gcrypt
 pkg10rep = ftp://ftp.g10code.com/g10code
 pkg2rep = $(TARBALLS)
 
 # For each package, the following variables can be defined:
 #
 # speedo_pkg_PACKAGE_git: The GIT repository that should be built.
 # speedo_pkg_PACKAGE_gitref: The GIT revision to checkout
 #
 # speedo_pkg_PACKAGE_tar: URL to the tar file that should be built.
 #
 # Exactly one of the above variables is required.  Note that this
 # version of speedo does not cache repositories or tar files, and does
 # not test the integrity of the downloaded software.  If you care
 # about this, you can also specify filenames to locally verified files.
 # Filenames are differentiated from URLs by starting with a slash '/'.
 #
 # speedo_pkg_PACKAGE_configure: Extra arguments to configure.
 #
 # speedo_pkg_PACKAGE_make_args: Extra arguments to make.
 #
 # speedo_pkg_PACKAGE_make_args_inst: Extra arguments to make install.
 #
 # Note that you can override the defaults in this file in a local file
 # "config.mk"
 
 ifeq ($(WHAT),this)
 else ifeq ($(WHAT),git)
   speedo_pkg_libgpg_error_git = $(gitrep)/libgpg-error
   speedo_pkg_libgpg_error_gitref = master
   speedo_pkg_npth_git = $(gitrep)/npth
   speedo_pkg_npth_gitref = master
   speedo_pkg_libassuan_git = $(gitrep)/libassuan
   speedo_pkg_libassuan_gitref = master
   speedo_pkg_libgcrypt_git = $(gitrep)/libgcrypt
   speedo_pkg_libgcrypt_gitref = master
   speedo_pkg_libksba_git = $(gitrep)/libksba
   speedo_pkg_libksba_gitref = master
   speedo_pkg_ntbtls_git = $(gitrep)/ntbtls
   speedo_pkg_ntbtls_gitref = master
   speedo_pkg_gpgme_git = $(gitrep)/gpgme
   speedo_pkg_gpgme_gitref = master
   speedo_pkg_pinentry_git = $(gitrep)/pinentry
   speedo_pkg_pinentry_gitref = master
   speedo_pkg_gpa_git = $(gitrep)/gpa
   speedo_pkg_gpa_gitref = master
   speedo_pkg_gpgex_git = $(gitrep)/gpgex
   speedo_pkg_gpgex_gitref = master
 else ifeq ($(WHAT),release)
   speedo_pkg_libgpg_error_tar = \
 	$(pkgrep)/libgpg-error/libgpg-error-$(libgpg_error_ver).tar.bz2
   speedo_pkg_npth_tar = \
 	$(pkgrep)/npth/npth-$(npth_ver).tar.bz2
   speedo_pkg_libassuan_tar = \
 	$(pkgrep)/libassuan/libassuan-$(libassuan_ver).tar.bz2
   speedo_pkg_libgcrypt_tar = \
 	$(pkgrep)/libgcrypt/libgcrypt-$(libgcrypt_ver).tar.bz2
   speedo_pkg_libksba_tar = \
 	$(pkgrep)/libksba/libksba-$(libksba_ver).tar.bz2
   speedo_pkg_ntbtls_tar = \
 	$(pkgrep)/ntbtls/ntbtls-$(ntbtls_ver).tar.bz2
   speedo_pkg_gpgme_tar = \
 	$(pkgrep)/gpgme/gpgme-$(gpgme_ver).tar.bz2
   speedo_pkg_pinentry_tar = \
 	$(pkgrep)/pinentry/pinentry-$(pinentry_ver).tar.bz2
   speedo_pkg_gpa_tar = \
 	$(pkgrep)/gpa/gpa-$(gpa_ver).tar.bz2
   speedo_pkg_gpgex_tar = \
 	$(pkg10rep)/gpgex/gpgex-$(gpgex_ver).tar.bz2
 else
   $(error invalid value for WHAT (use on of: git release this))
 endif
 
 speedo_pkg_pkg_config_tar = $(pkg2rep)/pkg-config-$(pkg_config_ver).tar.gz
 speedo_pkg_zlib_tar       = $(pkgrep)/zlib/zlib-$(zlib_ver).tar.gz
 speedo_pkg_bzip2_tar      = $(pkgrep)/bzip2/bzip2-$(bzip2_ver).tar.gz
 speedo_pkg_sqlite_tar     = $(pkgrep)/sqlite/sqlite-autoconf-$(sqlite_ver).tar.gz
 speedo_pkg_libiconv_tar   = $(pkg2rep)/libiconv-$(libiconv_ver).tar.gz
 speedo_pkg_gettext_tar    = $(pkg2rep)/gettext-$(gettext_ver).tar.gz
 speedo_pkg_libffi_tar     = $(pkg2rep)/libffi-$(libffi_ver).tar.gz
 speedo_pkg_glib_tar       = $(pkg2rep)/glib-$(glib_ver).tar.xz
 speedo_pkg_libpng_tar     = $(pkg2rep)/libpng-$(libpng_ver).tar.bz2
 speedo_pkg_gdk_pixbuf_tar = $(pkg2rep)/gdk-pixbuf-$(gdk_pixbuf_ver).tar.xz
 speedo_pkg_atk_tar        = $(pkg2rep)/atk-$(atk_ver).tar.bz2
 speedo_pkg_pango_tar      = $(pkg2rep)/pango-$(pango_ver).tar.bz2
 speedo_pkg_pixman_tar     = $(pkg2rep)/pixman-$(pixman_ver).tar.gz
 speedo_pkg_cairo_tar      = $(pkg2rep)/cairo-$(cairo_ver).tar.xz
 speedo_pkg_gtk__tar       = $(pkg2rep)/gtk+-$(gtk__ver).tar.xz
 
 
 #
 # Package build options
 #
 
 speedo_pkg_npth_configure = --enable-static
 
 speedo_pkg_libgpg_error_configure = --enable-static
 speedo_pkg_w64_libgpg_error_configure = --enable-static
 
 speedo_pkg_libassuan_configure = --enable-static
 speedo_pkg_w64_libassuan_configure = --enable-static
 
 speedo_pkg_libgcrypt_configure = --disable-static
 
 speedo_pkg_libksba_configure = --disable-static
 
 speedo_pkg_ntbtls_configure = --enable-static
 
 
 ifeq ($(STATIC),1)
 speedo_pkg_npth_configure += --disable-shared
 
 speedo_pkg_libgpg_error_configure += --disable-shared
 
 speedo_pkg_libassuan_configure += --disable-shared
 
 speedo_pkg_libgcrypt_configure += --disable-shared
 
 speedo_pkg_libksba_configure += --disable-shared
 endif
 
 # For now we build ntbtls only static
 speedo_pkg_ntbtls_configure = --disable-shared
 
 ifeq ($(TARGETOS),w32)
 speedo_pkg_gnupg_configure = \
         --disable-g13 --enable-ntbtls \
         --enable-build-timestamp
 else
 speedo_pkg_gnupg_configure = --disable-g13 --enable-wks-tools
 endif
 speedo_pkg_gnupg_extracflags = -g
 
 # Create the version info files only for W32 so that they won't get
 # installed if for example INSTALL_PREFIX=/usr/local is used.
 ifeq ($(TARGETOS),w32)
 define speedo_pkg_gnupg_post_install
 (set -e; \
  sed -n  's/.*PACKAGE_VERSION "\(.*\)"/\1/p' config.h >$(idir)/INST_VERSION; \
  sed -n  's/.*W32INFO_VI_PRODUCTVERSION \(.*\)/\1/p' common/w32info-rc.h \
     |sed 's/,/./g' >$(idir)/INST_PROD_VERSION )
 endef
 endif
 
 # The LDFLAGS is needed for -lintl for glib.
 ifeq ($(WITH_GUI),1)
 speedo_pkg_gpgme_configure = \
 	--enable-static --enable-w32-glib --disable-w32-qt \
 	--with-gpg-error-prefix=$(idir) \
 	LDFLAGS=-L$(idir)/lib
 else
 speedo_pkg_gpgme_configure = \
 	--disable-static --disable-w32-glib --disable-w32-qt \
 	--with-gpg-error-prefix=$(idir) \
 	LDFLAGS=-L$(idir)/lib
 endif
 
 
 ifeq ($(TARGETOS),w32)
 speedo_pkg_pinentry_configure = --disable-pinentry-gtk2
 else
 speedo_pkg_pinentry_configure = --enable-pinentry-gtk2
 endif
 speedo_pkg_pinentry_configure += \
         --disable-pinentry-qt5   \
         --disable-pinentry-qt    \
 	--disable-pinentry-fltk  \
 	--disable-pinentry-tty   \
 	CPPFLAGS=-I$(idir)/include   \
 	LDFLAGS=-L$(idir)/lib        \
 	CXXFLAGS=-static-libstdc++
 
 
 speedo_pkg_gpa_configure = \
         --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
         --with-gpgme-prefix=$(idir) --with-zlib=$(idir) \
         --with-libassuan-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
 speedo_pkg_gpgex_configure = \
 	--with-gpg-error-prefix=$(idir) \
 	--with-libassuan-prefix=$(idir) \
 	--enable-gpa-only
 
 speedo_pkg_w64_gpgex_configure = \
 	--with-gpg-error-prefix=$(idir6) \
 	--with-libassuan-prefix=$(idir6) \
 	--enable-gpa-only
 
 
 #
 # External packages
 #
 
 ifeq ($(TARGETOS),w32)
 speedo_pkg_zlib_make_args = \
         -fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a
 
 speedo_pkg_zlib_make_args_inst = \
         -fwin32/Makefile.gcc \
         BINARY_PATH=$(idir)/bin INCLUDE_PATH=$(idir)/include \
 	LIBRARY_PATH=$(idir)/lib SHARED_MODE=1 IMPLIB=libz.dll.a
 
 # Zlib needs some special magic to generate a libtool file.
 # We also install the pc file here.
 define speedo_pkg_zlib_post_install
 (set -e; mkdir $(idir)/lib/pkgconfig || true;	        \
 cp $(auxsrc)/zlib.pc $(idir)/lib/pkgconfig/; 	        \
 cd $(idir);						\
 echo "# Generated by libtool" > lib/libz.la		\
 echo "dlname='../bin/zlib1.dll'" >> lib/libz.la;	\
 echo "library_names='libz.dll.a'" >> lib/libz.la;	\
 echo "old_library='libz.a'" >> lib/libz.la;		\
 echo "dependency_libs=''" >> lib/libz.la;		\
 echo "current=1" >> lib/libz.la;			\
 echo "age=2" >> lib/libz.la;				\
 echo "revision=5" >> lib/libz.la;			\
 echo "installed=yes" >> lib/libz.la;			\
 echo "shouldnotlink=no" >> lib/libz.la;			\
 echo "dlopen=''" >> lib/libz.la;			\
 echo "dlpreopen=''" >> lib/libz.la;			\
 echo "libdir=\"$(idir)/lib\"" >> lib/libz.la)
 endef
 
 endif
 
 ifeq ($(TARGETOS),w32)
 speedo_pkg_bzip2_make_args = \
 	CC="$(host)-gcc" AR="$(host)-ar" RANLIB="$(host)-ranlib"
 
 speedo_pkg_bzip2_make_args_inst = \
 	PREFIX=$(idir) CC="$(host)-gcc" AR="$(host)-ar" RANLIB="$(host)-ranlib"
 endif
 
 speedo_pkg_w64_libiconv_configure = \
 	--enable-shared=no --enable-static=yes
 
 speedo_pkg_gettext_configure = \
 	--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
         CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
 speedo_pkg_w64_gettext_configure = \
 	--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
         CPPFLAGS=-I$(idir6)/include LDFLAGS=-L$(idir6)/lib
 speedo_pkg_gettext_extracflags = -O2
 # We only need gettext-runtime and there is sadly no top level
 # configure option for this
 speedo_pkg_gettext_make_dir = gettext-runtime
 
 
 speedo_pkg_glib_configure = \
 	--disable-modular-tests \
 	--with-libiconv=gnu \
 	CPPFLAGS=-I$(idir)/include \
 	LDFLAGS=-L$(idir)/lib \
 	CCC=$(host)-g++ \
         LIBFFI_CFLAGS=-I$(idir)/lib/libffi-$(libffi_ver)/include \
 	LIBFFI_LIBS=\"-L$(idir)/lib -lffi\"
 ifeq ($(TARGETOS),w32)
 speedo_pkg_glib_extracflags = -march=i486
 endif
 
 ifeq ($(TARGETOS),w32)
 speedo_pkg_libpng_configure = \
 	CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" \
 	LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
 else
 speedo_pkg_libpng_configure = \
         CPPFLAGS=\"-I$(idir)/include\" \
         LDFLAGS=\"-L$(idir)/lib\"
 endif
 
 ifneq ($(TARGETOS),w32)
 speedo_pkg_gdk_pixbuf_configure = --without-libtiff --without-libjpeg
 endif
 
 speedo_pkg_pixman_configure = \
 	CPPFLAGS=-I$(idir)/include \
 	LDFLAGS=-L$(idir)/lib
 
 ifeq ($(TARGETOS),w32)
 speedo_pkg_cairo_configure = \
 	--disable-qt --disable-ft --disable-fc \
 	--enable-win32 --enable-win32-font \
 	CPPFLAGS=-I$(idir)/include \
 	LDFLAGS=-L$(idir)/lib
 else
 speedo_pkg_cairo_configure = \
 	--disable-qt \
         CPPFLAGS=-I$(idir)/include \
         LDFLAGS=-L$(idir)/lib
 endif
 
 speedo_pkg_pango_configure = \
 	--disable-gtk-doc  \
 	CPPFLAGS=-I$(idir)/include \
 	LDFLAGS=-L$(idir)/lib
 
 speedo_pkg_gtk__configure = \
 	--disable-cups \
 	CPPFLAGS=-I$(idir)/include \
 	LDFLAGS=-L$(idir)/lib
 
 
 # ---------
 
 all: all-speedo
 
 report: report-speedo
 
 clean: clean-speedo
 
 ifeq ($(TARGETOS),w32)
 STRIP = i686-w64-mingw32-strip
 else
 STRIP = strip
 endif
 W32CC = i686-w64-mingw32-gcc
 
 -include config.mk
 
 #
 #  The generic speedo code
 #
 
 MKDIR=mkdir
 MAKENSIS=makensis
 SHA1SUM := $(shell $(topsrc)/build-aux/getswdb.sh --find-sha1sum)
 ifeq ($(SHA1SUM),false)
 $(error The sha1sum tool is missing)
 endif
 SHA2SUM := $(shell $(topsrc)/build-aux/getswdb.sh --find-sha256sum)
 ifeq ($(SHA2SUM),false)
 $(error The sha256sum tool is missing)
 endif
 
 
 BUILD_ISODATE=$(shell date -u +%Y-%m-%d)
 BUILD_DATESTR=$(subst -,,$(BUILD_ISODATE))
 
 # The next two macros will work only after gnupg has been build.
 ifeq ($(TARGETOS),w32)
 INST_VERSION=$(shell head -1 $(idir)/INST_VERSION)
 INST_PROD_VERSION=$(shell head -1 $(idir)/INST_PROD_VERSION)
 endif
 
 # List with packages
 speedo_build_list = $(speedo_spkgs)
 speedo_w64_build_list = $(speedo_w64_spkgs)
 
 # To avoid running external commands during the read phase (":=" style
 # assignments), we check that the targetos has been given
 ifneq ($(TARGETOS),)
 
 # Determine build and host system
 build := $(shell $(topsrc)/autogen.sh --silent --print-build)
 ifeq ($(TARGETOS),w32)
   speedo_autogen_buildopt := --build-w32
   speedo_autogen_buildopt6 := --build-w64
   host := $(shell $(topsrc)/autogen.sh --silent --print-host --build-w32)
   host6:= $(shell $(topsrc)/autogen.sh --silent --print-host --build-w64)
   speedo_host_build_option := --host=$(host) --build=$(build)
   speedo_host_build_option6 := --host=$(host6) --build=$(build)
   speedo_w32_cflags := -mms-bitfields
 else
   speedo_autogen_buildopt :=
   host :=
   speedo_host_build_option :=
   speedo_w32_cflags :=
 endif
 
 ifeq ($(MAKE_J),)
   speedo_makeopt=
 else
   speedo_makeopt=-j$(MAKE_J)
 endif
 
 # End non-empty TARGETOS
 endif
 
 
 
 # The playground area is our scratch area, where we unpack, build and
 # install the packages.
 $(stampdir)/stamp-directories:
 	$(MKDIR) $(root) || true
 	$(MKDIR) $(stampdir) || true
 	$(MKDIR) $(sdir)  || true
 	$(MKDIR) $(bdir)  || true
 	$(MKDIR) $(idir)   || true
 ifeq ($(TARGETOS),w32)
 	$(MKDIR) $(bdir6)  || true
 	$(MKDIR) $(idir6)   || true
 endif
 	touch $(stampdir)/stamp-directories
 
 # Frob the name $1 by converting all '-' and '+' characters to '_'.
 define FROB_macro
 $(subst +,_,$(subst -,_,$(1)))
 endef
 
 # Get the variable $(1) (which may contain '-' and '+' characters).
 define GETVAR
 $($(call FROB_macro,$(1)))
 endef
 
 # Set a couple of common variables.
 define SETVARS
         pkg="$(1)";                                                     \
         git="$(call GETVAR,speedo_pkg_$(1)_git)";                       \
         gitref="$(call GETVAR,speedo_pkg_$(1)_gitref)";                 \
         tar="$(call GETVAR,speedo_pkg_$(1)_tar)";                       \
         ver="$(call GETVAR,$(1)_ver)";                                  \
         sha2="$(call GETVAR,$(1)_sha2)";                                \
         sha1="$(call GETVAR,$(1)_sha1)";                                \
         pkgsdir="$(sdir)/$(1)";                                         \
         if [ "$(1)" = "gnupg" ]; then                                   \
           git='';                                                       \
           gitref='';                                                    \
           tar='';                                                       \
           pkgsdir="$(topsrc)";                                          \
         fi;                                                             \
         pkgbdir="$(bdir)/$(1)";                                         \
         pkgcfg="$(call GETVAR,speedo_pkg_$(1)_configure)";              \
         tmp="$(speedo_w32_cflags)                                       \
              $(call GETVAR,speedo_pkg_$(1)_extracflags)";               \
         if [ x$$$$(echo "$$$$tmp" | tr -d '[:space:]')x != xx ]; then   \
           pkgextracflags="CFLAGS=\"$$$$tmp\"";                          \
         else                                                            \
           pkgextracflags=;                                              \
         fi;                                                             \
         pkgmkdir="$(call GETVAR,speedo_pkg_$(1)_make_dir)";             \
         pkgmkargs="$(call GETVAR,speedo_pkg_$(1)_make_args)";           \
         pkgmkargs_inst="$(call GETVAR,speedo_pkg_$(1)_make_args_inst)"; \
         pkgmkargs_uninst="$(call GETVAR,speedo_pkg_$(1)_make_args_uninst)"; \
         export PKG_CONFIG="/usr/bin/pkg-config";                        \
         export PKG_CONFIG_PATH="$(idir)/lib/pkgconfig";                 \
         [ "$(TARGETOS)" != native ] && export PKG_CONFIG_LIBDIR="";     \
         export SYSROOT="$(idir)";                                       \
         export PATH="$(idir)/bin:$${PATH}";                             \
         export LD_LIBRARY_PATH="$(idir)/lib:$${LD_LIBRARY_PATH}"
 endef
 
 define SETVARS_W64
         pkg="$(1)";                                                     \
         git="$(call GETVAR,speedo_pkg_$(1)_git)";                       \
         gitref="$(call GETVAR,speedo_pkg_$(1)_gitref)";                 \
         tar="$(call GETVAR,speedo_pkg_$(1)_tar)";                       \
         ver="$(call GETVAR,$(1)_ver)";                                  \
         sha2="$(call GETVAR,$(1)_sha2)";                                \
         sha1="$(call GETVAR,$(1)_sha1)";                                \
         pkgsdir="$(sdir)/$(1)";                                         \
         if [ "$(1)" = "gnupg" ]; then                                   \
           git='';                                                       \
           gitref='';                                                    \
           tar='';                                                       \
           pkgsdir="$(topsrc)";                                          \
         fi;                                                             \
         pkgbdir="$(bdir6)/$(1)";                                        \
         pkgcfg="$(call GETVAR,speedo_pkg_w64_$(1)_configure)";          \
         tmp="$(speedo_w32_cflags)                                       \
              $(call GETVAR,speedo_pkg_$(1)_extracflags)";               \
         if [ x$$$$(echo "$$$$tmp" | tr -d '[:space:]')x != xx ]; then   \
           pkgextracflags="CFLAGS=\"$$$$tmp\"";                          \
         else                                                            \
           pkgextracflags=;                                              \
         fi;                                                             \
         pkgmkdir="$(call GETVAR,speedo_pkg_$(1)_make_dir)";             \
         pkgmkargs="$(call GETVAR,speedo_pkg_$(1)_make_args)";           \
         pkgmkargs_inst="$(call GETVAR,speedo_pkg_$(1)_make_args_inst)"; \
         pkgmkargs_uninst="$(call GETVAR,speedo_pkg_$(1)_make_args_uninst)"; \
         export PKG_CONFIG="/usr/bin/pkg-config";                        \
         export PKG_CONFIG_PATH="$(idir6)/lib/pkgconfig";                \
         [ "$(TARGETOS)" != native ] && export PKG_CONFIG_LIBDIR="";     \
         export SYSROOT="$(idir6)";                                      \
         export PATH="$(idir6)/bin:$${PATH}";                            \
         export LD_LIBRARY_PATH="$(idir6)/lib:$${LD_LIBRARY_PATH}"
 endef
 
 
 # Template for source packages.
 
 # Note that the gnupg package is special: The package source dir is
 # the same as the topsrc dir and thus we need to detect the gnupg
 # package and cd to that directory.  We also test that no in-source build
 # has been done.  autogen.sh is not run for gnupg.
 #
 define SPKG_template
 
 $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
 	@echo "speedo: /*"
 	@echo "speedo:  *   $(1)"
 	@echo "speedo:  */"
 	@(set -e; cd $(sdir);				\
 	 $(call SETVARS,$(1)); 				\
 	 if [ "$(WHAT)" = "this" ]; then                \
            echo "speedo: using included source";        \
 	 elif [ "$(1)" = "gnupg" ]; then                \
 	   cd $$$${pkgsdir};                            \
            if [ -f config.log ]; then                   \
              echo "GnuPG has already been build in-source" >&2  ;\
 	     echo "Please run \"make distclean\" and retry" >&2 ;\
 	     exit 1 ;	                         	\
            fi;                                          \
 	   echo "speedo: unpacking gnupg not needed";   \
 	 elif [ -n "$$$${git}" ]; then			\
 	   echo "speedo: unpacking $(1) from $$$${git}:$$$${gitref}"; \
            git clone -b "$$$${gitref}" "$$$${git}" "$$$${pkg}"; \
 	   cd "$$$${pkg}"; 				\
 	   AUTOGEN_SH_SILENT=1 ./autogen.sh;            \
          elif [ -n "$$$${tar}" ]; then			\
 	   echo "speedo: unpacking $(1) from $$$${tar}"; \
            case "$$$${tar}" in				\
              *.gz) pretar=zcat ;;	   		\
              *.bz2) pretar=bzcat ;;			\
 	     *.xz) pretar=xzcat ;;                     	\
              *) pretar=cat ;;				\
            esac;					\
            [ -f tmp.tgz ] && rm tmp.tgz;                \
            case "$$$${tar}" in				\
 	     /*) $$$${pretar} < $$$${tar} | tar xf - ;;	\
 	     *)  wget -q -O - $$$${tar} | tee tmp.tgz   \
                   | $$$${pretar} | tar x$$$${opt}f - ;; \
 	   esac;					\
 	   if [ -f tmp.tgz ]; then                      \
 	     if [ -n "$$$${sha2}" ]; then               \
                tmp=$$$$($(SHA2SUM) <tmp.tgz|cut -d' ' -f1);\
                if [ "$$$${tmp}" != "$$$${sha2}" ]; then \
 	         echo "speedo:";                        \
                  echo "speedo: ERROR: SHA-256 checksum mismatch for $(1)";\
 	         echo "speedo:";                        \
                  exit 1;                                \
                fi;                                      \
 	     elif [ -n "$$$${sha1}" ]; then            \
                tmp=$$$$($(SHA1SUM) <tmp.tgz|cut -d' ' -f1);\
                if [ "$$$${tmp}" != "$$$${sha1}" ]; then \
 	         echo "speedo:";                        \
                  echo "speedo: ERROR: SHA-1 checksum mismatch for $(1)";\
 	         echo "speedo:";                        \
                  exit 1;                                \
                fi;                                      \
 	     else                                       \
                echo "speedo:";                          \
                echo "speedo: Warning: No checksum known for $(1)";\
                echo "speedo:";                          \
              fi;                                        \
 	     rm tmp.tgz;                                \
            fi;                                          \
 	   base=`echo "$$$${tar}" | sed -e 's,^.*/,,'   \
                  | sed -e 's,\.tar.*$$$$,,'`;		\
 	   mv $$$${base} $(1);				\
 	   patch="$(patdir)/$(1)-$$$${base#$(1)-}.patch";\
 	   patchx="$(patdir)/$(1).patch";               \
 	   if [ -x "$$$${patch}" ]; then  		\
              echo "speedo: applying patch $$$${patch}"; \
              cd $(1); "$$$${patch}"; 	 		\
 	   elif [ -x "$$$${patchx}" ]; then  		\
              echo "speedo: applying patch $$$${patchx}";\
              cd $(1); "$$$${patchx}"; 	 		\
 	   elif [ -f "$$$${patch}" ]; then  		\
              echo "speedo: warning: $$$${patch} is not executable"; \
 	   fi;						\
 	 else                                           \
 	   echo "speedo: unpacking $(1) from UNKNOWN";  \
 	 fi)
 	@touch $(stampdir)/stamp-$(1)-00-unpack
 
 $(stampdir)/stamp-$(1)-01-configure: $(stampdir)/stamp-$(1)-00-unpack
 	@echo "speedo: configuring $(1)"
 ifneq ($(findstring $(1),$(speedo_make_only_style)),)
 	@echo "speedo: configure run not required"
 else ifneq ($(findstring $(1),$(speedo_gnupg_style)),)
 	@($(call SETVARS,$(1));				\
 	 mkdir "$$$${pkgbdir}";				\
 	 cd "$$$${pkgbdir}";		        	\
          if [ -n "$(speedo_autogen_buildopt)" ]; then   \
             eval AUTOGEN_SH_SILENT=1 w32root="$(idir)"  \
                "$$$${pkgsdir}/autogen.sh"               \
                $(speedo_autogen_buildopt)            	\
                $$$${pkgcfg} $$$${pkgextracflags}; 	\
          else                                        	\
             eval "$$$${pkgsdir}/configure" 		\
 	       --silent                 		\
 	       --enable-maintainer-mode			\
                --prefix="$(idir)"		        \
                $$$${pkgcfg} $$$${pkgextracflags};     	\
 	 fi)
 else
 	@($(call SETVARS,$(1)); 			\
 	 mkdir "$$$${pkgbdir}";				\
 	 cd "$$$${pkgbdir}";		        	\
 	 eval "$$$${pkgsdir}/configure" 		\
 	     --silent $(speedo_host_build_option)	\
              --prefix="$(idir)"		        	\
 	     $$$${pkgcfg}  $$$${pkgextracflags};	\
 	 )
 endif
 	@touch $(stampdir)/stamp-$(1)-01-configure
 
-# Note that unpack has no 64 bit version becuase it is just the source.
+# Note that unpack has no 64 bit version because it is just the source.
 # Fixme: We should use templates to create the standard and w64
 # version of these rules.
 $(stampdir)/stamp-w64-$(1)-01-configure: $(stampdir)/stamp-$(1)-00-unpack
 	@echo "speedo: configuring $(1) (64 bit)"
 ifneq ($(findstring $(1),$(speedo_make_only_style)),)
 	@echo "speedo: configure run not required"
 else ifneq ($(findstring $(1),$(speedo_gnupg_style)),)
 	@($(call SETVARS_W64,$(1));			\
 	 mkdir "$$$${pkgbdir}";				\
 	 cd "$$$${pkgbdir}";		        	\
          if [ -n "$(speedo_autogen_buildopt)" ]; then   \
             eval AUTOGEN_SH_SILENT=1 w64root="$(idir6)" \
                "$$$${pkgsdir}/autogen.sh"               \
                $(speedo_autogen_buildopt6)            	\
                $$$${pkgcfg} $$$${pkgextracflags};       \
          else                                        	\
             eval "$$$${pkgsdir}/configure" 		\
 	       --silent                 		\
 	       --enable-maintainer-mode			\
                --prefix="$(idir6)"		        \
                $$$${pkgcfg} $$$${pkgextracflags};       \
 	 fi)
 else
 	@($(call SETVARS_W64,$(1)); 			\
 	 mkdir "$$$${pkgbdir}";				\
 	 cd "$$$${pkgbdir}";		        	\
 	 eval "$$$${pkgsdir}/configure" 		\
 	     --silent $(speedo_host_build_option6)	\
              --prefix="$(idir6)"	        	\
 	     $$$${pkgcfg} $$$${pkgextracflags};       	\
 	 )
 endif
 	@touch $(stampdir)/stamp-w64-$(1)-01-configure
 
 
 $(stampdir)/stamp-$(1)-02-make: $(stampdir)/stamp-$(1)-01-configure
 	@echo "speedo: making $(1)"
 ifneq ($(findstring $(1),$(speedo_make_only_style)),)
 	@($(call SETVARS,$(1));				\
           cd "$$$${pkgsdir}";				\
 	  test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
           if test "$$$${pkg}" = zlib -a "$(TARGETOS)" != w32 ; then \
             ./configure --prefix="$(idir)" ; \
           fi ;\
 	  $(MAKE) --no-print-directory $(speedo_makeopt) $$$${pkgmkargs} V=0)
 else
 	@($(call SETVARS,$(1));				\
           cd "$$$${pkgbdir}";				\
 	  test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
 	  $(MAKE) --no-print-directory $(speedo_makeopt) $$$${pkgmkargs} V=0)
 endif
 	@touch $(stampdir)/stamp-$(1)-02-make
 
 $(stampdir)/stamp-w64-$(1)-02-make: $(stampdir)/stamp-w64-$(1)-01-configure
 	@echo "speedo: making $(1) (64 bit)"
 ifneq ($(findstring $(1),$(speedo_make_only_style)),)
 	@($(call SETVARS_W64,$(1));				\
           cd "$$$${pkgsdir}";				\
 	  test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
 	  $(MAKE) --no-print-directory $(speedo_makeopt) $$$${pkgmkargs} V=0)
 else
 	@($(call SETVARS_W64,$(1));				\
           cd "$$$${pkgbdir}";				\
 	  test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
 	  $(MAKE) --no-print-directory $(speedo_makeopt) $$$${pkgmkargs} V=0)
 endif
 	@touch $(stampdir)/stamp-w64-$(1)-02-make
 
 # Note that post_install must come last because it may be empty and
 # "; ;" is a syntax error.
 $(stampdir)/stamp-$(1)-03-install: $(stampdir)/stamp-$(1)-02-make
 	@echo "speedo: installing $(1)"
 ifneq ($(findstring $(1),$(speedo_make_only_style)),)
 	@($(call SETVARS,$(1));				\
           cd "$$$${pkgsdir}";				\
 	  test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
 	  $(MAKE) --no-print-directory $$$${pkgmkargs_inst} install V=0;\
 	  $(call speedo_pkg_$(call FROB_macro,$(1))_post_install))
 else
 	@($(call SETVARS,$(1));				\
           cd "$$$${pkgbdir}";				\
 	  test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
 	  $(MAKE) --no-print-directory $$$${pkgmkargs_inst} install-strip V=0;\
 	  $(call speedo_pkg_$(call FROB_macro,$(1))_post_install))
 endif
 	touch $(stampdir)/stamp-$(1)-03-install
 
 $(stampdir)/stamp-w64-$(1)-03-install: $(stampdir)/stamp-w64-$(1)-02-make
 	@echo "speedo: installing $(1) (64 bit)"
 ifneq ($(findstring $(1),$(speedo_make_only_style)),)
 	@($(call SETVARS_W64,$(1));				\
           cd "$$$${pkgsdir}";				\
 	  test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
 	  $(MAKE) --no-print-directory $$$${pkgmkargs_inst} install V=0;\
 	  $(call speedo_pkg_$(call FROB_macro,$(1))_post_install))
 else
 	@($(call SETVARS_W64,$(1));				\
           cd "$$$${pkgbdir}";				\
 	  test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
 	  $(MAKE) --no-print-directory $$$${pkgmkargs_inst} install-strip V=0;\
 	  $(call speedo_pkg_$(call FROB_macro,$(1))_post_install))
 endif
 	touch $(stampdir)/stamp-w64-$(1)-03-install
 
 $(stampdir)/stamp-final-$(1): $(stampdir)/stamp-$(1)-03-install
 	@($(call SETVARS,$(1));                                  \
 	  printf "%-14s %-12s %s\n" $(1) "$$$${ver}" "$$$${sha1}" \
 	      >> $(bdir)/pkg-versions.txt)
 	@echo "speedo: $(1) done"
 	@touch $(stampdir)/stamp-final-$(1)
 
 $(stampdir)/stamp-w64-final-$(1): $(stampdir)/stamp-w64-$(1)-03-install
 	@echo "speedo: $(1) (64 bit) done"
 	@touch $(stampdir)/stamp-w64-final-$(1)
 
 .PHONY : clean-$(1)
 clean-$(1):
 	@echo "speedo: uninstalling $(1)"
 	@($(call SETVARS,$(1));			          \
 	 (cd "$$$${pkgbdir}" 2>/dev/null &&		  \
 	  $(MAKE) --no-print-directory                    \
            $$$${pkgmkargs_uninst} uninstall V=0 ) || true;\
          if [ "$(1)" = "gnupg" ]; then                    \
 	   rm -fR "$$$${pkgbdir}" || true                ;\
 	 else                                             \
 	   rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}" || true;\
 	 fi)
 	-rm -f $(stampdir)/stamp-final-$(1) $(stampdir)/stamp-$(1)-*
 
 
 .PHONY : build-$(1)
 build-$(1): $(stampdir)/stamp-final-$(1)
 
 
 .PHONY : report-$(1)
 report-$(1):
 	@($(call SETVARS,$(1));				\
 	 echo -n $(1):\  ;				\
 	 if [ -n "$$$${git}" ]; then			\
            if [ -e "$$$${pkgsdir}/.git" ]; then		\
 	     cd "$$$${pkgsdir}" &&			\
              git describe ;		                \
 	   else						\
              echo missing;				\
 	   fi						\
          elif [ -n "$$$${tar}" ]; then			\
 	   base=`echo "$$$${tar}" | sed -e 's,^.*/,,'   \
                  | sed -e 's,\.tar.*$$$$,,'`;		\
 	   echo $$$${base} ;				\
          fi)
 
 endef
 
 
 # Insert the template for each source package.
 $(foreach spkg, $(speedo_spkgs), $(eval $(call SPKG_template,$(spkg))))
 
 $(stampdir)/stamp-final: $(stampdir)/stamp-directories clean-pkg-versions
 ifeq ($(TARGETOS),w32)
 $(stampdir)/stamp-final: $(addprefix $(stampdir)/stamp-w64-final-,$(speedo_w64_build_list))
 endif
 $(stampdir)/stamp-final: $(addprefix $(stampdir)/stamp-final-,$(speedo_build_list))
 	touch $(stampdir)/stamp-final
 
 clean-pkg-versions:
         @: >$(bdir)/pkg-versions.txt
 
 all-speedo: $(stampdir)/stamp-final
 
 report-speedo: $(addprefix report-,$(speedo_build_list))
 
-# Just to check if we catched all stamps.
+# Just to check if we caught all stamps.
 clean-stamps:
 	$(RM) -fR $(stampdir)
 
 clean-speedo:
 	$(RM) -fR PLAY
 
 
 #
 # Windows installer
 #
 # {{{
 ifeq ($(TARGETOS),w32)
 
 dist-source: installer
 	for i in 00 01 02 03; do sleep 1;touch PLAY/stamps/stamp-*-${i}-*;done
 	(set -e;\
 	 tarname="$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).tar" ;\
 	 [ -f "$$tarname" ] && rm "$$tarname" ;\
          tar -C $(topsrc) -cf "$$tarname" --exclude-backups --exclude-vcs \
              --transform='s,^\./,$(INST_NAME)-$(INST_VERSION)/,' \
              --anchored --exclude './PLAY' . ;\
 	 tar --totals -rf "$$tarname" --exclude-backups --exclude-vcs \
               --transform='s,^,$(INST_NAME)-$(INST_VERSION)/,' \
 	     PLAY/stamps/stamp-*-00-unpack PLAY/src swdb.lst swdb.lst.sig ;\
 	 [ -f "$$tarname".xz ] && rm "$$tarname".xz;\
          xz "$$tarname" ;\
 	)
 
 
 # Extract the two latest news entries.  */
 $(bdir)/NEWS.tmp: $(topsrc)/NEWS
 	awk '/^Notewo/ {if(okay>1){exit}; okay++};okay {print $0}' \
 	    <$(topsrc)/NEWS  >$(bdir)/NEWS.tmp
 
 # Sort the file with the package versions.
 $(bdir)/pkg-versions.sorted: $(bdir)/pkg-versions.txt
 	grep -v '^gnupg ' <$(bdir)/pkg-versions.txt \
 	    | sort | uniq >$(bdir)/pkg-versions.sorted
 
 $(bdir)/README.txt: $(bdir)/NEWS.tmp $(topsrc)/README $(w32src)/README.txt \
                     $(w32src)/pkg-copyright.txt $(bdir)/pkg-versions.sorted
 	sed -e '/^;.*/d;' \
 	-e '/!NEWSFILE!/{r $(bdir)/NEWS.tmp' -e 'd;}' \
 	-e '/!GNUPGREADME!/{r $(topsrc)/README' -e 'd;}' \
         -e '/!PKG-COPYRIGHT!/{r $(w32src)/pkg-copyright.txt' -e 'd;}' \
         -e '/!PKG-VERSIONS!/{r $(bdir)/pkg-versions.sorted' -e 'd;}' \
         -e 's,!VERSION!,$(INST_VERSION),g' \
 	   < $(w32src)/README.txt \
            | sed -e '/^#/d' \
            | awk '{printf "%s\r\n", $$0}' >$(bdir)/README.txt
 
 $(bdir)/g4wihelp.dll: $(w32src)/g4wihelp.c $(w32src)/exdll.h
 	(set -e; cd $(bdir); \
 	 $(W32CC) -I. -shared -O2 -o g4wihelp.dll $(w32src)/g4wihelp.c \
 	          -lwinmm -lgdi32; \
 	 $(STRIP) g4wihelp.dll)
 
 w32_insthelpers: $(bdir)/g4wihelp.dll
 
 $(bdir)/inst-options.ini: $(w32src)/inst-options.ini
 	cat $(w32src)/inst-options.ini >$(bdir)/inst-options.ini
 
 extra_installer_options =
 ifeq ($(WITH_GUI),1)
 extra_installer_options += -DWITH_GUI=1
 endif
 
 installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt
 	$(MAKENSIS) -V2 \
                     -DINST_DIR=$(idir) \
                     -DINST6_DIR=$(idir6) \
                     -DBUILD_DIR=$(bdir) \
                     -DTOP_SRCDIR=$(topsrc) \
                     -DW32_SRCDIR=$(w32src) \
                     -DBUILD_ISODATE=$(BUILD_ISODATE) \
                     -DBUILD_DATESTR=$(BUILD_DATESTR) \
 		    -DNAME=$(INST_NAME) \
 	            -DVERSION=$(INST_VERSION) \
 		    -DPROD_VERSION=$(INST_PROD_VERSION) \
 		    $(extra_installer_options) $(w32src)/inst.nsi
 	@echo "Ready: $(idir)/$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).exe"
 
 
 define MKSWDB_commands
  ( pref="#+macro: gnupg24_w32_" ;\
    echo "$${pref}ver  $(INST_VERSION)_$(BUILD_DATESTR)"  ;\
    echo "$${pref}date $(2)" ;\
    echo "$${pref}size $$(wc -c <$(1)|awk '{print int($$1/1024)}')k";\
    echo "$${pref}sha1 $$(sha1sum <$(1)|cut -d' ' -f1)" ;\
    echo "$${pref}sha2 $$(sha256sum <$(1)|cut -d' ' -f1)" ;\
  ) | tee $(1).swdb
 endef
 
 
 # Build the installer from the source tarball.
 installer-from-source: dist-source
 	(set -e;\
 	 [ -d PLAY-release ] && rm -rf PLAY-release; \
 	 mkdir PLAY-release;\
 	 cd PLAY-release; \
 	 tar xJf "../$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).tar.xz";\
 	 cd $(INST_NAME)-$(INST_VERSION); \
          $(MAKE) -f build-aux/speedo.mk this-w32-installer SELFCHECK=0;\
 	 reldate="$$(date -u +%Y-%m-%d)" ;\
 	 exefile="$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).exe" ;\
 	 cp "PLAY/inst/$$exefile" ../.. ;\
 	 exefile="../../$$exefile" ;\
 	 $(call MKSWDB_commands,$${exefile},$${reldate}); \
 	)
 
 # This target repeats some of the installer-from-source steps but it
 # is intended to be called interactively, so that the passphrase can be
 # entered.
 sign-installer:
 	@(set -e; \
 	 cd PLAY-release; \
 	 cd $(INST_NAME)-$(INST_VERSION); \
 	 reldate="$$(date -u +%Y-%m-%d)" ;\
 	 exefile="$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).exe" ;\
 	 echo "speedo: /*" ;\
 	 echo "speedo:  * Signing installer" ;\
 	 echo "speedo:  * Key: $(AUTHENTICODE_KEY)";\
 	 echo "speedo:  */" ;\
 	 osslsigncode sign -certs $(AUTHENTICODE_CERTS)\
             -pkcs12 $(AUTHENTICODE_KEY) -askpass \
             -ts "http://timestamp.globalsign.com/scripts/timstamp.dll" \
             -h sha256 -n GnuPG -i https://gnupg.org \
 	    -in "PLAY/inst/$$exefile" -out "../../$$exefile" ;\
 	 exefile="../../$$exefile" ;\
 	 $(call MKSWDB_commands,$${exefile},$${reldate}); \
 	 echo "speedo: /*" ;\
 	 echo "speedo:  * Verification result" ;\
 	 echo "speedo:  */" ;\
          osslsigncode verify $${exefile} \
 	)
 
 
 
 endif
 # }}} W32
 
 
 #
-# Check availibility of standard tools
+# Check availability of standard tools
 #
 check-tools:
 
 
 #
 # Mark phony targets
 #
 .PHONY: all all-speedo report-speedo clean-stamps clean-speedo installer \
 	w32_insthelpers check-tools clean-pkg-versions
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 5a17f9793..9e1184868 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -1,8638 +1,8638 @@
 % texinfo.tex -- TeX macros to handle Texinfo files.
 %
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2007-05-03.09}
+\def\texinfoversion{2018-10-25.16}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 % 2007 Free Software Foundation, Inc.
 %
 % This texinfo.tex 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, or (at
 % your option) any later version.
 %
 % This texinfo.tex file 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 texinfo.tex file; see the file COPYING.  If not,
 % see <http://www.gnu.org/licenses/>.
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
 % restriction.  (This has been our intent since Texinfo was invented.)
 %
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
 %   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
 %   ftp://tug.org/tex/texinfo.tex
 %     (and all CTAN mirrors, see http://www.ctan.org).
 % The texinfo.tex in any given distribution could well be out
 % of date, so if that's what you're using, please check.
 %
 % Send bug reports to bug-texinfo@gnu.org.  Please include including a
 % complete document in each bug report with which we can reproduce the
 % problem.  Patches are, of course, greatly appreciated.
 %
 % To process a Texinfo manual with TeX, it's most reliable to use the
 % texi2dvi shell script that comes with the distribution.  For a simple
 % manual foo.texi, however, you can get away with this:
 %   tex foo.texi
 %   texindex foo.??
 %   tex foo.texi
 %   tex foo.texi
 %   dvips foo.dvi -o  # or whatever; this makes foo.ps.
 % The extra TeX runs get the cross-reference information correct.
 % Sometimes one run after texindex suffices, and sometimes you need more
 % than two; texi2dvi does it as many times as necessary.
 %
 % It is possible to adapt texinfo.tex for other languages, to some
 % extent.  You can get the existing language-specific files from the
 % full Texinfo distribution.
 %
 % The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
 
 
 \message{Loading texinfo [version \texinfoversion]:}
 
 % If in a .fmt file, print the version number
 % and turn on active characters that we couldn't do earlier because
 % they might have appeared in the input file name.
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
 
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
 % For @tex, we can use \tabalign.
 \let\+ = \relax
 
 % Save some plain tex macros whose names we will redefine.
 \let\ptexb=\b
 \let\ptexbullet=\bullet
 \let\ptexc=\c
 \let\ptexcomma=\,
 \let\ptexdot=\.
 \let\ptexdots=\dots
 \let\ptexend=\end
 \let\ptexequiv=\equiv
 \let\ptexexclam=\!
 \let\ptexfootnote=\footnote
 \let\ptexgtr=>
 \let\ptexhat=^
 \let\ptexi=\i
 \let\ptexindent=\indent
 \let\ptexinsert=\insert
 \let\ptexlbrace=\{
 \let\ptexless=<
 \let\ptexnewwrite\newwrite
 \let\ptexnoindent=\noindent
 \let\ptexplus=+
 \let\ptexrbrace=\}
 \let\ptexslash=\/
 \let\ptexstar=\*
 \let\ptext=\t
 
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
 \newlinechar = `^^J
 
 % Use TeX 3.0's \inputlineno to get the line number, for better error
 % messages, but if we're using an old version of TeX, don't do anything.
 %
 \ifx\inputlineno\thisisundefined
   \let\linenumber = \empty % Pre-3.0.
 \else
   \def\linenumber{l.\the\inputlineno:\space}
 \fi
 
 % Set up fixed words for English if not already set.
 \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
 \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
 \ifx\putwordfile\undefined      \gdef\putwordfile{file}\fi
 \ifx\putwordin\undefined        \gdef\putwordin{in}\fi
 \ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
 \ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
 \ifx\putwordInfo\undefined      \gdef\putwordInfo{Info}\fi
 \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
 \ifx\putwordMethodon\undefined  \gdef\putwordMethodon{Method on}\fi
 \ifx\putwordNoTitle\undefined   \gdef\putwordNoTitle{No Title}\fi
 \ifx\putwordof\undefined        \gdef\putwordof{of}\fi
 \ifx\putwordon\undefined        \gdef\putwordon{on}\fi
 \ifx\putwordpage\undefined      \gdef\putwordpage{page}\fi
 \ifx\putwordsection\undefined   \gdef\putwordsection{section}\fi
 \ifx\putwordSection\undefined   \gdef\putwordSection{Section}\fi
 \ifx\putwordsee\undefined       \gdef\putwordsee{see}\fi
 \ifx\putwordSee\undefined       \gdef\putwordSee{See}\fi
 \ifx\putwordShortTOC\undefined  \gdef\putwordShortTOC{Short Contents}\fi
 \ifx\putwordTOC\undefined       \gdef\putwordTOC{Table of Contents}\fi
 %
 \ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
 \ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
 \ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
 \ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi
 \ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi
 \ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi
 \ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi
 \ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi
 \ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi
 \ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi
 \ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi
 \ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi
 %
 \ifx\putwordDefmac\undefined    \gdef\putwordDefmac{Macro}\fi
 \ifx\putwordDefspec\undefined   \gdef\putwordDefspec{Special Form}\fi
 \ifx\putwordDefvar\undefined    \gdef\putwordDefvar{Variable}\fi
 \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
 \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
 
 % Since the category of space is not known, we have to be careful.
 \chardef\spacecat = 10
 \def\spaceisspace{\catcode`\ =\spacecat}
 
 % sometimes characters are active, so we need control sequences.
 \chardef\colonChar = `\:
 \chardef\commaChar = `\,
 \chardef\dashChar  = `\-
 \chardef\dotChar   = `\.
 \chardef\exclamChar= `\!
 \chardef\lquoteChar= `\`
 \chardef\questChar = `\?
 \chardef\rquoteChar= `\'
 \chardef\semiChar  = `\;
 \chardef\underChar = `\_
 
 % Ignore a token.
 %
 \def\gobble#1{}
 
 % The following is used inside several \edef's.
 \def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
 
 % Hyphenation fixes.
 \hyphenation{
   Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
   ap-pen-dix bit-map bit-maps
   data-base data-bases eshell fall-ing half-way long-est man-u-script
   man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
   par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
   spell-ing spell-ings
   stand-alone strong-est time-stamp time-stamps which-ever white-space
   wide-spread wrap-around
 }
 
 % Margin to add to right of even pages, to left of odd pages.
 \newdimen\bindingoffset
 \newdimen\normaloffset
 \newdimen\pagewidth \newdimen\pageheight
 
 % For a final copy, take out the rectangles
 % that mark overfull boxes (in case you have decided
 % that the text looks ok even though it passes the margin).
 %
 \def\finalout{\overfullrule=0pt}
 
 % @| inserts a changebar to the left of the current line.  It should
 % surround any changed text.  This approach does *not* work if the
 % change spans more than two lines of output.  To handle that, we would
 % have adopt a much more difficult approach (putting marks into the main
 % vertical list for the beginning and end of each change).
 %
 \def\|{%
   % \vadjust can only be used in horizontal mode.
   \leavevmode
   %
   % Append this vertical mode material after the current line in the output.
   \vadjust{%
     % We want to insert a rule with the height and depth of the current
     % leading; that is exactly what \strutbox is supposed to record.
     \vskip-\baselineskip
     %
     % \vadjust-items are inserted at the left edge of the type.  So
     % the \llap here moves out into the left-hand margin.
     \llap{%
       %
       % For a thicker or thinner bar, change the `1pt'.
       \vrule height\baselineskip width1pt
       %
       % This is the space between the bar and the text.
       \hskip 12pt
     }%
   }%
 }
 
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
 % since that produces some useless output on the terminal.  We also make
 % some effort to order the tracing commands to reduce output in the log
 % file; cf. trace.sty in LaTeX.
 %
 \def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
 \def\loggingall{%
   \tracingstats2
   \tracingpages1
   \tracinglostchars2  % 2 gives us more in etex
   \tracingparagraphs1
   \tracingoutput1
   \tracingmacros2
   \tracingrestores1
   \showboxbreadth\maxdimen \showboxdepth\maxdimen
   \ifx\eTeXversion\undefined\else % etex gives us more logging
     \tracingscantokens1
     \tracingifs1
     \tracinggroups1
     \tracingnesting2
     \tracingassigns1
   \fi
   \tracingcommands3  % 3 gives us more in etex
   \errorcontextlines16
 }%
 
 % add check for \lastpenalty to plain's definitions.  If the last thing
 % we did was a \nobreak, we don't want to insert more space.
 %
 \def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
   \removelastskip\penalty-50\smallskip\fi\fi}
 \def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
   \removelastskip\penalty-100\medskip\fi\fi}
 \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
   \removelastskip\penalty-200\bigskip\fi\fi}
 
 % For @cropmarks command.
 % Do @cropmarks to get crop marks.
 %
 \newif\ifcropmarks
 \let\cropmarks = \cropmarkstrue
 %
 % Dimensions to add cropmarks at corners.
 % Added by P. A. MacKay, 12 Nov. 1986
 %
 \newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
 \newdimen\cornerlong  \cornerlong=1pc
 \newdimen\cornerthick \cornerthick=.3pt
 \newdimen\topandbottommargin \topandbottommargin=.75in
 
 % Main output routine.
 \chardef\PAGE = 255
 \output = {\onepageout{\pagecontents\PAGE}}
 
 \newbox\headlinebox
 \newbox\footlinebox
 
 % \onepageout takes a vbox as an argument.  Note that \pagecontents
 % does insertions, but you have to call it yourself.
 \def\onepageout#1{%
   \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
   %
   \ifodd\pageno  \advance\hoffset by \bindingoffset
   \else \advance\hoffset by -\bindingoffset\fi
   %
   % Do this outside of the \shipout so @code etc. will be expanded in
   % the headline as they should be, not taken literally (outputting ''code).
   \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
   \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
   %
   {%
     % Have to do this stuff outside the \shipout because we want it to
     % take effect in \write's, yet the group defined by the \vbox ends
     % before the \shipout runs.
     %
     \indexdummies         % don't expand commands in the output.
     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
                % the page break happens to be in the middle of an example.
                % 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
                % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
       \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
       %
       \ifcropmarks \vbox to \outervsize\bgroup
         \hsize = \outerhsize
         \vskip-\topandbottommargin
         \vtop to0pt{%
           \line{\ewtop\hfil\ewtop}%
           \nointerlineskip
           \line{%
             \vbox{\moveleft\cornerthick\nstop}%
             \hfill
             \vbox{\moveright\cornerthick\nstop}%
           }%
           \vss}%
         \vskip\topandbottommargin
         \line\bgroup
           \hfil % center the page within the outer (page) hsize.
           \ifodd\pageno\hskip\bindingoffset\fi
           \vbox\bgroup
       \fi
       %
       \unvbox\headlinebox
       \pagebody{#1}%
       \ifdim\ht\footlinebox > 0pt
         % Only leave this space if the footline is nonempty.
         % (We lessened \vsize for it in \oddfootingyyy.)
         % The \baselineskip=24pt in plain's \makefootline has no effect.
         \vskip 24pt
         \unvbox\footlinebox
       \fi
       %
       \ifcropmarks
           \egroup % end of \vbox\bgroup
         \hfil\egroup % end of (centering) \line\bgroup
         \vskip\topandbottommargin plus1fill minus1fill
         \boxmaxdepth = \cornerthick
         \vbox to0pt{\vss
           \line{%
             \vbox{\moveleft\cornerthick\nsbot}%
             \hfill
             \vbox{\moveright\cornerthick\nsbot}%
           }%
           \nointerlineskip
           \line{\ewbot\hfil\ewbot}%
         }%
       \egroup % \vbox from first cropmarks clause
       \fi
     }% end of \shipout\vbox
   }% end of group with \indexdummies
   \advancepageno
   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
 
 \newinsert\margin \dimen\margin=\maxdimen
 
 \def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
 {\catcode`\@ =11
 \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
 % marginal hacks, juha@viisa.uucp (Juha Takala)
 \ifvoid\margin\else % marginal info is present
   \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
 \dimen@=\dp#1 \unvbox#1
 \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
 \ifr@ggedbottom \kern-\dimen@ \vfil \fi}
 }
 
 % Here are the rules for the cropmarks.  Note that they are
 % offset so that the space between them is truly \outerhsize or \outervsize
 % (P. A. MacKay, 12 November, 1986)
 %
 \def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
 \def\nstop{\vbox
   {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
 \def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
 \def\nsbot{\vbox
   {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
 
 % Parse an argument, then pass it to #1.  The argument is the rest of
 % the input line (except we remove a trailing comment).  #1 should be a
 % macro which expects an ordinary undelimited TeX argument.
 %
 \def\parsearg{\parseargusing{}}
 \def\parseargusing#1#2{%
   \def\argtorun{#2}%
   \begingroup
     \obeylines
     \spaceisspace
     #1%
     \parseargline\empty% Insert the \empty token, see \finishparsearg below.
 }
 
 {\obeylines %
   \gdef\parseargline#1^^M{%
     \endgroup % End of the group started in \parsearg.
     \argremovecomment #1\comment\ArgTerm%
   }%
 }
 
 % First remove any @comment, then any @c comment.
 \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
 \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
 
 % Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
 %
 % \argremovec might leave us with trailing space, e.g.,
 %    @end itemize  @c foo
 % This space token undergoes the same procedure and is eventually removed
 % by \finishparsearg.
 %
 \def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
 \def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
 \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
   \def\temp{#3}%
   \ifx\temp\empty
     % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
     \let\temp\finishparsearg
   \else
     \let\temp\argcheckspaces
   \fi
   % Put the space token in:
   \temp#1 #3\ArgTerm
 }
 
 % If a _delimited_ argument is enclosed in braces, they get stripped; so
 % to get _exactly_ the rest of the line, we had to prevent such situation.
 % We prepended an \empty token at the very beginning and we expand it now,
 % just before passing the control to \argtorun.
 % (Similarly, we have to think about #3 of \argcheckspacesY above: it is
 % either the null string, or it ends with \^^M---thus there is no danger
 % that a pair of braces would be stripped.
 %
 % But first, we have to remove the trailing space token.
 %
 \def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
 
 % \parseargdef\foo{...}
 %	is roughly equivalent to
 % \def\foo{\parsearg\Xfoo}
 % \def\Xfoo#1{...}
 %
 % Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
 % favourite TeX trick.  --kasal, 16nov03
 
 \def\parseargdef#1{%
   \expandafter \doparseargdef \csname\string#1\endcsname #1%
 }
 \def\doparseargdef#1#2{%
   \def#2{\parsearg#1}%
   \def#1##1%
 }
 
 % Several utility definitions with active space:
 {
   \obeyspaces
   \gdef\obeyedspace{ }
 
   % Make each space character in the input produce a normal interword
   % space in the output.  Don't allow a line break at this space, as this
   % is used only in environments like @example, where each line of input
   % should produce a line of output anyway.
   %
   \gdef\sepspaces{\obeyspaces\let =\tie}
 
   % If an index command is used in an @example environment, any spaces
   % therein should become regular spaces in the raw index file, not the
   % expansion of \tie (\leavevmode \penalty \@M \ ).
   \gdef\unsepspaces{\let =\space}
 }
 
 
 \def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
 
 % Define the framework for environments in texinfo.tex.  It's used like this:
 %
 %   \envdef\foo{...}
 %   \def\Efoo{...}
 %
 % It's the responsibility of \envdef to insert \begingroup before the
 % actual body; @end closes the group after calling \Efoo.  \envdef also
 % defines \thisenv, so the current environment is known; @end checks
 % whether the environment name matches.  The \checkenv macro can also be
 % used to check whether the current environment is the one expected.
 %
 % Non-false conditionals (@iftex, @ifset) don't fit into this, so they
 % are not treated as environments; they don't open a group.  (The
 % implementation of @end takes care not to call \endgroup in this
 % special case.)
 
 
 % At runtime, environments start with this:
 \def\startenvironment#1{\begingroup\def\thisenv{#1}}
 % initialize
 \let\thisenv\empty
 
 % ... but they get defined via ``\envdef\foo{...}'':
 \long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
 \def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
 
 % Check whether we're in the right environment:
 \def\checkenv#1{%
   \def\temp{#1}%
   \ifx\thisenv\temp
   \else
     \badenverr
   \fi
 }
 
 % Environment mismatch, #1 expected:
 \def\badenverr{%
   \errhelp = \EMsimple
   \errmessage{This command can appear only \inenvironment\temp,
     not \inenvironment\thisenv}%
 }
 \def\inenvironment#1{%
   \ifx#1\empty
     out of any environment%
   \else
     in environment \expandafter\string#1%
   \fi
 }
 
 % @end foo executes the definition of \Efoo.
 % But first, it executes a specialized version of \checkenv
 %
 \parseargdef\end{%
   \if 1\csname iscond.#1\endcsname
   \else
     % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
     \expandafter\checkenv\csname#1\endcsname
     \csname E#1\endcsname
     \endgroup
   \fi
 }
 
 \newhelp\EMsimple{Press RETURN to continue.}
 
 
 %% Simple single-character @ commands
 
 % @@ prints an @
 % Kludge this until the fonts are right (grr).
 \def\@{{\tt\char64}}
 
 % This is turned off because it was never documented
 % and you can use @w{...} around a quote to suppress ligatures.
 %% Define @` and @' to be the same as ` and '
 %% but suppressing ligatures.
 %\def\`{{`}}
 %\def\'{{'}}
 
 % Used to generate quoted braces.
 \def\mylbrace {{\tt\char123}}
 \def\myrbrace {{\tt\char125}}
 \let\{=\mylbrace
 \let\}=\myrbrace
 \begingroup
   % Definitions to produce \{ and \} commands for indices,
   % and @{ and @} for the aux/toc files.
   \catcode`\{ = \other \catcode`\} = \other
   \catcode`\[ = 1 \catcode`\] = 2
   \catcode`\! = 0 \catcode`\\ = \other
   !gdef!lbracecmd[\{]%
   !gdef!rbracecmd[\}]%
   !gdef!lbraceatcmd[@{]%
   !gdef!rbraceatcmd[@}]%
 !endgroup
 
 % @comma{} to avoid , parsing problems.
 \let\comma = ,
 
 % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
 % Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
 \let\, = \c
 \let\dotaccent = \.
 \def\ringaccent#1{{\accent23 #1}}
 \let\tieaccent = \t
 \let\ubaraccent = \b
 \let\udotaccent = \d
 
 % Other special characters: @questiondown @exclamdown @ordf @ordm
 % Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
 \def\questiondown{?`}
 \def\exclamdown{!`}
 \def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
 \def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
 
 % Dotless i and dotless j, used for accents.
 \def\imacro{i}
 \def\jmacro{j}
 \def\dotless#1{%
   \def\temp{#1}%
   \ifx\temp\imacro \ptexi
   \else\ifx\temp\jmacro \j
   \else \errmessage{@dotless can be used only with i or j}%
   \fi\fi
 }
 
 % The \TeX{} logo, as in plain, but resetting the spacing so that a
 % period following counts as ending a sentence.  (Idea found in latex.)
 %
 \edef\TeX{\TeX \spacefactor=1000 }
 
 % @LaTeX{} logo.  Not quite the same results as the definition in
 % latex.ltx, since we use a different font for the raised A; it's most
 % convenient for us to use an explicitly smaller font, rather than using
 % the \scriptstyle font (since we don't reset \scriptstyle and
 % \scriptscriptstyle).
 %
 \def\LaTeX{%
   L\kern-.36em
   {\setbox0=\hbox{T}%
    \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
   \kern-.15em
   \TeX
 }
 
 % Be sure we're in horizontal mode when doing a tie, since we make space
 % equivalent to this in @example-like environments. Otherwise, a space
 % at the beginning of a line will start with \penalty -- and
 % since \penalty is valid in vertical mode, we'd end up putting the
 % penalty on the vertical list instead of in the new paragraph.
 {\catcode`@ = 11
  % Avoid using \@M directly, because that causes trouble
  % if the definition is written into an index file.
  \global\let\tiepenalty = \@M
  \gdef\tie{\leavevmode\penalty\tiepenalty\ }
 }
 
 % @: forces normal size whitespace following.
 \def\:{\spacefactor=1000 }
 
 % @* forces a line break.
 \def\*{\hfil\break\hbox{}\ignorespaces}
 
 % @/ allows a line break.
 \let\/=\allowbreak
 
 % @. is an end-of-sentence period.
 \def\.{.\spacefactor=\endofsentencespacefactor\space}
 
 % @! is an end-of-sentence bang.
 \def\!{!\spacefactor=\endofsentencespacefactor\space}
 
 % @? is an end-of-sentence query.
 \def\?{?\spacefactor=\endofsentencespacefactor\space}
 
 % @frenchspacing on|off  says whether to put extra space after punctuation.
 %
 \def\onword{on}
 \def\offword{off}
 %
 \parseargdef\frenchspacing{%
   \def\temp{#1}%
   \ifx\temp\onword \plainfrenchspacing
   \else\ifx\temp\offword \plainnonfrenchspacing
   \else
     \errhelp = \EMsimple
     \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
   \fi\fi
 }
 
 % @w prevents a word break.  Without the \leavevmode, @w at the
 % beginning of a paragraph, when TeX is still in vertical mode, would
 % produce a whole line of output instead of starting the paragraph.
 \def\w#1{\leavevmode\hbox{#1}}
 
 % @group ... @end group forces ... to be all on one page, by enclosing
 % it in a TeX vbox.  We use \vtop instead of \vbox to construct the box
 % to keep its height that of a normal line.  According to the rules for
 % \topskip (p.114 of the TeXbook), the glue inserted is
 % max (\topskip - \ht (first item), 0).  If that height is large,
 % therefore, no glue is inserted, and the space between the headline and
 % the text is small, which looks bad.
 %
 % Another complication is that the group might be very large.  This can
 % cause the glue on the previous page to be unduly stretched, because it
 % does not have much material.  In this case, it's better to add an
 % explicit \vfill so that the extra space is at the bottom.  The
 % threshold for doing this is if the group is more than \vfilllimit
 % percent of a page (\vfilllimit can be changed inside of @tex).
 %
 \newbox\groupbox
 \def\vfilllimit{0.7}
 %
 \envdef\group{%
   \ifnum\catcode`\^^M=\active \else
     \errhelp = \groupinvalidhelp
     \errmessage{@group invalid in context where filling is enabled}%
   \fi
   \startsavinginserts
   %
   \setbox\groupbox = \vtop\bgroup
     % Do @comment since we are called inside an environment such as
     % @example, where each end-of-line in the input causes an
     % end-of-line in the output.  We don't want the end-of-line after
     % the `@group' to put extra space in the output.  Since @group
     % should appear on a line by itself (according to the Texinfo
     % manual), we don't worry about eating any user text.
     \comment
 }
 %
 % The \vtop produces a box with normal height and large depth; thus, TeX puts
 % \baselineskip glue before it, and (when the next line of text is done)
 % \lineskip glue after it.  Thus, space below is not quite equal to space
 % above.  But it's pretty close.
 \def\Egroup{%
     % To get correct interline space between the last line of the group
     % and the first line afterwards, we have to propagate \prevdepth.
     \endgraf % Not \par, as it may have been set to \lisppar.
     \global\dimen1 = \prevdepth
   \egroup           % End the \vtop.
   % \dimen0 is the vertical size of the group's box.
   \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
   % \dimen2 is how much space is left on the page (more or less).
   \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
   % if the group doesn't fit on the current page, and it's a big big
   % group, force a page break.
   \ifdim \dimen0 > \dimen2
     \ifdim \pagetotal < \vfilllimit\pageheight
       \page
     \fi
   \fi
   \box\groupbox
   \prevdepth = \dimen1
   \checkinserts
 }
 %
 % TeX puts in an \escapechar (i.e., `@') at the beginning of the help
 % message, so this ends up printing `@group can only ...'.
 %
 \newhelp\groupinvalidhelp{%
 group can only be used in environments such as @example,^^J%
 where each line of input produces a line of output.}
 
 % @need space-in-mils
 % forces a page break if there is not space-in-mils remaining.
 
 \newdimen\mil  \mil=0.001in
 
 % Old definition--didn't work.
 %\parseargdef\need{\par %
 %% This method tries to make TeX break the page naturally
 %% if the depth of the box does not fit.
 %{\baselineskip=0pt%
 %\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
 %\prevdepth=-1000pt
 %}}
 
 \parseargdef\need{%
   % Ensure vertical mode, so we don't make a big box in the middle of a
   % paragraph.
   \par
   %
   % If the @need value is less than one line space, it's useless.
   \dimen0 = #1\mil
   \dimen2 = \ht\strutbox
   \advance\dimen2 by \dp\strutbox
   \ifdim\dimen0 > \dimen2
     %
     % Do a \strut just to make the height of this box be normal, so the
     % normal leading is inserted relative to the preceding line.
     % And a page break here is fine.
     \vtop to #1\mil{\strut\vfil}%
     %
     % TeX does not even consider page breaks if a penalty added to the
     % main vertical list is 10000 or more.  But in order to see if the
     % empty box we just added fits on the page, we must make it consider
     % page breaks.  On the other hand, we don't want to actually break the
     % page after the empty box.  So we use a penalty of 9999.
     %
     % There is an extremely small chance that TeX will actually break the
     % page at this \penalty, if there are no other feasible breakpoints in
     % sight.  (If the user is using lots of big @group commands, which
     % almost-but-not-quite fill up a page, TeX will have a hard time doing
     % good page breaking, for example.)  However, I could not construct an
     % example where a page broke at this \penalty; if it happens in a real
     % document, then we can reconsider our strategy.
     \penalty9999
     %
     % Back up by the size of the box, whether we did a page break or not.
     \kern -#1\mil
     %
     % Do not allow a page break right after this kern.
     \nobreak
   \fi
 }
 
 % @br   forces paragraph break (and is undocumented).
 
 \let\br = \par
 
 % @page forces the start of a new page.
 %
 \def\page{\par\vfill\supereject}
 
 % @exdent text....
 % outputs text on separate line in roman font, starting at standard page margin
 
 % This records the amount of indent in the innermost environment.
 % That's how much \exdent should take out.
 \newskip\exdentamount
 
 % This defn is used inside fill environments such as @defun.
 \parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}
 
 % This defn is used inside nofill environments such as @example.
 \parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount
   \leftline{\hskip\leftskip{\rm#1}}}}
 
 % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
 % paragraph.  For more general purposes, use the \margin insertion
 % class.  WHICH is `l' or `r'.
 %
 \newskip\inmarginspacing \inmarginspacing=1cm
 \def\strutdepth{\dp\strutbox}
 %
 \def\doinmargin#1#2{\strut\vadjust{%
   \nobreak
   \kern-\strutdepth
   \vtop to \strutdepth{%
     \baselineskip=\strutdepth
     \vss
     % if you have multiple lines of stuff to put here, you'll need to
     % make the vbox yourself of the appropriate size.
     \ifx#1l%
       \llap{\ignorespaces #2\hskip\inmarginspacing}%
     \else
       \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
     \fi
     \null
   }%
 }}
 \def\inleftmargin{\doinmargin l}
 \def\inrightmargin{\doinmargin r}
 %
 % @inmargin{TEXT [, RIGHT-TEXT]}
 % (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
 % else use TEXT for both).
 %
 \def\inmargin#1{\parseinmargin #1,,\finish}
 \def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
   \setbox0 = \hbox{\ignorespaces #2}%
   \ifdim\wd0 > 0pt
     \def\lefttext{#1}%  have both texts
     \def\righttext{#2}%
   \else
     \def\lefttext{#1}%  have only one text
     \def\righttext{#1}%
   \fi
   %
   \ifodd\pageno
     \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin
   \else
     \def\temp{\inleftmargin\lefttext}%
   \fi
   \temp
 }
 
 % @include file    insert text of that file as input.
 %
 \def\include{\parseargusing\filenamecatcodes\includezzz}
 \def\includezzz#1{%
   \pushthisfilestack
   \def\thisfile{#1}%
   {%
     \makevalueexpandable
     \def\temp{\input #1 }%
     \expandafter
   }\temp
   \popthisfilestack
 }
 \def\filenamecatcodes{%
   \catcode`\\=\other
   \catcode`~=\other
   \catcode`^=\other
   \catcode`_=\other
   \catcode`|=\other
   \catcode`<=\other
   \catcode`>=\other
   \catcode`+=\other
   \catcode`-=\other
 }
 
 \def\pushthisfilestack{%
   \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
 }
 \def\pushthisfilestackX{%
   \expandafter\pushthisfilestackY\thisfile\StackTerm
 }
 \def\pushthisfilestackY #1\StackTerm #2\StackTerm {%
   \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}%
 }
 
 \def\popthisfilestack{\errthisfilestackempty}
 \def\errthisfilestackempty{\errmessage{Internal error:
   the stack of filenames is empty.}}
 
 \def\thisfile{}
 
 % @center line
 % outputs that line, centered.
 %
 \parseargdef\center{%
   \ifhmode
     \let\next\centerH
   \else
     \let\next\centerV
   \fi
   \next{\hfil \ignorespaces#1\unskip \hfil}%
 }
 \def\centerH#1{%
   {%
     \hfil\break
     \advance\hsize by -\leftskip
     \advance\hsize by -\rightskip
     \line{#1}%
     \break
   }%
 }
 \def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
 
 % @sp n   outputs n lines of vertical space
 
 \parseargdef\sp{\vskip #1\baselineskip}
 
 % @comment ...line which is ignored...
 % @c is the same as @comment
 % @ignore ... @end ignore  is another way to write a comment
 
 \def\comment{\begingroup \catcode`\^^M=\other%
 \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
 \commentxxx}
 {\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
 
 \let\c=\comment
 
 % @paragraphindent NCHARS
 % We'll use ems for NCHARS, close enough.
 % NCHARS can also be the word `asis' or `none'.
 % We cannot feasibly implement @paragraphindent asis, though.
 %
 \def\asisword{asis} % no translation, these are keywords
 \def\noneword{none}
 %
 \parseargdef\paragraphindent{%
   \def\temp{#1}%
   \ifx\temp\asisword
   \else
     \ifx\temp\noneword
       \defaultparindent = 0pt
     \else
       \defaultparindent = #1em
     \fi
   \fi
   \parindent = \defaultparindent
 }
 
 % @exampleindent NCHARS
 % We'll use ems for NCHARS like @paragraphindent.
 % It seems @exampleindent asis isn't necessary, but
 % I preserve it to make it similar to @paragraphindent.
 \parseargdef\exampleindent{%
   \def\temp{#1}%
   \ifx\temp\asisword
   \else
     \ifx\temp\noneword
       \lispnarrowing = 0pt
     \else
       \lispnarrowing = #1em
     \fi
   \fi
 }
 
 % @firstparagraphindent WORD
 % If WORD is `none', then suppress indentation of the first paragraph
 % after a section heading.  If WORD is `insert', then do indent at such
 % paragraphs.
 %
 % The paragraph indentation is suppressed or not by calling
 % \suppressfirstparagraphindent, which the sectioning commands do.
 % We switch the definition of this back and forth according to WORD.
 % By default, we suppress indentation.
 %
 \def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
 \def\insertword{insert}
 %
 \parseargdef\firstparagraphindent{%
   \def\temp{#1}%
   \ifx\temp\noneword
     \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
   \else\ifx\temp\insertword
     \let\suppressfirstparagraphindent = \relax
   \else
     \errhelp = \EMsimple
     \errmessage{Unknown @firstparagraphindent option `\temp'}%
   \fi\fi
 }
 
 % Here is how we actually suppress indentation.  Redefine \everypar to
 % \kern backwards by \parindent, and then reset itself to empty.
 %
 % We also make \indent itself not actually do anything until the next
 % paragraph.
 %
 \gdef\dosuppressfirstparagraphindent{%
   \gdef\indent{%
     \restorefirstparagraphindent
     \indent
   }%
   \gdef\noindent{%
     \restorefirstparagraphindent
     \noindent
   }%
   \global\everypar = {%
     \kern -\parindent
     \restorefirstparagraphindent
   }%
 }
 
 \gdef\restorefirstparagraphindent{%
   \global \let \indent = \ptexindent
   \global \let \noindent = \ptexnoindent
   \global \everypar = {}%
 }
 
 
 % @asis just yields its argument.  Used with @table, for example.
 %
 \def\asis#1{#1}
 
 % @math outputs its argument in math mode.
 %
 % One complication: _ usually means subscripts, but it could also mean
 % an actual _ character, as in @math{@var{some_variable} + 1}.  So make
 % _ active, and distinguish by seeing if the current family is \slfam,
 % which is what @var uses.
 {
   \catcode`\_ = \active
   \gdef\mathunderscore{%
     \catcode`\_=\active
     \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
   }
 }
 % Another complication: we want \\ (and @\) to output a \ character.
 % FYI, plain.tex uses \\ as a temporary control sequence (why?), but
 % this is not advertised and we don't care.  Texinfo does not
 % otherwise define @\.
 %
 % The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
 \def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
 %
 \def\math{%
   \tex
   \mathunderscore
   \let\\ = \mathbackslash
   \mathactive
   $\finishmath
 }
 \def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
 
 % Some active characters (such as <) are spaced differently in math.
 % We have to reset their definitions in case the @math was an argument
 % to a command which sets the catcodes (such as @item or @section).
 %
 {
   \catcode`^ = \active
   \catcode`< = \active
   \catcode`> = \active
   \catcode`+ = \active
   \gdef\mathactive{%
     \let^ = \ptexhat
     \let< = \ptexless
     \let> = \ptexgtr
     \let+ = \ptexplus
   }
 }
 
 % @bullet and @minus need the same treatment as @math, just above.
 \def\bullet{$\ptexbullet$}
 \def\minus{$-$}
 
 % @dots{} outputs an ellipsis using the current font.
 % We do .5em per period so that it has the same spacing in the cm
 % typewriter fonts as three actual period characters; on the other hand,
 % in other typewriter fonts three periods are wider than 1.5em.  So do
 % whichever is larger.
 %
 \def\dots{%
   \leavevmode
   \setbox0=\hbox{...}% get width of three periods
   \ifdim\wd0 > 1.5em
     \dimen0 = \wd0
   \else
     \dimen0 = 1.5em
   \fi
   \hbox to \dimen0{%
     \hskip 0pt plus.25fil
     .\hskip 0pt plus1fil
     .\hskip 0pt plus1fil
     .\hskip 0pt plus.5fil
   }%
 }
 
 % @enddots{} is an end-of-sentence ellipsis.
 %
 \def\enddots{%
   \dots
   \spacefactor=\endofsentencespacefactor
 }
 
 % @comma{} is so commas can be inserted into text without messing up
 % Texinfo's parsing.
 %
 \let\comma = ,
 
 % @refill is a no-op.
 \let\refill=\relax
 
 % If working on a large document in chapters, it is convenient to
 % be able to disable indexing, cross-referencing, and contents, for test runs.
 % This is done with @novalidate (before @setfilename).
 %
 \newif\iflinks \linkstrue % by default we want the aux files.
 \let\novalidate = \linksfalse
 
 % @setfilename is done at the beginning of every texinfo file.
 % So open here the files we need to have open while reading the input.
 % This makes it possible to make a .fmt file for texinfo.
 \def\setfilename{%
    \fixbackslash  % Turn off hack to swallow `\input texinfo'.
    \iflinks
      \tryauxfile
      % Open the new aux file.  TeX will close it automatically at exit.
      \immediate\openout\auxfile=\jobname.aux
    \fi % \openindices needs to do some work in any case.
    \openindices
    \let\setfilename=\comment % Ignore extra @setfilename cmds.
    %
    % If texinfo.cnf is present on the system, read it.
    % Useful for site-wide @afourpaper, etc.
    \openin 1 texinfo.cnf
    \ifeof 1 \else \input texinfo.cnf \fi
    \closein 1
    %
    \comment % Ignore the actual filename.
 }
 
 % Called from \setfilename.
 %
 \def\openindices{%
   \newindex{cp}%
   \newcodeindex{fn}%
   \newcodeindex{vr}%
   \newcodeindex{tp}%
   \newcodeindex{ky}%
   \newcodeindex{pg}%
 }
 
 % @bye.
 \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
 
 
 \message{pdf,}
 % adobe `portable' document format
 \newcount\tempnum
 \newcount\lnkcount
 \newtoks\filename
 \newcount\filenamelength
 \newcount\pgn
 \newtoks\toksA
 \newtoks\toksB
 \newtoks\toksC
 \newtoks\toksD
 \newbox\boxA
 \newcount\countA
 \newif\ifpdf
 \newif\ifpdfmakepagedest
 
 % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
 % can be set).  So we test for \relax and 0 as well as \undefined,
 % borrowed from ifpdf.sty.
 \ifx\pdfoutput\undefined
 \else
   \ifx\pdfoutput\relax
   \else
     \ifcase\pdfoutput
     \else
       \pdftrue
     \fi
   \fi
 \fi
 
 % PDF uses PostScript string constants for the names of xref targets,
 % for display in the outlines, and in other places.  Thus, we have to
 % double any backslashes.  Otherwise, a name like "\node" will be
 % interpreted as a newline (\n), followed by o, d, e.  Not good.
 % http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
 % (and related messages, the final outcome is that it is up to the TeX
 % user to double the backslashes and otherwise make the string valid, so
 % that's what we do).
 
 % double active backslashes.
 %
 {\catcode`\@=0 \catcode`\\=\active
  @gdef@activebackslashdouble{%
    @catcode`@\=@active
    @let\=@doublebackslash}
 }
 
 % To handle parens, we must adopt a different approach, since parens are
 % not active characters.  hyperref.dtx (which has the same problem as
 % 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%
     \ifx\\##2\\%
     \else
       #2%
       \HyReturnAfterFi{%
         \HyPsdReplace##2\END
       }%
     \fi
   }%
   \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
 }
 \long\def\HyReturnAfterFi#1\fi{\fi#1}
 
 % #1 is a control sequence in which to do the replacements.
 \def\backslashparens#1{%
   \xdef#1{#1}% redefine it as its expansion; the definition is simply
              % \lastnode when called from \setref -> \pdfmkdest.
   \HyPsdSubst{(}{\realbackslash(}{#1}%
   \HyPsdSubst{)}{\realbackslash)}{#1}%
 }
 
 \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
 with PDF output, and none of those formats could be found.  (.eps cannot
 be supported due to the design of the PDF format; use regular TeX (DVI
 output) for that.)}
 
 \ifpdf
   \input pdfcolor
   \pdfcatalog{/PageMode /UseOutlines}
   %
   % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
     \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
     \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
     %
     % pdftex (and the PDF format) support .png, .jpg, .pdf (among
     % others).  Let's try in that order.
     \let\pdfimgext=\empty
     \begingroup
       \openin 1 #1.png \ifeof 1
         \openin 1 #1.jpg \ifeof 1
           \openin 1 #1.jpeg \ifeof 1
             \openin 1 #1.JPG \ifeof 1
               \openin 1 #1.pdf \ifeof 1
                 \errhelp = \nopdfimagehelp
                 \errmessage{Could not find image file #1 for pdf}%
               \else \gdef\pdfimgext{pdf}%
               \fi
             \else \gdef\pdfimgext{JPG}%
             \fi
           \else \gdef\pdfimgext{jpeg}%
           \fi
         \else \gdef\pdfimgext{jpg}%
         \fi
       \else \gdef\pdfimgext{png}%
       \fi
       \closein 1
     \endgroup
     %
     % without \immediate, pdftex seg faults when the same image is
     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
       \immediate\pdfimage
     \else
       \immediate\pdfximage
     \fi
       \ifdim \wd0 >0pt width \imagewidth \fi
       \ifdim \wd2 >0pt height \imageheight \fi
       \ifnum\pdftexversion<13
          #1.\pdfimgext
        \else
          {#1.\pdfimgext}%
        \fi
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
     \fi}
   %
   \def\pdfmkdest#1{{%
     % We have to set dummies so commands such as @code, and characters
     % such as \, aren't expanded when present in a section title.
     \indexnofonts
     \turnoffactive
     \activebackslashdouble
     \makevalueexpandable
     \def\pdfdestname{#1}%
     \backslashparens\pdfdestname
     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
   }}
   %
   % used to mark target names; must be expandable.
   \def\pdfmkpgn#1{#1}
   %
   % by default, use a color that is dark enough to print on paper as
   % nearly black, but still distinguishable for online viewing.
   % (Defined in pdfcolor.tex.)
   \let\urlcolor = \BrickRed
   \let\linkcolor = \BrickRed
   \def\endlink{\Black\pdfendlink}
   %
   % Adding outlines to PDF; macros for calculating structure of outlines
   % come from Petr Olsak
   \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
     \else \csname#1\endcsname \fi}
   \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
     \advance\tempnum by 1
     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
   %
   % #1 is the section text, which is what will be displayed in the
   % outline by the pdf viewer.  #2 is the pdf expression for the number
   % of subentries (or empty, for subsubsections).  #3 is the node text,
   % which might be empty if this toc entry had no corresponding node.
   % #4 is the page number
   %
   \def\dopdfoutline#1#2#3#4{%
     % Generate a link to the node text if that exists; else, use the
     % page number.  We could generate a destination for the section
     % text in the case where a section has no node, but it doesn't
     % seem worth the trouble, since most documents are normally structured.
     \def\pdfoutlinedest{#3}%
     \ifx\pdfoutlinedest\empty
       \def\pdfoutlinedest{#4}%
     \else
       % Doubled backslashes in the name.
       {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
        \backslashparens\pdfoutlinedest}%
     \fi
     %
     % Also double the backslashes in the display string.
     {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
      \backslashparens\pdfoutlinetext}%
     %
     \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
   }
   %
   \def\pdfmakeoutlines{%
     \begingroup
       % Thanh's hack / proper braces in bookmarks
       \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
       %
       % Read toc silently, to get counts of subentries for \pdfoutline.
       \def\numchapentry##1##2##3##4{%
 	\def\thischapnum{##2}%
 	\def\thissecnum{0}%
 	\def\thissubsecnum{0}%
       }%
       \def\numsecentry##1##2##3##4{%
 	\advancenumber{chap\thischapnum}%
 	\def\thissecnum{##2}%
 	\def\thissubsecnum{0}%
       }%
       \def\numsubsecentry##1##2##3##4{%
 	\advancenumber{sec\thissecnum}%
 	\def\thissubsecnum{##2}%
       }%
       \def\numsubsubsecentry##1##2##3##4{%
 	\advancenumber{subsec\thissubsecnum}%
       }%
       \def\thischapnum{0}%
       \def\thissecnum{0}%
       \def\thissubsecnum{0}%
       %
       % use \def rather than \let here because we redefine \chapentry et
       % al. a second time, below.
       \def\appentry{\numchapentry}%
       \def\appsecentry{\numsecentry}%
       \def\appsubsecentry{\numsubsecentry}%
       \def\appsubsubsecentry{\numsubsubsecentry}%
       \def\unnchapentry{\numchapentry}%
       \def\unnsecentry{\numsecentry}%
       \def\unnsubsecentry{\numsubsecentry}%
       \def\unnsubsubsecentry{\numsubsubsecentry}%
       \readdatafile{toc}%
       %
       % Read toc second time, this time actually producing the outlines.
       % The `-' means take the \expnumber as the absolute number of
       % subentries, which we calculated on our first read of the .toc above.
       %
       % We use the node names as the destinations.
       \def\numchapentry##1##2##3##4{%
         \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
       \def\numsecentry##1##2##3##4{%
         \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}%
       \def\numsubsecentry##1##2##3##4{%
         \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}%
       \def\numsubsubsecentry##1##2##3##4{% count is always zero
         \dopdfoutline{##1}{}{##3}{##4}}%
       %
       % PDF outlines are displayed using system fonts, instead of
       % document fonts.  Therefore we cannot use special characters,
       % since the encoding is unknown.  For example, the eogonek from
       % Latin 2 (0xea) gets translated to a | character.  Info from
       % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
       %
       % xx to do this right, we have to translate 8-bit characters to
       % their "best" equivalent, based on the @documentencoding.  Right
       % now, I guess we'll just let the pdf reader have its way.
       \indexnofonts
       \setupdatafile
       \catcode`\\=\active \otherbackslash
       \input \jobname.toc
     \endgroup
   }
   %
   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
     \ifx\PP\D\let\nextsp\relax
     \else\let\nextsp\skipspaces
       \ifx\p\space\else\addtokens{\filename}{\PP}%
         \advance\filenamelength by 1
       \fi
     \fi
     \nextsp}
   \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
   \ifnum\pdftexversion < 14
     \let \startlink \pdfannotlink
   \else
     \let \startlink \pdfstartlink
   \fi
   % make a live url in pdf output.
   \def\pdfurl#1{%
     \begingroup
       % it seems we really need yet another set of dummies; have not
       % 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
       \makevalueexpandable
       \leavevmode\urlcolor
       \startlink attr{/Border [0 0 0]}%
         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
     \endgroup}
   \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
   \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
   \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
   \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
   \def\maketoks{%
     \expandafter\poptoks\the\toksA|ENDTOKS|\relax
     \ifx\first0\adn0
     \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
     \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
     \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
     \else
       \ifnum0=\countA\else\makelink\fi
       \ifx\first.\let\next=\done\else
         \let\next=\maketoks
         \addtokens{\toksB}{\the\toksD}
         \ifx\first,\addtokens{\toksB}{\space}\fi
       \fi
     \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
     \next}
   \def\makelink{\addtokens{\toksB}%
     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
   \def\pdflink#1{%
     \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
     \linkcolor #1\endlink}
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 \else
   \let\pdfmkdest = \gobble
   \let\pdfurl = \gobble
   \let\endlink = \relax
   \let\linkcolor = \relax
   \let\pdfmakeoutlines = \relax
 \fi  % \ifx\pdfoutput
 
 
 \message{fonts,}
 
 % Change the current font style to #1, remembering it in \curfontstyle.
 % For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
 % italics, not bold italics.
 %
 \def\setfontstyle#1{%
   \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
   \csname ten#1\endcsname  % change the current font
 }
 
 % Select #1 fonts with the current style.
 %
 \def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
 
 \def\rm{\fam=0 \setfontstyle{rm}}
 \def\it{\fam=\itfam \setfontstyle{it}}
 \def\sl{\fam=\slfam \setfontstyle{sl}}
 \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
 \def\tt{\fam=\ttfam \setfontstyle{tt}}
 
 % Texinfo sort of supports the sans serif font style, which plain TeX does not.
 % So we set up a \sf.
 \newfam\sffam
 \def\sf{\fam=\sffam \setfontstyle{sf}}
 \let\li = \sf % Sometimes we call it \li, not \sf.
 
 % We don't need math for this font style.
 \def\ttsl{\setfontstyle{ttsl}}
 
 
 % Default leading.
 \newdimen\textleading  \textleading = 13.2pt
 
 % Set the baselineskip to #1, and the lineskip and strut size
 % correspondingly.  There is no deep meaning behind these magic numbers
 % used as factors; they just match (closely enough) what Knuth defined.
 %
 \def\lineskipfactor{.08333}
 \def\strutheightpercent{.70833}
 \def\strutdepthpercent {.29167}
 %
 \def\setleading#1{%
   \normalbaselineskip = #1\relax
   \normallineskip = \lineskipfactor\normalbaselineskip
   \normalbaselines
   \setbox\strutbox =\hbox{%
     \vrule width0pt height\strutheightpercent\baselineskip
                     depth \strutdepthpercent \baselineskip
   }%
 }
 
 %
 % PDF CMaps.  See also LaTeX's t1.cmap.
 %
 % \cmapOT1
 \ifpdf
   \begingroup
     \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
     \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
 %%DocumentNeededResources: ProcSet (CIDInit)
 %%IncludeResource: ProcSet (CIDInit)
 %%BeginResource: CMap (TeX-OT1-0)
 %%Title: (TeX-OT1-0 TeX OT1 0)
 %%Version: 1.000
 %%EndComments
 /CIDInit /ProcSet findresource begin
 12 dict begin
 begincmap
 /CIDSystemInfo
 << /Registry (TeX)
 /Ordering (OT1)
 /Supplement 0
 >> def
 /CMapName /TeX-OT1-0 def
 /CMapType 2 def
 1 begincodespacerange
 <00> <7F>
 endcodespacerange
 8 beginbfrange
 <00> <01> <0393>
 <09> <0A> <03A8>
 <23> <26> <0023>
 <28> <3B> <0028>
 <3F> <5B> <003F>
 <5D> <5E> <005D>
 <61> <7A> <0061>
 <7B> <7C> <2013>
 endbfrange
 40 beginbfchar
 <02> <0398>
 <03> <039B>
 <04> <039E>
 <05> <03A0>
 <06> <03A3>
 <07> <03D2>
 <08> <03A6>
 <0B> <00660066>
 <0C> <00660069>
 <0D> <0066006C>
 <0E> <006600660069>
 <0F> <00660066006C>
 <10> <0131>
 <11> <0237>
 <12> <0060>
 <13> <00B4>
 <14> <02C7>
 <15> <02D8>
 <16> <00AF>
 <17> <02DA>
 <18> <00B8>
 <19> <00DF>
 <1A> <00E6>
 <1B> <0153>
 <1C> <00F8>
 <1D> <00C6>
 <1E> <0152>
 <1F> <00D8>
 <21> <0021>
 <22> <201D>
 <27> <2019>
 <3C> <00A1>
 <3D> <003D>
 <3E> <00BF>
 <5C> <201C>
 <5F> <02D9>
 <60> <2018>
 <7D> <02DD>
 <7E> <007E>
 <7F> <00A8>
 endbfchar
 endcmap
 CMapName currentdict /CMap defineresource pop
 end
 end
 %%EndResource
 %%EOF
     }\endgroup
   \expandafter\edef\csname cmapOT1\endcsname#1{%
     \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
   }%
 %
 % \cmapOT1IT
   \begingroup
     \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
     \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
 %%DocumentNeededResources: ProcSet (CIDInit)
 %%IncludeResource: ProcSet (CIDInit)
 %%BeginResource: CMap (TeX-OT1IT-0)
 %%Title: (TeX-OT1IT-0 TeX OT1IT 0)
 %%Version: 1.000
 %%EndComments
 /CIDInit /ProcSet findresource begin
 12 dict begin
 begincmap
 /CIDSystemInfo
 << /Registry (TeX)
 /Ordering (OT1IT)
 /Supplement 0
 >> def
 /CMapName /TeX-OT1IT-0 def
 /CMapType 2 def
 1 begincodespacerange
 <00> <7F>
 endcodespacerange
 8 beginbfrange
 <00> <01> <0393>
 <09> <0A> <03A8>
 <25> <26> <0025>
 <28> <3B> <0028>
 <3F> <5B> <003F>
 <5D> <5E> <005D>
 <61> <7A> <0061>
 <7B> <7C> <2013>
 endbfrange
 42 beginbfchar
 <02> <0398>
 <03> <039B>
 <04> <039E>
 <05> <03A0>
 <06> <03A3>
 <07> <03D2>
 <08> <03A6>
 <0B> <00660066>
 <0C> <00660069>
 <0D> <0066006C>
 <0E> <006600660069>
 <0F> <00660066006C>
 <10> <0131>
 <11> <0237>
 <12> <0060>
 <13> <00B4>
 <14> <02C7>
 <15> <02D8>
 <16> <00AF>
 <17> <02DA>
 <18> <00B8>
 <19> <00DF>
 <1A> <00E6>
 <1B> <0153>
 <1C> <00F8>
 <1D> <00C6>
 <1E> <0152>
 <1F> <00D8>
 <21> <0021>
 <22> <201D>
 <23> <0023>
 <24> <00A3>
 <27> <2019>
 <3C> <00A1>
 <3D> <003D>
 <3E> <00BF>
 <5C> <201C>
 <5F> <02D9>
 <60> <2018>
 <7D> <02DD>
 <7E> <007E>
 <7F> <00A8>
 endbfchar
 endcmap
 CMapName currentdict /CMap defineresource pop
 end
 end
 %%EndResource
 %%EOF
     }\endgroup
   \expandafter\edef\csname cmapOT1IT\endcsname#1{%
     \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
   }%
 %
 % \cmapOT1TT
   \begingroup
     \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
     \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
 %%DocumentNeededResources: ProcSet (CIDInit)
 %%IncludeResource: ProcSet (CIDInit)
 %%BeginResource: CMap (TeX-OT1TT-0)
 %%Title: (TeX-OT1TT-0 TeX OT1TT 0)
 %%Version: 1.000
 %%EndComments
 /CIDInit /ProcSet findresource begin
 12 dict begin
 begincmap
 /CIDSystemInfo
 << /Registry (TeX)
 /Ordering (OT1TT)
 /Supplement 0
 >> def
 /CMapName /TeX-OT1TT-0 def
 /CMapType 2 def
 1 begincodespacerange
 <00> <7F>
 endcodespacerange
 5 beginbfrange
 <00> <01> <0393>
 <09> <0A> <03A8>
 <21> <26> <0021>
 <28> <5F> <0028>
 <61> <7E> <0061>
 endbfrange
 32 beginbfchar
 <02> <0398>
 <03> <039B>
 <04> <039E>
 <05> <03A0>
 <06> <03A3>
 <07> <03D2>
 <08> <03A6>
 <0B> <2191>
 <0C> <2193>
 <0D> <0027>
 <0E> <00A1>
 <0F> <00BF>
 <10> <0131>
 <11> <0237>
 <12> <0060>
 <13> <00B4>
 <14> <02C7>
 <15> <02D8>
 <16> <00AF>
 <17> <02DA>
 <18> <00B8>
 <19> <00DF>
 <1A> <00E6>
 <1B> <0153>
 <1C> <00F8>
 <1D> <00C6>
 <1E> <0152>
 <1F> <00D8>
 <20> <2423>
 <27> <2019>
 <60> <2018>
 <7F> <00A8>
 endbfchar
 endcmap
 CMapName currentdict /CMap defineresource pop
 end
 end
 %%EndResource
 %%EOF
     }\endgroup
   \expandafter\edef\csname cmapOT1TT\endcsname#1{%
     \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
   }%
 \else
   \expandafter\let\csname cmapOT1\endcsname\gobble
   \expandafter\let\csname cmapOT1IT\endcsname\gobble
   \expandafter\let\csname cmapOT1TT\endcsname\gobble
 \fi
 
 
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
 % #3 is the font's design size, #4 is a scale factor, #5 is the CMap
 % encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
 % empty to omit).
 \def\setfont#1#2#3#4#5{%
   \font#1=\fontprefix#2#3 scaled #4
   \csname cmap#5\endcsname#1%
 }
 % This is what gets called when #5 of \setfont is empty.
 \let\cmap\gobble
 
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
 % before you read in texinfo.tex.
 \ifx\fontprefix\undefined
 \def\fontprefix{cm}
 \fi
 % Support font families that don't use the same naming scheme as CM.
 \def\rmshape{r}
 \def\rmbshape{bx}               %where the normal face is bold
 \def\bfshape{b}
 \def\bxshape{bx}
 \def\ttshape{tt}
 \def\ttbshape{tt}
 \def\ttslshape{sltt}
 \def\itshape{ti}
 \def\itbshape{bxti}
 \def\slshape{sl}
 \def\slbshape{bxsl}
 \def\sfshape{ss}
 \def\sfbshape{ss}
 \def\scshape{csc}
 \def\scbshape{csc}
 
 % Definitions for a main text size of 11pt.  This is the default in
 % Texinfo.
 %
 \def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
 \edef\mainmagstep{\magstephalf}
 \setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
 \setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
 \setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
 \setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
 \setfont\textsl\slshape{10}{\mainmagstep}{OT1}
 \setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
 \setfont\textsc\scshape{10}{\mainmagstep}{OT1}
 \setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep
 
 % A few fonts for @defun names and args.
 \setfont\defbf\bfshape{10}{\magstep1}{OT1}
 \setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
 \setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
 \def\smallnominalsize{9pt}
 \setfont\smallrm\rmshape{9}{1000}{OT1}
 \setfont\smalltt\ttshape{9}{1000}{OT1TT}
 \setfont\smallbf\bfshape{10}{900}{OT1}
 \setfont\smallit\itshape{9}{1000}{OT1IT}
 \setfont\smallsl\slshape{9}{1000}{OT1}
 \setfont\smallsf\sfshape{9}{1000}{OT1}
 \setfont\smallsc\scshape{10}{900}{OT1}
 \setfont\smallttsl\ttslshape{10}{900}{OT1TT}
 \font\smalli=cmmi9
 \font\smallsy=cmsy9
 
 % Fonts for small examples (8pt).
 \def\smallernominalsize{8pt}
 \setfont\smallerrm\rmshape{8}{1000}{OT1}
 \setfont\smallertt\ttshape{8}{1000}{OT1TT}
 \setfont\smallerbf\bfshape{10}{800}{OT1}
 \setfont\smallerit\itshape{8}{1000}{OT1IT}
 \setfont\smallersl\slshape{8}{1000}{OT1}
 \setfont\smallersf\sfshape{8}{1000}{OT1}
 \setfont\smallersc\scshape{10}{800}{OT1}
 \setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
 \font\smalleri=cmmi8
 \font\smallersy=cmsy8
 
 % Fonts for title page (20.4pt):
 \def\titlenominalsize{20pt}
 \setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
 \setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
 \setfont\titlesl\slbshape{10}{\magstep4}{OT1}
 \setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
 \setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
 \setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
 \let\titlebf=\titlerm
 \setfont\titlesc\scbshape{10}{\magstep4}{OT1}
 \font\titlei=cmmi12 scaled \magstep3
 \font\titlesy=cmsy10 scaled \magstep4
 \def\authorrm{\secrm}
 \def\authortt{\sectt}
 
 % Chapter (and unnumbered) fonts (17.28pt).
 \def\chapnominalsize{17pt}
 \setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
 \setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
 \setfont\chapsl\slbshape{10}{\magstep3}{OT1}
 \setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
 \setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
 \setfont\chapsf\sfbshape{17}{1000}{OT1}
 \let\chapbf=\chaprm
 \setfont\chapsc\scbshape{10}{\magstep3}{OT1}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3
 
 % Section fonts (14.4pt).
 \def\secnominalsize{14pt}
 \setfont\secrm\rmbshape{12}{\magstep1}{OT1}
 \setfont\secit\itbshape{10}{\magstep2}{OT1IT}
 \setfont\secsl\slbshape{10}{\magstep2}{OT1}
 \setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
 \setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
 \setfont\secsf\sfbshape{12}{\magstep1}{OT1}
 \let\secbf\secrm
 \setfont\secsc\scbshape{10}{\magstep2}{OT1}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
 
 % Subsection fonts (13.15pt).
 \def\ssecnominalsize{13pt}
 \setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
 \setfont\ssecit\itbshape{10}{1315}{OT1IT}
 \setfont\ssecsl\slbshape{10}{1315}{OT1}
 \setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
 \setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
 \setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
 \let\ssecbf\ssecrm
 \setfont\ssecsc\scbshape{10}{1315}{OT1}
 \font\sseci=cmmi12 scaled \magstephalf
 \font\ssecsy=cmsy10 scaled 1315
 
 % Reduced fonts for @acro in text (10pt).
 \def\reducednominalsize{10pt}
 \setfont\reducedrm\rmshape{10}{1000}{OT1}
 \setfont\reducedtt\ttshape{10}{1000}{OT1TT}
 \setfont\reducedbf\bfshape{10}{1000}{OT1}
 \setfont\reducedit\itshape{10}{1000}{OT1IT}
 \setfont\reducedsl\slshape{10}{1000}{OT1}
 \setfont\reducedsf\sfshape{10}{1000}{OT1}
 \setfont\reducedsc\scshape{10}{1000}{OT1}
 \setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
 \font\reducedi=cmmi10
 \font\reducedsy=cmsy10
 
 % reset the current fonts
 \textfonts
 \rm
 } % end of 11pt text font size definitions
 
 
 % Definitions to make the main text be 10pt Computer Modern, with
 % 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}
 \edef\mainmagstep{1000}
 \setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
 \setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
 \setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
 \setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
 \setfont\textsl\slshape{10}{\mainmagstep}{OT1}
 \setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
 \setfont\textsc\scshape{10}{\mainmagstep}{OT1}
 \setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep
 
 % A few fonts for @defun names and args.
 \setfont\defbf\bfshape{10}{\magstephalf}{OT1}
 \setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
 \setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
 \def\smallnominalsize{9pt}
 \setfont\smallrm\rmshape{9}{1000}{OT1}
 \setfont\smalltt\ttshape{9}{1000}{OT1TT}
 \setfont\smallbf\bfshape{10}{900}{OT1}
 \setfont\smallit\itshape{9}{1000}{OT1IT}
 \setfont\smallsl\slshape{9}{1000}{OT1}
 \setfont\smallsf\sfshape{9}{1000}{OT1}
 \setfont\smallsc\scshape{10}{900}{OT1}
 \setfont\smallttsl\ttslshape{10}{900}{OT1TT}
 \font\smalli=cmmi9
 \font\smallsy=cmsy9
 
 % Fonts for small examples (8pt).
 \def\smallernominalsize{8pt}
 \setfont\smallerrm\rmshape{8}{1000}{OT1}
 \setfont\smallertt\ttshape{8}{1000}{OT1TT}
 \setfont\smallerbf\bfshape{10}{800}{OT1}
 \setfont\smallerit\itshape{8}{1000}{OT1IT}
 \setfont\smallersl\slshape{8}{1000}{OT1}
 \setfont\smallersf\sfshape{8}{1000}{OT1}
 \setfont\smallersc\scshape{10}{800}{OT1}
 \setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
 \font\smalleri=cmmi8
 \font\smallersy=cmsy8
 
 % Fonts for title page (20.4pt):
 \def\titlenominalsize{20pt}
 \setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
 \setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
 \setfont\titlesl\slbshape{10}{\magstep4}{OT1}
 \setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
 \setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
 \setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
 \let\titlebf=\titlerm
 \setfont\titlesc\scbshape{10}{\magstep4}{OT1}
 \font\titlei=cmmi12 scaled \magstep3
 \font\titlesy=cmsy10 scaled \magstep4
 \def\authorrm{\secrm}
 \def\authortt{\sectt}
 
 % Chapter fonts (14.4pt).
 \def\chapnominalsize{14pt}
 \setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
 \setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
 \setfont\chapsl\slbshape{10}{\magstep2}{OT1}
 \setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
 \setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
 \setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
 \let\chapbf\chaprm
 \setfont\chapsc\scbshape{10}{\magstep2}{OT1}
 \font\chapi=cmmi12 scaled \magstep1
 \font\chapsy=cmsy10 scaled \magstep2
 
 % Section fonts (12pt).
 \def\secnominalsize{12pt}
 \setfont\secrm\rmbshape{12}{1000}{OT1}
 \setfont\secit\itbshape{10}{\magstep1}{OT1IT}
 \setfont\secsl\slbshape{10}{\magstep1}{OT1}
 \setfont\sectt\ttbshape{12}{1000}{OT1TT}
 \setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
 \setfont\secsf\sfbshape{12}{1000}{OT1}
 \let\secbf\secrm
 \setfont\secsc\scbshape{10}{\magstep1}{OT1}
 \font\seci=cmmi12
 \font\secsy=cmsy10 scaled \magstep1
 
 % Subsection fonts (10pt).
 \def\ssecnominalsize{10pt}
 \setfont\ssecrm\rmbshape{10}{1000}{OT1}
 \setfont\ssecit\itbshape{10}{1000}{OT1IT}
 \setfont\ssecsl\slbshape{10}{1000}{OT1}
 \setfont\ssectt\ttbshape{10}{1000}{OT1TT}
 \setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
 \setfont\ssecsf\sfbshape{10}{1000}{OT1}
 \let\ssecbf\ssecrm
 \setfont\ssecsc\scbshape{10}{1000}{OT1}
 \font\sseci=cmmi10
 \font\ssecsy=cmsy10
 
 % Reduced fonts for @acro in text (9pt).
 \def\reducednominalsize{9pt}
 \setfont\reducedrm\rmshape{9}{1000}{OT1}
 \setfont\reducedtt\ttshape{9}{1000}{OT1TT}
 \setfont\reducedbf\bfshape{10}{900}{OT1}
 \setfont\reducedit\itshape{9}{1000}{OT1IT}
 \setfont\reducedsl\slshape{9}{1000}{OT1}
 \setfont\reducedsf\sfshape{9}{1000}{OT1}
 \setfont\reducedsc\scshape{10}{900}{OT1}
 \setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
 \font\reducedi=cmmi9
 \font\reducedsy=cmsy9
 
 % reduce space between paragraphs
 \divide\parskip by 2
 
 % reset the current fonts
 \textfonts
 \rm
 } % end of 10pt text font size definitions
 
 
 % 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}
 %
 \parseargdef\fonttextsize{%
   \def\textsizearg{#1}%
   \wlog{doing @fonttextsize \textsizearg}%
   %
   % 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
   \else
     \errhelp=\EMsimple
     \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
   \fi\fi
  \endgroup
 }
 
 
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
 % texinfo doesn't allow for producing subscripts and superscripts except
 % in the main text, we don't bother to reset \scriptfont and
 % \scriptscriptfont (which would also require loading a lot more fonts).
 %
 \def\resetmathfonts{%
   \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
   \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
   \textfont\ttfam=\tentt \textfont\sffam=\tensf
 }
 
 % The font-changing commands redefine the meanings of \tenSTYLE, instead
 % of just \STYLE.  We do this because \STYLE needs to also set the
 % current \fam for math mode.  Our \STYLE (e.g., \rm) commands hardwire
 % \tenSTYLE to set the current font.
 %
 % Each font-changing command also sets the names \lsize (one size lower)
 % and \lllsize (three sizes lower).  These relative commands are used in
 % the LaTeX logo and acronyms.
 %
 % This all needs generalizing, badly.
 %
 \def\textfonts{%
   \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
   \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
   \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
   \let\tenttsl=\textttsl
   \def\curfontsize{text}%
   \def\lsize{reduced}\def\lllsize{smaller}%
   \resetmathfonts \setleading{\textleading}}
 \def\titlefonts{%
   \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
   \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
   \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
   \let\tenttsl=\titlettsl
   \def\curfontsize{title}%
   \def\lsize{chap}\def\lllsize{subsec}%
   \resetmathfonts \setleading{25pt}}
 \def\titlefont#1{{\titlefonts\rm #1}}
 \def\chapfonts{%
   \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
   \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
   \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
   \let\tenttsl=\chapttsl
   \def\curfontsize{chap}%
   \def\lsize{sec}\def\lllsize{text}%
   \resetmathfonts \setleading{19pt}}
 \def\secfonts{%
   \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
   \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
   \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
   \let\tenttsl=\secttsl
   \def\curfontsize{sec}%
   \def\lsize{subsec}\def\lllsize{reduced}%
   \resetmathfonts \setleading{16pt}}
 \def\subsecfonts{%
   \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
   \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
   \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
   \let\tenttsl=\ssecttsl
   \def\curfontsize{ssec}%
   \def\lsize{text}\def\lllsize{small}%
   \resetmathfonts \setleading{15pt}}
 \let\subsubsecfonts = \subsecfonts
 \def\reducedfonts{%
   \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
   \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
   \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
   \let\tenttsl=\reducedttsl
   \def\curfontsize{reduced}%
   \def\lsize{small}\def\lllsize{smaller}%
   \resetmathfonts \setleading{10.5pt}}
 \def\smallfonts{%
   \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
   \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
   \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
   \let\tenttsl=\smallttsl
   \def\curfontsize{small}%
   \def\lsize{smaller}\def\lllsize{smaller}%
   \resetmathfonts \setleading{10.5pt}}
 \def\smallerfonts{%
   \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
   \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
   \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
   \let\tenttsl=\smallerttsl
   \def\curfontsize{smaller}%
   \def\lsize{smaller}\def\lllsize{smaller}%
   \resetmathfonts \setleading{9.5pt}}
 
 % Set the fonts to use with the @small... environments.
 \let\smallexamplefonts = \smallfonts
 
 % About \smallexamplefonts.  If we use \smallfonts (9pt), @smallexample
 % can fit this many characters:
 %   8.5x11=86   smallbook=72  a4=90  a5=69
 % If we use \scriptfonts (8pt), then we can fit this many characters:
 %   8.5x11=90+  smallbook=80  a4=90+  a5=77
 % For me, subjectively, the few extra characters that fit aren't worth
 % the additional smallness of 8pt.  So I'm making the default 9pt.
 %
 % By the way, for comparison, here's what fits with @example (10pt):
 %   8.5x11=71  smallbook=60  a4=75  a5=58
 %
 % I wish the USA used A4 paper.
 % --karl, 24jan03.
 
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
 \definetextfontsizexi
 
 % Define these so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
 \def\angleright{$\rangle$}
 
 % Count depth in font-changes, for error checks
 \newcount\fontdepth \fontdepth=0
 
 % Fonts for short table of contents.
 \setfont\shortcontrm\rmshape{12}{1000}{OT1}
 \setfont\shortcontbf\bfshape{10}{\magstep1}{OT1}  % no cmb12
 \setfont\shortcontsl\slshape{12}{1000}{OT1}
 \setfont\shortconttt\ttshape{12}{1000}{OT1TT}
 
 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
 %% serif) and @ii for TeX italic
 
 % \smartitalic{ARG} outputs arg in italics, followed by an italic correction
 % unless the following character is such as not to need one.
 \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
                     \ptexslash\fi\fi\fi}
 \def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
 \def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
 
 % like \smartslanted except unconditionally uses \ttsl.
 % @var is set to this for defun arguments.
 \def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
 
 % like \smartslanted except unconditionally use \sl.  We never want
 % ttsl for book titles, do we?
 \def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
 
 \let\i=\smartitalic
 \let\slanted=\smartslanted
 \let\var=\smartslanted
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
 
 % @b, explicit bold.
 \def\b#1{{\bf #1}}
 \let\strong=\b
 
 % @sansserif, explicit sans.
 \def\sansserif#1{{\sf #1}}
 
 % We can't just use \exhyphenpenalty, because that only has effect at
 % the end of a paragraph.  Restore normal hyphenation at the end of the
 % group within which \nohyphenation is presumably called.
 %
 \def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
 \def\restorehyphenation{\hyphenchar\font = `- }
 
 % Set sfcode to normal for the chars that usually have another value.
 % Can't use plain's \frenchspacing because it uses the `\x notation, and
 % sometimes \x has an active definition that messes things up.
 %
 \catcode`@=11
   \def\plainfrenchspacing{%
     \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
     \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
     \def\endofsentencespacefactor{1000}% for @. and friends
   }
   \def\plainnonfrenchspacing{%
     \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
     \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
     \def\endofsentencespacefactor{3000}% for @. and friends
   }
 \catcode`@=\other
 \def\endofsentencespacefactor{3000}% default
 
 \def\t#1{%
   {\tt \rawbackslash \plainfrenchspacing #1}%
   \null
 }
 \def\samp#1{`\tclose{#1}'\null}
 \setfont\keyrm\rmshape{8}{1000}{OT1}
 \font\keysy=cmsy9
 \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
   \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
     \vbox{\hrule\kern-0.4pt
      \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
     \kern-0.4pt\hrule}%
   \kern-.06em\raise0.4pt\hbox{\angleright}}}}
 \def\key #1{{\nohyphenation \uppercase{#1}}\null}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
 
 % @file, @option are the same as @samp.
 \let\file=\samp
 \let\option=\samp
 
 % @code is a modification of @t,
 % which makes spaces the same size as normal in the surrounding text.
 \def\tclose#1{%
   {%
     % Change normal interword space to be same as for the current font.
     \spaceskip = \fontdimen2\font
     %
     % Switch to typewriter.
     \tt
     %
     % But `\ ' produces the large typewriter interword space.
     \def\ {{\spaceskip = 0pt{} }}%
     %
     % Turn off hyphenation.
     \nohyphenation
     %
     \rawbackslash
     \plainfrenchspacing
     #1%
   }%
   \null
 }
 
 % We *must* turn on hyphenation at `-' and `_' in @code.
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
 
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
 % and arrange explicitly to hyphenate at a dash.
 %  -- rms.
 {
   \catcode`\-=\active \catcode`\_=\active
   \catcode`\'=\active \catcode`\`=\active
   %
   \global\def\code{\begingroup
     \catcode\rquoteChar=\active \catcode\lquoteChar=\active
     \let'\codequoteright \let`\codequoteleft
     %
     \catcode\dashChar=\active  \catcode\underChar=\active
     \ifallowcodebreaks
      \let-\codedash
      \let_\codeunder
     \else
      \let-\realdash
      \let_\realunder
     \fi
     \codex
   }
 }
 
 \def\realdash{-}
 \def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @math{@code{var_name}+1} can work.  In math mode, _
   % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
   % will therefore expand the active definition of _, which is us
   % (inside @code that is), therefore an endless loop.
   \ifusingtt{\ifmmode
                \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
              \else\normalunderscore \fi
              \discretionary{}{}{}}%
             {\_}%
 }
 \def\codex #1{\tclose{#1}\endgroup}
 
 % An additional complication: the above will allow breaks after, e.g.,
 % 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}
 \def\keywordfalse{false}
 
 \parseargdef\allowcodebreaks{%
   \def\txiarg{#1}%
   \ifx\txiarg\keywordtrue
     \allowcodebreakstrue
   \else\ifx\txiarg\keywordfalse
     \allowcodebreaksfalse
   \else
     \errhelp = \EMsimple
     \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
   \fi\fi
 }
 
 % @kbd is like @code, except that if the argument is just one @key command,
 % then @kbd has no effect.
 
 % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
 \parseargdef\kbdinputstyle{%
   \def\txiarg{#1}%
   \ifx\txiarg\worddistinct
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
   \else\ifx\txiarg\wordexample
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
   \else\ifx\txiarg\wordcode
     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
   \else
     \errhelp = \EMsimple
     \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
   \fi\fi\fi
 }
 \def\worddistinct{distinct}
 \def\wordexample{example}
 \def\wordcode{code}
 
 % Default is `distinct.'
 \kbdinputstyle distinct
 
 \def\xkey{\key}
 \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
 \ifx\one\xkey\ifx\threex\three \key{#2}%
 \else{\tclose{\kbdfont\look}}\fi
 \else{\tclose{\kbdfont\look}}\fi}
 
 % For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
 \let\indicateurl=\code
 \let\env=\code
 \let\command=\code
 
 % @uref (abbreviation for `urlref') takes an optional (comma-separated)
 % second argument specifying the text to display and an optional third
 % arg as text to display instead of (rather than in addition to) the url
 % itself.  First (mandatory) arg is the url.  Perhaps eventually put in
 % a hypertex \special here.
 %
 \def\uref#1{\douref #1,,,\finish}
 \def\douref#1,#2,#3,#4\finish{\begingroup
   \unsepspaces
   \pdfurl{#1}%
   \setbox0 = \hbox{\ignorespaces #3}%
   \ifdim\wd0 > 0pt
     \unhbox0 % third arg given, show only that
   \else
     \setbox0 = \hbox{\ignorespaces #2}%
     \ifdim\wd0 > 0pt
       \ifpdf
         \unhbox0             % PDF: 2nd arg given, show only it
       \else
         \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
       \fi
     \else
       \code{#1}% only url given, so show it
     \fi
   \fi
   \endlink
 \endgroup}
 
 % @url synonym for @uref, since that's how everyone uses it.
 %
 \let\url=\uref
 
 % rms does not like angle brackets --karl, 17may97.
 % So now @email is just like @uref, unless we are pdf.
 %
 %\def\email#1{\angleleft{\tt #1}\angleright}
 \ifpdf
   \def\email#1{\doemail#1,,\finish}
   \def\doemail#1,#2,#3\finish{\begingroup
     \unsepspaces
     \pdfurl{mailto:#1}%
     \setbox0 = \hbox{\ignorespaces #2}%
     \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
     \endlink
   \endgroup}
 \else
   \let\email=\uref
 \fi
 
 % Check if we are currently using a typewriter font.  Since all the
 % Computer Modern typewriter fonts have zero interword stretch (and
 % shrink), and it is reasonable to expect all typewriter fonts to have
 % this property, we can check that font parameter.
 %
 \def\ifmonospace{\ifdim\fontdimen3\font=0pt }
 
 % Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
 % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
 %
 \def\dmn#1{\thinspace #1}
 
 \def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
 
 % @l was never documented to mean ``switch to the Lisp font'',
 % and it is not used as such in any manual I can find.  We need it for
 % Polish suppressed-l.  --karl, 22sep96.
 %\def\l#1{{\li #1}\null}
 
 % Explicit font changes: @r, @sc, undocumented @ii.
 \def\r#1{{\rm #1}}              % roman font
 \def\sc#1{{\smallcaps#1}}       % smallcaps font
 \def\ii#1{{\it #1}}             % italic font
 
 % @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}%
   \def\temp{#2}%
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
   \fi
 }
 
 % @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}%
   \def\temp{#2}%
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
   \fi
 }
 
 % @pounds{} is a sterling sign, which Knuth put in the CM italic font.
 %
 \def\pounds{{\it\$}}
 
 % @euro{} comes from a separate font, depending on the current style.
 % We use the free feym* fonts from the eurosym package by Henrik
 % 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
     % bold:
     \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
   \else
     % regular:
     \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
   \fi
   \thiseurofont
 }
 
 % @registeredsymbol - R in a circle.  The font for the R should really
 % be smaller yet, but lllsize is the best we can do for now.
 % Adapted from the plain.tex definition of \copyright.
 %
 \def\registeredsymbol{%
   $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
                \hfil\crcr\Orb}}%
     }$%
 }
 
 % @textdegree - the normal degrees sign.
 %
 \def\textdegree{$^\circ$}
 
 % 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
 
 
 \message{page headings,}
 
 \newskip\titlepagetopglue \titlepagetopglue = 1.5in
 \newskip\titlepagebottomglue \titlepagebottomglue = 2pc
 
 % First the title page.  Must do @settitle before @titlepage.
 \newif\ifseenauthor
 \newif\iffinishedtitlepage
 
 % Do an implicit @contents or @shortcontents after @end titlepage if the
 % user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
 %
 \newif\ifsetcontentsaftertitlepage
  \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
 \newif\ifsetshortcontentsaftertitlepage
  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
 
 \parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
         \endgroup\page\hbox{}\page}
 
 \envdef\titlepage{%
   % Open one extra group, as we want to close it in the middle of \Etitlepage.
   \begingroup
     \parindent=0pt \textfonts
     % Leave some space at the very top of the page.
     \vglue\titlepagetopglue
     % No rule at page bottom unless we print one at the top with @title.
     \finishedtitlepagetrue
     %
     % Most title ``pages'' are actually two pages long, with space
     % at the top of the second.  We don't want the ragged left on the second.
     \let\oldpage = \page
     \def\page{%
       \iffinishedtitlepage\else
 	 \finishtitlepage
       \fi
       \let\page = \oldpage
       \page
       \null
     }%
 }
 
 \def\Etitlepage{%
     \iffinishedtitlepage\else
 	\finishtitlepage
     \fi
     % It is important to do the page break before ending the group,
     % because the headline and footline are only empty inside the group.
     % If we use the new definition of \page, we always get a blank page
     % after the title page, which we certainly don't want.
     \oldpage
   \endgroup
   %
   % Need this before the \...aftertitlepage checks so that if they are
   % in effect the toc pages will come out with page numbers.
   \HEADINGSon
   %
   % If they want short, they certainly want long too.
   \ifsetshortcontentsaftertitlepage
     \shortcontents
     \contents
     \global\let\shortcontents = \relax
     \global\let\contents = \relax
   \fi
   %
   \ifsetcontentsaftertitlepage
     \contents
     \global\let\contents = \relax
     \global\let\shortcontents = \relax
   \fi
 }
 
 \def\finishtitlepage{%
   \vskip4pt \hrule height 2pt width \hsize
   \vskip\titlepagebottomglue
   \finishedtitlepagetrue
 }
 
 %%% Macros to be used within @titlepage:
 
 \let\subtitlerm=\tenrm
 \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
 
 \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
 		\let\tt=\authortt}
 
 \parseargdef\title{%
   \checkenv\titlepage
   \leftline{\titlefonts\rm #1}
   % print a rule at the page bottom also.
   \finishedtitlepagefalse
   \vskip4pt \hrule height 4pt width \hsize \vskip4pt
 }
 
 \parseargdef\subtitle{%
   \checkenv\titlepage
   {\subtitlefont \rightline{#1}}%
 }
 
 % @author should come last, but may come many times.
 % It can also be used inside @quotation.
 %
 \parseargdef\author{%
   \def\temp{\quotation}%
   \ifx\thisenv\temp
     \def\quotationauthor{#1}% printed in \Equotation.
   \else
     \checkenv\titlepage
     \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
     {\authorfont \leftline{#1}}%
   \fi
 }
 
 
 %%% Set up page headings and footings.
 
 \let\thispage=\folio
 
 \newtoks\evenheadline    % headline on even pages
 \newtoks\oddheadline     % headline on odd pages
 \newtoks\evenfootline    % footline on even pages
 \newtoks\oddfootline     % footline on odd pages
 
 % Now make TeX use those variables
 \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
                             \else \the\evenheadline \fi}}
 \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
                             \else \the\evenfootline \fi}\HEADINGShook}
 \let\HEADINGShook=\relax
 
 % Commands to set those variables.
 % For example, this is what  @headings on  does
 % @evenheading @thistitle|@thispage|@thischapter
 % @oddheading @thischapter|@thispage|@thistitle
 % @evenfooting @thisfile||
 % @oddfooting ||@thisfile
 
 
 \def\evenheading{\parsearg\evenheadingxxx}
 \def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
 \def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
 \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
 \def\oddheading{\parsearg\oddheadingxxx}
 \def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
 \def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
 \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
 \parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
 
 \def\evenfooting{\parsearg\evenfootingxxx}
 \def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish}
 \def\evenfootingyyy #1\|#2\|#3\|#4\finish{%
 \global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
 \def\oddfooting{\parsearg\oddfootingxxx}
 \def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish}
 \def\oddfootingyyy #1\|#2\|#3\|#4\finish{%
   \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
   %
   % Leave some space for the footline.  Hopefully ok to assume
   % @evenfooting will not be used by itself.
   \global\advance\pageheight by -12pt
   \global\advance\vsize by -12pt
 }
 
 \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
 
 
 % @headings double      turns headings on for double-sided printing.
 % @headings single      turns headings on for single-sided printing.
 % @headings off         turns them off.
 % @headings on          same as @headings double, retained for compatibility.
 % @headings after       turns on double-sided headings after this page.
 % @headings doubleafter turns on double-sided headings after this page.
 % @headings singleafter turns on single-sided headings after this page.
 % By default, they are off at the start of a document,
 % and turned `on' after @end titlepage.
 
 \def\headings #1 {\csname HEADINGS#1\endcsname}
 
 \def\HEADINGSoff{%
 \global\evenheadline={\hfil} \global\evenfootline={\hfil}
 \global\oddheadline={\hfil} \global\oddfootline={\hfil}}
 \HEADINGSoff
 % When we turn headings on, set the page number to 1.
 % For double-sided printing, put current file name in lower left corner,
 % chapter name on inside top of right hand pages, document
 % title on inside top of left hand pages, and page numbers on outside top
 % edge of all pages.
 \def\HEADINGSdouble{%
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
 \global\let\contentsalignmacro = \chapoddpage
 }
 \let\contentsalignmacro = \chappager
 
 % For single-sided printing, chapter title goes across top left of page,
 % page number on top right.
 \def\HEADINGSsingle{%
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\thischapter\hfil\folio}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
 \global\let\contentsalignmacro = \chappager
 }
 \def\HEADINGSon{\HEADINGSdouble}
 
 \def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
 \let\HEADINGSdoubleafter=\HEADINGSafter
 \def\HEADINGSdoublex{%
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
 \global\let\contentsalignmacro = \chapoddpage
 }
 
 \def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
 \def\HEADINGSsinglex{%
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\thischapter\hfil\folio}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
 \global\let\contentsalignmacro = \chappager
 }
 
 % Subroutines used in generating headings
 % This produces Day Month Year style of output.
 % Only define if not already defined, in case a txi-??.tex file has set
 % up a different format (e.g., txi-cs.tex does this).
 \ifx\today\undefined
 \def\today{%
   \number\day\space
   \ifcase\month
   \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
   \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
   \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
   \fi
   \space\number\year}
 \fi
 
 % @settitle line...  specifies the title of the document, for headings.
 % It generates no output of its own.
 \def\thistitle{\putwordNoTitle}
 \def\settitle{\parsearg{\gdef\thistitle}}
 
 
 \message{tables,}
 % Tables -- @table, @ftable, @vtable, @item(x).
 
 % default indentation of table text
 \newdimen\tableindent \tableindent=.8in
 % default indentation of @itemize and @enumerate text
 \newdimen\itemindent  \itemindent=.3in
 % margin between end of table item and start of table text.
 \newdimen\itemmargin  \itemmargin=.1in
 
 % used internally for \itemindent minus \itemmargin
 \newdimen\itemmax
 
 % Note @table, @ftable, and @vtable define @item, @itemx, etc., with
 % these defs.
 % They also define \itemindex
 % to index the item name in whatever manner is desired (perhaps none).
 
 \newif\ifitemxneedsnegativevskip
 
 \def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi}
 
 \def\internalBitem{\smallbreak \parsearg\itemzzz}
 \def\internalBitemx{\itemxpar \parsearg\itemzzz}
 
 \def\itemzzz #1{\begingroup %
   \advance\hsize by -\rightskip
   \advance\hsize by -\tableindent
   \setbox0=\hbox{\itemindicate{#1}}%
   \itemindex{#1}%
   \nobreak % This prevents a break before @itemx.
   %
   % If the item text does not fit in the space we have, put it on a line
   % by itself, and do not allow a page break either before or after that
   % line.  We do not start a paragraph here because then if the next
   % command is, e.g., @kindex, the whatsit would get put into the
   % horizontal list on a line by itself, resulting in extra blank space.
   \ifdim \wd0>\itemmax
     %
     % Make this a paragraph so we get the \parskip glue and wrapping,
     % but leave it ragged-right.
     \begingroup
       \advance\leftskip by-\tableindent
       \advance\hsize by\tableindent
       \advance\rightskip by0pt plus1fil
       \leavevmode\unhbox0\par
     \endgroup
     %
     % We're going to be starting a paragraph, but we don't want the
     % \parskip glue -- logically it's part of the @item we just started.
     \nobreak \vskip-\parskip
     %
     % Stop a page break at the \parskip glue coming up.  However, if
     % what follows is an environment such as @example, there will be no
     % \parskip glue; then the negative vskip we just inserted would
     % 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
   \else
     % The item text fits into the space.  Start a paragraph, so that the
     % following text (if any) will end up on the same line.
     \noindent
     % Do this with kerns and \unhbox so that if there is a footnote in
     % the item text, it can migrate to the main vertical list and
     % eventually be printed.
     \nobreak\kern-\tableindent
     \dimen0 = \itemmax  \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0
     \unhbox0
     \nobreak\kern\dimen0
     \endgroup
     \itemxneedsnegativevskiptrue
   \fi
 }
 
 \def\item{\errmessage{@item while not in a list environment}}
 \def\itemx{\errmessage{@itemx while not in a list environment}}
 
 % @table, @ftable, @vtable.
 \envdef\table{%
   \let\itemindex\gobble
   \tablecheck{table}%
 }
 \envdef\ftable{%
   \def\itemindex ##1{\doind {fn}{\code{##1}}}%
   \tablecheck{ftable}%
 }
 \envdef\vtable{%
   \def\itemindex ##1{\doind {vr}{\code{##1}}}%
   \tablecheck{vtable}%
 }
 \def\tablecheck#1{%
   \ifnum \the\catcode`\^^M=\active
     \endgroup
     \errmessage{This command won't work in this context; perhaps the problem is
       that we are \inenvironment\thisenv}%
     \def\next{\doignore{#1}}%
   \else
     \let\next\tablex
   \fi
   \next
 }
 \def\tablex#1{%
   \def\itemindicate{#1}%
   \parsearg\tabley
 }
 \def\tabley#1{%
   {%
     \makevalueexpandable
     \edef\temp{\noexpand\tablez #1\space\space\space}%
     \expandafter
   }\temp \endtablez
 }
 \def\tablez #1 #2 #3 #4\endtablez{%
   \aboveenvbreak
   \ifnum 0#1>0 \advance \leftskip by #1\mil \fi
   \ifnum 0#2>0 \tableindent=#2\mil \fi
   \ifnum 0#3>0 \advance \rightskip by #3\mil \fi
   \itemmax=\tableindent
   \advance \itemmax by -\itemmargin
   \advance \leftskip by \tableindent
   \exdentamount=\tableindent
   \parindent = 0pt
   \parskip = \smallskipamount
   \ifdim \parskip=0pt \parskip=2pt \fi
   \let\item = \internalBitem
   \let\itemx = \internalBitemx
 }
 \def\Etable{\endgraf\afterenvbreak}
 \let\Eftable\Etable
 \let\Evtable\Etable
 \let\Eitemize\Etable
 \let\Eenumerate\Etable
 
 % This is the counter used by @enumerate, which is really @itemize
 
 \newcount \itemno
 
 \envdef\itemize{\parsearg\doitemize}
 
 \def\doitemize#1{%
   \aboveenvbreak
   \itemmax=\itemindent
   \advance\itemmax by -\itemmargin
   \advance\leftskip by \itemindent
   \exdentamount=\itemindent
   \parindent=0pt
   \parskip=\smallskipamount
   \ifdim\parskip=0pt \parskip=2pt \fi
   \def\itemcontents{#1}%
   % @itemize with no arg is equivalent to @itemize @bullet.
   \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
   \let\item=\itemizeitem
 }
 
 % Definition of @item while inside @itemize and @enumerate.
 %
 \def\itemizeitem{%
   \advance\itemno by 1  % for enumerations
   {\let\par=\endgraf \smallbreak}% reasonable place to break
   {%
    % If the document has an @itemize directly after a section title, a
    % \nobreak will be last on the list, and \sectionheading will have
    % done a \vskip-\parskip.  In that case, we don't want to zero
    % parskip, or the item text will crash with the heading.  On the
    % other hand, when there is normal text preceding the item (as there
    % usually is), we do want to zero parskip, or there would be too much
    % space.  In that case, we won't have a \nobreak before.  At least
    % that's the theory.
    \ifnum\lastpenalty<10000 \parskip=0in \fi
    \noindent
    \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
    \vadjust{\penalty 1200}}% not good to break after first line of item.
   \flushcr
 }
 
 % \splitoff TOKENS\endmark defines \first to be the first token in
 % TOKENS, and \rest to be the remainder.
 %
 \def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}%
 
 % Allow an optional argument of an uppercase letter, lowercase letter,
 % or number, to specify the first label in the enumerated list.  No
 % argument is the same as `1'.
 %
 \envparseargdef\enumerate{\enumeratey #1  \endenumeratey}
 \def\enumeratey #1 #2\endenumeratey{%
   % If we were given no argument, pretend we were given `1'.
   \def\thearg{#1}%
   \ifx\thearg\empty \def\thearg{1}\fi
   %
   % Detect if the argument is a single token.  If so, it might be a
   % letter.  Otherwise, the only valid thing it can be is a number.
   % (We will always have one token, because of the test we just made.
   % This is a good thing, since \splitoff doesn't work given nothing at
   % all -- the first parameter is undelimited.)
   \expandafter\splitoff\thearg\endmark
   \ifx\rest\empty
     % Only one token in the argument.  It could still be anything.
     % A ``lowercase letter'' is one whose \lccode is nonzero.
     % An ``uppercase letter'' is one whose \lccode is both nonzero, and
     %   not equal to itself.
     % Otherwise, we assume it's a number.
     %
     % We need the \relax at the end of the \ifnum lines to stop TeX from
     % continuing to look for a <number>.
     %
     \ifnum\lccode\expandafter`\thearg=0\relax
       \numericenumerate % a number (we hope)
     \else
       % It's a letter.
       \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax
         \lowercaseenumerate % lowercase letter
       \else
         \uppercaseenumerate % uppercase letter
       \fi
     \fi
   \else
     % Multiple tokens in the argument.  We hope it's a number.
     \numericenumerate
   \fi
 }
 
 % An @enumerate whose labels are integers.  The starting integer is
 % given in \thearg.
 %
 \def\numericenumerate{%
   \itemno = \thearg
   \startenumeration{\the\itemno}%
 }
 
 % The starting (lowercase) letter is in \thearg.
 \def\lowercaseenumerate{%
   \itemno = \expandafter`\thearg
   \startenumeration{%
     % Be sure we're not beyond the end of the alphabet.
     \ifnum\itemno=0
       \errmessage{No more lowercase letters in @enumerate; get a bigger
                   alphabet}%
     \fi
     \char\lccode\itemno
   }%
 }
 
 % The starting (uppercase) letter is in \thearg.
 \def\uppercaseenumerate{%
   \itemno = \expandafter`\thearg
   \startenumeration{%
     % Be sure we're not beyond the end of the alphabet.
     \ifnum\itemno=0
       \errmessage{No more uppercase letters in @enumerate; get a bigger
                   alphabet}
     \fi
     \char\uccode\itemno
   }%
 }
 
 % Call \doitemize, adding a period to the first argument and supplying the
 % common last two arguments.  Also subtract one from the initial value in
 % \itemno, since @item increments \itemno.
 %
 \def\startenumeration#1{%
   \advance\itemno by -1
   \doitemize{#1.}\flushcr
 }
 
 % @alphaenumerate and @capsenumerate are abbreviations for giving an arg
 % to @enumerate.
 %
 \def\alphaenumerate{\enumerate{a}}
 \def\capsenumerate{\enumerate{A}}
 \def\Ealphaenumerate{\Eenumerate}
 \def\Ecapsenumerate{\Eenumerate}
 
 
 % @multitable macros
 % Amy Hendrickson, 8/18/94, 3/6/96
 %
 % @multitable ... @end multitable will make as many columns as desired.
 % Contents of each column will wrap at width given in preamble.  Width
 % can be specified either with sample text given in a template line,
 % or in percent of \hsize, the current width of text on page.
 
 % Table can continue over pages but will only break between lines.
 
 % To make preamble:
 %
 % Either define widths of columns in terms of percent of \hsize:
 %   @multitable @columnfractions .25 .3 .45
 %   @item ...
 %
 %   Numbers following @columnfractions are the percent of the total
 %   current hsize to be used for each column. You may use as many
 %   columns as desired.
 
 
 % Or use a template:
 %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
 %   @item ...
 %   using the widest term desired in each column.
 
 % Each new table line starts with @item, each subsequent new column
 % starts with @tab. Empty columns may be produced by supplying @tab's
 % with nothing between them for as many times as empty columns are needed,
 % ie, @tab@tab@tab will produce two empty columns.
 
 % @item, @tab do not need to be on their own lines, but it will not hurt
 % if they are.
 
 % Sample multitable:
 
 %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
 %   @item first col stuff @tab second col stuff @tab third col
 %   @item
 %   first col stuff
 %   @tab
 %   second col stuff
 %   @tab
 %   third col
 %   @item first col stuff @tab second col stuff
 %   @tab Many paragraphs of text may be used in any column.
 %
 %         They will wrap at the width determined by the template.
 %   @item@tab@tab This will be in third column.
 %   @end multitable
 
 % Default dimensions may be reset by user.
 % @multitableparskip is vertical space between paragraphs in table.
 % @multitableparindent is paragraph indent in table.
 % @multitablecolmargin is horizontal space to be left between columns.
 % @multitablelinespace is space to leave between table items, baseline
 %                                                            to baseline.
 %   0pt means it depends on current normal line spacing.
 %
 \newskip\multitableparskip
 \newskip\multitableparindent
 \newdimen\multitablecolspace
 \newskip\multitablelinespace
 \multitableparskip=0pt
 \multitableparindent=6pt
 \multitablecolspace=12pt
 \multitablelinespace=0pt
 
 % Macros used to set up halign preamble:
 %
 \let\endsetuptable\relax
 \def\xendsetuptable{\endsetuptable}
 \let\columnfractions\relax
 \def\xcolumnfractions{\columnfractions}
 \newif\ifsetpercent
 
 % #1 is the @columnfraction, usually a decimal number like .5, but might
 % be just 1.  We just use it, whatever it is.
 %
 \def\pickupwholefraction#1 {%
   \global\advance\colcount by 1
   \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
   \setuptable
 }
 
 \newcount\colcount
 \def\setuptable#1{%
   \def\firstarg{#1}%
   \ifx\firstarg\xendsetuptable
     \let\go = \relax
   \else
     \ifx\firstarg\xcolumnfractions
       \global\setpercenttrue
     \else
       \ifsetpercent
          \let\go\pickupwholefraction
       \else
          \global\advance\colcount by 1
          \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
                    % separator; typically that is always in the input, anyway.
          \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
       \fi
     \fi
     \ifx\go\pickupwholefraction
       % Put the argument back for the \pickupwholefraction call, so
       % we'll always have a period there to be parsed.
       \def\go{\pickupwholefraction#1}%
     \else
       \let\go = \setuptable
     \fi%
   \fi
   \go
 }
 
 % multitable-only commands.
 %
 % @headitem starts a heading row, which we typeset in bold.
 % Assignments have to be global since we are inside the implicit group
 % of an alignment entry.  Note that \everycr resets \everytab.
 \def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
 %
 % A \tab used to include \hskip1sp.  But then the space in a template
 % line is not enough.  That is bad.  So let's go back to just `&' until
 % we encounter the problem it was intended to solve again.
 %					--karl, nathan@acm.org, 20apr99.
 \def\tab{\checkenv\multitable &\the\everytab}%
 
 % @multitable ... @end multitable definitions:
 %
 \newtoks\everytab  % insert after every tab.
 %
 \envdef\multitable{%
   \vskip\parskip
   \startsavinginserts
   %
   % @item within a multitable starts a normal row.
   % We use \def instead of \let so that if one of the multitable entries
   % contains an @itemize, we don't choke on the \item (seen as \crcr aka
   % \endtemplate) expanding \doitemize.
   \def\item{\crcr}%
   %
   \tolerance=9500
   \hbadness=9500
   \setmultitablespacing
   \parskip=\multitableparskip
   \parindent=\multitableparindent
   \overfullrule=0pt
   \global\colcount=0
   %
   \everycr = {%
     \noalign{%
       \global\everytab={}%
       \global\colcount=0 % Reset the column counter.
       % Check for saved footnotes, etc.
       \checkinserts
       % Keeps underfull box messages off when table breaks over pages.
       %\filbreak
 	% Maybe so, but it also creates really weird page breaks when the
 	% table breaks over pages. Wouldn't \vfil be better?  Wait until the
 	% problem manifests itself, so it can be fixed for real --karl.
     }%
   }%
   %
   \parsearg\domultitable
 }
 \def\domultitable#1{%
   % To parse everything between @multitable and @item:
   \setuptable#1 \endsetuptable
   %
   % This preamble sets up a generic column definition, which will
   % be used as many times as user calls for columns.
   % \vtop will set a single line and will also let text wrap and
   % continue for many paragraphs if desired.
   \halign\bgroup &%
     \global\advance\colcount by 1
     \multistrut
     \vtop{%
       % Use the current \colcount to find the correct column width:
       \hsize=\expandafter\csname col\the\colcount\endcsname
       %
       % In order to keep entries from bumping into each other
       % we will add a \leftskip of \multitablecolspace to all columns after
       % the first one.
       %
       % If a template has been used, we will add \multitablecolspace
       % to the width of each template entry.
       %
       % If the user has set preamble in terms of percent of \hsize we will
       % use that dimension as the width of the column, and the \leftskip
       % will keep entries from bumping into each other.  Table will start at
       % left margin and final column will justify at right margin.
       %
       % Make sure we don't inherit \rightskip from the outer environment.
       \rightskip=0pt
       \ifnum\colcount=1
 	% The first column will be indented with the surrounding text.
 	\advance\hsize by\leftskip
       \else
 	\ifsetpercent \else
 	  % If user has not set preamble in terms of percent of \hsize
 	  % we will advance \hsize by \multitablecolspace.
 	  \advance\hsize by \multitablecolspace
 	\fi
        % In either case we will make \leftskip=\multitablecolspace:
       \leftskip=\multitablecolspace
       \fi
       % Ignoring space at the beginning and end avoids an occasional spurious
       % blank line, when TeX decides to break the line at the space before the
       % box from the multistrut, so the strut ends up on a line by itself.
       % For example:
       % @multitable @columnfractions .11 .89
       % @item @code{#}
       % @tab Legal holiday which is valid in major parts of the whole country.
       % Is automatically provided with highlighting sequences respectively
       % marking characters.
       \noindent\ignorespaces##\unskip\multistrut
     }\cr
 }
 \def\Emultitable{%
   \crcr
   \egroup % end the \halign
   \global\setpercentfalse
 }
 
 \def\setmultitablespacing{%
   \def\multistrut{\strut}% just use the standard line spacing
   %
   % Compute \multitablelinespace (if not defined by user) for use in
   % \multitableparskip calculation.  We used define \multistrut based on
   % this, but (ironically) that caused the spacing to be off.
   % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
 \ifdim\multitablelinespace=0pt
 \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
 \global\advance\multitablelinespace by-\ht0
 \fi
 %% Test to see if parskip is larger than space between lines of
 %% table. If not, do nothing.
 %%        If so, set to same dimension as multitablelinespace.
 \ifdim\multitableparskip>\multitablelinespace
 \global\multitableparskip=\multitablelinespace
 \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
                                       %% than skip between lines in the table.
 \fi%
 \ifdim\multitableparskip=0pt
 \global\multitableparskip=\multitablelinespace
 \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
                                       %% than skip between lines in the table.
 \fi}
 
 
 \message{conditionals,}
 
 % @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
 % @ifnotxml always succeed.  They currently do nothing; we don't
 % attempt to check whether the conditionals are properly nested.  But we
 % have to remember that they are conditionals, so that @end doesn't
 % attempt to close an environment group.
 %
 \def\makecond#1{%
   \expandafter\let\csname #1\endcsname = \relax
   \expandafter\let\csname iscond.#1\endcsname = 1
 }
 \makecond{iftex}
 \makecond{ifnotdocbook}
 \makecond{ifnothtml}
 \makecond{ifnotinfo}
 \makecond{ifnotplaintext}
 \makecond{ifnotxml}
 
 % Ignore @ignore, @ifhtml, @ifinfo, and the like.
 %
 \def\direntry{\doignore{direntry}}
 \def\documentdescription{\doignore{documentdescription}}
 \def\docbook{\doignore{docbook}}
 \def\html{\doignore{html}}
 \def\ifdocbook{\doignore{ifdocbook}}
 \def\ifhtml{\doignore{ifhtml}}
 \def\ifinfo{\doignore{ifinfo}}
 \def\ifnottex{\doignore{ifnottex}}
 \def\ifplaintext{\doignore{ifplaintext}}
 \def\ifxml{\doignore{ifxml}}
 \def\ignore{\doignore{ignore}}
 \def\menu{\doignore{menu}}
 \def\xml{\doignore{xml}}
 
 % Ignore text until a line `@end #1', keeping track of nested conditionals.
 %
 % A count to remember the depth of nesting.
 \newcount\doignorecount
 
 \def\doignore#1{\begingroup
   % Scan in ``verbatim'' mode:
   \obeylines
   \catcode`\@ = \other
   \catcode`\{ = \other
   \catcode`\} = \other
   %
   % Make sure that spaces turn into tokens that match what \doignoretext wants.
   \spaceisspace
   %
   % Count number of #1's that we've seen.
   \doignorecount = 0
   %
   % Swallow text until we reach the matching `@end #1'.
   \dodoignore{#1}%
 }
 
 { \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
   \obeylines %
   %
   \gdef\dodoignore#1{%
     % #1 contains the command name as a string, e.g., `ifinfo'.
     %
     % Define a command to find the next `@end #1'.
     \long\def\doignoretext##1^^M@end #1{%
       \doignoretextyyy##1^^M@#1\_STOP_}%
     %
     % And this command to find another #1 command, at the beginning of a
     % line.  (Otherwise, we would consider a line `@c @ifset', for
     % example, to count as an @ifset for nesting.)
     \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
     %
     % And now expand that command.
     \doignoretext ^^M%
   }%
 }
 
 \def\doignoreyyy#1{%
   \def\temp{#1}%
   \ifx\temp\empty			% Nothing found.
     \let\next\doignoretextzzz
   \else					% Found a nested condition, ...
     \advance\doignorecount by 1
     \let\next\doignoretextyyy		% ..., look for another.
     % If we're here, #1 ends with ^^M\ifinfo (for example).
   \fi
   \next #1% the token \_STOP_ is present just after this macro.
 }
 
 % We have to swallow the remaining "\_STOP_".
 %
 \def\doignoretextzzz#1{%
   \ifnum\doignorecount = 0	% We have just found the outermost @end.
     \let\next\enddoignore
   \else				% Still inside a nested condition.
     \advance\doignorecount by -1
     \let\next\doignoretext      % Look for the next @end.
   \fi
   \next
 }
 
 % Finish off ignored text.
 { \obeylines%
   % Ignore anything after the last `@end #1'; this matters in verbatim
   % environments, where otherwise the newline after an ignored conditional
   % would result in a blank line in the output.
   \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
 }
 
 
 % @set VAR sets the variable VAR to an empty value.
 % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
 %
 % Since we want to separate VAR from REST-OF-LINE (which might be
 % empty), we can't just use \parsearg; we have to insert a space of our
 % own to delimit the rest of the line, and then take it out again if we
 % didn't need it.
 % We rely on the fact that \parsearg sets \catcode`\ =10.
 %
 \parseargdef\set{\setyyy#1 \endsetyyy}
 \def\setyyy#1 #2\endsetyyy{%
   {%
     \makevalueexpandable
     \def\temp{#2}%
     \edef\next{\gdef\makecsname{SET#1}}%
     \ifx\temp\empty
       \next{}%
     \else
       \setzzz#2\endsetzzz
     \fi
   }%
 }
 % Remove the trailing space \setxxx inserted.
 \def\setzzz#1 \endsetzzz{\next{#1}}
 
 % @clear VAR clears (i.e., unsets) the variable VAR.
 %
 \parseargdef\clear{%
   {%
     \makevalueexpandable
     \global\expandafter\let\csname SET#1\endcsname=\relax
   }%
 }
 
 % @value{foo} gets the text saved in variable foo.
 \def\value{\begingroup\makevalueexpandable\valuexxx}
 \def\valuexxx#1{\expandablevalue{#1}\endgroup}
 {
   \catcode`\- = \active \catcode`\_ = \active
   %
   \gdef\makevalueexpandable{%
     \let\value = \expandablevalue
     % We don't want these characters active, ...
     \catcode`\-=\other \catcode`\_=\other
     % ..., but we might end up with active ones in the argument if
     % we're called from @code, as @code{@value{foo-bar_}}, though.
     % So \let them to their normal equivalents.
     \let-\realdash \let_\normalunderscore
   }
 }
 
 % We have this subroutine so that we can handle at least some @value's
 % properly in indexes (we call \makevalueexpandable in \indexdummies).
 % The command has to be fully expandable (if the variable is set), since
 % the result winds up in the index file.  This means that if the
 % variable's value contains other Texinfo commands, it's almost certain
 % it will fail (although perhaps we could fix that with sufficient work
 % to do a one-level expansion on the result, instead of complete).
 %
 \def\expandablevalue#1{%
   \expandafter\ifx\csname SET#1\endcsname\relax
     {[No value for ``#1'']}%
     \message{Variable `#1', used in @value, is not set.}%
   \else
     \csname SET#1\endcsname
   \fi
 }
 
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
 %
 % To get special treatment of `@end ifset,' call \makeond and the redefine.
 %
 \makecond{ifset}
 \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
 \def\doifset#1#2{%
   {%
     \makevalueexpandable
     \let\next=\empty
     \expandafter\ifx\csname SET#2\endcsname\relax
       #1% If not set, redefine \next.
     \fi
     \expandafter
   }\next
 }
 \def\ifsetfail{\doignore{ifset}}
 
 % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
 % defined with @set, or has been undefined with @clear.
 %
 % The `\else' inside the `\doifset' parameter is a trick to reuse the
 % above code: if the variable is not set, do nothing, if it is set,
 % then redefine \next to \ifclearfail.
 %
 \makecond{ifclear}
 \def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
 \def\ifclearfail{\doignore{ifclear}}
 
 % @dircategory CATEGORY  -- specify a category of the dir file
 % which this file should belong to.  Ignore this in TeX.
 \let\dircategory=\comment
 
 % @defininfoenclose.
 \let\definfoenclose=\comment
 
 
 \message{indexing,}
 % Index generation facilities
 
 % Define \newwrite to be identical to plain tex's \newwrite
 % except not \outer, so it can be used within macros and \if's.
 \edef\newwrite{\makecsname{ptexnewwrite}}
 
 % \newindex {foo} defines an index named foo.
 % It automatically defines \fooindex such that
 % \fooindex ...rest of line... puts an entry in the index foo.
 % It also defines \fooindfile to be the number of the output channel for
 % the file that accumulates this index.  The file's extension is foo.
 % The name of an index should be no more than 2 characters long
 % for the sake of vms.
 %
 \def\newindex#1{%
   \iflinks
     \expandafter\newwrite \csname#1indfile\endcsname
     \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
   \fi
   \expandafter\xdef\csname#1index\endcsname{%     % Define @#1index
     \noexpand\doindex{#1}}
 }
 
 % @defindex foo  ==  \newindex{foo}
 %
 \def\defindex{\parsearg\newindex}
 
 % Define @defcodeindex, like @defindex except put all entries in @code.
 %
 \def\defcodeindex{\parsearg\newcodeindex}
 %
 \def\newcodeindex#1{%
   \iflinks
     \expandafter\newwrite \csname#1indfile\endcsname
     \openout \csname#1indfile\endcsname \jobname.#1
   \fi
   \expandafter\xdef\csname#1index\endcsname{%
     \noexpand\docodeindex{#1}}%
 }
 
 
 % @synindex foo bar    makes index foo feed into index bar.
 % Do this instead of @defindex foo if you don't want it as a separate index.
 %
 % @syncodeindex foo bar   similar, but put all entries made for index foo
 % inside @code.
 %
 \def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
 \def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
 
 % #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
 % #3 the target index (bar).
 \def\dosynindex#1#2#3{%
   % Only do \closeout if we haven't already done it, else we'll end up
   % closing the target index.
   \expandafter \ifx\csname donesynindex#2\endcsname \undefined
     % The \closeout helps reduce unnecessary open files; the limit on the
     % Acorn RISC OS is a mere 16 files.
     \expandafter\closeout\csname#2indfile\endcsname
     \expandafter\let\csname\donesynindex#2\endcsname = 1
   \fi
   % redefine \fooindfile:
   \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
   \expandafter\let\csname#2indfile\endcsname=\temp
   % redefine \fooindex:
   \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}%
 }
 
 % Define \doindex, the driver for all \fooindex macros.
 % Argument #1 is generated by the calling \fooindex macro,
 %  and it is "foo", the name of the index.
 
 % \doindex just uses \parsearg; it calls \doind for the actual work.
 % This is because \doind is more useful to call from other macros.
 
 % There is also \dosubind {index}{topic}{subtopic}
 % which makes an entry in a two-level index such as the operation index.
 
 \def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer}
 \def\singleindexer #1{\doind{\indexname}{#1}}
 
 % like the previous two, but they put @code around the argument.
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
 \def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
 
 % Take care of Texinfo commands that can appear in an index entry.
 % Since there are some commands we want to expand, and others we don't,
 % we have to laboriously prevent expansion for those that we don't.
 %
 \def\indexdummies{%
   \escapechar = `\\     % use backslash in output files.
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
   %
   % Need these in case \tex is in effect and \{ is a \delimiter again.
   % But can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.
   \let\{ = \mylbrace
   \let\} = \myrbrace
   %
   % I don't entirely understand this, but when an index entry is
   % generated from a macro call, the \endinput which \scanmacro inserts
   % causes processing to be prematurely terminated.  This is,
   % apparently, because \indexsorttmp is fully expanded, and \endinput
   % is an expandable command.  The redefinition below makes \endinput
   % disappear altogether for that purpose -- although logging shows that
   % 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}
   % @findex xyz
   % @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
   %
   % Do the redefinitions.
   \commondummies
 }
 
 % For the aux and toc files, @ is the escape character.  So we want to
 % redefine everything using @ as the escape character (instead of
 % \realbackslash, still used for index files).  When everything uses @,
 % this will be simpler.
 %
 \def\atdummies{%
   \def\@{@@}%
   \def\ {@ }%
   \let\{ = \lbraceatcmd
   \let\} = \rbraceatcmd
   %
   % Do the redefinitions.
   \commondummies
   \otherbackslash
 }
 
 % Called from \indexdummies and \atdummies.
 %
 \def\commondummies{%
   %
   % \definedummyword defines \#1 as \string\#1\space, thus effectively
   % preventing its expansion.  This is used only for control% words,
   % not control letters, because the \space would be incorrect for
   % control characters, but is needed to separate the control word
   % from whatever follows.
   %
   % For control letters, we have \definedummyletter, which omits the
   % space.
   %
   % These can be used both for control words that take an argument and
   % those that do not.  If it is followed by {arg} in the input, then
   % that will dutifully get written to the index (or wherever).
   %
   \def\definedummyword  ##1{\def##1{\string##1\space}}%
   \def\definedummyletter##1{\def##1{\string##1}}%
   \let\definedummyaccent\definedummyletter
   %
   \commondummiesnofonts
   %
   \definedummyletter\_%
   %
   % Non-English letters.
   \definedummyword\AA
   \definedummyword\AE
   \definedummyword\L
   \definedummyword\OE
   \definedummyword\O
   \definedummyword\aa
   \definedummyword\ae
   \definedummyword\l
   \definedummyword\oe
   \definedummyword\o
   \definedummyword\ss
   \definedummyword\exclamdown
   \definedummyword\questiondown
   \definedummyword\ordf
   \definedummyword\ordm
   %
   % Although these internal commands shouldn't show up, sometimes they do.
   \definedummyword\bf
   \definedummyword\gtr
   \definedummyword\hat
   \definedummyword\less
   \definedummyword\sf
   \definedummyword\sl
   \definedummyword\tclose
   \definedummyword\tt
   %
   \definedummyword\LaTeX
   \definedummyword\TeX
   %
   % Assorted special characters.
   \definedummyword\bullet
   \definedummyword\comma
   \definedummyword\copyright
   \definedummyword\registeredsymbol
   \definedummyword\dots
   \definedummyword\enddots
   \definedummyword\equiv
   \definedummyword\error
   \definedummyword\euro
   \definedummyword\expansion
   \definedummyword\minus
   \definedummyword\pounds
   \definedummyword\point
   \definedummyword\print
   \definedummyword\result
   \definedummyword\textdegree
   %
   % We want to disable all macros so that they are not expanded by \write.
   \macrolist
   %
   \normalturnoffactive
   %
   % Handle some cases of @value -- where it does not contain any
   % (non-fully-expandable) commands.
   \makevalueexpandable
 }
 
 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
 %
 \def\commondummiesnofonts{%
   % Control letters and accents.
   \definedummyletter\!%
   \definedummyaccent\"%
   \definedummyaccent\'%
   \definedummyletter\*%
   \definedummyaccent\,%
   \definedummyletter\.%
   \definedummyletter\/%
   \definedummyletter\:%
   \definedummyaccent\=%
   \definedummyletter\?%
   \definedummyaccent\^%
   \definedummyaccent\`%
   \definedummyaccent\~%
   \definedummyword\u
   \definedummyword\v
   \definedummyword\H
   \definedummyword\dotaccent
   \definedummyword\ringaccent
   \definedummyword\tieaccent
   \definedummyword\ubaraccent
   \definedummyword\udotaccent
   \definedummyword\dotless
   %
   % Texinfo font commands.
   \definedummyword\b
   \definedummyword\i
   \definedummyword\r
   \definedummyword\sc
   \definedummyword\t
   %
   % Commands that take arguments.
   \definedummyword\acronym
   \definedummyword\cite
   \definedummyword\code
   \definedummyword\command
   \definedummyword\dfn
   \definedummyword\emph
   \definedummyword\env
   \definedummyword\file
   \definedummyword\kbd
   \definedummyword\key
   \definedummyword\math
   \definedummyword\option
   \definedummyword\pxref
   \definedummyword\ref
   \definedummyword\samp
   \definedummyword\strong
   \definedummyword\tie
   \definedummyword\uref
   \definedummyword\url
   \definedummyword\var
   \definedummyword\verb
   \definedummyword\w
   \definedummyword\xref
 }
 
 % \indexnofonts is used when outputting the strings to sort the index
 % by, and when constructing control sequence names.  It eliminates all
 % control sequences and just writes whatever the best ASCII sort string
 % would be for a given command (usually its argument).
 %
 \def\indexnofonts{%
   % Accent commands should become @asis.
   \def\definedummyaccent##1{\let##1\asis}%
   % We can just ignore other control letters.
   \def\definedummyletter##1{\let##1\empty}%
   % Hopefully, all control words can become @asis.
   \let\definedummyword\definedummyaccent
   %
   \commondummiesnofonts
   %
   % Don't no-op \tt, since it isn't a user-level command
   % and is used in the definitions of the active chars like <, >, |, etc.
   % Likewise with the other plain tex font commands.
   %\let\tt=\asis
   %
   \def\ { }%
   \def\@{@}%
   % how to handle braces?
   \def\_{\normalunderscore}%
   %
   % Non-English letters.
   \def\AA{AA}%
   \def\AE{AE}%
   \def\L{L}%
   \def\OE{OE}%
   \def\O{O}%
   \def\aa{aa}%
   \def\ae{ae}%
   \def\l{l}%
   \def\oe{oe}%
   \def\o{o}%
   \def\ss{ss}%
   \def\exclamdown{!}%
   \def\questiondown{?}%
   \def\ordf{a}%
   \def\ordm{o}%
   %
   \def\LaTeX{LaTeX}%
   \def\TeX{TeX}%
   %
   % Assorted special characters.
   % (The following {} will end up in the sort string, but that's ok.)
   \def\bullet{bullet}%
   \def\comma{,}%
   \def\copyright{copyright}%
   \def\registeredsymbol{R}%
   \def\dots{...}%
   \def\enddots{...}%
   \def\equiv{==}%
   \def\error{error}%
   \def\euro{euro}%
   \def\expansion{==>}%
   \def\minus{-}%
   \def\pounds{pounds}%
   \def\point{.}%
   \def\print{-|}%
   \def\result{=>}%
   \def\textdegree{degrees}%
   %
   % We need to get rid of all macros, leaving only the arguments (if present).
   % Of course this is not nearly correct, but it is the best we can do for now.
   % 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
 }
 
 \let\indexbackslash=0  %overridden during \printindex.
 \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
 
 % Most index entries go through here, but \dosubind is the general case.
 % #1 is the index name, #2 is the entry text.
 \def\doind#1#2{\dosubind{#1}{#2}{}}
 
 % Workhorse for all \fooindexes.
 % #1 is name of index, #2 is stuff to put there, #3 is subentry --
 % empty if called from \doind, as we usually are (the main exception
 % is with most defuns, which call us directly).
 %
 \def\dosubind#1#2#3{%
   \iflinks
   {%
     % Store the main index entry text (including the third arg).
     \toks0 = {#2}%
     % If third arg is present, precede it with a space.
     \def\thirdarg{#3}%
     \ifx\thirdarg\empty \else
       \toks0 = \expandafter{\the\toks0 \space #3}%
     \fi
     %
     \edef\writeto{\csname#1indfile\endcsname}%
     %
     \safewhatsit\dosubindwrite
   }%
   \fi
 }
 
 % Write the entry in \toks0 to the index file:
 %
 \def\dosubindwrite{%
   % Put the index entry in the margin if desired.
   \ifx\SETmarginindex\relax\else
     \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
   \fi
   %
   % Remember, we are within a group.
   \indexdummies % Must do this here, since \bf, etc expand at this stage
   \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
       % so it will be output as is; and it will print as backslash.
   %
   % Process the index entry with all font commands turned off, to
   % get the string to sort by.
   {\indexnofonts
    \edef\temp{\the\toks0}% need full expansion
    \xdef\indexsorttmp{\temp}%
   }%
   %
   % Set up the complete index entry, with both the sort key and
   % the original text, including any font commands.  We write
   % three arguments to \entry to the .?? file (four in the
   % subentry case), texindex reduces to two when writing the .??s
   % sorted result.
   \edef\temp{%
     \write\writeto{%
       \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}%
   }%
   \temp
 }
 
 % Take care of unwanted page breaks/skips around a whatsit:
 %
 % If a skip is the last thing on the list now, preserve it
 % by backing up by \lastskip, doing the \write, then inserting
 % the skip again.  Otherwise, the whatsit generated by the
 % \write or \pdfdest will make \lastskip zero.  The result is that
 % sequences like this:
 % @end defun
 % @tindex whatever
 % @defun ...
 % will have extra space inserted, because the \medbreak in the
 % start of the @defun won't see the skip inserted by the @end of
 % the previous defun.
 %
 % But don't do any of this if we're not in vertical mode.  We
 % don't want to do a \vskip and prematurely end a paragraph.
 %
 % Avoid page breaks due to these extra skips, too.
 %
 % But wait, there is a catch there:
 % We'll have to check whether \lastskip is zero skip.  \ifdim is not
 % sufficient for this purpose, as it ignores stretch and shrink parts
 % of the skip.  The only way seems to be to check the textual
 % representation of the skip.
 %
 % The following is almost like \def\zeroskipmacro{0.0pt} except that
 % the ``p'' and ``t'' characters have catcode \other, not 11 (letter).
 %
 \edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
 %
 \newskip\whatsitskip
 \newcount\whatsitpenalty
 %
 % ..., ready, GO:
 %
 \def\safewhatsit#1{%
 \ifhmode
   #1%
 \else
   % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
   \whatsitskip = \lastskip
   \edef\lastskipmacro{\the\lastskip}%
   \whatsitpenalty = \lastpenalty
   %
   % If \lastskip is nonzero, that means the last item was a
   % skip.  And since a skip is discardable, that means this
   % -\skip0 glue we're inserting is preceded by a
   % non-discardable item, therefore it is not a potential
   % breakpoint, therefore no \nobreak needed.
   \ifx\lastskipmacro\zeroskipmacro
   \else
     \vskip-\whatsitskip
   \fi
   %
   #1%
   %
   \ifx\lastskipmacro\zeroskipmacro
     % If \lastskip was zero, perhaps the last item was a penalty, and
     % perhaps it was >=10000, e.g., a \nobreak.  In that case, we want
     % 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.
     % would allow a break between the index-whatever whatsit
     % and the "Description." paragraph.
     \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
   \else
     % On the other hand, if we had a nonzero \lastskip,
     % this make-up glue would be preceded by a non-discardable item
     % (the whatsit from the \write), so we must insert a \nobreak.
     \nobreak\vskip\whatsitskip
   \fi
 \fi
 }
 
 % The index entry written in the file actually looks like
 %  \entry {sortstring}{page}{topic}
 % or
 %  \entry {sortstring}{page}{topic}{subtopic}
 % The texindex program reads in these files and writes files
 % containing these kinds of lines:
 %  \initial {c}
 %     before the first topic whose initial is c
 %  \entry {topic}{pagelist}
 %     for a topic that is used without subtopics
 %  \primary {topic}
 %     for the beginning of a topic that is used with subtopics
 %  \secondary {subtopic}{pagelist}
 %     for each subtopic.
 
 % Define the user-accessible indexing commands
 % @findex, @vindex, @kindex, @cindex.
 
 \def\findex {\fnindex}
 \def\kindex {\kyindex}
 \def\cindex {\cpindex}
 \def\vindex {\vrindex}
 \def\tindex {\tpindex}
 \def\pindex {\pgindex}
 
 \def\cindexsub {\begingroup\obeylines\cindexsub}
 {\obeylines %
 \gdef\cindexsub "#1" #2^^M{\endgroup %
 \dosubind{cp}{#2}{#1}}}
 
 % Define the macros used in formatting output of the sorted index material.
 
 % @printindex causes a particular index (the ??s file) to get printed.
 % It does not print any chapter heading (usually an @unnumbered).
 %
 \parseargdef\printindex{\begingroup
   \dobreak \chapheadingskip{10000}%
   %
   \smallfonts \rm
   \tolerance = 9500
   \plainfrenchspacing
   \everypar = {}% don't want the \kern\-parindent from indentation suppression.
   %
   % See if the index file exists and is nonempty.
   % Change catcode of @ here so that if the index file contains
   % \initial {@}
   % as its first line, TeX doesn't complain about mismatched braces
   % (because it thinks @} is a control sequence).
   \catcode`\@ = 11
   \openin 1 \jobname.#1s
   \ifeof 1
     % \enddoublecolumns gets confused if there is no text in the index,
     % and it loses the chapter title and the aux file entries for the
     % index.  The easiest way to prevent this problem is to make sure
     % there is some text.
     \putwordIndexNonexistent
   \else
     %
     % If the index file exists but is empty, then \openin leaves \ifeof
     % false.  We have to make TeX try to read something from the file, so
     % it can discover if there is anything in it.
     \read 1 to \temp
     \ifeof 1
       \putwordIndexIsEmpty
     \else
       % Index files are almost Texinfo source, but we use \ as the escape
       % character.  It would be better to use @, but that's too big a change
       % to make right now.
       \def\indexbackslash{\backslashcurfont}%
       \catcode`\\ = 0
       \escapechar = `\\
       \begindoublecolumns
       \input \jobname.#1s
       \enddoublecolumns
     \fi
   \fi
   \closein 1
 \endgroup}
 
 % These macros are used by the sorted index file itself.
 % Change them to control the appearance of the index.
 
 \def\initial#1{{%
   % Some minor font changes for the special characters.
   \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
   %
   % Remove any glue we may have, we'll be inserting our own.
   \removelastskip
   %
   % We like breaks before the index initials, so insert a bonus.
   \nobreak
   \vskip 0pt plus 3\baselineskip
   \penalty 0
   \vskip 0pt plus -3\baselineskip
   %
   % Typeset the initial.  Making this add up to a whole number of
   % baselineskips increases the chance of the dots lining up from column
   % to column.  It still won't often be perfect, because of the stretch
   % we need before each entry, but it's better.
   %
   % No shrink because it confuses \balancecolumns.
   \vskip 1.67\baselineskip plus .5\baselineskip
   \leftline{\secbf #1}%
   % Do our best not to break after the initial.
   \nobreak
   \vskip .33\baselineskip plus .1\baselineskip
 }}
 
 % \entry typesets a paragraph consisting of the text (#1), dot leaders, and
 % then page number (#2) flushed to the right margin.  It is used for index
 % and table of contents entries.  The paragraph is indented by \leftskip.
 %
 % A straightforward implementation would start like this:
 %	\def\entry#1#2{...
 % But this frozes the catcodes in the argument, and can cause problems to
 % @code, which sets - active.  This problem was fixed by a kludge---
 % ``-'' was active throughout whole index, but this isn't really right.
 %
 % The right solution is to prevent \entry from swallowing the whole text.
 %                                 --kasal, 21nov03
 \def\entry{%
   \begingroup
     %
     % Start a new paragraph if necessary, so our assignments below can't
     % affect previous text.
     \par
     %
     % Do not fill out the last line with white space.
     \parfillskip = 0in
     %
     % No extra space above this paragraph.
     \parskip = 0in
     %
     % Do not prefer a separate line ending with a hyphen to fewer lines.
     \finalhyphendemerits = 0
     %
     % \hangindent is only relevant when the entry text and page number
     % don't both fit on one line.  In that case, bob suggests starting the
     % dots pretty far over on the line.  Unfortunately, a large
     % indentation looks wrong when the entry text itself is broken across
     % lines.  So we use a small indentation and put up with long leaders.
     %
     % \hangafter is reset to 1 (which is the value we want) at the start
     % of each paragraph, so we need not do anything with that.
     \hangindent = 2em
     %
     % When the entry text needs to be broken, just fill out the first line
     % with blank space.
     \rightskip = 0pt plus1fil
     %
     % A bit of stretch before each entry for the benefit of balancing
     % columns.
     \vskip 0pt plus1pt
     %
     % Swallow the left brace of the text (first parameter):
     \afterassignment\doentry
     \let\temp =
 }
 \def\doentry{%
     \bgroup % Instead of the swallowed brace.
       \noindent
       \aftergroup\finishentry
       % And now comes the text of the entry.
 }
 \def\finishentry#1{%
     % #1 is the page number.
     %
     % The following is kludged to not output a line of dots in the index if
     % there are no page numbers.  The next person who breaks this will be
     % cursed by a Unix daemon.
     \def\tempa{{\rm }}%
     \def\tempb{#1}%
     \edef\tempc{\tempa}%
     \edef\tempd{\tempb}%
     \ifx\tempc\tempd
       \ %
     \else
       %
       % If we must, put the page number on a line of its own, and fill out
       % this line with blank space.  (The \hfil is overwhelmed with the
       % fill leaders glue in \indexdotfill if the page number does fit.)
       \hfil\penalty50
       \null\nobreak\indexdotfill % Have leaders before the page number.
       %
       % The `\ ' here is removed by the implicit \unskip that TeX does as
       % part of (the primitive) \par.  Without it, a spurious underfull
       % \hbox ensues.
       \ifpdf
 	\pdfgettoks#1.%
 	\ \the\toksA
       \else
 	\ #1%
       \fi
     \fi
     \par
   \endgroup
 }
 
 % Like plain.tex's \dotfill, except uses up at least 1 em.
 \def\indexdotfill{\cleaders
   \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
 
 \def\primary #1{\line{#1\hfil}}
 
 \newskip\secondaryindent \secondaryindent=0.5cm
 \def\secondary#1#2{{%
   \parfillskip=0in
   \parskip=0in
   \hangindent=1in
   \hangafter=1
   \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
   \ifpdf
     \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
   \else
     #2
   \fi
   \par
 }}
 
 % Define two-column mode, which we use to typeset indexes.
 % Adapted from the TeXbook, page 416, which is to say,
 % the manmac.tex format used to print the TeXbook itself.
 \catcode`\@=11
 
 \newbox\partialpage
 \newdimen\doublecolumnhsize
 
 \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
   % Grab any single-column material above us.
   \output = {%
     %
     % Here is a possibility not foreseen in manmac: if we accumulate a
     % whole lot of material, we might end up calling this \output
     % routine twice in a row (see the doublecol-lose test, which is
     % essentially a couple of indexes with @setchapternewpage off).  In
     % that case we just ship out what is in \partialpage with the normal
     % output routine.  Generally, \partialpage will be empty when this
     % runs and this will be a no-op.  See the indexspread.tex test case.
     \ifvoid\partialpage \else
       \onepageout{\pagecontents\partialpage}%
     \fi
     %
     \global\setbox\partialpage = \vbox{%
       % Unvbox the main output page.
       \unvbox\PAGE
       \kern-\topskip \kern\baselineskip
     }%
   }%
   \eject % run that output routine to set \partialpage
   %
   % Use the double-column output routine for subsequent pages.
   \output = {\doublecolumnout}%
   %
   % Change the page size parameters.  We could do this once outside this
   % routine, in each of @smallbook, @afourpaper, and the default 8.5x11
   % format, but then we repeat the same computation.  Repeating a couple
   % of assignments once per index is clearly meaningless for the
   % execution time, so we may as well do it in one place.
   %
   % First we halve the line length, less a little for the gutter between
   % the columns.  We compute the gutter based on the line length, so it
   % changes automatically with the paper format.  The magic constant
   % below is chosen so that the gutter has the same value (well, +-<1pt)
   % as it did when we hard-coded it.
   %
   % We put the result in a separate register, \doublecolumhsize, so we
   % can restore it in \pagesofar, after \hsize itself has (potentially)
   % been clobbered.
   %
   \doublecolumnhsize = \hsize
     \advance\doublecolumnhsize by -.04154\hsize
     \divide\doublecolumnhsize by 2
   \hsize = \doublecolumnhsize
   %
   % Double the \vsize as well.  (We don't need a separate register here,
   % since nobody clobbers \vsize.)
   \vsize = 2\vsize
 }
 
 % The double-column output routine for all double-column pages except
 % the last.
 %
 \def\doublecolumnout{%
   \splittopskip=\topskip \splitmaxdepth=\maxdepth
   % Get the available space for the double columns -- the normal
   % (undoubled) page height minus any material left over from the
   % previous page.
   \dimen@ = \vsize
   \divide\dimen@ by 2
   \advance\dimen@ by -\ht\partialpage
   %
   % box0 will be the left-hand column, box2 the right.
   \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
   \onepageout\pagesofar
   \unvbox255
   \penalty\outputpenalty
 }
 %
 % Re-output the contents of the output page -- any previous material,
 % followed by the two boxes we just split, in box0 and box2.
 \def\pagesofar{%
   \unvbox\partialpage
   %
   \hsize = \doublecolumnhsize
   \wd0=\hsize \wd2=\hsize
   \hbox to\pagewidth{\box0\hfil\box2}%
 }
 %
 % All done with double columns.
 \def\enddoublecolumns{%
   % The following penalty ensures that the page builder is exercised
   % _before_ we change the output routine.  This is necessary in the
   % following situation:
   %
   % The last section of the index consists only of a single entry.
   % Before this section, \pagetotal is less than \pagegoal, so no
   % break occurs before the last section starts.  However, the last
   % section, consisting of \initial and the single \entry, does not
   % fit on the page and has to be broken off.  Without the following
   % penalty the page builder will not be exercised until \eject
   % below, and by that time we'll already have changed the output
   % routine to the \balancecolumns version, so the next-to-last
   % double-column page will be processed with \balancecolumns, which
   % is wrong:  The two columns will go to the main vertical list, with
   % the broken-off section in the recent contributions.  As soon as
   % the output routine finishes, TeX starts reconsidering the page
   % break.  The two columns and the broken-off section both fit on the
   % page, because the two columns now take up only half of the page
   % goal.  When TeX sees \eject from below which follows the final
   % section, it invokes the new output routine that we've set after
   % \balancecolumns below; \onepageout will try to fit the two columns
   % and the final section into the vbox of \pageheight (see
   % \pagebody), causing an overfull box.
   %
   % Note that glue won't work here, because glue does not exercise the
   % page builder, unlike penalties (see The TeXbook, pp. 280-281).
   \penalty0
   %
   \output = {%
     % Split the last of the double-column material.  Leave it on the
     % current page, no automatic page break.
     \balancecolumns
     %
     % If we end up splitting too much material for the current page,
     % though, there will be another page break right after this \output
     % invocation ends.  Having called \balancecolumns once, we do not
     % want to call it again.  Therefore, reset \output to its normal
     % definition right away.  (We hope \balancecolumns will never be
     % called on to balance too much material, but if it is, this makes
     % the output somewhat more palatable.)
     \global\output = {\onepageout{\pagecontents\PAGE}}%
   }%
   \eject
   \endgroup % started in \begindoublecolumns
   %
   % \pagegoal was set to the doubled \vsize above, since we restarted
   % the current page.  We're now back to normal single-column
   % typesetting, so reset \pagegoal to the normal \vsize (after the
   % \endgroup where \vsize got restored).
   \pagegoal = \vsize
 }
 %
 % Called at the end of the double column material.
 \def\balancecolumns{%
   \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
   \dimen@ = \ht0
   \advance\dimen@ by \topskip
   \advance\dimen@ by-\baselineskip
   \divide\dimen@ by 2 % target to split to
   %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}%
   \splittopskip = \topskip
   % Loop until we get a decent breakpoint.
   {%
     \vbadness = 10000
     \loop
       \global\setbox3 = \copy0
       \global\setbox1 = \vsplit3 to \dimen@
     \ifdim\ht3>\dimen@
       \global\advance\dimen@ by 1pt
     \repeat
   }%
   %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}%
   \setbox0=\vbox to\dimen@{\unvbox1}%
   \setbox2=\vbox to\dimen@{\unvbox3}%
   %
   \pagesofar
 }
 \catcode`\@ = \other
 
 
 \message{sectioning,}
 % Chapters, sections, etc.
 
 % \unnumberedno is an oxymoron, of course.  But we count the unnumbered
 % sections so that we can refer to them unambiguously in the pdf
 % outlines by their "section number".  We avoid collisions with chapter
 % numbers by starting them at 10000.  (If a document ever has 10000
 % chapters, we're in trouble anyway, I'm sure.)
 \newcount\unnumberedno \unnumberedno = 10000
 \newcount\chapno
 \newcount\secno        \secno=0
 \newcount\subsecno     \subsecno=0
 \newcount\subsubsecno  \subsubsecno=0
 
 % This counter is funny since it counts through charcodes of letters A, B, ...
 \newcount\appendixno  \appendixno = `\@
 %
 % \def\appendixletter{\char\the\appendixno}
 % We do the following ugly conditional instead of the above simple
 % construct for the sake of pdftex, which needs the actual
 % letter in the expansion, not just typeset.
 %
 \def\appendixletter{%
   \ifnum\appendixno=`A A%
   \else\ifnum\appendixno=`B B%
   \else\ifnum\appendixno=`C C%
   \else\ifnum\appendixno=`D D%
   \else\ifnum\appendixno=`E E%
   \else\ifnum\appendixno=`F F%
   \else\ifnum\appendixno=`G G%
   \else\ifnum\appendixno=`H H%
   \else\ifnum\appendixno=`I I%
   \else\ifnum\appendixno=`J J%
   \else\ifnum\appendixno=`K K%
   \else\ifnum\appendixno=`L L%
   \else\ifnum\appendixno=`M M%
   \else\ifnum\appendixno=`N N%
   \else\ifnum\appendixno=`O O%
   \else\ifnum\appendixno=`P P%
   \else\ifnum\appendixno=`Q Q%
   \else\ifnum\appendixno=`R R%
   \else\ifnum\appendixno=`S S%
   \else\ifnum\appendixno=`T T%
   \else\ifnum\appendixno=`U U%
   \else\ifnum\appendixno=`V V%
   \else\ifnum\appendixno=`W W%
   \else\ifnum\appendixno=`X X%
   \else\ifnum\appendixno=`Y Y%
   \else\ifnum\appendixno=`Z Z%
   % The \the is necessary, despite appearances, because \appendixletter is
   % expanded while writing the .toc file.  \char\appendixno is not
   % expandable, thus it is written literally, thus all appendixes come out
   % with the same letter (or @) in the toc without it.
   \else\char\the\appendixno
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
 
 % Each @chapter defines this as the name of the chapter.
 % page headings and footings can use it.  @section does likewise.
 % However, they are not reliable, because we don't use marks.
 \def\thischapter{}
 \def\thissection{}
 
 \newcount\absseclevel % used to calculate proper heading level
 \newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
 
 % @raisesections: treat @section as chapter, @subsection as section, etc.
 \def\raisesections{\global\advance\secbase by -1}
 \let\up=\raisesections % original BFox name
 
 % @lowersections: treat @chapter as section, @section as subsection, etc.
 \def\lowersections{\global\advance\secbase by 1}
 \let\down=\lowersections % original BFox name
 
 % we only have subsub.
 \chardef\maxseclevel = 3
 %
 % A numbered section within an unnumbered changes to unnumbered too.
-% To achive this, remember the "biggest" unnum. sec. we are currently in:
+% To achieve this, remember the "biggest" unnum. sec. we are currently in:
 \chardef\unmlevel = \maxseclevel
 %
 % Trace whether the current chapter is an appendix or not:
 % \chapheadtype is "N" or "A", unnumbered chapters are ignored.
 \def\chapheadtype{N}
 
 % Choose a heading macro
 % #1 is heading type
 % #2 is heading level
 % #3 is text for heading
 \def\genhead#1#2#3{%
   % Compute the abs. sec. level:
   \absseclevel=#2
   \advance\absseclevel by \secbase
   % Make sure \absseclevel doesn't fall outside the range:
   \ifnum \absseclevel < 0
     \absseclevel = 0
   \else
     \ifnum \absseclevel > 3
       \absseclevel = 3
     \fi
   \fi
   % The heading type:
   \def\headtype{#1}%
   \if \headtype U%
     \ifnum \absseclevel < \unmlevel
       \chardef\unmlevel = \absseclevel
     \fi
   \else
     % Check for appendix sections:
     \ifnum \absseclevel = 0
       \edef\chapheadtype{\headtype}%
     \else
       \if \headtype A\if \chapheadtype N%
 	\errmessage{@appendix... within a non-appendix chapter}%
       \fi\fi
     \fi
     % Check for numbered within unnumbered:
     \ifnum \absseclevel > \unmlevel
       \def\headtype{U}%
     \else
       \chardef\unmlevel = 3
     \fi
   \fi
   % Now print the heading:
   \if \headtype U%
     \ifcase\absseclevel
 	\unnumberedzzz{#3}%
     \or \unnumberedseczzz{#3}%
     \or \unnumberedsubseczzz{#3}%
     \or \unnumberedsubsubseczzz{#3}%
     \fi
   \else
     \if \headtype A%
       \ifcase\absseclevel
 	  \appendixzzz{#3}%
       \or \appendixsectionzzz{#3}%
       \or \appendixsubseczzz{#3}%
       \or \appendixsubsubseczzz{#3}%
       \fi
     \else
       \ifcase\absseclevel
 	  \chapterzzz{#3}%
       \or \seczzz{#3}%
       \or \numberedsubseczzz{#3}%
       \or \numberedsubsubseczzz{#3}%
       \fi
     \fi
   \fi
   \suppressfirstparagraphindent
 }
 
 % an interface:
 \def\numhead{\genhead N}
 \def\apphead{\genhead A}
 \def\unnmhead{\genhead U}
 
 % @chapter, @appendix, @unnumbered.  Increment top-level counter, reset
 % all lower-level sectioning counters to zero.
 %
 % Also set \chaplevelprefix, which we prepend to @float sequence numbers
 % (e.g., figures), q.v.  By default (before any chapter), that is empty.
 \let\chaplevelprefix = \empty
 %
 \outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
 \def\chapterzzz#1{%
   % section resetting is \global in case the chapter is in a group, such
   % as an @include file.
   \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
     \global\advance\chapno by 1
   %
   % Used for \float.
   \gdef\chaplevelprefix{\the\chapno.}%
   \resetallfloatnos
   %
   \message{\putwordChapter\space \the\chapno}%
   %
   % Write the actual heading.
   \chapmacro{#1}{Ynumbered}{\the\chapno}%
   %
   % So @section and the like are numbered underneath this chapter.
   \global\let\section = \numberedsec
   \global\let\subsection = \numberedsubsec
   \global\let\subsubsection = \numberedsubsubsec
 }
 
 \outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
 \def\appendixzzz#1{%
   \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
     \global\advance\appendixno by 1
   \gdef\chaplevelprefix{\appendixletter.}%
   \resetallfloatnos
   %
   \def\appendixnum{\putwordAppendix\space \appendixletter}%
   \message{\appendixnum}%
   %
   \chapmacro{#1}{Yappendix}{\appendixletter}%
   %
   \global\let\section = \appendixsec
   \global\let\subsection = \appendixsubsec
   \global\let\subsubsection = \appendixsubsubsec
 }
 
 \outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
 \def\unnumberedzzz#1{%
   \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
     \global\advance\unnumberedno by 1
   %
   % Since an unnumbered has no number, no prefix for figures.
   \global\let\chaplevelprefix = \empty
   \resetallfloatnos
   %
   % This used to be simply \message{#1}, but TeX fully expands the
   % argument to \message.  Therefore, if #1 contained @-commands, TeX
   % expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
   % expanded @cite (which turns out to cause errors because \cite is meant
   % to be executed, not expanded).
   %
   % Anyway, we don't want the fully-expanded definition of @cite to appear
   % as a result of the \message, we just want `@cite' itself.  We use
   % \the<toks register> to achieve this: TeX expands \the<toks> only once,
   % simply yielding the contents of <toks register>.  (We also do this for
   % the toc entries.)
   \toks0 = {#1}%
   \message{(\the\toks0)}%
   %
   \chapmacro{#1}{Ynothing}{\the\unnumberedno}%
   %
   \global\let\section = \unnumberedsec
   \global\let\subsection = \unnumberedsubsec
   \global\let\subsubsection = \unnumberedsubsubsec
 }
 
 % @centerchap is like @unnumbered, but the heading is centered.
 \outer\parseargdef\centerchap{%
   % Well, we could do the following in a group, but that would break
   % an assumption that \chapmacro is called at the outermost level.
   % Thus we are safer this way:		--kasal, 24feb04
   \let\centerparametersmaybe = \centerparameters
   \unnmhead0{#1}%
   \let\centerparametersmaybe = \relax
 }
 
 % @top is like @unnumbered.
 \let\top\unnumbered
 
 % Sections.
 \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
 \def\seczzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
 }
 
 \outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
 \def\appendixsectionzzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
 }
 \let\appendixsec\appendixsection
 
 \outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
 \def\unnumberedseczzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
 }
 
 % Subsections.
 \outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
 \def\numberedsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
 }
 
 \outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
 \def\appendixsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Yappendix}%
                  {\appendixletter.\the\secno.\the\subsecno}%
 }
 
 \outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
 \def\unnumberedsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Ynothing}%
                  {\the\unnumberedno.\the\secno.\the\subsecno}%
 }
 
 % Subsubsections.
 \outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
 \def\numberedsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Ynumbered}%
                  {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
 \outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
 \def\appendixsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Yappendix}%
                  {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
 \outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
 \def\unnumberedsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Ynothing}%
                  {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
 % These macros control what the section commands do, according
 % to what kind of chapter we are in (ordinary, appendix, or unnumbered).
 % Define them by default for a numbered chapter.
 \let\section = \numberedsec
 \let\subsection = \numberedsubsec
 \let\subsubsection = \numberedsubsubsec
 
 % Define @majorheading, @heading and @subheading
 
 % NOTE on use of \vbox for chapter headings, section headings, and such:
 %       1) We use \vbox rather than the earlier \line to permit
 %          overlong headings to fold.
 %       2) \hyphenpenalty is set to 10000 because hyphenation in a
 %          heading is obnoxious; this forbids it.
 %       3) Likewise, headings look best if no \parindent is used, and
 %          if justification is not attempted.  Hence \raggedright.
 
 
 \def\majorheading{%
   {\advance\chapheadingskip by 10pt \chapbreak }%
   \parsearg\chapheadingzzz
 }
 
 \def\chapheading{\chapbreak \parsearg\chapheadingzzz}
 \def\chapheadingzzz#1{%
   {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
                     \parindent=0pt\raggedright
                     \rm #1\hfill}}%
   \bigskip \par\penalty 200\relax
   \suppressfirstparagraphindent
 }
 
 % @heading, @subheading, @subsubheading.
 \parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{}
   \suppressfirstparagraphindent}
 \parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{}
   \suppressfirstparagraphindent}
 \parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{}
   \suppressfirstparagraphindent}
 
 % These macros generate a chapter, section, etc. heading only
 % (including whitespace, linebreaking, etc. around it),
 % given all the information in convenient, parsed form.
 
 %%% Args are the skip and penalty (usually negative)
 \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
 
 %%% Define plain chapter starts, and page on/off switching for it
 % Parameter controlling skip before chapter headings (if needed)
 
 \newskip\chapheadingskip
 
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
 \def\chappager{\par\vfill\supereject}
 \def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
 
 \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
 
 \def\CHAPPAGoff{%
 \global\let\contentsalignmacro = \chappager
 \global\let\pchapsepmacro=\chapbreak
 \global\let\pagealignmacro=\chappager}
 
 \def\CHAPPAGon{%
 \global\let\contentsalignmacro = \chappager
 \global\let\pchapsepmacro=\chappager
 \global\let\pagealignmacro=\chappager
 \global\def\HEADINGSon{\HEADINGSsingle}}
 
 \def\CHAPPAGodd{%
 \global\let\contentsalignmacro = \chapoddpage
 \global\let\pchapsepmacro=\chapoddpage
 \global\let\pagealignmacro=\chapoddpage
 \global\def\HEADINGSon{\HEADINGSdouble}}
 
 \CHAPPAGon
 
 % Chapter opening.
 %
 % #1 is the text, #2 is the section type (Ynumbered, Ynothing,
 % Yappendix, Yomitfromtoc), #3 the chapter number.
 %
 % To test against our argument.
 \def\Ynothingkeyword{Ynothing}
 \def\Yomitfromtockeyword{Yomitfromtoc}
 \def\Yappendixkeyword{Yappendix}
 %
 \def\chapmacro#1#2#3{%
   \pchapsepmacro
   {%
     \chapfonts \rm
     %
     % Have to define \thissection before calling \donoderef, because the
     % xref code eventually uses it.  On the other hand, it has to be called
     % after \pchapsepmacro, or the headline will change too soon.
     \gdef\thissection{#1}%
     \gdef\thischaptername{#1}%
     %
     % Only insert the separating space if we have a chapter/appendix
     % number, and don't print the unnumbered ``number''.
     \def\temptype{#2}%
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unnchap}%
       \gdef\thischapternum{}%
       \gdef\thischapter{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
       \def\toctype{omit}%
       \gdef\thischapternum{}%
       \gdef\thischapter{}%
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
       \def\toctype{app}%
       \xdef\thischapternum{\appendixletter}%
       % We don't substitute the actual chapter name into \thischapter
       % because we don't want its macros evaluated now.  And we don't
       % use \thissection because that changes with each section.
       %
       \xdef\thischapter{\putwordAppendix{} \appendixletter:
                         \noexpand\thischaptername}%
     \else
       \setbox0 = \hbox{#3\enspace}%
       \def\toctype{numchap}%
       \xdef\thischapternum{\the\chapno}%
       \xdef\thischapter{\putwordChapter{} \the\chapno:
                         \noexpand\thischaptername}%
     \fi\fi\fi
     %
     % Write the toc entry for this chapter.  Must come before the
     % \donoderef, because we include the current node name in the toc
     % entry, and \donoderef resets it to empty.
     \writetocentry{\toctype}{#1}{#3}%
     %
     % For pdftex, we have to write out the node definition (aka, make
     % the pdfdest) after any page break, but before the actual text has
     % been typeset.  If the destination for the pdf outline is after the
     % text, then jumping from the outline may wind up with the text not
     % being visible, for instance under high magnification.
     \donoderef{#2}%
     %
     % Typeset the actual heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0 \centerparametersmaybe
           \unhbox0 #1\par}%
   }%
   \nobreak\bigskip % no page break after a chapter title
   \nobreak
 }
 
 % @centerchap -- centered and unnumbered.
 \let\centerparametersmaybe = \relax
 \def\centerparameters{%
   \advance\rightskip by 3\rightskip
   \leftskip = \rightskip
   \parfillskip = 0pt
 }
 
 
 % I don't think this chapter style is supported any more, so I'm not
 % updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
 %
 \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
 %
 \def\unnchfopen #1{%
 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
                        \parindent=0pt\raggedright
                        \rm #1\hfill}}\bigskip \par\nobreak
 }
 \def\chfopen #1#2{\chapoddpage {\chapfonts
 \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
 \par\penalty 5000 %
 }
 \def\centerchfopen #1{%
 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
                        \parindent=0pt
                        \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
 }
 \def\CHAPFopen{%
   \global\let\chapmacro=\chfopen
   \global\let\centerchapmacro=\centerchfopen}
 
 
 % Section titles.  These macros combine the section number parts and
 % call the generic \sectionheading to do the printing.
 %
 \newskip\secheadingskip
 \def\secheadingbreak{\dobreak \secheadingskip{-1000}}
 
 % Subsection titles.
 \newskip\subsecheadingskip
 \def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}}
 
 % Subsubsection titles.
 \def\subsubsecheadingskip{\subsecheadingskip}
 \def\subsubsecheadingbreak{\subsecheadingbreak}
 
 
 % Print any size, any type, section title.
 %
 % #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
 % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
 % section number.
 %
 \def\sectionheading#1#2#3#4{%
   {%
     % Switch to the right set of fonts.
     \csname #2fonts\endcsname \rm
     %
     % Insert space above the heading.
     \csname #2headingbreak\endcsname
     %
     % Only insert the space after the number if we have a section number.
     \def\sectionlevel{#2}%
     \def\temptype{#3}%
     %
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unn}%
       \gdef\thissection{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       % for @headings -- no section number, don't include in toc,
       % and don't redefine \thissection.
       \setbox0 = \hbox{}%
       \def\toctype{omit}%
       \let\sectionlevel=\empty
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{#4\enspace}%
       \def\toctype{app}%
       \gdef\thissection{#1}%
     \else
       \setbox0 = \hbox{#4\enspace}%
       \def\toctype{num}%
       \gdef\thissection{#1}%
     \fi\fi\fi
     %
     % Write the toc entry (before \donoderef).  See comments in \chapmacro.
     \writetocentry{\toctype\sectionlevel}{#1}{#4}%
     %
     % Write the node reference (= pdf destination for pdftex).
     % Again, see comments in \chapmacro.
     \donoderef{#3}%
     %
     % Interline glue will be inserted when the vbox is completed.
     % That glue will be a valid breakpoint for the page, since it'll be
     % preceded by a whatsit (usually from the \donoderef, or from the
     % \writetocentry if there was no node).  We don't want to allow that
     % break, since then the whatsits could end up on page n while the
     % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
     \nobreak
     %
     % Output the actual section heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
           \hangindent=\wd0  % zero if no section number
           \unhbox0 #1}%
   }%
   % Add extra space after the heading -- half of whatever came above it.
   % Don't allow stretch, though.
   \kern .5 \csname #2headingskip\endcsname
   %
   % Do not let the kern be a potential breakpoint, as it would be if it
   % was followed by glue.
   \nobreak
   %
   % We'll almost certainly start a paragraph next, so don't let that
   % 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
 }
 
 
 \message{toc,}
 % Table of contents.
 \newwrite\tocfile
 
 % Write an entry to the toc file, opening it if necessary.
 % Called from @chapter, etc.
 %
 % Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
 % We append the current node name (if any) and page number as additional
 % arguments for the \{chap,sec,...}entry macros which will eventually
 % read this.  The node name is used in the pdf outlines as the
 % destination to jump to.
 %
 % We open the .toc file for writing here instead of at @setfilename (or
 % any other fixed time) so that @contents can be anywhere in the document.
 % But if #1 is `omit', then we don't do anything.  This is used for the
 % table of contents chapter openings themselves.
 %
 \newif\iftocfileopened
 \def\omitkeyword{omit}%
 %
 \def\writetocentry#1#2#3{%
   \edef\writetoctype{#1}%
   \ifx\writetoctype\omitkeyword \else
     \iftocfileopened\else
       \immediate\openout\tocfile = \jobname.toc
       \global\tocfileopenedtrue
     \fi
     %
     \iflinks
       {\atdummies
        \edef\temp{%
          \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
        \temp
       }%
     \fi
   \fi
   %
   % Tell \shipout to create a pdf destination on each page, if we're
   % writing pdf.  These are used in the table of contents.  We can't
   % just write one on every page because the title pages are numbered
   % 1 and 2 (the page numbers aren't printed), and so are the first
   % two pages of the document.  Thus, we'd have two destinations named
   % `1', and two named `2'.
   \ifpdf \global\pdfmakepagedesttrue \fi
 }
 
 
 % 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
   \catcode`\<=\active
   \catcode`\>=\active
   \catcode`\\=\active
   \catcode`\^=\active
   \catcode`\_=\active
   \catcode`\|=\active
   \catcode`\~=\active
 }
 
 
 % Read the toc file, which is essentially Texinfo input.
 \def\readtocfile{%
   \setupdatafile
   \activecatcodes
   \input \jobname.toc
 }
 
 \newskip\contentsrightmargin \contentsrightmargin=1in
 \newcount\savepageno
 \newcount\lastnegativepageno \lastnegativepageno = -1
 
 % Prepare to read what we've written to \tocfile.
 %
 \def\startcontents#1{%
   % If @setchapternewpage on, and @headings double, the contents should
   % start on an odd page, unlike chapters.  Thus, we maintain
   % \contentsalignmacro in parallel with \pagealignmacro.
   % From: Torbjorn Granlund <tege@matematik.su.se>
   \contentsalignmacro
   \immediate\closeout\tocfile
   %
   % Don't need to put `Contents' or `Short Contents' in the headline.
   % It is abundantly clear what they are.
   \def\thischapter{}%
   \chapmacro{#1}{Yomitfromtoc}{}%
   %
   \savepageno = \pageno
   \begingroup                  % Set up to handle contents files properly.
     \raggedbottom              % Worry more about breakpoints than the bottom.
     \advance\hsize by -\contentsrightmargin % Don't use the full line length.
     %
     % Roman numerals for page numbers.
     \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
 }
 
 
 % Normal (long) toc.
 \def\contents{%
   \startcontents{\putwordTOC}%
     \openin 1 \jobname.toc
     \ifeof 1 \else
       \readtocfile
     \fi
     \vfill \eject
     \contentsalignmacro % in case @setchapternewpage odd is in effect
     \ifeof 1 \else
       \pdfmakeoutlines
     \fi
     \closein 1
   \endgroup
   \lastnegativepageno = \pageno
   \global\pageno = \savepageno
 }
 
 % And just the chapters.
 \def\summarycontents{%
   \startcontents{\putwordShortTOC}%
     %
     \let\numchapentry = \shortchapentry
     \let\appentry = \shortchapentry
     \let\unnchapentry = \shortunnchapentry
     % We want a true roman here for the page numbers.
     \secfonts
     \let\rm=\shortcontrm \let\bf=\shortcontbf
     \let\sl=\shortcontsl \let\tt=\shortconttt
     \rm
     \hyphenpenalty = 10000
     \advance\baselineskip by 1pt % Open it up a little.
     \def\numsecentry##1##2##3##4{}
     \let\appsecentry = \numsecentry
     \let\unnsecentry = \numsecentry
     \let\numsubsecentry = \numsecentry
     \let\appsubsecentry = \numsecentry
     \let\unnsubsecentry = \numsecentry
     \let\numsubsubsecentry = \numsecentry
     \let\appsubsubsecentry = \numsecentry
     \let\unnsubsubsecentry = \numsecentry
     \openin 1 \jobname.toc
     \ifeof 1 \else
       \readtocfile
     \fi
     \closein 1
     \vfill \eject
     \contentsalignmacro % in case @setchapternewpage odd is in effect
   \endgroup
   \lastnegativepageno = \pageno
   \global\pageno = \savepageno
 }
 \let\shortcontents = \summarycontents
 
 % Typeset the label for a chapter or appendix for the short contents.
 % The arg is, e.g., `A' for an appendix, or `3' for a chapter.
 %
 \def\shortchaplabel#1{%
   % This space should be enough, since a single number is .5em, and the
   % widest letter (M) is 1em, at least in the Computer Modern fonts.
   % But use \hss just in case.
   % (This space doesn't include the extra space that gets added after
   % the label; that gets put in by \shortchapentry above.)
   %
   % We'd like to right-justify chapter numbers, but that looks strange
   % with appendix letters.  And right-justifying numbers and
   % left-justifying letters looks strange when there is less than 10
   % chapters.  Have to read the whole toc once to know how many chapters
   % there are before deciding ...
   \hbox to 1em{#1\hss}%
 }
 
 % These macros generate individual entries in the table of contents.
 % The first argument is the chapter or section name.
 % The last argument is the page number.
 % The arguments in between are the chapter number, section number, ...
 
 % Chapters, in the main contents.
 \def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
 %
 % Chapters, in the short toc.
 % See comments in \dochapentry re vbox and related settings.
 \def\shortchapentry#1#2#3#4{%
   \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
 }
 
 % Appendices, in the main contents.
 % Need the word Appendix, and a fixed-size box.
 %
 \def\appendixbox#1{%
   % We use M since it's probably the widest letter.
   \setbox0 = \hbox{\putwordAppendix{} M}%
   \hbox to \wd0{\putwordAppendix{} #1\hss}}
 %
 \def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
 
 % Unnumbered chapters.
 \def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
 \def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
 
 % Sections.
 \def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
 \let\appsecentry=\numsecentry
 \def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
 
 % Subsections.
 \def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
 \let\appsubsecentry=\numsubsecentry
 \def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
 
 % And subsubsections.
 \def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
 \let\appsubsubsecentry=\numsubsubsecentry
 \def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
 
 % This parameter controls the indentation of the various levels.
 % Same as \defaultparindent.
 \newdimen\tocindent \tocindent = 15pt
 
 % Now for the actual typesetting. In all these, #1 is the text and #2 is the
 % page number.
 %
 % If the toc has to be broken over pages, we want it to be at chapters
 % if at all possible; hence the \penalty.
 \def\dochapentry#1#2{%
    \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
    \begingroup
      \chapentryfonts
      \tocentry{#1}{\dopageno\bgroup#2\egroup}%
    \endgroup
    \nobreak\vskip .25\baselineskip plus.1\baselineskip
 }
 
 \def\dosecentry#1#2{\begingroup
   \secentryfonts \leftskip=\tocindent
   \tocentry{#1}{\dopageno\bgroup#2\egroup}%
 \endgroup}
 
 \def\dosubsecentry#1#2{\begingroup
   \subsecentryfonts \leftskip=2\tocindent
   \tocentry{#1}{\dopageno\bgroup#2\egroup}%
 \endgroup}
 
 \def\dosubsubsecentry#1#2{\begingroup
   \subsubsecentryfonts \leftskip=3\tocindent
   \tocentry{#1}{\dopageno\bgroup#2\egroup}%
 \endgroup}
 
 % We use the same \entry macro as for the index entries.
 \let\tocentry = \entry
 
 % Space between chapter (or whatever) number and the title.
 \def\labelspace{\hskip1em \relax}
 
 \def\dopageno#1{{\rm #1}}
 \def\doshortpageno#1{{\rm #1}}
 
 \def\chapentryfonts{\secfonts \rm}
 \def\secentryfonts{\textfonts}
 \def\subsecentryfonts{\textfonts}
 \def\subsubsecentryfonts{\textfonts}
 
 
 \message{environments,}
 % @foo ... @end foo.
 
 % @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 %
 % Since these characters are used in examples, it should be an even number of
 % \tt widths. Each \tt character is 1en, so two makes it 1em.
 %
 \def\point{$\star$}
 \def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
 \def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
 \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
 \def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
 
 % The @error{} command.
 % Adapted from the TeXbook's \boxit.
 %
 \newbox\errorbox
 %
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
 \setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
 %
 \setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
    \advance\hsize by -2\dimen2 % Rules.
    \vbox{%
       \hrule height\dimen2
       \hbox{\vrule width\dimen2 \kern3pt          % Space to left of text.
          \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
          \kern3pt\vrule width\dimen2}% Space to right.
       \hrule height\dimen2}
     \hfil}
 %
 \def\error{\leavevmode\lower.7ex\copy\errorbox}
 
 % @tex ... @end tex    escapes into raw Tex temporarily.
 % One exception: @ is still an escape character, so that @end tex works.
 % But \@ or @@ will get a plain tex @ character.
 
 \envdef\tex{%
   \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
   \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
   \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
   \catcode `\%=14
   \catcode `\+=\other
   \catcode `\"=\other
   \catcode `\|=\other
   \catcode `\<=\other
   \catcode `\>=\other
   \escapechar=`\\
   %
   \let\b=\ptexb
   \let\bullet=\ptexbullet
   \let\c=\ptexc
   \let\,=\ptexcomma
   \let\.=\ptexdot
   \let\dots=\ptexdots
   \let\equiv=\ptexequiv
   \let\!=\ptexexclam
   \let\i=\ptexi
   \let\indent=\ptexindent
   \let\noindent=\ptexnoindent
   \let\{=\ptexlbrace
   \let\+=\tabalign
   \let\}=\ptexrbrace
   \let\/=\ptexslash
   \let\*=\ptexstar
   \let\t=\ptext
   \let\frenchspacing=\plainfrenchspacing
   %
   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
   \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
   \def\@{@}%
 }
 % There is no need to define \Etex.
 
 % Define @lisp ... @end lisp.
 % @lisp environment forms a group so it can rebind things,
 % including the definition of @end lisp (which normally is erroneous).
 
 % Amount to narrow the margins by for @lisp.
 \newskip\lispnarrowing \lispnarrowing=0.4in
 
 % This is the definition that ^^M gets inside @lisp, @example, and other
 % such environments.  \null is better than a space, since it doesn't
 % have any width.
 \def\lisppar{\null\endgraf}
 
 % This space is always present above and below environments.
 \newskip\envskipamount \envskipamount = 0pt
 
 % Make spacing and below environment symmetrical.  We use \parskip here
 % to help in doing that, since in @example-like environments \parskip
 % is reset to zero; thus the \afterenvbreak inserts no space -- but the
 % start of the next paragraph will insert \parskip.
 %
 \def\aboveenvbreak{{%
   % =10000 instead of <10000 because of a special case in \itemzzz and
   % \sectionheading, q.v.
   \ifnum \lastpenalty=10000 \else
     \advance\envskipamount by \parskip
     \endgraf
     \ifdim\lastskip<\envskipamount
       \removelastskip
       % it's not a good place to break if the last penalty was \nobreak
       % or better ...
       \ifnum\lastpenalty<10000 \penalty-50 \fi
       \vskip\envskipamount
     \fi
   \fi
 }}
 
 \let\afterenvbreak = \aboveenvbreak
 
 % \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
 % also clear it, so that its embedded environments do the narrowing again.
 \let\nonarrowing=\relax
 
 % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
 % environment contents.
 \font\circle=lcircle10
 \newdimen\circthick
 \newdimen\cartouter\newdimen\cartinner
 \newskip\normbskip\newskip\normpskip\newskip\normlskip
 \circthick=\fontdimen8\circle
 %
 \def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
 \def\ctr{{\hskip 6pt\circle\char'010}}
 \def\cbl{{\circle\char'012\hskip -6pt}}
 \def\cbr{{\hskip 6pt\circle\char'011}}
 \def\carttop{\hbox to \cartouter{\hskip\lskip
         \ctl\leaders\hrule height\circthick\hfil\ctr
         \hskip\rskip}}
 \def\cartbot{\hbox to \cartouter{\hskip\lskip
         \cbl\leaders\hrule height\circthick\hfil\cbr
         \hskip\rskip}}
 %
 \newskip\lskip\newskip\rskip
 
 \envdef\cartouche{%
   \ifhmode\par\fi  % can't be in the midst of a paragraph.
   \startsavinginserts
   \lskip=\leftskip \rskip=\rightskip
   \leftskip=0pt\rightskip=0pt % we want these *outside*.
   \cartinner=\hsize \advance\cartinner by-\lskip
   \advance\cartinner by-\rskip
   \cartouter=\hsize
   \advance\cartouter by 18.4pt	% allow for 3pt kerns on either
 				% side, and for 6pt waste from
 				% each corner char, and rule thickness
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   % Flag to tell @lisp, etc., not to narrow margin.
   \let\nonarrowing = t%
   \vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
       \hbox\bgroup
 	  \hskip\lskip
 	  \vrule\kern3pt
 	  \vbox\bgroup
 	      \kern3pt
 	      \hsize=\cartinner
 	      \baselineskip=\normbskip
 	      \lineskip=\normlskip
 	      \parskip=\normpskip
 	      \vskip -\parskip
 	      \comment % For explanation, see the end of \def\group.
 }
 \def\Ecartouche{%
               \ifhmode\par\fi
 	      \kern3pt
 	  \egroup
 	  \kern3pt\vrule
 	  \hskip\rskip
       \egroup
       \cartbot
   \egroup
   \checkinserts
 }
 
 
 % This macro is called at the beginning of all the @example variants,
 % inside a group.
 \def\nonfillstart{%
   \aboveenvbreak
   \hfuzz = 12pt % Don't be fussy
   \sepspaces % Make spaces be word-separators rather than space tokens.
   \let\par = \lisppar % don't ignore blank lines
   \obeylines % each line of input is a line of output
   \parskip = 0pt
   \parindent = 0pt
   \emergencystretch = 0pt % don't try to avoid overfull boxes
   \ifx\nonarrowing\relax
     \advance \leftskip by \lispnarrowing
     \exdentamount=\lispnarrowing
   \else
     \let\nonarrowing = \relax
   \fi
   \let\exdent=\nofillexdent
 }
 
 % If you want all examples etc. small: @set dispenvsize small.
 % If you want even small examples the full size: @set dispenvsize nosmall.
 % This affects the following displayed environments:
 %    @example, @display, @format, @lisp
 %
 \def\smallword{small}
 \def\nosmallword{nosmall}
 \let\SETdispenvsize\relax
 \def\setnormaldispenv{%
   \ifx\SETdispenvsize\smallword
     % end paragraph for sake of leading, in case document has no blank
     % line.  This is redundant with what happens in \aboveenvbreak, but
     % we need to do it before changing the fonts, and it's inconvenient
     % to change the fonts afterward.
     \ifnum \lastpenalty=10000 \else \endgraf \fi
     \smallexamplefonts \rm
   \fi
 }
 \def\setsmalldispenv{%
   \ifx\SETdispenvsize\nosmallword
   \else
     \ifnum \lastpenalty=10000 \else \endgraf \fi
     \smallexamplefonts \rm
   \fi
 }
 
 % We often define two environments, @foo and @smallfoo.
 % Let's do it by one command:
 \def\makedispenv #1#2{
   \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
   \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
   \expandafter\let\csname E#1\endcsname \afterenvbreak
   \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
 }
 
 % Define two synonyms:
 \def\maketwodispenvs #1#2#3{
   \makedispenv{#1}{#3}
   \makedispenv{#2}{#3}
 }
 
 % @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
 %
 % @smallexample and @smalllisp: use smaller fonts.
 % Originally contributed by Pavel@xerox.
 %
 \maketwodispenvs {lisp}{example}{%
   \nonfillstart
   \tt\quoteexpand
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
   \gobble       % eat return
 }
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
 \makedispenv {display}{%
   \nonfillstart
   \gobble
 }
 
 % @format/@smallformat: same as @display except don't narrow margins.
 %
 \makedispenv{format}{%
   \let\nonarrowing = t%
   \nonfillstart
   \gobble
 }
 
 % @flushleft: same as @format, but doesn't obey \SETdispenvsize.
 \envdef\flushleft{%
   \let\nonarrowing = t%
   \nonfillstart
   \gobble
 }
 \let\Eflushleft = \afterenvbreak
 
 % @flushright.
 %
 \envdef\flushright{%
   \let\nonarrowing = t%
   \nonfillstart
   \advance\leftskip by 0pt plus 1fill
   \gobble
 }
 \let\Eflushright = \afterenvbreak
 
 
 % @quotation does normal linebreaking (hence we can't use \nonfillstart)
 % and narrows the margins.  We keep \parskip nonzero in general, since
 % we're doing normal filling.  So, when using \aboveenvbreak and
 % \afterenvbreak, temporarily make \parskip 0.
 %
 \envdef\quotation{%
   {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
   \parindent=0pt
   %
   % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
   \ifx\nonarrowing\relax
     \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
     \exdentamount = \lispnarrowing
   \else
     \let\nonarrowing = \relax
   \fi
   \parsearg\quotationlabel
 }
 
 % We have retained a nonzero parskip for the environment, since we're
 % doing normal filling.
 %
 \def\Equotation{%
   \par
   \ifx\quotationauthor\undefined\else
     % indent a bit.
     \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
   \fi
   {\parskip=0pt \afterenvbreak}%
 }
 
 % If we're given an argument, typeset it in bold with a colon after.
 \def\quotationlabel#1{%
   \def\temp{#1}%
   \ifx\temp\empty \else
     {\bf #1: }%
   \fi
 }
 
 
 % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
 % If we want to allow any <char> as delimiter,
 % we need the curly braces so that makeinfo sees the @verb command, eg:
 % `@verbx...x' would look like the '@verbx' command.  --janneke@gnu.org
 %
 % [Knuth]: Donald Ervin Knuth, 1996.  The TeXbook.
 %
 % [Knuth] p.344; only we need to do the other characters Texinfo sets
 % active too.  Otherwise, they get lost as the first character on a
 % verbatim line.
 \def\dospecials{%
   \do\ \do\\\do\{\do\}\do\$\do\&%
   \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
   \do\<\do\>\do\|\do\@\do+\do\"%
 }
 %
 % [Knuth] p. 380
 \def\uncatcodespecials{%
   \def\do##1{\catcode`##1=\other}\dospecials}
 %
 % [Knuth] pp. 380,381,391
 % Disable Spanish ligatures ?` and !` of \tt font
 \begingroup
   \catcode`\`=\active\gdef`{\relax\lq}
 \endgroup
 %
 % Setup for the @verb command.
 %
 % Eight spaces for a tab
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }}
 \endgroup
 %
 \def\setupverb{%
   \tt  % easiest (and conventionally used) font for verbatim
   \def\par{\leavevmode\endgraf}%
   \catcode`\`=\active
   \tabeightspaces
   % Respect line breaks,
   % print special symbols as themselves, and
   % make each space count
   % must do in this order:
   \obeylines \uncatcodespecials \sepspaces
 }
 
 % Setup for the @verbatim environment
 %
 % Real tab expansion
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
 \def\starttabbox{\setbox0=\hbox\bgroup}
 
 % Allow an option to not replace quotes with a regular directed right
 % quote/apostrophe (char 0x27), but instead use the undirected quote
 % 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.
 %
 \def\codequoteright{%
   \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
     '%
   \else
     \char'15
   \fi
 }
 %
 % 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 SETcodequotebacktick\endcsname\relax
     `%
   \else
     \char'22
   \fi
 }
 %
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
     \catcode`\^^I=\active
     \def^^I{\leavevmode\egroup
       \dimen0=\wd0 % the width so far, or since the previous tab
       \divide\dimen0 by\tabw
       \multiply\dimen0 by\tabw % compute previous multiple of \tabw
       \advance\dimen0 by\tabw  % advance to next multiple of \tabw
       \wd0=\dimen0 \box0 \starttabbox
     }%
   }
   \catcode`\'=\active
   \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
   %
   \catcode`\`=\active
   \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
   %
   \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
 \endgroup
 
 % start the verbatim environment.
 \def\setupverbatim{%
   \let\nonarrowing = t%
   \nonfillstart
   % Easiest (and conventionally used) font for verbatim
   \tt
   \def\par{\leavevmode\egroup\box0\endgraf}%
   \catcode`\`=\active
   \tabexpand
   \quoteexpand
   % Respect line breaks,
   % print special symbols as themselves, and
   % make each space count
   % must do in this order:
   \obeylines \uncatcodespecials \sepspaces
   \everypar{\starttabbox}%
 }
 
 % Do the @verb magic: verbatim text is quoted by unique
 % delimiter characters.  Before first delimiter expect a
 % right brace, after last delimiter expect closing brace:
 %
 %    \def\doverb'{'<char>#1<char>'}'{#1}
 %
 % [Knuth] p. 382; only eat outer {}
 \begingroup
   \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other
   \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
 \endgroup
 %
 \def\verb{\begingroup\setupverb\doverb}
 %
 %
 % Do the @verbatim magic: define the macro \doverbatim so that
 % the (first) argument ends when '@end verbatim' is reached, ie:
 %
 %     \def\doverbatim#1@end verbatim{#1}
 %
 % For Texinfo it's a lot easier than for LaTeX,
 % because texinfo's \verbatim doesn't stop at '\end{verbatim}':
 % we need not redefine '\', '{' and '}'.
 %
 % Inspired by LaTeX's verbatim command set [latex.ltx]
 %
 \begingroup
   \catcode`\ =\active
   \obeylines %
   % ignore everything up to the first ^^M, that's the newline at the end
   % of the @verbatim input line itself.  Otherwise we get an extra blank
   % line in the output.
   \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}%
   % We really want {...\end verbatim} in the body of the macro, but
   % without the active space; thus we have to use \xdef and \gobble.
 \endgroup
 %
 \envdef\verbatim{%
     \setupverbatim\doverbatim
 }
 \let\Everbatim = \afterenvbreak
 
 
 % @verbatiminclude FILE - insert text of file in verbatim environment.
 %
 \def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude}
 %
 \def\doverbatiminclude#1{%
   {%
     \makevalueexpandable
     \setupverbatim
     \input #1
     \afterenvbreak
   }%
 }
 
 % @copying ... @end copying.
 % Save the text away for @insertcopying later.
 %
 % We save the uninterpreted tokens, rather than creating a box.
 % Saving the text in a box would be much easier, but then all the
 % typesetting commands (@smallbook, font changes, etc.) have to be done
 % beforehand -- and a) we want @copying to be done first in the source
 % file; b) letting users define the frontmatter in as flexible order as
 % possible is very desirable.
 %
 \def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
 \def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
 %
 \def\insertcopying{%
   \begingroup
     \parindent = 0pt  % paragraph indentation looks wrong on title page
     \scanexp\copyingtext
   \endgroup
 }
 
 
 \message{defuns,}
 % @defun etc.
 
 \newskip\defbodyindent \defbodyindent=.4in
 \newskip\defargsindent \defargsindent=50pt
 \newskip\deflastargmargin \deflastargmargin=18pt
 \newcount\defunpenalty
 
 % Start the processing of @deffn:
 \def\startdefun{%
   \ifnum\lastpenalty<10000
     \medbreak
     \defunpenalty=10003 % Will keep this @deffn together with the
                         % following @def command, see below.
   \else
     % If there are two @def commands in a row, we'll have a \nobreak,
     % which is there to keep the function description together with its
     % header.  But if there's nothing but headers, we need to allow a
     % break somewhere.  Check specifically for penalty 10002, inserted
     % by \printdefunline, instead of 10000, since the sectioning
     % commands also insert a nobreak penalty, and we don't want to allow
     % a break between a section heading and a defun.
     %
     % As a minor refinement, we avoid "club" headers by signalling
     % with penalty of 10003 after the very first @deffn in the
     % sequence (see above), and penalty of 10002 after any following
     % @def command.
     \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
     %
     % Similarly, after a section heading, do not allow a break.
     % But do insert the glue.
     \medskip  % preceded by discardable penalty, so not a breakpoint
   \fi
   %
   \parindent=0in
   \advance\leftskip by \defbodyindent
   \exdentamount=\defbodyindent
 }
 
 \def\dodefunx#1{%
   % First, check whether we are in the right environment:
   \checkenv#1%
   %
   % As above, allow line break if we have multiple x headers in a row.
   % It's not a great place, though.
   \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
   %
   % And now, it's time to reuse the body of the original defun:
   \expandafter\gobbledefun#1%
 }
 \def\gobbledefun#1\startdefun{}
 
 % \printdefunline \deffnheader{text}
 %
 \def\printdefunline#1#2{%
   \begingroup
     % call \deffnheader:
     #1#2 \endheader
     % common ending:
     \interlinepenalty = 10000
     \advance\rightskip by 0pt plus 1fil
     \endgraf
     \nobreak\vskip -\parskip
     \penalty\defunpenalty  % signal to \startdefun and \dodefunx
     % Some of the @defun-type tags do not enable magic parentheses,
     % rendering the following check redundant.  But we don't optimize.
     \checkparencounts
   \endgroup
 }
 
 \def\Edefun{\endgraf\medbreak}
 
 % \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
 % the only thing remainnig is to define \deffnheader.
 %
 \def\makedefun#1{%
   \expandafter\let\csname E#1\endcsname = \Edefun
   \edef\temp{\noexpand\domakedefun
     \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
   \temp
 }
 
 % \domakedefun \deffn \deffnx \deffnheader
 %
 % Define \deffn and \deffnx, without parameters.
 % \deffnheader has to be defined explicitly.
 %
 \def\domakedefun#1#2#3{%
   \envdef#1{%
     \startdefun
     \parseargusing\activeparens{\printdefunline#3}%
   }%
   \def#2{\dodefunx#1}%
   \def#3%
 }
 
 %%% Untyped functions:
 
 % @deffn category name args
 \makedefun{deffn}{\deffngeneral{}}
 
 % @deffn category class name args
 \makedefun{defop}#1 {\defopon{#1\ \putwordon}}
 
 % \defopon {category on}class name args
 \def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
 
 % \deffngeneral {subind}category name args
 %
 \def\deffngeneral#1#2 #3 #4\endheader{%
   % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
   \dosubind{fn}{\code{#3}}{#1}%
   \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
 }
 
 %%% Typed functions:
 
 % @deftypefn category type name args
 \makedefun{deftypefn}{\deftypefngeneral{}}
 
 % @deftypeop category class type name args
 \makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
 
 % \deftypeopon {category on}class type name args
 \def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
 
 % \deftypefngeneral {subind}category type name args
 %
 \def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
   \dosubind{fn}{\code{#4}}{#1}%
   \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
 }
 
 %%% Typed variables:
 
 % @deftypevr category type var args
 \makedefun{deftypevr}{\deftypecvgeneral{}}
 
 % @deftypecv category class type var args
 \makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
 
 % \deftypecvof {category of}class type var args
 \def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
 
 % \deftypecvgeneral {subind}category type var args
 %
 \def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
   \dosubind{vr}{\code{#4}}{#1}%
   \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
 }
 
 %%% Untyped variables:
 
 % @defvr category var args
 \makedefun{defvr}#1 {\deftypevrheader{#1} {} }
 
 % @defcv category class var args
 \makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
 
 % \defcvof {category of}class var args
 \def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
 
 %%% Type:
 % @deftp category name args
 \makedefun{deftp}#1 #2 #3\endheader{%
   \doind{tp}{\code{#2}}%
   \defname{#1}{}{#2}\defunargs{#3\unskip}%
 }
 
 % Remaining @defun-like shortcuts:
 \makedefun{defun}{\deffnheader{\putwordDeffunc} }
 \makedefun{defmac}{\deffnheader{\putwordDefmac} }
 \makedefun{defspec}{\deffnheader{\putwordDefspec} }
 \makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} }
 \makedefun{defvar}{\defvrheader{\putwordDefvar} }
 \makedefun{defopt}{\defvrheader{\putwordDefopt} }
 \makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
 \makedefun{defmethod}{\defopon\putwordMethodon}
 \makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
 \makedefun{defivar}{\defcvof\putwordInstanceVariableof}
 \makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
 
 % \defname, which formats the name of the @def (not the args).
 % #1 is the category, such as "Function".
 % #2 is the return type, if any.
 % #3 is the function name.
 %
 % We are followed by (but not passed) the arguments, if any.
 %
 \def\defname#1#2#3{%
   % Get the values of \leftskip and \rightskip as they were outside the @def...
   \advance\leftskip by -\defbodyindent
   %
   % How we'll format the type name.  Putting it in brackets helps
   % distinguish it from the body text that may end up on the next line
   % just below it.
   \def\temp{#1}%
   \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
   %
   % Figure out line sizes for the paragraph shape.
   % The first line needs space for \box0; but if \rightskip is nonzero,
   % we need only space for the part of \box0 which exceeds it:
   \dimen0=\hsize  \advance\dimen0 by -\wd0  \advance\dimen0 by \rightskip
   % The continuations:
   \dimen2=\hsize  \advance\dimen2 by -\defargsindent
   % (plain.tex says that \dimen1 should be used only as global.)
   \parshape 2 0in \dimen0 \defargsindent \dimen2
   %
   % Put the type name to the right margin.
   \noindent
   \hbox to 0pt{%
     \hfil\box0 \kern-\hsize
     % \hsize has to be shortened this way:
     \kern\leftskip
     % Intentionally do not respect \rightskip, since we need the space.
   }%
   %
   % Allow all lines to be underfull without complaint:
   \tolerance=10000 \hbadness=10000
   \exdentamount=\defbodyindent
   {%
     % defun fonts. We use typewriter by default (used to be bold) because:
     % . we're printing identifiers, they should be in tt in principle.
     % . in languages with many accents, such as Czech or French, it's
     %   common to leave accents off identifiers.  The result looks ok in
     %   tt, but exceedingly strange in rm.
     % . we don't want -- and --- to be treated as ligatures.
     % . this still does not fix the ?` and !` ligatures, but so far no
     %   one has made identifiers using them :).
     \df \tt
     \def\temp{#2}% return value type
     \ifx\temp\empty\else \tclose{\temp} \fi
     #3% output function name
   }%
   {\rm\enskip}% hskip 0.5 em of \tenrm
   %
   \boldbrax
   % arguments will be output next, if any.
 }
 
 % Print arguments in slanted roman (not ttsl), inconsistently with using
 % tt for the name.  This is because literal text is sometimes needed in
 % the argument list (groff manual), and ttsl and tt are not very
 % distinguishable.  Prevent hyphenation at `-' chars.
 %
 \def\defunargs#1{%
   % use sl by default (not ttsl),
   % tt for the names.
   \df \sl \hyphenchar\font=0
   %
   % On the other hand, if an argument has two dashes (for instance), we
   % want a way to get ttsl.  Let's try @var for that.
   \let\var=\ttslanted
   #1%
   \sl\hyphenchar\font=45
 }
 
 % We want ()&[] to print specially on the defun line.
 %
 \def\activeparens{%
   \catcode`\(=\active \catcode`\)=\active
   \catcode`\[=\active \catcode`\]=\active
   \catcode`\&=\active
 }
 
 % Make control sequences which act like normal parenthesis chars.
 \let\lparen = ( \let\rparen = )
 
 % Be sure that we always have a definition for `(', etc.  For example,
 % if the fn name has parens in it, \boldbrax will not be in effect yet,
 % so TeX would otherwise complain about undefined control sequence.
 {
   \activeparens
   \global\let(=\lparen \global\let)=\rparen
   \global\let[=\lbrack \global\let]=\rbrack
   \global\let& = \&
 
   \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
   \gdef\magicamp{\let&=\amprm}
 }
 
 \newcount\parencount
 
 % If we encounter &foo, then turn on ()-hacking afterwards
 \newif\ifampseen
 \def\amprm#1 {\ampseentrue{\bf\&#1 }}
 
 \def\parenfont{%
   \ifampseen
     % At the first level, print parens in roman,
     % otherwise use the default font.
     \ifnum \parencount=1 \rm \fi
   \else
     % The \sf parens (in \boldbrax) actually are a little bolder than
     % the contained text.  This is especially needed for [ and ] .
     \sf
   \fi
 }
 \def\infirstlevel#1{%
   \ifampseen
     \ifnum\parencount=1
       #1%
     \fi
   \fi
 }
 \def\bfafterword#1 {#1 \bf}
 
 \def\opnr{%
   \global\advance\parencount by 1
   {\parenfont(}%
   \infirstlevel \bfafterword
 }
 \def\clnr{%
   {\parenfont)}%
   \infirstlevel \sl
   \global\advance\parencount by -1
 }
 
 \newcount\brackcount
 \def\lbrb{%
   \global\advance\brackcount by 1
   {\bf[}%
 }
 \def\rbrb{%
   {\bf]}%
   \global\advance\brackcount by -1
 }
 
 \def\checkparencounts{%
   \ifnum\parencount=0 \else \badparencount \fi
   \ifnum\brackcount=0 \else \badbrackcount \fi
 }
 \def\badparencount{%
   \errmessage{Unbalanced parentheses in @def}%
   \global\parencount=0
 }
 \def\badbrackcount{%
   \errmessage{Unbalanced square braces in @def}%
   \global\brackcount=0
 }
 
 
 \message{macros,}
 % @macro.
 
 % To do this right we need a feature of e-TeX, \scantokens,
 % which we arrange to emulate with a temporary file in ordinary TeX.
 \ifx\eTeXversion\undefined
   \newwrite\macscribble
   \def\scantokens#1{%
     \toks0={#1}%
     \immediate\openout\macscribble=\jobname.tmp
     \immediate\write\macscribble{\the\toks0}%
     \immediate\closeout\macscribble
     \input \jobname.tmp
   }
 \fi
 
 \def\scanmacro#1{%
   \begingroup
     \newlinechar`\^^M
     \let\xeatspaces\eatspaces
     % Undo catcode changes of \startcontents and \doprintindex
     % When called from @insertcopying or (short)caption, we need active
     % backslash to get it printed correctly.  Previously, we had
     % \catcode`\\=\other instead.  We'll see whether a problem appears
     % with macro expansion.				--kasal, 19aug04
     \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
     % ... and \example
     \spaceisspace
     %
     % Append \endinput to make sure that TeX does not see the ending newline.
     % I've verified that it is necessary both for e-TeX and for ordinary TeX
     %							--kasal, 29nov03
     \scantokens{#1\endinput}%
   \endgroup
 }
 
 \def\scanexp#1{%
   \edef\temp{\noexpand\scanmacro{#1}}%
   \temp
 }
 
 \newcount\paramno   % Count of parameters
 \newtoks\macname    % Macro name
 \newif\ifrecursive  % Is it recursive?
 
 % List of all defined macros in the form
 %    \definedummyword\macro1\definedummyword\macro2...
 % Currently is also contains all @aliases; the list can be split
 % if there is a need.
 \def\macrolist{}
 
 % Add the macro to \macrolist
 \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
 \def\addtomacrolistxxx#1{%
      \toks0 = \expandafter{\macrolist\definedummyword#1}%
      \xdef\macrolist{\the\toks0}%
 }
 
 % Utility routines.
 % 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
   \csname#2\endcsname
 }
 
 % Trim leading and trailing spaces off a string.
 % Concepts from aro-bend problem 15 (see CTAN).
 {\catcode`\@=11
 \gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }}
 \gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@}
 \gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @}
 \def\unbrace#1{#1}
 \unbrace{\gdef\trim@@@ #1 } #2@{#1}
 }
 
 % Trim a single trailing ^^M off a string.
 {\catcode`\^^M=\other \catcode`\Q=3%
 \gdef\eatcr #1{\eatcra #1Q^^MQ}%
 \gdef\eatcra#1^^MQ{\eatcrb#1Q}%
 \gdef\eatcrb#1Q#2Q{#1}%
 }
 
 % Macro bodies are absorbed as an argument in a context where
 % all characters are catcode 10, 11 or 12, except \ which is active
 % (as in normal texinfo). It is necessary to change the definition of \.
 
 % It's necessary to have hard CRs when the macro is executed. This is
 % done by  making ^^M (\endlinechar) catcode 12 when reading the macro
 % body, and then making it the \newlinechar in \scanmacro.
 
 \def\scanctxt{%
   \catcode`\"=\other
   \catcode`\+=\other
   \catcode`\<=\other
   \catcode`\>=\other
   \catcode`\@=\other
   \catcode`\^=\other
   \catcode`\_=\other
   \catcode`\|=\other
   \catcode`\~=\other
 }
 
 \def\scanargctxt{%
   \scanctxt
   \catcode`\\=\other
   \catcode`\^^M=\other
 }
 
 \def\macrobodyctxt{%
   \scanctxt
   \catcode`\{=\other
   \catcode`\}=\other
   \catcode`\^^M=\other
   \usembodybackslash
 }
 
 \def\macroargctxt{%
   \scanctxt
   \catcode`\\=\other
 }
 
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
 % where N is the macro parameter number.
 % We define \csname macarg.\endcsname to be \realbackslash, so
 % \\ in macro replacement text gets you a backslash.
 
 {\catcode`@=0 @catcode`@\=@active
  @gdef@usembodybackslash{@let\=@mbodybackslash}
  @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname}
 }
 \expandafter\def\csname macarg.\endcsname{\realbackslash}
 
 \def\macro{\recursivefalse\parsearg\macroxxx}
 \def\rmacro{\recursivetrue\parsearg\macroxxx}
 
 \def\macroxxx#1{%
   \getargs{#1}%           now \macname is the macname and \argl the arglist
   \ifx\argl\empty       % no arguments
      \paramno=0%
   \else
      \expandafter\parsemargdef \argl;%
   \fi
   \if1\csname ismacro.\the\macname\endcsname
      \message{Warning: redefining \the\macname}%
   \else
      \expandafter\ifx\csname \the\macname\endcsname \relax
      \else \errmessage{Macro name \the\macname\space already defined}\fi
      \global\cslet{macsave.\the\macname}{\the\macname}%
      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
      \addtomacrolist{\the\macname}%
   \fi
   \begingroup \macrobodyctxt
   \ifrecursive \expandafter\parsermacbody
   \else \expandafter\parsemacbody
   \fi}
 
 \parseargdef\unmacro{%
   \if1\csname ismacro.#1\endcsname
     \global\cslet{#1}{macsave.#1}%
     \global\expandafter\let \csname ismacro.#1\endcsname=0%
     % Remove the macro name from \macrolist:
     \begingroup
       \expandafter\let\csname#1\endcsname \relax
       \let\definedummyword\unmacrodo
       \xdef\macrolist{\macrolist}%
     \endgroup
   \else
     \errmessage{Macro #1 not defined}%
   \fi
 }
 
 % Called by \do from \dounmacro on each macro.  The idea is to omit any
 % macro definitions that have been changed to \relax.
 %
 \def\unmacrodo#1{%
   \ifx #1\relax
     % remove this
   \else
     \noexpand\definedummyword \noexpand#1%
   \fi
 }
 
 % This makes use of the obscure feature that if the last token of a
 % <parameter list> is #, then the preceding argument is delimited by
 % an opening brace, and that opening brace is not consumed.
 \def\getargs#1{\getargsxxx#1{}}
 \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
 \def\getmacname #1 #2\relax{\macname={#1}}
 \def\getmacargs#1{\def\argl{#1}}
 
 % Parse the optional {params} list.  Set up \paramno and \paramlist
 % so \defmacro knows what to do.  Define \macarg.blah for each blah
 % in the params list, to be ##N where N is the position in that list.
 % That gets used by \mbodybackslash (above).
 
 % We need to get `macro parameter char #' into several definitions.
 % The technique used is stolen from LaTeX:  let \hash be something
 % unexpandable, insert that wherever you need a #, and then redefine
 % it to # just before using the token list produced.
 %
 % The same technique is used to protect \eatspaces till just before
 % the macro is used.
 
 \def\parsemargdef#1;{\paramno=0\def\paramlist{}%
         \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
 \def\parsemargdefxxx#1,{%
   \if#1;\let\next=\relax
   \else \let\next=\parsemargdefxxx
     \advance\paramno by 1%
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
         {\xeatspaces{\hash\the\paramno}}%
     \edef\paramlist{\paramlist\hash\the\paramno,}%
   \fi\next}
 
 % These two commands read recursive and nonrecursive macro bodies.
 % (They're different since rec and nonrec macros end differently.)
 
 \long\def\parsemacbody#1@end macro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
 \long\def\parsermacbody#1@end rmacro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
 
 % This defines the macro itself. There are six cases: recursive and
 % nonrecursive macros of zero, one, and many arguments.
 % Much magic with \expandafter here.
 % \xdef is used so that macro definitions will survive the file
 % they're defined in; @include reads the file inside a group.
 \def\defmacro{%
   \let\hash=##% convert placeholders to macro parameter chars
   \ifrecursive
     \ifcase\paramno
     % 0
       \expandafter\xdef\csname\the\macname\endcsname{%
         \noexpand\scanmacro{\temp}}%
     \or % 1
       \expandafter\xdef\csname\the\macname\endcsname{%
          \bgroup\noexpand\macroargctxt
          \noexpand\braceorline
          \expandafter\noexpand\csname\the\macname xxx\endcsname}%
       \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
          \egroup\noexpand\scanmacro{\temp}}%
     \else % many
       \expandafter\xdef\csname\the\macname\endcsname{%
          \bgroup\noexpand\macroargctxt
          \noexpand\csname\the\macname xx\endcsname}%
       \expandafter\xdef\csname\the\macname xx\endcsname##1{%
           \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
       \expandafter\expandafter
       \expandafter\xdef
       \expandafter\expandafter
         \csname\the\macname xxx\endcsname
           \paramlist{\egroup\noexpand\scanmacro{\temp}}%
     \fi
   \else
     \ifcase\paramno
     % 0
       \expandafter\xdef\csname\the\macname\endcsname{%
         \noexpand\norecurse{\the\macname}%
         \noexpand\scanmacro{\temp}\egroup}%
     \or % 1
       \expandafter\xdef\csname\the\macname\endcsname{%
          \bgroup\noexpand\macroargctxt
          \noexpand\braceorline
          \expandafter\noexpand\csname\the\macname xxx\endcsname}%
       \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
         \egroup
         \noexpand\norecurse{\the\macname}%
         \noexpand\scanmacro{\temp}\egroup}%
     \else % many
       \expandafter\xdef\csname\the\macname\endcsname{%
          \bgroup\noexpand\macroargctxt
          \expandafter\noexpand\csname\the\macname xx\endcsname}%
       \expandafter\xdef\csname\the\macname xx\endcsname##1{%
           \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
       \expandafter\expandafter
       \expandafter\xdef
       \expandafter\expandafter
       \csname\the\macname xxx\endcsname
       \paramlist{%
           \egroup
           \noexpand\norecurse{\the\macname}%
           \noexpand\scanmacro{\temp}\egroup}%
     \fi
   \fi}
 
 \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
 
 % \braceorline decides whether the next nonwhitespace character is a
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
 % as an argument (by \parsebrace or \parsearg)
 \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
     \expandafter\parsearg
   \fi \macnamexxx}
 
 
 % @alias.
 % We need some trickery to remove the optional spaces around the equal
 % sign.  Just make them active and then expand them all to nothing.
 \def\alias{\parseargusing\obeyspaces\aliasxxx}
 \def\aliasxxx #1{\aliasyyy#1\relax}
 \def\aliasyyy #1=#2\relax{%
   {%
     \expandafter\let\obeyedspace=\empty
     \addtomacrolist{#1}%
     \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
   }%
   \next
 }
 
 
 \message{cross references,}
 
 \newwrite\auxfile
 \newif\ifhavexrefs    % True if xref values are known.
 \newif\ifwarnedxrefs  % True if we warned once that they aren't known.
 
 % @inforef is relatively simple.
 \def\inforef #1{\inforefzzz #1,,,,**}
 \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
   node \samp{\ignorespaces#1{}}}
 
 % @node's only job in TeX is to define \lastnode, which is used in
 % cross-references.  The @node line might or might not have commas, and
 % might or might not have spaces before the first comma, like:
 % @node foo , bar , ...
 % We don't want such trailing spaces in the node name.
 %
 \parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
 %
 % also remove a trailing comma, in case of something like this:
 % @node Help-Cross,  ,  , Cross-refs
 \def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
 \def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
 
 \let\nwnode=\node
 \let\lastnode=\empty
 
 % Write a cross-reference definition for the current node.  #1 is the
 % type (Ynumbered, Yappendix, Ynothing).
 %
 \def\donoderef#1{%
   \ifx\lastnode\empty\else
     \setref{\lastnode}{#1}%
     \global\let\lastnode=\empty
   \fi
 }
 
 % @anchor{NAME} -- define xref target at arbitrary point.
 %
 \newcount\savesfregister
 %
 \def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
 \def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
 \def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
 
 % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
 % anchor), which consists of three parts:
 % 1) NAME-title - the current sectioning name taken from \thissection,
 %                 or the anchor name.
 % 2) NAME-snt   - section number and type, passed as the SNT arg, or
 %                 empty for anchors.
 % 3) NAME-pg    - the page number.
 %
 % This is called from \donoderef, \anchor, and \dofloat.  In the case of
 % floats, there is an additional part, which is not written here:
 % 4) NAME-lof   - the text as it should appear in a @listoffloats.
 %
 \def\setref#1#2{%
   \pdfmkdest{#1}%
   \iflinks
     {%
       \atdummies  % preserve commands, but don't expand them
       \edef\writexrdef##1##2{%
 	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
 	  ##1}{##2}}% these are parameters of \writexrdef
       }%
       \toks0 = \expandafter{\thissection}%
       \immediate \writexrdef{title}{\the\toks0 }%
       \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
       \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
     }%
   \fi
 }
 
 % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
 % node name, #4 the name of the Info file, #5 the name of the printed
 % manual.  All but the node name can be omitted.
 %
 \def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
 \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
 \def\ref#1{\xrefX[#1,,,,,,,]}
 \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
   \unsepspaces
   \def\printedmanual{\ignorespaces #5}%
   \def\printedrefname{\ignorespaces #3}%
   \setbox1=\hbox{\printedmanual\unskip}%
   \setbox0=\hbox{\printedrefname\unskip}%
   \ifdim \wd0 = 0pt
     % No printed node name was explicitly given.
     \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
       % Use the node name inside the square brackets.
       \def\printedrefname{\ignorespaces #1}%
     \else
       % Use the actual chapter/section title appear inside
       % the square brackets.  Use the real section title if we have it.
       \ifdim \wd1 > 0pt
         % It is in another manual, so we don't have it.
         \def\printedrefname{\ignorespaces #1}%
       \else
         \ifhavexrefs
           % We know the real title if we have the xref values.
           \def\printedrefname{\refx{#1-title}{}}%
         \else
           % Otherwise just copy the Info node name.
           \def\printedrefname{\ignorespaces #1}%
         \fi%
       \fi
     \fi
   \fi
   %
   % Make link in pdf output.
   \ifpdf
     \leavevmode
     \getfilename{#4}%
     {\indexnofonts
      \turnoffactive
      % See comments at \activebackslashdouble.
      {\activebackslashdouble \xdef\pdfxrefdest{#1}%
       \backslashparens\pdfxrefdest}%
      %
      \ifnum\filenamelength>0
        \startlink attr{/Border [0 0 0]}%
          goto file{\the\filename.pdf} name{\pdfxrefdest}%
      \else
        \startlink attr{/Border [0 0 0]}%
          goto name{\pdfmkpgn{\pdfxrefdest}}%
      \fi
     }%
     \linkcolor
   \fi
   %
   % Float references are printed completely differently: "Figure 1.2"
   % instead of "[somenode], p.3".  We distinguish them by the
   % LABEL-title being set to a magic string.
   {%
     % Have to otherify everything special to allow the \csname to
     % include an _ in the xref name, etc.
     \indexnofonts
     \turnoffactive
     \expandafter\global\expandafter\let\expandafter\Xthisreftitle
       \csname XR#1-title\endcsname
   }%
   \iffloat\Xthisreftitle
     % If the user specified the print name (third arg) to the ref,
     % print it instead of our usual "Figure 1.2".
     \ifdim\wd0 = 0pt
       \refx{#1-snt}{}%
     \else
       \printedrefname
     \fi
     %
     % if the user also gave the printed manual name (fifth arg), append
     % "in MANUALNAME".
     \ifdim \wd1 > 0pt
       \space \putwordin{} \cite{\printedmanual}%
     \fi
   \else
     % node/anchor (non-float) references.
     %
     % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
     % insert empty discretionaries after hyphens, which means that it will
     % not find a line break at a hyphen in a node names.  Since some manuals
     % are best written with fairly long node names, containing hyphens, this
     % is a loss.  Therefore, we give the text of the node name again, so it
     % is as if TeX is seeing it for the first time.
     \ifdim \wd1 > 0pt
       \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
     \else
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
       % into the usual \leavevmode...\vrule stuff for purposes of
       % printing. So we \turnoffactive for the \refx-snt, back on for the
       % printing, back off for the \refx-pg.
       {\turnoffactive
        % Only output a following space if the -snt ref is nonempty; for
        % @unnumbered and @anchor, it won't be.
        \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
        \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
       }%
       % output the `[mynode]' via a macro so it can be overridden.
       \xrefprintnodename\printedrefname
       %
       % But we always want a comma and a space:
       ,\space
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
     \fi
   \fi
   \endlink
 \endgroup}
 
 % This macro is called from \xrefX for the `[nodename]' part of xref
 % output.  It's a separate macro only so it can be changed more easily,
 % since square brackets don't work well in some documents.  Particularly
 % one that Bob is working on :).
 %
 \def\xrefprintnodename#1{[#1]}
 
 % Things referred to by \setref.
 %
 \def\Ynothing{}
 \def\Yomitfromtoc{}
 \def\Ynumbered{%
   \ifnum\secno=0
     \putwordChapter@tie \the\chapno
   \else \ifnum\subsecno=0
     \putwordSection@tie \the\chapno.\the\secno
   \else \ifnum\subsubsecno=0
     \putwordSection@tie \the\chapno.\the\secno.\the\subsecno
   \else
     \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
   \fi\fi\fi
 }
 \def\Yappendix{%
   \ifnum\secno=0
      \putwordAppendix@tie @char\the\appendixno{}%
   \else \ifnum\subsecno=0
      \putwordSection@tie @char\the\appendixno.\the\secno
   \else \ifnum\subsubsecno=0
     \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno
   \else
     \putwordSection@tie
       @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
   \fi\fi\fi
 }
 
 % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
 % If its value is nonempty, SUFFIX is output afterward.
 %
 \def\refx#1#2{%
   {%
     \indexnofonts
     \otherbackslash
     \expandafter\global\expandafter\let\expandafter\thisrefX
       \csname XR#1\endcsname
   }%
   \ifx\thisrefX\relax
     % If not defined, say something at least.
     \angleleft un\-de\-fined\angleright
     \iflinks
       \ifhavexrefs
         \message{\linenumber Undefined cross reference `#1'.}%
       \else
         \ifwarnedxrefs\else
           \global\warnedxrefstrue
           \message{Cross reference values unknown; you must run TeX again.}%
         \fi
       \fi
     \fi
   \else
     % It's defined, so just use it.
     \thisrefX
   \fi
   #2% Output the suffix in any case.
 }
 
 % This is the macro invoked by entries in the aux file.  Usually it's
 % just a \def (we prepend XR to the control sequence name to avoid
 % collisions).  But if this is a float type, we have more work to do.
 %
 \def\xrdef#1#2{%
   {% The node name might contain 8-bit characters, which in our current
    % implementation are changed to commands like @'e.  Don't let these
    % mess up the control sequence name.
     \indexnofonts
     \turnoffactive
     \xdef\safexrefname{#1}%
   }%
   %
   \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
   %
   % Was that xref control sequence that we just defined for a float?
   \expandafter\iffloat\csname XR\safexrefname\endcsname
     % it was a float, and we have the (safe) float type in \iffloattype.
     \expandafter\let\expandafter\floatlist
       \csname floatlist\iffloattype\endcsname
     %
     % Is this the first time we've seen this float type?
     \expandafter\ifx\floatlist\relax
       \toks0 = {\do}% yes, so just \do
     \else
       % had it before, so preserve previous elements in list.
       \toks0 = \expandafter{\floatlist\do}%
     \fi
     %
     % Remember this xref in the control sequence \floatlistFLOATTYPE,
     % for later use in \listoffloats.
     \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
       {\safexrefname}}%
   \fi
 }
 
 % Read the last existing aux file, if any.  No error if none exists.
 %
 \def\tryauxfile{%
   \openin 1 \jobname.aux
   \ifeof 1 \else
     \readdatafile{aux}%
     \global\havexrefstrue
   \fi
   \closein 1
 }
 
 \def\setupdatafile{%
   \catcode`\^^@=\other
   \catcode`\^^A=\other
   \catcode`\^^B=\other
   \catcode`\^^C=\other
   \catcode`\^^D=\other
   \catcode`\^^E=\other
   \catcode`\^^F=\other
   \catcode`\^^G=\other
   \catcode`\^^H=\other
   \catcode`\^^K=\other
   \catcode`\^^L=\other
   \catcode`\^^N=\other
   \catcode`\^^P=\other
   \catcode`\^^Q=\other
   \catcode`\^^R=\other
   \catcode`\^^S=\other
   \catcode`\^^T=\other
   \catcode`\^^U=\other
   \catcode`\^^V=\other
   \catcode`\^^W=\other
   \catcode`\^^X=\other
   \catcode`\^^Z=\other
   \catcode`\^^[=\other
   \catcode`\^^\=\other
   \catcode`\^^]=\other
   \catcode`\^^^=\other
   \catcode`\^^_=\other
   % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
   % in xref tags, i.e., node names.  But since ^^e4 notation isn't
   % supported in the main text, it doesn't seem desirable.  Furthermore,
   % that is not enough: for node names that actually contain a ^
   % character, we would end up writing a line like this: 'xrdef {'hat
   % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
   % argument, and \hat is not an expandable control sequence.  It could
   % all be worked out, but why?  Either we support ^^ or we don't.
   %
   % The other change necessary for this was to define \auxhat:
   % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
   % and then to call \auxhat in \setq.
   %
   \catcode`\^=\other
   %
   % Special characters.  Should be turned off anyway, but...
   \catcode`\~=\other
   \catcode`\[=\other
   \catcode`\]=\other
   \catcode`\"=\other
   \catcode`\_=\other
   \catcode`\|=\other
   \catcode`\<=\other
   \catcode`\>=\other
   \catcode`\$=\other
   \catcode`\#=\other
   \catcode`\&=\other
   \catcode`\%=\other
   \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
   %
   % This is to support \ in node names and titles, since the \
   % characters end up in a \csname.  It's easier than
   % leaving it active and making its active definition an actual \
   % character.  What I don't understand is why it works in the *value*
   % of the xrdef.  Seems like it should be a catcode12 \, and that
   % should not typeset properly.  But it works, so I'm moving on for
   % now.  --karl, 15jan04.
   \catcode`\\=\other
   %
   % Make the characters 128-255 be printing characters.
   {%
     \count1=128
     \def\loop{%
       \catcode\count1=\other
       \advance\count1 by 1
       \ifnum \count1<256 \loop \fi
     }%
   }%
   %
   % @ is our escape character in .aux files, and we need braces.
   \catcode`\{=1
   \catcode`\}=2
   \catcode`\@=0
 }
 
 \def\readdatafile#1{%
 \begingroup
   \setupdatafile
   \input\jobname.#1
 \endgroup}
 
 
 \message{insertions,}
 % including footnotes.
 
 \newcount \footnoteno
 
 % The trailing space in the following definition for supereject is
 % vital for proper filling; pages come out unaligned when you do a
 % pagealignmacro call if that space before the closing brace is
 % removed. (Generally, numeric constants should always be followed by a
 % space to prevent strange expansion errors.)
 \def\supereject{\par\penalty -20000\footnoteno =0 }
 
 % @footnotestyle is meaningful for info output only.
 \let\footnotestyle=\comment
 
 {\catcode `\@=11
 %
 % Auto-number footnotes.  Otherwise like plain.
 \gdef\footnote{%
   \let\indent=\ptexindent
   \let\noindent=\ptexnoindent
   \global\advance\footnoteno by \@ne
   \edef\thisfootno{$^{\the\footnoteno}$}%
   %
   % In case the footnote comes at the end of a sentence, preserve the
   % extra spacing after we do the footnote number.
   \let\@sf\empty
   \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
   %
   % Remove inadvertent blank space before typesetting the footnote number.
   \unskip
   \thisfootno\@sf
   \dofootnote
 }%
 
 % Don't bother with the trickery in plain.tex to not require the
 % footnote text as a parameter.  Our footnotes don't need to be so general.
 %
 % Oh yes, they do; otherwise, @ifset (and anything else that uses
 % \parseargline) fails inside footnotes because the tokens are fixed when
 % the footnote is read.  --karl, 16nov96.
 %
 \gdef\dofootnote{%
   \insert\footins\bgroup
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
   % So reset some parameters.
   \hsize=\pagewidth
   \interlinepenalty\interfootnotelinepenalty
   \splittopskip\ht\strutbox % top baseline for broken footnotes
   \splitmaxdepth\dp\strutbox
   \floatingpenalty\@MM
   \leftskip\z@skip
   \rightskip\z@skip
   \spaceskip\z@skip
   \xspaceskip\z@skip
   \parindent\defaultparindent
   %
   \smallfonts \rm
   %
   % Because we use hanging indentation in footnotes, a @noindent appears
   % to exdent this text, so make it be a no-op.  makeinfo does not use
   % hanging indentation so @noindent can still be needed within footnote
   % text after an @example or the like (not that this is good style).
   \let\noindent = \relax
   %
   % Hang the footnote text off the number.  Use \everypar in case the
   % footnote extends for more than one paragraph.
   \everypar = {\hang}%
   \textindent{\thisfootno}%
   %
   % Don't crash into the line above the footnote text.  Since this
   % expands into a box, it must come within the paragraph, lest it
   % provide a place where TeX can split the footnote.
   \footstrut
   \futurelet\next\fo@t
 }
 }%end \catcode `\@=11
 
 % In case a @footnote appears in a vbox, save the footnote text and create
 % the real \insert just after the vbox finished.  Otherwise, the insertion
 % would be lost.
 % Similarly, if a @footnote appears inside an alignment, save the footnote
 % text to a box and make the \insert when a row of the table is finished.
 % And the same can be done for other insert classes.  --kasal, 16nov03.
 
 % Replace the \insert primitive by a cheating macro.
 % Deeper inside, just make sure that the saved insertions are not spilled
 % out prematurely.
 %
 \def\startsavinginserts{%
   \ifx \insert\ptexinsert
     \let\insert\saveinsert
   \else
     \let\checkinserts\relax
   \fi
 }
 
 % This \insert replacement works for both \insert\footins{foo} and
 % \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
 %
 \def\saveinsert#1{%
   \edef\next{\noexpand\savetobox \makeSAVEname#1}%
   \afterassignment\next
   % swallow the left brace
   \let\temp =
 }
 \def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}}
 \def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1}
 
 \def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi}
 
 \def\placesaveins#1{%
   \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname
     {\box#1}%
 }
 
 % eat @SAVE -- beware, all of them have catcode \other:
 {
   \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials  %  ;-)
   \gdef\gobblesave @SAVE{}
 }
 
 % initialization:
 \def\newsaveins #1{%
   \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}%
   \next
 }
 \def\newsaveinsX #1{%
   \csname newbox\endcsname #1%
   \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts
     \checksaveins #1}%
 }
 
 % initialize:
 \let\checkinserts\empty
 \newsaveins\footins
 \newsaveins\margin
 
 
 % @image.  We use the macros from epsf.tex to support this.
 % If epsf.tex is not installed and @image is used, we complain.
 %
 % Check for and read epsf.tex up front.  If we read it only at @image
 % time, we might be inside a group, and then its definitions would get
 % undone and the next image would fail.
 \openin 1 = epsf.tex
 \ifeof 1 \else
   % Do not bother showing banner with epsf.tex v2.7k (available in
   % doc/epsf.tex and on ctan).
   \def\epsfannounce{\toks0 = }%
   \input epsf.tex
 \fi
 \closein 1
 %
 % We will only complain once about lack of epsf.tex.
 \newif\ifwarnednoepsf
 \newhelp\noepsfhelp{epsf.tex must be installed for images to
   work.  It is also included in the Texinfo distribution, or you can get
   it from ftp://tug.org/tex/epsf.tex.}
 %
 \def\image#1{%
   \ifx\epsfbox\undefined
     \ifwarnednoepsf \else
       \errhelp = \noepsfhelp
       \errmessage{epsf.tex not found, images will be ignored}%
       \global\warnednoepsftrue
     \fi
   \else
     \imagexxx #1,,,,,\finish
   \fi
 }
 %
 % Arguments to @image:
 % #1 is (mandatory) image filename; we tack on .eps extension.
 % #2 is (optional) width, #3 is (optional) height.
 % #4 is (ignored optional) html alt text.
 % #5 is (ignored optional) extension.
 % #6 is just the usual extra ignored arg for parsing this stuff.
 \newif\ifimagevmode
 \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
   \catcode`\^^M = 5     % in case we're inside an example
   \normalturnoffactive  % allow _ et al. in names
   % If the image is by itself, center it.
   \ifvmode
     \imagevmodetrue
     \nobreak\bigskip
     % Usually we'll have text after the image which will insert
     % \parskip glue, so insert it here too to equalize the space
     % above and below.
     \nobreak\vskip\parskip
     \nobreak
     \line\bgroup
   \fi
   %
   % Output the image.
   \ifpdf
     \dopdfimage{#1}{#2}{#3}%
   \else
     % \epsfbox itself resets \epsf?size at each figure.
     \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
     \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
     \epsfbox{#1.eps}%
   \fi
   %
   \ifimagevmode \egroup \bigbreak \fi  % space after the image
 \endgroup}
 
 
 % @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables,
 % etc.  We don't actually implement floating yet, we always include the
 % float "here".  But it seemed the best name for the future.
 %
 \envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish}
 
 % There may be a space before second and/or third parameter; delete it.
 \def\eatcommaspace#1, {#1,}
 
 % #1 is the optional FLOATTYPE, the text label for this float, typically
 % "Figure", "Table", "Example", etc.  Can't contain commas.  If omitted,
 % this float will not be numbered and cannot be referred to.
 %
 % #2 is the optional xref label.  Also must be present for the float to
 % be referable.
 %
 % #3 is the optional positioning argument; for now, it is ignored.  It
 % will somehow specify the positions allowed to float to (here, top, bottom).
 %
 % We keep a separate counter for each FLOATTYPE, which we reset at each
 % chapter-level command.
 \let\resetallfloatnos=\empty
 %
 \def\dofloat#1,#2,#3,#4\finish{%
   \let\thiscaption=\empty
   \let\thisshortcaption=\empty
   %
   % don't lose footnotes inside @float.
   %
   % BEWARE: when the floats start float, we have to issue warning whenever an
   % insert appears inside a float which could possibly float. --kasal, 26may04
   %
   \startsavinginserts
   %
   % We can't be used inside a paragraph.
   \par
   %
   \vtop\bgroup
     \def\floattype{#1}%
     \def\floatlabel{#2}%
     \def\floatloc{#3}% we do nothing with this yet.
     %
     \ifx\floattype\empty
       \let\safefloattype=\empty
     \else
       {%
         % the floattype might have accents or other special characters,
         % but we need to use it in a control sequence name.
         \indexnofonts
         \turnoffactive
         \xdef\safefloattype{\floattype}%
       }%
     \fi
     %
     % If label is given but no type, we handle that as the empty type.
     \ifx\floatlabel\empty \else
       % We want each FLOATTYPE to be numbered separately (Figure 1,
       % Table 1, Figure 2, ...).  (And if no label, no number.)
       %
       \expandafter\getfloatno\csname\safefloattype floatno\endcsname
       \global\advance\floatno by 1
       %
       {%
         % This magic value for \thissection is output by \setref as the
         % XREFLABEL-title value.  \xrefX uses it to distinguish float
         % labels (which have a completely different output format) from
         % node and anchor labels.  And \xrdef uses it to construct the
         % lists of floats.
         %
         \edef\thissection{\floatmagic=\safefloattype}%
         \setref{\floatlabel}{Yfloat}%
       }%
     \fi
     %
     % start with \parskip glue, I guess.
     \vskip\parskip
     %
     % Don't suppress indentation if a float happens to start a section.
     \restorefirstparagraphindent
 }
 
 % we have these possibilities:
 % @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
 % @float Foo,lbl & no caption:    Foo 1.1
 % @float Foo & @caption{Cap}:     Foo: Cap
 % @float Foo & no caption:        Foo
 % @float ,lbl & Caption{Cap}:     1.1: Cap
 % @float ,lbl & no caption:       1.1
 % @float & @caption{Cap}:         Cap
 % @float & no caption:
 %
 \def\Efloat{%
     \let\floatident = \empty
     %
     % In all cases, if we have a float type, it comes first.
     \ifx\floattype\empty \else \def\floatident{\floattype}\fi
     %
     % If we have an xref label, the number comes next.
     \ifx\floatlabel\empty \else
       \ifx\floattype\empty \else % if also had float type, need tie first.
         \appendtomacro\floatident{\tie}%
       \fi
       % the number.
       \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
     \fi
     %
     % Start the printed caption with what we've constructed in
     % \floatident, but keep it separate; we need \floatident again.
     \let\captionline = \floatident
     %
     \ifx\thiscaption\empty \else
       \ifx\floatident\empty \else
 	\appendtomacro\captionline{: }% had ident, so need a colon between
       \fi
       %
       % caption text.
       \appendtomacro\captionline{\scanexp\thiscaption}%
     \fi
     %
     % If we have anything to print, print it, with space before.
     % Eventually this needs to become an \insert.
     \ifx\captionline\empty \else
       \vskip.5\parskip
       \captionline
       %
       % Space below caption.
       \vskip\parskip
     \fi
     %
     % If have an xref label, write the list of floats info.  Do this
     % after the caption, to avoid chance of it being a breakpoint.
     \ifx\floatlabel\empty \else
       % Write the text that goes in the lof to the aux file as
       % \floatlabel-lof.  Besides \floatident, we include the short
       % caption if specified, else the full caption if specified, else nothing.
       {%
         \atdummies
         %
         % since we read the caption text in the macro world, where ^^M
         % is turned into a normal character, we have to scan it back, so
         % we don't write the literal three characters "^^M" into the aux file.
 	\scanexp{%
 	  \xdef\noexpand\gtemp{%
 	    \ifx\thisshortcaption\empty
 	      \thiscaption
 	    \else
 	      \thisshortcaption
 	    \fi
 	  }%
 	}%
         \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
 	  \ifx\gtemp\empty \else : \gtemp \fi}}%
       }%
     \fi
   \egroup  % end of \vtop
   %
   % place the captured inserts
   %
   % BEWARE: when the floats start floating, we have to issue warning
   % whenever an insert appears inside a float which could possibly
   % float. --kasal, 26may04
   %
   \checkinserts
 }
 
 % Append the tokens #2 to the definition of macro #1, not expanding either.
 %
 \def\appendtomacro#1#2{%
   \expandafter\def\expandafter#1\expandafter{#1#2}%
 }
 
 % @caption, @shortcaption
 %
 \def\caption{\docaption\thiscaption}
 \def\shortcaption{\docaption\thisshortcaption}
 \def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
 \def\defcaption#1#2{\egroup \def#1{#2}}
 
 % The parameter is the control sequence identifying the counter we are
 % going to use.  Create it if it doesn't exist and assign it to \floatno.
 \def\getfloatno#1{%
   \ifx#1\relax
       % Haven't seen this figure type before.
       \csname newcount\endcsname #1%
       %
       % Remember to reset this floatno at the next chap.
       \expandafter\gdef\expandafter\resetallfloatnos
         \expandafter{\resetallfloatnos #1=0 }%
   \fi
   \let\floatno#1%
 }
 
 % \setref calls this to get the XREFLABEL-snt value.  We want an @xref
 % to the FLOATLABEL to expand to "Figure 3.1".  We call \setref when we
 % first read the @float command.
 %
 \def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}%
 
 % Magic string used for the XREFLABEL-title value, so \xrefX can
 % distinguish floats from other xref types.
 \def\floatmagic{!!float!!}
 
 % #1 is the control sequence we are passed; we expand into a conditional
 % which is true if #1 represents a float ref.  That is, the magic
 % \thissection value which we \setref above.
 %
 \def\iffloat#1{\expandafter\doiffloat#1==\finish}
 %
 % #1 is (maybe) the \floatmagic string.  If so, #2 will be the
 % (safe) float type for this float.  We set \iffloattype to #2.
 %
 \def\doiffloat#1=#2=#3\finish{%
   \def\temp{#1}%
   \def\iffloattype{#2}%
   \ifx\temp\floatmagic
 }
 
 % @listoffloats FLOATTYPE - print a list of floats like a table of contents.
 %
 \parseargdef\listoffloats{%
   \def\floattype{#1}% floattype
   {%
     % the floattype might have accents or other special characters,
     % but we need to use it in a control sequence name.
     \indexnofonts
     \turnoffactive
     \xdef\safefloattype{\floattype}%
   }%
   %
   % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
   \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
     \ifhavexrefs
       % if the user said @listoffloats foo but never @float foo.
       \message{\linenumber No `\safefloattype' floats to list.}%
     \fi
   \else
     \begingroup
       \leftskip=\tocindent  % indent these entries like a toc
       \let\do=\listoffloatsdo
       \csname floatlist\safefloattype\endcsname
     \endgroup
   \fi
 }
 
 % This is called on each entry in a list of floats.  We're passed the
 % xref label, in the form LABEL-title, which is how we save it in the
 % aux file.  We strip off the -title and look up \XRLABEL-lof, which
 % has the text we're supposed to typeset here.
 %
 % Figures without xref labels will not be included in the list (since
 % they won't appear in the aux file).
 %
 \def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
 \def\listoffloatsdoentry#1-title\finish{{%
   % Can't fully expand XR#1-lof because it can contain anything.  Just
   % pass the control sequence.  On the other hand, XR#1-pg is just the
   % page number, and we want to fully expand that so we can get a link
   % in pdf output.
   \toksA = \expandafter{\csname XR#1-lof\endcsname}%
   %
   % use the same \entry macro we use to generate the TOC and index.
   \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
   \writeentry
 }}
 
 
 \message{localization,}
 
 % @documentlanguage is usually given very early, just after
 % @setfilename.  If done too late, it may not override everything
 % properly.  Single argument is the language abbreviation.
 % It would be nice if we could set up a hyphenation file here.
 %
 \parseargdef\documentlanguage{%
   \tex % read txi-??.tex file in plain TeX.
     % Read the file if it exists.
     \openin 1 txi-#1.tex
     \ifeof 1
       \errhelp = \nolanghelp
       \errmessage{Cannot read language file txi-#1.tex}%
     \else
       \input txi-#1.tex
     \fi
     \closein 1
   \endgroup
 }
 \newhelp\nolanghelp{The given language definition file cannot be found or
 is empty.  Maybe you need to install it?  In the current directory
 should work if nowhere else does.}
 
 % Set the catcode of characters 128 through 255 to the specified number.
 %
 \def\setnonasciicharscatcode#1{%
    \count255=128
    \loop\ifnum\count255<256
       \global\catcode\count255=#1
       \advance\count255 by 1
    \repeat
 }
 
 % @documentencoding sets the definition of non-ASCII characters
 % according to the specified encoding.
 %
 \parseargdef\documentencoding{%
   % Encoding being declared for the document.
   \def\declaredencoding{\csname #1.enc\endcsname}%
   %
   % Supported encodings: names converted to tokens in order to be able
   % to compare them with \ifx.
   \def\ascii{\csname US-ASCII.enc\endcsname}%
   \def\latnine{\csname ISO-8859-15.enc\endcsname}%
   \def\latone{\csname ISO-8859-1.enc\endcsname}%
   \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
   \def\utfeight{\csname UTF-8.enc\endcsname}%
   %
   \ifx \declaredencoding \ascii
      \asciichardefs
   %
   \else \ifx \declaredencoding \lattwo
      \setnonasciicharscatcode\active
      \lattwochardefs
   %
   \else \ifx \declaredencoding \latone
      \setnonasciicharscatcode\active
      \latonechardefs
   %
   \else \ifx \declaredencoding \latnine
      \setnonasciicharscatcode\active
      \latninechardefs
   %
   \else \ifx \declaredencoding \utfeight
      \setnonasciicharscatcode\active
      \utfeightchardefs
   %
   \else
     \message{Unknown document encoding #1, ignoring.}%
   %
   \fi % utfeight
   \fi % latnine
   \fi % latone
   \fi % lattwo
   \fi % ascii
 }
 
 % 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.
 \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
 
 % First, make active non-ASCII characters in order for them to be
 % correctly categorized when TeX reads the replacement text of
 % macros containing the character definitions.
 \setnonasciicharscatcode\active
 %
 % Latin1 (ISO-8859-1) character definitions.
 \def\latonechardefs{%
   \gdef^^a0{~}
   \gdef^^a1{\exclamdown}
   \gdef^^a2{\missingcharmsg{CENT SIGN}}
   \gdef^^a3{{\pounds}}
   \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
   \gdef^^a5{\missingcharmsg{YEN SIGN}}
   \gdef^^a6{\missingcharmsg{BROKEN BAR}}
   \gdef^^a7{\S}
   \gdef^^a8{\"{}}
   \gdef^^a9{\copyright}
   \gdef^^aa{\ordf}
   \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}}
   \gdef^^ac{$\lnot$}
   \gdef^^ad{\-}
   \gdef^^ae{\registeredsymbol}
   \gdef^^af{\={}}
   %
   \gdef^^b0{\textdegree}
   \gdef^^b1{$\pm$}
   \gdef^^b2{$^2$}
   \gdef^^b3{$^3$}
   \gdef^^b4{\'{}}
   \gdef^^b5{$\mu$}
   \gdef^^b6{\P}
   %
   \gdef^^b7{$^.$}
   \gdef^^b8{\cedilla\ }
   \gdef^^b9{$^1$}
   \gdef^^ba{\ordm}
   %
   \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}}
   \gdef^^bc{$1\over4$}
   \gdef^^bd{$1\over2$}
   \gdef^^be{$3\over4$}
   \gdef^^bf{\questiondown}
   %
   \gdef^^c0{\`A}
   \gdef^^c1{\'A}
   \gdef^^c2{\^A}
   \gdef^^c3{\~A}
   \gdef^^c4{\"A}
   \gdef^^c5{\ringaccent A}
   \gdef^^c6{\AE}
   \gdef^^c7{\cedilla C}
   \gdef^^c8{\`E}
   \gdef^^c9{\'E}
   \gdef^^ca{\^E}
   \gdef^^cb{\"E}
   \gdef^^cc{\`I}
   \gdef^^cd{\'I}
   \gdef^^ce{\^I}
   \gdef^^cf{\"I}
   %
   \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
   \gdef^^d1{\~N}
   \gdef^^d2{\`O}
   \gdef^^d3{\'O}
   \gdef^^d4{\^O}
   \gdef^^d5{\~O}
   \gdef^^d6{\"O}
   \gdef^^d7{$\times$}
   \gdef^^d8{\O}
   \gdef^^d9{\`U}
   \gdef^^da{\'U}
   \gdef^^db{\^U}
   \gdef^^dc{\"U}
   \gdef^^dd{\'Y}
   \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
   \gdef^^df{\ss}
   %
   \gdef^^e0{\`a}
   \gdef^^e1{\'a}
   \gdef^^e2{\^a}
   \gdef^^e3{\~a}
   \gdef^^e4{\"a}
   \gdef^^e5{\ringaccent a}
   \gdef^^e6{\ae}
   \gdef^^e7{\cedilla c}
   \gdef^^e8{\`e}
   \gdef^^e9{\'e}
   \gdef^^ea{\^e}
   \gdef^^eb{\"e}
   \gdef^^ec{\`{\dotless i}}
   \gdef^^ed{\'{\dotless i}}
   \gdef^^ee{\^{\dotless i}}
   \gdef^^ef{\"{\dotless i}}
   %
   \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
   \gdef^^f1{\~n}
   \gdef^^f2{\`o}
   \gdef^^f3{\'o}
   \gdef^^f4{\^o}
   \gdef^^f5{\~o}
   \gdef^^f6{\"o}
   \gdef^^f7{$\div$}
   \gdef^^f8{\o}
   \gdef^^f9{\`u}
   \gdef^^fa{\'u}
   \gdef^^fb{\^u}
   \gdef^^fc{\"u}
   \gdef^^fd{\'y}
   \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
   \gdef^^ff{\"y}
 }
 
 % Latin9 (ISO-8859-15) encoding character definitions.
 \def\latninechardefs{%
   % Encoding is almost identical to Latin1.
   \latonechardefs
   %
   \gdef^^a4{\euro}
   \gdef^^a6{\v S}
   \gdef^^a8{\v s}
   \gdef^^b4{\v Z}
   \gdef^^b8{\v z}
   \gdef^^bc{\OE}
   \gdef^^bd{\oe}
   \gdef^^be{\"Y}
 }
 
 % Latin2 (ISO-8859-2) character definitions.
 \def\lattwochardefs{%
   \gdef^^a0{~}
   \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}}
   \gdef^^a2{\u{}}
   \gdef^^a3{\L}
   \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
   \gdef^^a5{\v L}
   \gdef^^a6{\'S}
   \gdef^^a7{\S}
   \gdef^^a8{\"{}}
   \gdef^^a9{\v S}
   \gdef^^aa{\cedilla S}
   \gdef^^ab{\v T}
   \gdef^^ac{\'Z}
   \gdef^^ad{\-}
   \gdef^^ae{\v Z}
   \gdef^^af{\dotaccent Z}
   %
   \gdef^^b0{\textdegree}
   \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}}
   \gdef^^b2{\missingcharmsg{OGONEK}}
   \gdef^^b3{\l}
   \gdef^^b4{\'{}}
   \gdef^^b5{\v l}
   \gdef^^b6{\'s}
   \gdef^^b7{\v{}}
   \gdef^^b8{\cedilla\ }
   \gdef^^b9{\v s}
   \gdef^^ba{\cedilla s}
   \gdef^^bb{\v t}
   \gdef^^bc{\'z}
   \gdef^^bd{\H{}}
   \gdef^^be{\v z}
   \gdef^^bf{\dotaccent z}
   %
   \gdef^^c0{\'R}
   \gdef^^c1{\'A}
   \gdef^^c2{\^A}
   \gdef^^c3{\u A}
   \gdef^^c4{\"A}
   \gdef^^c5{\'L}
   \gdef^^c6{\'C}
   \gdef^^c7{\cedilla C}
   \gdef^^c8{\v C}
   \gdef^^c9{\'E}
   \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}}
   \gdef^^cb{\"E}
   \gdef^^cc{\v E}
   \gdef^^cd{\'I}
   \gdef^^ce{\^I}
   \gdef^^cf{\v D}
   %
   \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
   \gdef^^d1{\'N}
   \gdef^^d2{\v N}
   \gdef^^d3{\'O}
   \gdef^^d4{\^O}
   \gdef^^d5{\H O}
   \gdef^^d6{\"O}
   \gdef^^d7{$\times$}
   \gdef^^d8{\v R}
   \gdef^^d9{\ringaccent U}
   \gdef^^da{\'U}
   \gdef^^db{\H U}
   \gdef^^dc{\"U}
   \gdef^^dd{\'Y}
   \gdef^^de{\cedilla T}
   \gdef^^df{\ss}
   %
   \gdef^^e0{\'r}
   \gdef^^e1{\'a}
   \gdef^^e2{\^a}
   \gdef^^e3{\u a}
   \gdef^^e4{\"a}
   \gdef^^e5{\'l}
   \gdef^^e6{\'c}
   \gdef^^e7{\cedilla c}
   \gdef^^e8{\v c}
   \gdef^^e9{\'e}
   \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}}
   \gdef^^eb{\"e}
   \gdef^^ec{\v e}
   \gdef^^ed{\'\i}
   \gdef^^ee{\^\i}
   \gdef^^ef{\v d}
   %
   \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
   \gdef^^f1{\'n}
   \gdef^^f2{\v n}
   \gdef^^f3{\'o}
   \gdef^^f4{\^o}
   \gdef^^f5{\H o}
   \gdef^^f6{\"o}
   \gdef^^f7{$\div$}
   \gdef^^f8{\v r}
   \gdef^^f9{\ringaccent u}
   \gdef^^fa{\'u}
   \gdef^^fb{\H u}
   \gdef^^fc{\"u}
   \gdef^^fd{\'y}
   \gdef^^fe{\cedilla t}
   \gdef^^ff{\dotaccent{}}
 }
 
 % 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
 
 \gdef\UTFviiiTwoOctets#1#2{\expandafter
    \UTFviiiDefined\csname u8:#1\string #2\endcsname}
 %
 \gdef\UTFviiiThreeOctets#1#2#3{\expandafter
    \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
 %
 \gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
    \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
 
 \gdef\UTFviiiDefined#1{%
   \ifx #1\relax
     \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
   \else
     \expandafter #1%
   \fi
 }
 
 \begingroup
   \catcode`\~13
   \catcode`\"12
 
   \def\UTFviiiLoop{%
     \global\catcode\countUTFx\active
     \uccode`\~\countUTFx
     \uppercase\expandafter{\UTFviiiTmp}%
     \advance\countUTFx by 1
     \ifnum\countUTFx < \countUTFy
       \expandafter\UTFviiiLoop
     \fi}
 
   \countUTFx = "C2
   \countUTFy = "E0
   \def\UTFviiiTmp{%
     \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
   \UTFviiiLoop
 
   \countUTFx = "E0
   \countUTFy = "F0
   \def\UTFviiiTmp{%
     \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
   \UTFviiiLoop
 
   \countUTFx = "F0
   \countUTFy = "F4
   \def\UTFviiiTmp{%
     \xdef~{\noexpand\UTFviiiFourOctets\string~}}
   \UTFviiiLoop
 \endgroup
 
 \begingroup
   \catcode`\"=12
   \catcode`\<=12
   \catcode`\.=12
   \catcode`\,=12
   \catcode`\;=12
   \catcode`\!=12
   \catcode`\~=13
 
   \gdef\DeclareUnicodeCharacter#1#2{%
     \countUTFz = "#1\relax
     \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
     \begingroup
       \parseXMLCharref
       \def\UTFviiiTwoOctets##1##2{%
         \csname u8:##1\string ##2\endcsname}%
       \def\UTFviiiThreeOctets##1##2##3{%
         \csname u8:##1\string ##2\string ##3\endcsname}%
       \def\UTFviiiFourOctets##1##2##3##4{%
         \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
       \expandafter\expandafter\expandafter\expandafter
        \expandafter\expandafter\expandafter
        \gdef\UTFviiiTmp{#2}%
     \endgroup}
 
   \gdef\parseXMLCharref{%
     \ifnum\countUTFz < "A0\relax
       \errhelp = \EMsimple
       \errmessage{Cannot define Unicode char value < 00A0}%
     \else\ifnum\countUTFz < "800\relax
       \parseUTFviiiA,%
       \parseUTFviiiB C\UTFviiiTwoOctets.,%
     \else\ifnum\countUTFz < "10000\relax
       \parseUTFviiiA;%
       \parseUTFviiiA,%
       \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
     \else
       \parseUTFviiiA;%
       \parseUTFviiiA,%
       \parseUTFviiiA!%
       \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
     \fi\fi\fi
   }
 
   \gdef\parseUTFviiiA#1{%
     \countUTFx = \countUTFz
     \divide\countUTFz by 64
     \countUTFy = \countUTFz
     \multiply\countUTFz by 64
     \advance\countUTFx by -\countUTFz
     \advance\countUTFx by 128
     \uccode `#1\countUTFx
     \countUTFz = \countUTFy}
 
   \gdef\parseUTFviiiB#1#2#3#4{%
     \advance\countUTFz by "#10\relax
     \uccode `#3\countUTFz
     \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
 \endgroup
 
 \def\utfeightchardefs{%
   \DeclareUnicodeCharacter{00A0}{\tie}
   \DeclareUnicodeCharacter{00A1}{\exclamdown}
   \DeclareUnicodeCharacter{00A3}{\pounds}
   \DeclareUnicodeCharacter{00A8}{\"{ }}
   \DeclareUnicodeCharacter{00A9}{\copyright}
   \DeclareUnicodeCharacter{00AA}{\ordf}
   \DeclareUnicodeCharacter{00AD}{\-}
   \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
   \DeclareUnicodeCharacter{00AF}{\={ }}
 
   \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
   \DeclareUnicodeCharacter{00B4}{\'{ }}
   \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
   \DeclareUnicodeCharacter{00BA}{\ordm}
   \DeclareUnicodeCharacter{00BF}{\questiondown}
 
   \DeclareUnicodeCharacter{00C0}{\`A}
   \DeclareUnicodeCharacter{00C1}{\'A}
   \DeclareUnicodeCharacter{00C2}{\^A}
   \DeclareUnicodeCharacter{00C3}{\~A}
   \DeclareUnicodeCharacter{00C4}{\"A}
   \DeclareUnicodeCharacter{00C5}{\AA}
   \DeclareUnicodeCharacter{00C6}{\AE}
   \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
   \DeclareUnicodeCharacter{00C8}{\`E}
   \DeclareUnicodeCharacter{00C9}{\'E}
   \DeclareUnicodeCharacter{00CA}{\^E}
   \DeclareUnicodeCharacter{00CB}{\"E}
   \DeclareUnicodeCharacter{00CC}{\`I}
   \DeclareUnicodeCharacter{00CD}{\'I}
   \DeclareUnicodeCharacter{00CE}{\^I}
   \DeclareUnicodeCharacter{00CF}{\"I}
 
   \DeclareUnicodeCharacter{00D1}{\~N}
   \DeclareUnicodeCharacter{00D2}{\`O}
   \DeclareUnicodeCharacter{00D3}{\'O}
   \DeclareUnicodeCharacter{00D4}{\^O}
   \DeclareUnicodeCharacter{00D5}{\~O}
   \DeclareUnicodeCharacter{00D6}{\"O}
   \DeclareUnicodeCharacter{00D8}{\O}
   \DeclareUnicodeCharacter{00D9}{\`U}
   \DeclareUnicodeCharacter{00DA}{\'U}
   \DeclareUnicodeCharacter{00DB}{\^U}
   \DeclareUnicodeCharacter{00DC}{\"U}
   \DeclareUnicodeCharacter{00DD}{\'Y}
   \DeclareUnicodeCharacter{00DF}{\ss}
 
   \DeclareUnicodeCharacter{00E0}{\`a}
   \DeclareUnicodeCharacter{00E1}{\'a}
   \DeclareUnicodeCharacter{00E2}{\^a}
   \DeclareUnicodeCharacter{00E3}{\~a}
   \DeclareUnicodeCharacter{00E4}{\"a}
   \DeclareUnicodeCharacter{00E5}{\aa}
   \DeclareUnicodeCharacter{00E6}{\ae}
   \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
   \DeclareUnicodeCharacter{00E8}{\`e}
   \DeclareUnicodeCharacter{00E9}{\'e}
   \DeclareUnicodeCharacter{00EA}{\^e}
   \DeclareUnicodeCharacter{00EB}{\"e}
   \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
   \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
   \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
   \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
 
   \DeclareUnicodeCharacter{00F1}{\~n}
   \DeclareUnicodeCharacter{00F2}{\`o}
   \DeclareUnicodeCharacter{00F3}{\'o}
   \DeclareUnicodeCharacter{00F4}{\^o}
   \DeclareUnicodeCharacter{00F5}{\~o}
   \DeclareUnicodeCharacter{00F6}{\"o}
   \DeclareUnicodeCharacter{00F8}{\o}
   \DeclareUnicodeCharacter{00F9}{\`u}
   \DeclareUnicodeCharacter{00FA}{\'u}
   \DeclareUnicodeCharacter{00FB}{\^u}
   \DeclareUnicodeCharacter{00FC}{\"u}
   \DeclareUnicodeCharacter{00FD}{\'y}
   \DeclareUnicodeCharacter{00FF}{\"y}
 
   \DeclareUnicodeCharacter{0100}{\=A}
   \DeclareUnicodeCharacter{0101}{\=a}
   \DeclareUnicodeCharacter{0102}{\u{A}}
   \DeclareUnicodeCharacter{0103}{\u{a}}
   \DeclareUnicodeCharacter{0106}{\'C}
   \DeclareUnicodeCharacter{0107}{\'c}
   \DeclareUnicodeCharacter{0108}{\^C}
   \DeclareUnicodeCharacter{0109}{\^c}
   \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
   \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
   \DeclareUnicodeCharacter{010C}{\v{C}}
   \DeclareUnicodeCharacter{010D}{\v{c}}
   \DeclareUnicodeCharacter{010E}{\v{D}}
 
   \DeclareUnicodeCharacter{0112}{\=E}
   \DeclareUnicodeCharacter{0113}{\=e}
   \DeclareUnicodeCharacter{0114}{\u{E}}
   \DeclareUnicodeCharacter{0115}{\u{e}}
   \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
   \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
   \DeclareUnicodeCharacter{011A}{\v{E}}
   \DeclareUnicodeCharacter{011B}{\v{e}}
   \DeclareUnicodeCharacter{011C}{\^G}
   \DeclareUnicodeCharacter{011D}{\^g}
   \DeclareUnicodeCharacter{011E}{\u{G}}
   \DeclareUnicodeCharacter{011F}{\u{g}}
 
   \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
   \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
   \DeclareUnicodeCharacter{0124}{\^H}
   \DeclareUnicodeCharacter{0125}{\^h}
   \DeclareUnicodeCharacter{0128}{\~I}
   \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
   \DeclareUnicodeCharacter{012A}{\=I}
   \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
   \DeclareUnicodeCharacter{012C}{\u{I}}
   \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
 
   \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
   \DeclareUnicodeCharacter{0131}{\dotless{i}}
   \DeclareUnicodeCharacter{0132}{IJ}
   \DeclareUnicodeCharacter{0133}{ij}
   \DeclareUnicodeCharacter{0134}{\^J}
   \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
   \DeclareUnicodeCharacter{0139}{\'L}
   \DeclareUnicodeCharacter{013A}{\'l}
 
   \DeclareUnicodeCharacter{0141}{\L}
   \DeclareUnicodeCharacter{0142}{\l}
   \DeclareUnicodeCharacter{0143}{\'N}
   \DeclareUnicodeCharacter{0144}{\'n}
   \DeclareUnicodeCharacter{0147}{\v{N}}
   \DeclareUnicodeCharacter{0148}{\v{n}}
   \DeclareUnicodeCharacter{014C}{\=O}
   \DeclareUnicodeCharacter{014D}{\=o}
   \DeclareUnicodeCharacter{014E}{\u{O}}
   \DeclareUnicodeCharacter{014F}{\u{o}}
 
   \DeclareUnicodeCharacter{0150}{\H{O}}
   \DeclareUnicodeCharacter{0151}{\H{o}}
   \DeclareUnicodeCharacter{0152}{\OE}
   \DeclareUnicodeCharacter{0153}{\oe}
   \DeclareUnicodeCharacter{0154}{\'R}
   \DeclareUnicodeCharacter{0155}{\'r}
   \DeclareUnicodeCharacter{0158}{\v{R}}
   \DeclareUnicodeCharacter{0159}{\v{r}}
   \DeclareUnicodeCharacter{015A}{\'S}
   \DeclareUnicodeCharacter{015B}{\'s}
   \DeclareUnicodeCharacter{015C}{\^S}
   \DeclareUnicodeCharacter{015D}{\^s}
   \DeclareUnicodeCharacter{015E}{\cedilla{S}}
   \DeclareUnicodeCharacter{015F}{\cedilla{s}}
 
   \DeclareUnicodeCharacter{0160}{\v{S}}
   \DeclareUnicodeCharacter{0161}{\v{s}}
   \DeclareUnicodeCharacter{0162}{\cedilla{t}}
   \DeclareUnicodeCharacter{0163}{\cedilla{T}}
   \DeclareUnicodeCharacter{0164}{\v{T}}
 
   \DeclareUnicodeCharacter{0168}{\~U}
   \DeclareUnicodeCharacter{0169}{\~u}
   \DeclareUnicodeCharacter{016A}{\=U}
   \DeclareUnicodeCharacter{016B}{\=u}
   \DeclareUnicodeCharacter{016C}{\u{U}}
   \DeclareUnicodeCharacter{016D}{\u{u}}
   \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
   \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
 
   \DeclareUnicodeCharacter{0170}{\H{U}}
   \DeclareUnicodeCharacter{0171}{\H{u}}
   \DeclareUnicodeCharacter{0174}{\^W}
   \DeclareUnicodeCharacter{0175}{\^w}
   \DeclareUnicodeCharacter{0176}{\^Y}
   \DeclareUnicodeCharacter{0177}{\^y}
   \DeclareUnicodeCharacter{0178}{\"Y}
   \DeclareUnicodeCharacter{0179}{\'Z}
   \DeclareUnicodeCharacter{017A}{\'z}
   \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
   \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
   \DeclareUnicodeCharacter{017D}{\v{Z}}
   \DeclareUnicodeCharacter{017E}{\v{z}}
 
   \DeclareUnicodeCharacter{01C4}{D\v{Z}}
   \DeclareUnicodeCharacter{01C5}{D\v{z}}
   \DeclareUnicodeCharacter{01C6}{d\v{z}}
   \DeclareUnicodeCharacter{01C7}{LJ}
   \DeclareUnicodeCharacter{01C8}{Lj}
   \DeclareUnicodeCharacter{01C9}{lj}
   \DeclareUnicodeCharacter{01CA}{NJ}
   \DeclareUnicodeCharacter{01CB}{Nj}
   \DeclareUnicodeCharacter{01CC}{nj}
   \DeclareUnicodeCharacter{01CD}{\v{A}}
   \DeclareUnicodeCharacter{01CE}{\v{a}}
   \DeclareUnicodeCharacter{01CF}{\v{I}}
 
   \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
   \DeclareUnicodeCharacter{01D1}{\v{O}}
   \DeclareUnicodeCharacter{01D2}{\v{o}}
   \DeclareUnicodeCharacter{01D3}{\v{U}}
   \DeclareUnicodeCharacter{01D4}{\v{u}}
 
   \DeclareUnicodeCharacter{01E2}{\={\AE}}
   \DeclareUnicodeCharacter{01E3}{\={\ae}}
   \DeclareUnicodeCharacter{01E6}{\v{G}}
   \DeclareUnicodeCharacter{01E7}{\v{g}}
   \DeclareUnicodeCharacter{01E8}{\v{K}}
   \DeclareUnicodeCharacter{01E9}{\v{k}}
 
   \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
   \DeclareUnicodeCharacter{01F1}{DZ}
   \DeclareUnicodeCharacter{01F2}{Dz}
   \DeclareUnicodeCharacter{01F3}{dz}
   \DeclareUnicodeCharacter{01F4}{\'G}
   \DeclareUnicodeCharacter{01F5}{\'g}
   \DeclareUnicodeCharacter{01F8}{\`N}
   \DeclareUnicodeCharacter{01F9}{\`n}
   \DeclareUnicodeCharacter{01FC}{\'{\AE}}
   \DeclareUnicodeCharacter{01FD}{\'{\ae}}
   \DeclareUnicodeCharacter{01FE}{\'{\O}}
   \DeclareUnicodeCharacter{01FF}{\'{\o}}
 
   \DeclareUnicodeCharacter{021E}{\v{H}}
   \DeclareUnicodeCharacter{021F}{\v{h}}
 
   \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
   \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
   \DeclareUnicodeCharacter{0228}{\cedilla{E}}
   \DeclareUnicodeCharacter{0229}{\cedilla{e}}
   \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
   \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
 
   \DeclareUnicodeCharacter{0232}{\=Y}
   \DeclareUnicodeCharacter{0233}{\=y}
   \DeclareUnicodeCharacter{0237}{\dotless{j}}
 
   \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
   \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
   \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
   \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
   \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
   \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
   \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
   \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
   \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
   \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
   \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
   \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
 
   \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
   \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
 
   \DeclareUnicodeCharacter{1E20}{\=G}
   \DeclareUnicodeCharacter{1E21}{\=g}
   \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
   \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
   \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
   \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
   \DeclareUnicodeCharacter{1E26}{\"H}
   \DeclareUnicodeCharacter{1E27}{\"h}
 
   \DeclareUnicodeCharacter{1E30}{\'K}
   \DeclareUnicodeCharacter{1E31}{\'k}
   \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
   \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
   \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
   \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
   \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
   \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
   \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
   \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
   \DeclareUnicodeCharacter{1E3E}{\'M}
   \DeclareUnicodeCharacter{1E3F}{\'m}
 
   \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
   \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
   \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
   \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
   \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
   \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
   \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
   \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
   \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
   \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
 
   \DeclareUnicodeCharacter{1E54}{\'P}
   \DeclareUnicodeCharacter{1E55}{\'p}
   \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
   \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
   \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
   \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
   \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
   \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
   \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
   \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
 
   \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
   \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
   \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
   \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
   \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
   \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
   \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
   \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
   \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
   \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
 
   \DeclareUnicodeCharacter{1E7C}{\~V}
   \DeclareUnicodeCharacter{1E7D}{\~v}
   \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
   \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
 
   \DeclareUnicodeCharacter{1E80}{\`W}
   \DeclareUnicodeCharacter{1E81}{\`w}
   \DeclareUnicodeCharacter{1E82}{\'W}
   \DeclareUnicodeCharacter{1E83}{\'w}
   \DeclareUnicodeCharacter{1E84}{\"W}
   \DeclareUnicodeCharacter{1E85}{\"w}
   \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
   \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
   \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
   \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
   \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
   \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
   \DeclareUnicodeCharacter{1E8C}{\"X}
   \DeclareUnicodeCharacter{1E8D}{\"x}
   \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
   \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
 
   \DeclareUnicodeCharacter{1E90}{\^Z}
   \DeclareUnicodeCharacter{1E91}{\^z}
   \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
   \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
   \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
   \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
   \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
   \DeclareUnicodeCharacter{1E97}{\"t}
   \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
   \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
 
   \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
   \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
 
   \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
   \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
   \DeclareUnicodeCharacter{1EBC}{\~E}
   \DeclareUnicodeCharacter{1EBD}{\~e}
 
   \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
   \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
   \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
   \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
 
   \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
   \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
 
   \DeclareUnicodeCharacter{1EF2}{\`Y}
   \DeclareUnicodeCharacter{1EF3}{\`y}
   \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
 
   \DeclareUnicodeCharacter{1EF8}{\~Y}
   \DeclareUnicodeCharacter{1EF9}{\~y}
 
   \DeclareUnicodeCharacter{2013}{--}
   \DeclareUnicodeCharacter{2014}{---}
   \DeclareUnicodeCharacter{2022}{\bullet}
   \DeclareUnicodeCharacter{2026}{\dots}
   \DeclareUnicodeCharacter{20AC}{\euro}
 
   \DeclareUnicodeCharacter{2192}{\expansion}
   \DeclareUnicodeCharacter{21D2}{\result}
 
   \DeclareUnicodeCharacter{2212}{\minus}
   \DeclareUnicodeCharacter{2217}{\point}
   \DeclareUnicodeCharacter{2261}{\equiv}
 }% end of \utfeightchardefs
 
 
 % US-ASCII character definitions.
 \def\asciichardefs{% nothing need be done
    \relax
 }
 
 % Make non-ASCII characters printable again for compatibility with
 % existing Texinfo documents that may use them, even without declaring a
 % document encoding.
 %
 \setnonasciicharscatcode \other
 
 
 \message{formatting,}
 
 \newdimen\defaultparindent \defaultparindent = 15pt
 
 \chapheadingskip = 15pt plus 4pt minus 2pt
 \secheadingskip = 12pt plus 3pt minus 2pt
 \subsecheadingskip = 9pt plus 2pt minus 2pt
 
 % Prevent underfull vbox error messages.
 \vbadness = 10000
 
 % Don't be so finicky about underfull hboxes, either.
 \hbadness = 2000
 
 % Following George Bush, just get rid of widows and orphans.
 \widowpenalty=10000
 \clubpenalty=10000
 
 % Use TeX 3.0's \emergencystretch to help line breaking, but if we're
 % using an old version of TeX, don't do anything.  We want the amount of
 % stretch added to depend on the line length, hence the dependence on
 % \hsize.  We call this whenever the paper size is set.
 %
 \def\setemergencystretch{%
   \ifx\emergencystretch\thisisundefined
     % Allow us to assign to \emergencystretch anyway.
     \def\emergencystretch{\dimen0}%
   \else
     \emergencystretch = .15\hsize
   \fi
 }
 
 % Parameters in order: 1) textheight; 2) textwidth;
 % 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
 % 7) physical page height; 8) physical page width.
 %
 % We also call \setleading{\textleading}, so the caller should define
 % \textleading.  The caller should also set \parskip.
 %
 \def\internalpagesizes#1#2#3#4#5#6#7#8{%
   \voffset = #3\relax
   \topskip = #6\relax
   \splittopskip = \topskip
   %
   \vsize = #1\relax
   \advance\vsize by \topskip
   \outervsize = \vsize
   \advance\outervsize by 2\topandbottommargin
   \pageheight = \vsize
   %
   \hsize = #2\relax
   \outerhsize = \hsize
   \advance\outerhsize by 0.5in
   \pagewidth = \hsize
   %
   \normaloffset = #4\relax
   \bindingoffset = #5\relax
   %
   \ifpdf
     \pdfpageheight #7\relax
     \pdfpagewidth #8\relax
   \fi
   %
   \setleading{\textleading}
   %
   \parindent = \defaultparindent
   \setemergencystretch
 }
 
 % @letterpaper (the default).
 \def\letterpaper{{\globaldefs = 1
   \parskip = 3pt plus 2pt minus 1pt
   \textleading = 13.2pt
   %
   % If page is nothing but text, make it come out even.
   \internalpagesizes{46\baselineskip}{6in}%
                     {\voffset}{.25in}%
                     {\bindingoffset}{36pt}%
                     {11in}{8.5in}%
 }}
 
 % Use @smallbook to reset parameters for 7x9.25 trim size.
 \def\smallbook{{\globaldefs = 1
   \parskip = 2pt plus 1pt
   \textleading = 12pt
   %
   \internalpagesizes{7.5in}{5in}%
                     {\voffset}{.25in}%
                     {\bindingoffset}{16pt}%
                     {9.25in}{7in}%
   %
   \lispnarrowing = 0.3in
   \tolerance = 700
   \hfuzz = 1pt
   \contentsrightmargin = 0pt
   \defbodyindent = .5cm
 }}
 
 % Use @smallerbook to reset parameters for 6x9 trim size.
 % (Just testing, parameters still in flux.)
 \def\smallerbook{{\globaldefs = 1
   \parskip = 1.5pt plus 1pt
   \textleading = 12pt
   %
   \internalpagesizes{7.4in}{4.8in}%
                     {-.2in}{-.4in}%
                     {0pt}{14pt}%
                     {9in}{6in}%
   %
   \lispnarrowing = 0.25in
   \tolerance = 700
   \hfuzz = 1pt
   \contentsrightmargin = 0pt
   \defbodyindent = .4cm
 }}
 
 % Use @afourpaper to print on European A4 paper.
 \def\afourpaper{{\globaldefs = 1
   \parskip = 3pt plus 2pt minus 1pt
   \textleading = 13.2pt
   %
   % Double-side printing via postscript on Laserjet 4050
   % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
   % To change the settings for a different printer or situation, adjust
   % \normaloffset until the front-side and back-side texts align.  Then
   % do the same for \bindingoffset.  You can set these for testing in
   % your texinfo source file like this:
   % @tex
   % \global\normaloffset = -6mm
   % \global\bindingoffset = 10mm
   % @end tex
   \internalpagesizes{51\baselineskip}{160mm}
                     {\voffset}{\hoffset}%
                     {\bindingoffset}{44pt}%
                     {297mm}{210mm}%
   %
   \tolerance = 700
   \hfuzz = 1pt
   \contentsrightmargin = 0pt
   \defbodyindent = 5mm
 }}
 
 % Use @afivepaper to print on European A5 paper.
 % From romildo@urano.iceb.ufop.br, 2 July 2000.
 % He also recommends making @example and @lisp be small.
 \def\afivepaper{{\globaldefs = 1
   \parskip = 2pt plus 1pt minus 0.1pt
   \textleading = 12.5pt
   %
   \internalpagesizes{160mm}{120mm}%
                     {\voffset}{\hoffset}%
                     {\bindingoffset}{8pt}%
                     {210mm}{148mm}%
   %
   \lispnarrowing = 0.2in
   \tolerance = 800
   \hfuzz = 1.2pt
   \contentsrightmargin = 0pt
   \defbodyindent = 2mm
   \tableindent = 12mm
 }}
 
 % A specific text layout, 24x15cm overall, intended for A4 paper.
 \def\afourlatex{{\globaldefs = 1
   \afourpaper
   \internalpagesizes{237mm}{150mm}%
                     {\voffset}{4.6mm}%
                     {\bindingoffset}{7mm}%
                     {297mm}{210mm}%
   %
   % Must explicitly reset to 0 because we call \afourpaper.
   \globaldefs = 0
 }}
 
 % Use @afourwide to print on A4 paper in landscape format.
 \def\afourwide{{\globaldefs = 1
   \afourpaper
   \internalpagesizes{241mm}{165mm}%
                     {\voffset}{-2.95mm}%
                     {\bindingoffset}{7mm}%
                     {297mm}{210mm}%
   \globaldefs = 0
 }}
 
 % @pagesizes TEXTHEIGHT[,TEXTWIDTH]
 % Perhaps we should allow setting the margins, \topskip, \parskip,
 % and/or leading, also. Or perhaps we should compute them somehow.
 %
 \parseargdef\pagesizes{\pagesizesyyy #1,,\finish}
 \def\pagesizesyyy#1,#2,#3\finish{{%
   \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
   \globaldefs = 1
   %
   \parskip = 3pt plus 2pt minus 1pt
   \setleading{\textleading}%
   %
   \dimen0 = #1
   \advance\dimen0 by \voffset
   %
   \dimen2 = \hsize
   \advance\dimen2 by \normaloffset
   %
   \internalpagesizes{#1}{\hsize}%
                     {\voffset}{\normaloffset}%
                     {\bindingoffset}{44pt}%
                     {\dimen0}{\dimen2}%
 }}
 
 % Set default to letter.
 %
 \letterpaper
 
 
 \message{and turning on texinfo input format.}
 
 % Define macros to output various characters with catcode for normal text.
 \catcode`\"=\other
 \catcode`\~=\other
 \catcode`\^=\other
 \catcode`\_=\other
 \catcode`\|=\other
 \catcode`\<=\other
 \catcode`\>=\other
 \catcode`\+=\other
 \catcode`\$=\other
 \def\normaldoublequote{"}
 \def\normaltilde{~}
 \def\normalcaret{^}
 \def\normalunderscore{_}
 \def\normalverticalbar{|}
 \def\normalless{<}
 \def\normalgreater{>}
 \def\normalplus{+}
 \def\normaldollar{$}%$ font-lock fix
 
 % This macro is used to make a character print one way in \tt
 % (where it can probably be output as-is), and another way in other fonts,
 % where something hairier probably needs to be done.
 %
 % #1 is what to print if we are indeed using \tt; #2 is what to print
 % otherwise.  Since all the Computer Modern typewriter fonts have zero
 % interword stretch (and shrink), and it is reasonable to expect all
 % typewriter fonts to have this, we can check that font parameter.
 %
 \def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi}
 
 % Same as above, but check for italic font.  Actually this also catches
 % non-italic slanted fonts since it is impossible to distinguish them from
 % italic fonts.  But since this is only used by $ and it uses \sl anyway
 % this is not a problem.
 \def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi}
 
 % Turn off all special characters except @
 % (and those which the user can use as if they were ordinary).
 % Most of these we simply print from the \tt font, but for some, we can
 % use math or other variants that look better in normal text.
 
 \catcode`\"=\active
 \def\activedoublequote{{\tt\char34}}
 \let"=\activedoublequote
 \catcode`\~=\active
 \def~{{\tt\char126}}
 \chardef\hat=`\^
 \catcode`\^=\active
 \def^{{\tt \hat}}
 
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
 \let\realunder=_
 % Subroutine for the previous macro.
 \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
 
 \catcode`\|=\active
 \def|{{\tt\char124}}
 \chardef \less=`\<
 \catcode`\<=\active
 \def<{{\tt \less}}
 \chardef \gtr=`\>
 \catcode`\>=\active
 \def>{{\tt \gtr}}
 \catcode`\+=\active
 \def+{{\tt \char 43}}
 \catcode`\$=\active
 \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
 
 % If a .fmt file is being used, characters that might appear in a file
 % name cannot be active until we have parsed the command line.
 % So turn them off again, and have \everyjob (or @setfilename) turn them on.
 % \otherifyactive is called near the end of this file.
 \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
 
 % Used sometimes to turn off (effectively) the active characters even after
 % parsing them.
 \def\turnoffactive{%
   \normalturnoffactive
   \otherbackslash
 }
 
 \catcode`\@=0
 
 % \backslashcurfont outputs one backslash character in current font,
 % as in \char`\\.
 \global\chardef\backslashcurfont=`\\
 \global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
 
 % \realbackslash is an actual character `\' with catcode other, and
 % \doublebackslash is two of them (for the pdf outlines).
 {\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
 
 % In texinfo, backslash is an active character; it prints the backslash
 % in fixed width font.
 \catcode`\\=\active
 @def@normalbackslash{{@tt@backslashcurfont}}
 % On startup, @fixbackslash assigns:
 %  @let \ = @normalbackslash
 
 % \rawbackslash defines an active \ to do \backslashcurfont.
 % \otherbackslash defines an active \ to be a literal `\' character with
 % catcode other.
 @gdef@rawbackslash{@let\=@backslashcurfont}
 @gdef@otherbackslash{@let\=@realbackslash}
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
 % the literal character `\'.
 %
 @def@normalturnoffactive{%
   @let\=@normalbackslash
   @let"=@normaldoublequote
   @let~=@normaltilde
   @let^=@normalcaret
   @let_=@normalunderscore
   @let|=@normalverticalbar
   @let<=@normalless
   @let>=@normalgreater
   @let+=@normalplus
   @let$=@normaldollar %$ font-lock fix
   @unsepspaces
 }
 
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
 @otherifyactive
 
 % If a .fmt file is being used, we don't want the `\input texinfo' to show up.
 % That is what \eatinput is for; after that, the `\' should revert to printing
 % a backslash.
 %
 @gdef@eatinput input texinfo{@fixbackslash}
 @global@let\ = @eatinput
 
 % On the other hand, perhaps the file did not have a `\input texinfo'. Then
 % the first `\' in the file would cause an error. This macro tries to fix
 % that, assuming it is called before the first `\' could plausibly occur.
 % Also turn back on active characters that might appear in the input
 % file name, in case not using a pre-dumped format.
 %
 @gdef@fixbackslash{%
   @ifx\@eatinput @let\ = @normalbackslash @fi
   @catcode`+=@active
   @catcode`@_=@active
 }
 
 % Say @foo, not \foo, in error messages.
 @escapechar = `@@
 
 % These look ok in all fonts, so just make them not special.
 @catcode`@& = @other
 @catcode`@# = @other
 @catcode`@% = @other
 
 
 @c Local variables:
 @c eval: (add-hook 'write-file-hooks 'time-stamp)
 @c page-delimiter: "^\\\\message"
 @c time-stamp-start: "def\\\\texinfoversion{"
 @c time-stamp-format: "%:y-%02m-%02d.%02H"
 @c time-stamp-end: "}"
 @c End:
 
 @c vim:sw=2:
 
 @ignore
    arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
 @end ignore
diff --git a/common/mkerrors b/common/mkerrors
index 138d3c1d1..2a6960ab6 100755
--- a/common/mkerrors
+++ b/common/mkerrors
@@ -1,71 +1,71 @@
 #!/bin/sh
 # mkerrors - Extract error strings from errors.h
 #            and create C source for gnupg_strerror
 #	Copyright (C) 2001 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
 # GnuPG 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.
 #
 # GnuPG 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/>.
 
 cat <<EOF
 /* Generated automatically by mkerrors */
 /* Do not edit! */
 
 #include <config.h>
 #include <stdio.h>
 #include "errors.h"
 
 /**
  * gnupg_strerror:
  * @err:  Error code
  *
- * This function returns a textual representaion of the given
+ * This function returns a textual representation of the given
  * errorcode. If this is an unknown value, a string with the value
  * is returned (Beware: it is hold in a static buffer).
  *
  * Return value: String with the error description.
  **/
 const char *
 gnupg_strerror (int err)
 {
   const char *s;
   static char buf[25];
 
   switch (err)
     {
 EOF
 
 awk '
 /GNUPG_No_Error/  { okay=1 }
 !okay              {next}
 /}/                { exit 0 }
 /GNUPG_[A-Za-z_]*/ { print_code($1) }
 
 
 function print_code( s )
 {
 printf "    case %s: s=\"", s ;
 gsub(/_/, " ", s );
 printf "%s\"; break;\n", tolower(substr(s,7));
 }
 '
 
 cat <<EOF
     default:  sprintf (buf, "ec=%d", err ); s=buf; break;
     }
 
   return s;
 }
 
 EOF
diff --git a/common/mkerrtok b/common/mkerrtok
index e6310722a..49c10e595 100755
--- a/common/mkerrtok
+++ b/common/mkerrtok
@@ -1,66 +1,66 @@
 #!/bin/sh
 # mkerrtok - Create error tokens from errors.h
 #            and the C source for gnupg_errortoken
 #	Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
 # GnuPG 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.
 #
 # GnuPG 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/>.
 
 cat <<EOF
 /* Generated automatically by mkerrtok */
 /* Do not edit! */
 
 /**
  * gnupg_error_token:
  * @err:  Error code
  *
- * This function returns a textual representaion of the given
+ * This function returns a textual representation of the given
  * errorcode. If this is an unknown value, a static string is returned.
  * This function differs from gnupg_strerror that it yields the string
  * representation of the macro which is never subject to i18n.
  *
  * Return value: String with the error token.
  **/
 const char *
 gnupg_error_token (int err)
 {
   const char *s;
 
   switch (err)
     {
 EOF
 
 awk '
 /GNUPG_No_Error/  { okay=1 }
 !okay              {next}
 /}/                { exit 0 }
 /GNUPG_[A-Za-z_]*/ { print_code($1) }
 
 
 function print_code( s )
 {
 printf "    case %s: s=\"", s ;
 printf "%s\"; break;\n", substr(s,7);
 }
 '
 
 cat <<EOF
     default:  s = "Unknown_Error"; break;
     }
 
   return s;
 }
 
 EOF
diff --git a/configure.ac b/configure.ac
index 78a03c420..f0e696618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,2107 +1,2107 @@
 # configure.ac - for GnuPG 2.1
 # Copyright (C) 1998-2018 Free Software Foundation, Inc.
 # Copyright (C) 1998-2018 Werner Koch
 #
 # This file is part of GnuPG.
 #
 # GnuPG 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.
 #
 # GnuPG 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 <https://www.gnu.org/licenses/>.
 
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 min_automake_version="1.14"
 
 # To build a release you need to create a tag with the version number
 # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force".  Please
 # bump the version number immediately *after* the release and do
 # another commit and push so that the git magic is able to work.
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [3])
 m4_define([mym4_micro], [0])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release
 # with an annotated tag.  For example the 2.1 branch starts off with
 # the tag "gnupg-2.1-base".  This is used as the base for counting
 # beta numbers before the first release of a series.
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a
 # flag indicating a development version (mym4_isbeta).  Note that the
 # m4 processing is done by autoconf and not during the configure run.
 m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \
                            mym4_package mym4_major mym4_minor mym4_micro),[:]))
 m4_define([mym4_isbeta],       m4_argn(2, mym4_verslist))
 m4_define([mym4_version],      m4_argn(4, mym4_verslist))
 m4_define([mym4_revision],     m4_argn(7, mym4_verslist))
 m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
 m4_esyscmd([echo ]mym4_version[>VERSION])
 AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
 
 # When changing the SWDB tag please also adjust the hard coded tags in
 # build-aux/speedo.mk and Makefile.am
 AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg24", [swdb tag for this branch])
 
 NEED_GPG_ERROR_VERSION=1.29
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.7.0
 
 NEED_LIBASSUAN_API=2
 NEED_LIBASSUAN_VERSION=2.5.0
 
 NEED_KSBA_API=1
 NEED_KSBA_VERSION=1.3.4
 
 NEED_NTBTLS_API=1
 NEED_NTBTLS_VERSION=0.1.0
 
 NEED_NPTH_API=1
 NEED_NPTH_VERSION=1.2
 
 
 NEED_GNUTLS_VERSION=3.0
 
 NEED_SQLITE_VERSION=3.7
 
 development_version=mym4_isbeta
 PACKAGE=$PACKAGE_NAME
 PACKAGE_GT=${PACKAGE_NAME}2
 VERSION=$PACKAGE_VERSION
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([sm/gpgsm.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
 AC_CANONICAL_HOST
 AB_INIT
 
 AC_GNU_SOURCE
 
 
 # Some status variables.
 have_gpg_error=no
 have_libgcrypt=no
 have_libassuan=no
 have_ksba=no
 have_ntbtls=no
 have_gnutls=no
 have_sqlite=no
 have_npth=no
 have_libusb=no
 have_system_resolver=no
 gnupg_have_ldap="n/a"
 
 use_zip=yes
 use_bzip2=yes
 use_exec=yes
 use_trust_models=yes
 use_tofu=yes
 use_libdns=yes
 card_support=yes
 use_ccid_driver=auto
 dirmngr_auto_start=yes
 use_tls_library=no
 large_secmem=no
 show_tor_support=no
 
 # gpg is a required part and can't be disabled anymore.
 build_gpg=yes
 GNUPG_BUILD_PROGRAM(gpgsm, yes)
 # The agent is a required part and can't be disabled anymore.
 build_agent=yes
 GNUPG_BUILD_PROGRAM(scdaemon, yes)
 GNUPG_BUILD_PROGRAM(g13, no)
 GNUPG_BUILD_PROGRAM(dirmngr, yes)
 GNUPG_BUILD_PROGRAM(doc, yes)
 GNUPG_BUILD_PROGRAM(symcryptrun, no)
 # We use gpgtar to unpack test data, hence we always build it.  If the
 # user opts out, we simply don't install it.
 GNUPG_BUILD_PROGRAM(gpgtar, yes)
 GNUPG_BUILD_PROGRAM(wks-tools, no)
 
 AC_SUBST(PACKAGE)
 AC_SUBST(PACKAGE_GT)
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
 AC_DEFINE_UNQUOTED(PACKAGE_GT, "$PACKAGE_GT",
                                 [Name of this package for gettext])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
 AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
                                         [Bug report address])
 AC_DEFINE_UNQUOTED(NEED_LIBGCRYPT_VERSION, "$NEED_LIBGCRYPT_VERSION",
                                        [Required version of Libgcrypt])
 AC_DEFINE_UNQUOTED(NEED_KSBA_VERSION, "$NEED_KSBA_VERSION",
                                        [Required version of Libksba])
 AC_DEFINE_UNQUOTED(NEED_NTBTLS_VERSION, "$NEED_NTBTLS_VERSION",
                                        [Required version of NTBTLS])
 
 
 
 # The default is to use the modules from this package and the few
 # other packages in a standard place; i.e where this package gets
 # installed.  With these options it is possible to override these
 # ${prefix} depended values with fixed paths, which can't be replaced
 # at make time.  See also am/cmacros.am and the defaults in AH_BOTTOM.
 AC_ARG_WITH(agent-pgm,
     [  --with-agent-pgm=PATH  Use PATH as the default for the agent)],
           GNUPG_AGENT_PGM="$withval", GNUPG_AGENT_PGM="" )
 AC_SUBST(GNUPG_AGENT_PGM)
 AM_CONDITIONAL(GNUPG_AGENT_PGM, test -n "$GNUPG_AGENT_PGM")
 show_gnupg_agent_pgm="(default)"
 test -n "$GNUPG_AGENT_PGM" && show_gnupg_agent_pgm="$GNUPG_AGENT_PGM"
 
 AC_ARG_WITH(pinentry-pgm,
     [  --with-pinentry-pgm=PATH  Use PATH as the default for the pinentry)],
           GNUPG_PINENTRY_PGM="$withval", GNUPG_PINENTRY_PGM="" )
 AC_SUBST(GNUPG_PINENTRY_PGM)
 AM_CONDITIONAL(GNUPG_PINENTRY_PGM, test -n "$GNUPG_PINENTRY_PGM")
 show_gnupg_pinentry_pgm="(default)"
 test -n "$GNUPG_PINENTRY_PGM" && show_gnupg_pinentry_pgm="$GNUPG_PINENTRY_PGM"
 
 
 AC_ARG_WITH(scdaemon-pgm,
     [  --with-scdaemon-pgm=PATH  Use PATH as the default for the scdaemon)],
           GNUPG_SCDAEMON_PGM="$withval", GNUPG_SCDAEMON_PGM="" )
 AC_SUBST(GNUPG_SCDAEMON_PGM)
 AM_CONDITIONAL(GNUPG_SCDAEMON_PGM, test -n "$GNUPG_SCDAEMON_PGM")
 show_gnupg_scdaemon_pgm="(default)"
 test -n "$GNUPG_SCDAEMON_PGM" && show_gnupg_scdaemon_pgm="$GNUPG_SCDAEMON_PGM"
 
 
 AC_ARG_WITH(dirmngr-pgm,
     [  --with-dirmngr-pgm=PATH  Use PATH as the default for the dirmngr)],
           GNUPG_DIRMNGR_PGM="$withval", GNUPG_DIRMNGR_PGM="" )
 AC_SUBST(GNUPG_DIRMNGR_PGM)
 AM_CONDITIONAL(GNUPG_DIRMNGR_PGM, test -n "$GNUPG_DIRMNGR_PGM")
 show_gnupg_dirmngr_pgm="(default)"
 test -n "$GNUPG_DIRMNGR_PGM" && show_gnupg_dirmngr_pgm="$GNUPG_DIRMNGR_PGM"
 
 AC_ARG_WITH(protect-tool-pgm,
     [  --with-protect-tool-pgm=PATH  Use PATH as the default for the protect-tool)],
           GNUPG_PROTECT_TOOL_PGM="$withval", GNUPG_PROTECT_TOOL_PGM="" )
 AC_SUBST(GNUPG_PROTECT_TOOL_PGM)
 AM_CONDITIONAL(GNUPG_PROTECT_TOOL_PGM, test -n "$GNUPG_PROTECT_TOOL_PGM")
 show_gnupg_protect_tool_pgm="(default)"
 test -n "$GNUPG_PROTECT_TOOL_PGM" \
       && show_gnupg_protect_tool_pgm="$GNUPG_PROTECT_TOOL_PGM"
 
 AC_ARG_WITH(dirmngr-ldap-pgm,
     [  --with-dirmngr-ldap-pgm=PATH  Use PATH as the default for the dirmngr ldap wrapper)],
           GNUPG_DIRMNGR_LDAP_PGM="$withval", GNUPG_DIRMNGR_LDAP_PGM="" )
 AC_SUBST(GNUPG_DIRMNGR_LDAP_PGM)
 AM_CONDITIONAL(GNUPG_DIRMNGR_LDAP_PGM, test -n "$GNUPG_DIRMNGR_LDAP_PGM")
 show_gnupg_dirmngr_ldap_pgm="(default)"
 test -n "$GNUPG_DIRMNGR_LDAP_PGM" \
       && show_gnupg_dirmngr_ldap_pgm="$GNUPG_DIRMNGR_LDAP_PGM"
 
 
 #
 # For a long time gpg 2.x was installed as gpg2.  This changed with
 # 2.2.  This option can be used to install gpg under the name gpg2.
 #
 AC_ARG_ENABLE(gpg-is-gpg2,
     AC_HELP_STRING([--enable-gpg-is-gpg2],[Set installed name of gpg to gpg2]),
     gpg_is_gpg2=$enableval)
 if test "$gpg_is_gpg2" = "yes"; then
    AC_DEFINE(USE_GPG2_HACK, 1, [Define to install gpg as gpg2])
 fi
 AM_CONDITIONAL(USE_GPG2_HACK, test "$gpg_is_gpg2" = "yes")
 
 
 # SELinux support includes tracking of sensitive files to avoid
 # leaking their contents through processing these files by gpg itself
 AC_MSG_CHECKING([whether SELinux support is requested])
 AC_ARG_ENABLE(selinux-support,
               AC_HELP_STRING([--enable-selinux-support],
                              [enable SELinux support]),
               selinux_support=$enableval, selinux_support=no)
 AC_MSG_RESULT($selinux_support)
 
 
 AC_MSG_CHECKING([whether to allocate extra secure memory])
 AC_ARG_ENABLE(large-secmem,
               AC_HELP_STRING([--enable-large-secmem],
                              [allocate extra secure memory]),
               large_secmem=$enableval, large_secmem=no)
 AC_MSG_RESULT($large_secmem)
 if test "$large_secmem" = yes ; then
    SECMEM_BUFFER_SIZE=65536
 else
    SECMEM_BUFFER_SIZE=32768
 fi
 AC_DEFINE_UNQUOTED(SECMEM_BUFFER_SIZE,$SECMEM_BUFFER_SIZE,
                    [Size of secure memory buffer])
 
 AC_MSG_CHECKING([calibrated passphrase-stretching (s2k) duration])
 AC_ARG_WITH(agent-s2k-calibration,
               AC_HELP_STRING([--with-agent-s2k-calibration=MSEC],
                              [calibrate passphrase stretching (s2k) to MSEC milliseconds]),
               agent_s2k_calibration=$withval, agent_s2k_calibration=100)
 AC_MSG_RESULT($agent_s2k_calibration milliseconds)
 AC_DEFINE_UNQUOTED(AGENT_S2K_CALIBRATION, $agent_s2k_calibration,
                    [Agent s2k calibration time (ms)])
 
 AC_MSG_CHECKING([whether to enable trust models])
 AC_ARG_ENABLE(trust-models,
               AC_HELP_STRING([--disable-trust-models],
                              [disable all trust models except "always"]),
               use_trust_models=$enableval)
 AC_MSG_RESULT($use_trust_models)
 if test "$use_trust_models" = no ; then
     AC_DEFINE(NO_TRUST_MODELS, 1,
              [Define to include only trust-model always])
 fi
 
 AC_MSG_CHECKING([whether to enable TOFU])
 AC_ARG_ENABLE(tofu,
                 AC_HELP_STRING([--disable-tofu],
                                [disable the TOFU trust model]),
               use_tofu=$enableval, use_tofu=$use_trust_models)
 AC_MSG_RESULT($use_tofu)
 if test "$use_trust_models" = no && test "$use_tofu" = yes; then
     AC_MSG_ERROR([both --disable-trust-models and --enable-tofu given])
 fi
 
 AC_MSG_CHECKING([whether to enable libdns])
 AC_ARG_ENABLE(libdns,
                 AC_HELP_STRING([--disable-libdns],
                                [do not build with libdns support]),
               use_libdns=$enableval, use_libdns=yes)
 AC_MSG_RESULT($use_libdns)
 if test x"$use_libdns" = xyes ; then
     AC_DEFINE(USE_LIBDNS, 1, [Build with integrated libdns support])
 fi
 AM_CONDITIONAL(USE_LIBDNS, test "$use_libdns" = yes)
 
 
 #
 # Options to disable algorithm
 #
 
 GNUPG_GPG_DISABLE_ALGO([rsa],[RSA public key])
 # Elgamal is a MUST algorithm
 # DSA is a MUST algorithm
 GNUPG_GPG_DISABLE_ALGO([ecdh],[ECDH public key])
 GNUPG_GPG_DISABLE_ALGO([ecdsa],[ECDSA public key])
 GNUPG_GPG_DISABLE_ALGO([eddsa],[EdDSA public key])
 
 GNUPG_GPG_DISABLE_ALGO([idea],[IDEA cipher])
 # 3DES is a MUST algorithm
 GNUPG_GPG_DISABLE_ALGO([cast5],[CAST5 cipher])
 GNUPG_GPG_DISABLE_ALGO([blowfish],[BLOWFISH cipher])
 GNUPG_GPG_DISABLE_ALGO([aes128],[AES128 cipher])
 GNUPG_GPG_DISABLE_ALGO([aes192],[AES192 cipher])
 GNUPG_GPG_DISABLE_ALGO([aes256],[AES256 cipher])
 GNUPG_GPG_DISABLE_ALGO([twofish],[TWOFISH cipher])
 GNUPG_GPG_DISABLE_ALGO([camellia128],[CAMELLIA128 cipher])
 GNUPG_GPG_DISABLE_ALGO([camellia192],[CAMELLIA192 cipher])
 GNUPG_GPG_DISABLE_ALGO([camellia256],[CAMELLIA256 cipher])
 
 GNUPG_GPG_DISABLE_ALGO([md5],[MD5 hash])
 # SHA1 is a MUST algorithm
 GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
 GNUPG_GPG_DISABLE_ALGO([sha224],[SHA-224 hash])
 # SHA256 is a MUST algorithm for GnuPG.
 GNUPG_GPG_DISABLE_ALGO([sha384],[SHA-384 hash])
 GNUPG_GPG_DISABLE_ALGO([sha512],[SHA-512 hash])
 
 
 # Allow disabling of zip support.
 # This is in general not a good idea because according to rfc4880 OpenPGP
 # implementations SHOULD support ZLIB.
 AC_MSG_CHECKING([whether to enable the ZIP and ZLIB compression algorithm])
 AC_ARG_ENABLE(zip,
    AC_HELP_STRING([--disable-zip],
                   [disable the ZIP and ZLIB compression algorithm]),
    use_zip=$enableval)
 AC_MSG_RESULT($use_zip)
 
 # Allow disabling of bzib2 support.
 # It is defined only after we confirm the library is available later
 AC_MSG_CHECKING([whether to enable the BZIP2 compression algorithm])
 AC_ARG_ENABLE(bzip2,
    AC_HELP_STRING([--disable-bzip2],[disable the BZIP2 compression algorithm]),
    use_bzip2=$enableval)
 AC_MSG_RESULT($use_bzip2)
 
 # Configure option to allow or disallow execution of external
 # programs, like a photo viewer.
 AC_MSG_CHECKING([whether to enable external program execution])
 AC_ARG_ENABLE(exec,
     AC_HELP_STRING([--disable-exec],[disable all external program execution]),
     use_exec=$enableval)
 AC_MSG_RESULT($use_exec)
 if test "$use_exec" = no ; then
     AC_DEFINE(NO_EXEC,1,[Define to disable all external program execution])
 fi
 
 if test "$use_exec" = yes ; then
   AC_MSG_CHECKING([whether to enable photo ID viewing])
   AC_ARG_ENABLE(photo-viewers,
       [  --disable-photo-viewers disable photo ID viewers],
       [if test "$enableval" = no ; then
          AC_DEFINE(DISABLE_PHOTO_VIEWER,1,[define to disable photo viewing])
       fi],enableval=yes)
   gnupg_cv_enable_photo_viewers=$enableval
   AC_MSG_RESULT($enableval)
 
   if test "$gnupg_cv_enable_photo_viewers" = yes ; then
     AC_MSG_CHECKING([whether to use a fixed photo ID viewer])
     AC_ARG_WITH(photo-viewer,
         [  --with-photo-viewer=FIXED_VIEWER  set a fixed photo ID viewer],
         [if test "$withval" = yes ; then
            withval=no
         elif test "$withval" != no ; then
            AC_DEFINE_UNQUOTED(FIXED_PHOTO_VIEWER,"$withval",
   	                    [if set, restrict photo-viewer to this])
         fi],withval=no)
     AC_MSG_RESULT($withval)
   fi
 fi
 
 
 #
 # Check for the key/uid cache size.  This can't be zero, but can be
 # pretty small on embedded systems.  This is used for the gpg part.
 #
 AC_MSG_CHECKING([for the size of the key and uid cache])
 AC_ARG_ENABLE(key-cache,
         AC_HELP_STRING([--enable-key-cache=SIZE],
                        [Set key cache to SIZE (default 4096)]),,enableval=4096)
 if test "$enableval" = "no"; then
    enableval=5
 elif test "$enableval" = "yes" || test "$enableval" = ""; then
    enableval=4096
 fi
 changequote(,)dnl
 key_cache_size=`echo "$enableval" | sed 's/[A-Za-z]//g'`
 changequote([,])dnl
 if test "$enableval" != "$key_cache_size" || test "$key_cache_size" -lt 5; then
    AC_MSG_ERROR([invalid key-cache size])
 fi
 AC_MSG_RESULT($key_cache_size)
 AC_DEFINE_UNQUOTED(PK_UID_CACHE_SIZE,$key_cache_size,
                   [Size of the key and UID caches])
 
 
 
 #
 # Check whether we want to use Linux capabilities
 #
 AC_MSG_CHECKING([whether use of capabilities is requested])
 AC_ARG_WITH(capabilities,
     [  --with-capabilities     use linux capabilities [default=no]],
 [use_capabilities="$withval"],[use_capabilities=no])
 AC_MSG_RESULT($use_capabilities)
 
 #
 # Check whether to disable the card support
 AC_MSG_CHECKING([whether smartcard support is requested])
 AC_ARG_ENABLE(card-support,
               AC_HELP_STRING([--disable-card-support],
                              [disable smartcard support]),
               card_support=$enableval)
 AC_MSG_RESULT($card_support)
 if test "$card_support" = yes ; then
   AC_DEFINE(ENABLE_CARD_SUPPORT,1,[Define to include smartcard support])
 else
   build_scdaemon=no
 fi
 
 #
 # Allow disabling of internal CCID support.
 # It is defined only after we confirm the library is available later
 #
 AC_MSG_CHECKING([whether to enable the internal CCID driver])
 AC_ARG_ENABLE(ccid-driver,
               AC_HELP_STRING([--disable-ccid-driver],
                              [disable the internal CCID driver]),
               use_ccid_driver=$enableval)
 AC_MSG_RESULT($use_ccid_driver)
 
 AC_MSG_CHECKING([whether to auto start dirmngr])
 AC_ARG_ENABLE(dirmngr-auto-start,
               AC_HELP_STRING([--disable-dirmngr-auto-start],
                              [disable auto starting of the dirmngr]),
               dirmngr_auto_start=$enableval)
 AC_MSG_RESULT($dirmngr_auto_start)
 if test "$dirmngr_auto_start" = yes ; then
     AC_DEFINE(USE_DIRMNGR_AUTO_START,1,
               [Define to enable auto starting of the dirmngr])
 fi
 
 
 #
 # To avoid double inclusion of config.h which might happen at some
 # places, we add the usual double inclusion protection at the top of
 # config.h.
 #
 AH_TOP([
 #ifndef GNUPG_CONFIG_H_INCLUDED
 #define GNUPG_CONFIG_H_INCLUDED
 ])
 
 #
 # Stuff which goes at the bottom of config.h.
 #
 AH_BOTTOM([
 /* This is the major version number of GnuPG so that
    source included files can test for this.  Note, that
    we use 2 here even for GnuPG 1.9.x. */
 #define GNUPG_MAJOR_VERSION 2
 
 /* Now to separate file name parts.
    Please note that the string version must not contain more
    than one character because the code assumes strlen()==1 */
 #ifdef HAVE_DOSISH_SYSTEM
 #define DIRSEP_C '\\'
 #define DIRSEP_S "\\"
 #define EXTSEP_C '.'
 #define EXTSEP_S "."
 #define PATHSEP_C ';'
 #define PATHSEP_S ";"
 #define EXEEXT_S ".exe"
 #else
 #define DIRSEP_C '/'
 #define DIRSEP_S "/"
 #define EXTSEP_C '.'
 #define EXTSEP_S "."
 #define PATHSEP_C ':'
 #define PATHSEP_S ":"
 #define EXEEXT_S ""
 #endif
 
 /* This is the same as VERSION, but should be overridden if the
    platform cannot handle things like dots '.' in filenames. Set
    SAFE_VERSION_DOT and SAFE_VERSION_DASH to whatever SAFE_VERSION
    uses for dots and dashes. */
 #define SAFE_VERSION VERSION
 #define SAFE_VERSION_DOT  '.'
 #define SAFE_VERSION_DASH '-'
 
 /* Some global constants.
  * Note that the homedir must not end in a slash.  */
 #ifdef HAVE_DOSISH_SYSTEM
 # ifdef HAVE_DRIVE_LETTERS
 #  define GNUPG_DEFAULT_HOMEDIR "c:/gnupg"
 # else
 #  define GNUPG_DEFAULT_HOMEDIR "/gnupg"
 # endif
 #elif defined(__VMS)
 #define GNUPG_DEFAULT_HOMEDIR "/SYS$LOGIN/gnupg"
 #else
 #define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
 #endif
 #define GNUPG_PRIVATE_KEYS_DIR  "private-keys-v1.d"
 #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
 
 #define GNUPG_DEF_COPYRIGHT_LINE \
         "Copyright (C) 2018 Free Software Foundation, Inc."
 
 /* For some systems (DOS currently), we hardcode the path here.  For
    POSIX systems the values are constructed by the Makefiles, so that
    the values may be overridden by the make invocations; this is to
    comply with the GNU coding standards.  Note that these values are
    only defaults.  */
 #ifdef HAVE_DOSISH_SYSTEM
 # ifdef HAVE_DRIVE_LETTERS
 #  define GNUPG_BINDIR      "c:\\gnupg"
 #  define GNUPG_LIBEXECDIR  "c:\\gnupg"
 #  define GNUPG_LIBDIR      "c:\\gnupg"
 #  define GNUPG_DATADIR     "c:\\gnupg"
 #  define GNUPG_SYSCONFDIR  "c:\\gnupg"
 # else
 #  define GNUPG_BINDIR      "\\gnupg"
 #  define GNUPG_LIBEXECDIR  "\\gnupg"
 #  define GNUPG_LIBDIR      "\\gnupg"
 #  define GNUPG_DATADIR     "\\gnupg"
 #  define GNUPG_SYSCONFDIR  "\\gnupg"
 # endif
 #endif
 
 /* Derive some other constants. */
 #if !(defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID))
 #define EXEC_TEMPFILE_ONLY
 #endif
 
 
 /* We didn't define endianness above, so get it from OS macros.  This
    is intended for making fat binary builds on OS X. */
 #if !defined(BIG_ENDIAN_HOST) && !defined(LITTLE_ENDIAN_HOST)
 #if defined(__BIG_ENDIAN__)
 #define BIG_ENDIAN_HOST 1
 #elif defined(__LITTLE_ENDIAN__)
 #define LITTLE_ENDIAN_HOST 1
 #else
 #error "No endianness found"
 #endif
 #endif
 
 
 /* Hack used for W32: ldap.m4 also tests for the ASCII version of
    ldap_start_tls_s because that is the actual symbol used in the
    library.  winldap.h redefines it to our commonly used value,
    thus we define our usual macro here.  */
 #ifdef HAVE_LDAP_START_TLS_SA
 # ifndef HAVE_LDAP_START_TLS_S
 #  define HAVE_LDAP_START_TLS_S 1
 # endif
 #endif
 
 /* Enable the es_ macros from gpgrt.  */
 #define GPGRT_ENABLE_ES_MACROS 1
 
 /* Enable the log_ macros from gpgrt.  */
 #define GPGRT_ENABLE_LOG_MACROS 1
 
 /* Tell libgcrypt not to use its own libgpg-error implementation. */
 #define USE_LIBGPG_ERROR 1
 
 /* Tell Libgcrypt not to include deprecated definitions.  */
 #define GCRYPT_NO_DEPRECATED 1
 
 /* Our HTTP code is used in estream mode.  */
 #define HTTP_USE_ESTREAM 1
 
 /* Under W32 we do an explicit socket initialization, thus we need to
    avoid the on-demand initialization which would also install an atexit
    handler.  */
 #define HTTP_NO_WSASTARTUP
 
 /* Under Windows we use the gettext code from libgpg-error.  */
 #define GPG_ERR_ENABLE_GETTEXT_MACROS
 
 /* Under WindowsCE we use the strerror replacement from libgpg-error.  */
 #define GPG_ERR_ENABLE_ERRNO_MACROS
 
 #endif /*GNUPG_CONFIG_H_INCLUDED*/
 ])
 
 
 AM_MAINTAINER_MODE
 AC_ARG_VAR(SYSROOT,[locate config scripts also below that directory])
 
 # Checks for programs.
 AC_MSG_NOTICE([checking for programs])
 AC_PROG_MAKE_SET
 AM_SANITY_CHECK
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 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
 AM_PROG_CC_C_O
 if test "x$ac_cv_prog_cc_c89" = "xno" ; then
   AC_MSG_ERROR([[No C-89 compiler found]])
 fi
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB
 AC_CHECK_TOOL(AR, ar, :)
 AC_PATH_PROG(PERL,"perl")
 AC_CHECK_TOOL(WINDRES, windres, :)
 AC_PATH_PROG(YAT2M, "yat2m", "./yat2m" )
 AC_ARG_VAR(YAT2M, [tool to convert texi to man pages])
 AM_CONDITIONAL(HAVE_YAT2M, test -n "$ac_cv_path_YAT2M")
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
 GNUPG_CHECK_USTAR
 
 
 # We need to compile and run a program on the build machine.  A
 # comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in
 # the AC archive is broken for autoconf 2.57.  Given that there is no
 # newer version of that macro, we assume that it is also broken for
 # autoconf 2.61 and thus we use a simple but usually sufficient
 # approach.
 AC_MSG_CHECKING(for cc for build)
 if test "$cross_compiling" = "yes"; then
   CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
 else
   CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
 fi
 AC_MSG_RESULT($CC_FOR_BUILD)
 AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
 
 # We need to call this macro because other pkg-config macros are
 # not always used.
 PKG_PROG_PKG_CONFIG
 
 
 try_gettext=yes
 require_iconv=yes
 have_dosish_system=no
 have_w32_system=no
 have_w32ce_system=no
 have_android_system=no
 use_simple_gettext=no
 use_ldapwrapper=yes
 mmap_needed=yes
 require_pipe_to_unblock_pselect=yes
 case "${host}" in
     *-mingw32*)
         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
         AC_DEFINE(USE_ONLY_8DOT3,1,
                   [Set this to limit filenames to the 8.3 format])
         AC_DEFINE(USE_SIMPLE_GETTEXT,1,
                   [Because the Unix gettext has too much overhead on
                    MingW32 systems and these systems lack Posix functions,
                    we use a simplified version of gettext])
         have_dosish_system=yes
         have_w32_system=yes
         require_iconv=no
         require_pipe_to_unblock_pselect=no
         case "${host}" in
           *-mingw32ce*)
             have_w32ce_system=yes
             ;;
           *)
             AC_DEFINE(HAVE_DRIVE_LETTERS,1,
                       [Defined if the OS supports drive letters.])
             ;;
         esac
         try_gettext="no"
 	use_simple_gettext=yes
 	mmap_needed=no
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         # OS/2 with the EMX environment
         ac_cv_have_dev_random=no
         AC_DEFINE(HAVE_DRIVE_LETTERS)
         have_dosish_system=yes
         try_gettext="no"
         ;;
 
     i?86-*-msdosdjgpp*)
         # DOS with the DJGPP environment
         ac_cv_have_dev_random=no
         AC_DEFINE(HAVE_DRIVE_LETTERS)
         have_dosish_system=yes
         try_gettext="no"
         ;;
 
     *-*-hpux*)
         if test -z "$GCC" ; then
             CFLAGS="-Ae -D_HPUX_SOURCE $CFLAGS"
         fi
         ;;
     *-dec-osf4*)
         if test -z "$GCC" ; then
             # Suppress all warnings
             # to get rid of the unsigned/signed char mismatch warnings.
             CFLAGS="-w $CFLAGS"
         fi
         ;;
     *-dec-osf5*)
         if test -z "$GCC" ; then
             # Use the newer compiler `-msg_disable ptrmismatch1' to
             # get rid of the unsigned/signed char mismatch warnings.
             # Using this may hide other pointer mismatch warnings, but
 	    # it at least lets other warning classes through
             CFLAGS="-msg_disable ptrmismatch1 $CFLAGS"
         fi
         ;;
     m68k-atari-mint)
         ;;
     *-linux-android*)
         have_android_system=yes
         # Android is fully utf-8 and we do not want to use iconv to
         # keeps things simple
         require_iconv=no
         ;;
     *-apple-darwin*)
         AC_DEFINE(_DARWIN_C_SOURCE, 900000L,
                   Expose all libc features (__DARWIN_C_FULL).)
         ;;
     *-*-netbsd*)
         require_pipe_to_unblock_pselect=yes
         ;;
     *)
         ;;
 esac
 
 if test "$require_pipe_to_unblock_pselect" = yes; then
    AC_DEFINE(HAVE_PSELECT_NO_EINTR, 1,
              [Defined if we run on systems like NetBSD, where
               pselect cannot be unblocked by signal from a thread
               within the same process.  We use pipe in this case, instead.])
 fi
 
 if test "$have_dosish_system" = yes; then
    AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
              [Defined if we run on some of the PCDOS like systems
               (DOS, Windoze. OS/2) with special properties like
               no file modes, case insensitive file names and preferred
               use of backslashes as directory name separators.])
 fi
 AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)
 
 AM_CONDITIONAL(USE_SIMPLE_GETTEXT, test x"$use_simple_gettext" = xyes)
 
 if test "$have_w32_system" = yes; then
    AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
    if test "$have_w32ce_system" = yes; then
       AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE])
    fi
 fi
 AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
 AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
 
 if test "$have_android_system" = yes; then
    AC_DEFINE(HAVE_ANDROID_SYSTEM,1, [Defined if we build for an Android system])
 fi
 AM_CONDITIONAL(HAVE_ANDROID_SYSTEM, test "$have_android_system" = yes)
 
 
 # (These need to go after AC_PROG_CC so that $EXEEXT is defined)
 AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any])
 
 
 #
 # Checks for libraries.
 #
 AC_MSG_NOTICE([checking for libraries])
 
 
 #
 # libgpg-error is a library with error codes shared between GnuPG
 # related projects.
 #
 AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
                   have_gpg_error=yes,have_gpg_error=no)
 
 
 #
 # Libgcrypt is our generic crypto library
 #
 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION",
         have_libgcrypt=yes,have_libgcrypt=no)
 
 
 #
 # libassuan is used for IPC
 #
 AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
                   have_libassuan=yes,have_libassuan=no)
 if test "$have_libassuan" = "yes"; then
   AC_DEFINE_UNQUOTED(GNUPG_LIBASSUAN_VERSION, "$libassuan_version",
                      [version of the libassuan library])
   show_tor_support="only .onion"
 fi
 
 
 #
 # libksba is our X.509 support library
 #
 AM_PATH_KSBA("$NEED_KSBA_API:$NEED_KSBA_VERSION",have_ksba=yes,have_ksba=no)
 
 
 #
 # libusb allows us to use the integrated CCID smartcard reader driver.
 #
 # FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs.
 if test "$use_ccid_driver" = auto || test "$use_ccid_driver" = yes; then
    case "${host}" in
      *-mingw32*)
        LIBUSB_NAME=
        LIBUSB_LIBS=
        LIBUSB_CPPFLAGS=
        ;;
      *-*-darwin*)
        LIBUSB_NAME=usb-1.0
        LIBUSB_LIBS="-Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
        ;;
      *-*-freebsd*)
        # FreeBSD has a native 1.0 compatible library by -lusb.
        LIBUSB_NAME=usb
        LIBUSB_LIBS=
        ;;
      *)
        LIBUSB_NAME=usb-1.0
        LIBUSB_LIBS=
        ;;
    esac
 fi
 if test x"$LIBUSB_NAME" != x ; then
    AC_CHECK_LIB($LIBUSB_NAME, libusb_init,
                 [ LIBUSB_LIBS="-l$LIBUSB_NAME $LIBUSB_LIBS"
                   have_libusb=yes ])
    AC_MSG_CHECKING([libusb include dir])
    usb_incdir_found="no"
    for _incdir in "" "/usr/include/libusb-1.0" \
        "/usr/local/include/libusb-1.0" "/usr/pkg/include/libusb-1.0"; do
      _libusb_save_cppflags=$CPPFLAGS
      if test -n "${_incdir}"; then
        CPPFLAGS="-I${_incdir} ${CPPFLAGS}"
      fi
      AC_PREPROC_IFELSE([AC_LANG_SOURCE([[@%:@include <libusb.h>]])],
      [usb_incdir=${_incdir}; usb_incdir_found="yes"], [])
      CPPFLAGS=${_libusb_save_cppflags}
      if test "$usb_incdir_found" = "yes"; then
        break
      fi
    done
    if test "$usb_incdir_found" = "yes"; then
      AC_MSG_RESULT([${usb_incdir}])
    else
      AC_MSG_RESULT([not found])
      usb_incdir=""
      have_libusb=no
      if test "$use_ccid_driver" != yes; then
        use_ccid_driver=no
      fi
      LIBUSB_LIBS=""
    fi
 
    if test "$have_libusb" = yes; then
      AC_DEFINE(HAVE_LIBUSB,1, [defined if libusb is available])
    fi
    if test x"$usb_incdir" = x; then
      LIBUSB_CPPFLAGS=""
    else
      LIBUSB_CPPFLAGS="-I${usb_incdir}"
    fi
 fi
 AC_SUBST(LIBUSB_LIBS)
 AC_SUBST(LIBUSB_CPPFLAGS)
 
 #
 # Check whether it is necessary to link against libdl.
 # (For example to load libpcsclite)
 #
 gnupg_dlopen_save_libs="$LIBS"
 LIBS=""
 AC_SEARCH_LIBS(dlopen, c dl,,,)
 DL_LIBS=$LIBS
 AC_SUBST(DL_LIBS)
 LIBS="$gnupg_dlopen_save_libs"
 
 
 # Checks for g10
 
 AC_ARG_ENABLE(sqlite,
                 AC_HELP_STRING([--disable-sqlite],
                                [disable the use of SQLITE]),
               try_sqlite=$enableval, try_sqlite=yes)
 
 if test x"$use_tofu" = xyes ; then
   if test x"$try_sqlite" = xyes ; then
     PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $NEED_SQLITE_VERSION],
                                  [have_sqlite=yes],
                                  [have_sqlite=no])
   fi
   if test "$have_sqlite" = "yes"; then
     :
     AC_SUBST([SQLITE3_CFLAGS])
     AC_SUBST([SQLITE3_LIBS])
   else
     use_tofu=no
     tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
     AC_MSG_WARN([[
 ***
 *** Building without SQLite support - TOFU disabled
 ***
 *** $tmp]])
   fi
 fi
 
 AM_CONDITIONAL(SQLITE3, test "$have_sqlite" = "yes")
 
 if test x"$use_tofu" = xyes ; then
     AC_DEFINE(USE_TOFU, 1, [Enable to build the TOFU code])
 fi
 
 
 # Checks for g13
 
 AC_PATH_PROG(ENCFS, encfs, /usr/bin/encfs)
 AC_DEFINE_UNQUOTED(ENCFS,
 	"${ENCFS}", [defines the filename of the encfs program])
 
 AC_PATH_PROG(FUSERMOUNT, fusermount, /usr/bin/fusermount)
 AC_DEFINE_UNQUOTED(FUSERMOUNT,
 	"${FUSERMOUNT}", [defines the filename of the fusermount program])
 
 
 # Checks for dirmngr
 
 
 #
 # Checks for symcryptrun:
 #
 
 # libutil has openpty() and login_tty().
 AC_CHECK_LIB(util, openpty,
               [ LIBUTIL_LIBS="$LIBUTIL_LIBS -lutil"
                 AC_DEFINE(HAVE_LIBUTIL,1,
                          [defined if libutil is available])
              ])
 AC_SUBST(LIBUTIL_LIBS)
 
 # shred is used to clean temporary plain text files.
 AC_PATH_PROG(SHRED, shred, /usr/bin/shred)
 AC_DEFINE_UNQUOTED(SHRED,
 	"${SHRED}", [defines the filename of the shred program])
 
 
 #
 # Check whether the nPth library is available
 #
 AM_PATH_NPTH("$NEED_NPTH_API:$NEED_NPTH_VERSION",have_npth=yes,have_npth=no)
 if test "$have_npth" = "yes"; then
   AC_DEFINE(HAVE_NPTH, 1,
               [Defined if the New Portable Thread Library is available])
   AC_DEFINE(USE_NPTH, 1,
               [Defined if support for nPth is requested and nPth is available])
 else
   AC_MSG_WARN([[
 ***
 *** To support concurrent access for example in gpg-agent and the SCdaemon
 *** we need the support of the New Portable Threads Library.
 ***]])
 fi
 #
 # Enable debugging of nPth
 #
 AC_ARG_ENABLE(npth-debug,
    AC_HELP_STRING([--enable-npth-debug],
                   [build with debug version of npth]),
                   [if test $enableval = yes ; then
                      AC_DEFINE(NPTH_ENABLE_DEBUG,1,
                               [Build with debug version of nPth])
                   fi])
 
 
 
 #
 # NTBTLS is our TLS library.  If it is not available fallback to
 # GNUTLS.
 #
 AC_ARG_ENABLE(ntbtls,
               AC_HELP_STRING([--disable-ntbtls],
                              [disable the use of NTBTLS as TLS library]),
               try_ntbtls=$enableval, try_ntbtls=yes)
 if test x"$try_ntbtls" = xyes ; then
   AM_PATH_NTBTLS("$NEED_NTBTLS_API:$NEED_NTBTLS_VERSION",
                  [have_ntbtls=yes],[have_ntbtls=no])
 fi
 if test "$have_ntbtls" = yes ; then
    use_tls_library=ntbtls
    AC_DEFINE(HTTP_USE_NTBTLS, 1, [Enable NTBTLS support in http.c])
 else
   AC_ARG_ENABLE(gnutls,
                 AC_HELP_STRING([--disable-gnutls],
                                [disable GNUTLS as fallback TLS library]),
                 try_gnutls=$enableval, try_gnutls=yes)
   if test x"$try_gnutls" = xyes ; then
     PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $NEED_GNUTLS_VERSION],
                                    [have_gnutls=yes],
                                    [have_gnutls=no])
   fi
   if test "$have_gnutls" = "yes"; then
     AC_SUBST([LIBGNUTLS_CFLAGS])
     AC_SUBST([LIBGNUTLS_LIBS])
     use_tls_library=gnutls
     AC_DEFINE(HTTP_USE_GNUTLS, 1, [Enable GNUTLS support in http.c])
   else
     tmp=$(echo "$LIBGNUTLS_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
     AC_MSG_WARN([[
 ***
 *** Building without NTBTLS and GNUTLS - no TLS access to keyservers.
 ***
 *** $tmp]])
   fi
 fi
 
 #
 # Allow to set a fixed trust store file for system provided certificates.
 #
 AC_ARG_WITH([default-trust-store-file],
             [AC_HELP_STRING([--with-default-trust-store-file=FILE],
                             [Use FILE as system trust store])],
             default_trust_store_file="$withval",
             default_trust_store_file="")
 if test x"$default_trust_store_file" = xno;then
   default_trust_store_file=""
 fi
 if test x"$default_trust_store_file" != x ; then
   AC_DEFINE_UNQUOTED([DEFAULT_TRUST_STORE_FILE],
     ["$default_trust_store_file"], [Use as default system trust store file])
 fi
 
 
 AC_MSG_NOTICE([checking for networking options])
 
 #
 # Must check for network library requirements before doing link tests
 # for ldap, for example. If ldap libs are static (or dynamic and without
 # ELF runtime link paths), then link will fail and LDAP support won't
 # be detected.
 #
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname,
 	[NETLIBS="-lnsl $NETLIBS"]))
 AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
 	[NETLIBS="-lsocket $NETLIBS"]))
 
 
 #
 # Check standard resolver functions.
 #
 if test "$build_dirmngr" = "yes"; then
   _dns_save_libs=$LIBS
   LIBS=""
 
   # Find the system resolver which can always be enabled with
   # the dirmngr option --standard-resolver.
 
   # the double underscore thing is a glibc-ism?
   AC_SEARCH_LIBS(res_query,resolv bind,,
                  AC_SEARCH_LIBS(__res_query,resolv bind,,have_resolver=no))
   AC_SEARCH_LIBS(dn_expand,resolv bind,,
                  AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
 
   # macOS renames dn_skipname into res_9_dn_skipname in <resolv.h>,
   # and for some reason fools us into believing we don't need
   # -lresolv even if we do.  Since the test program checking for the
   # symbol does not include <resolv.h>, we need to check for the
   # renamed symbol explicitly.
   AC_SEARCH_LIBS(res_9_dn_skipname,resolv bind,,
       AC_SEARCH_LIBS(dn_skipname,resolv bind,,
           AC_SEARCH_LIBS(__dn_skipname,resolv bind,,have_resolver=no)))
 
   if test x"$have_resolver" != xno ; then
 
       # Make sure that the BIND 4 resolver interface is workable before
       # enabling any code that calls it.  At some point I'll rewrite the
       # code to use the BIND 8 resolver API.
       # We might also want to use libdns instead.
 
     AC_MSG_CHECKING([whether the resolver is usable])
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>]],
 [[unsigned char answer[PACKETSZ];
   res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
   dn_skipname(0,0);
   dn_expand(0,0,0,0,0);
 ]])],have_resolver=yes,have_resolver=no)
     AC_MSG_RESULT($have_resolver)
 
     # This is Apple-specific and somewhat bizarre as they changed the
     # define in bind 8 for some reason.
 
     if test x"$have_resolver" != xyes ; then
       AC_MSG_CHECKING(
            [whether I can make the resolver usable with BIND_8_COMPAT])
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define BIND_8_COMPAT
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>]],
 [[unsigned char answer[PACKETSZ];
   res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
   dn_skipname(0,0); dn_expand(0,0,0,0,0);
 ]])],[have_resolver=yes ; need_compat=yes])
       AC_MSG_RESULT($have_resolver)
     fi
   fi
 
   if test x"$have_resolver" = xyes ; then
     AC_DEFINE(HAVE_SYSTEM_RESOLVER,1,[The system's resolver is usable.])
     DNSLIBS="$DNSLIBS $LIBS"
     if test x"$need_compat" = xyes ; then
       AC_DEFINE(BIND_8_COMPAT,1,[an Apple OSXism])
     fi
     if test "$use_libdns" = yes; then
      show_tor_support=yes
     fi
   elif test "$use_libdns" = yes; then
     show_tor_support=yes
   else
     AC_MSG_WARN([[
 ***
 *** The system's DNS resolver is not usable.
 *** Dirmngr functionality is limited.
 ***]])
     show_tor_support="${show_tor_support} (no system resolver)"
   fi
 
   if test "$have_w32_system" = yes; then
     if test "$use_libdns" = yes; then
       DNSLIBS="$DNSLIBS -liphlpapi"
     fi
   fi
 
   LIBS=$_dns_save_libs
 fi
 
 AC_SUBST(DNSLIBS)
 
 
 #
 # Check for LDAP
 #
 # Note that running the check changes the variable
 # gnupg_have_ldap from "n/a" to "no" or "yes".
 
 AC_ARG_ENABLE(ldap,
     AC_HELP_STRING([--disable-ldap],[disable LDAP support]),
     [if test "$enableval" = "no"; then gnupg_have_ldap=no; fi])
 
 if test "$gnupg_have_ldap" != "no" ; then
   if test "$build_dirmngr" = "yes" ; then
      GNUPG_CHECK_LDAP($NETLIBS)
      AC_CHECK_LIB(lber, ber_free,
                   [ LBER_LIBS="$LBER_LIBS -llber"
                     AC_DEFINE(HAVE_LBER,1,
                              [defined if liblber is available])
                     have_lber=yes
                  ])
   fi
 fi
 AC_SUBST(LBER_LIBS)
 if test "$gnupg_have_ldap" = "no"; then
     AC_MSG_WARN([[
 ***
 *** Building without LDAP support.
 *** No CRL access or X.509 certificate search available.
 ***]])
 fi
 
 AM_CONDITIONAL(USE_LDAP, [test "$gnupg_have_ldap" = yes])
 if test "$gnupg_have_ldap" = yes ; then
   AC_DEFINE(USE_LDAP,1,[Defined if LDAP is support])
 else
  use_ldapwrapper=no
 fi
 
 if test "$use_ldapwrapper" = yes; then
    AC_DEFINE(USE_LDAPWRAPPER,1, [Build dirmngr with LDAP wrapper process])
 fi
 AM_CONDITIONAL(USE_LDAPWRAPPER, test "$use_ldapwrapper" = yes)
 
 
 
 
 #
 # Check for sendmail
 #
 # This isn't necessarily sendmail itself, but anything that gives a
 # sendmail-ish interface to the outside world.  That includes Exim,
 # Postfix, etc.  Basically, anything that can handle "sendmail -t".
 AC_ARG_WITH(mailprog,
       AC_HELP_STRING([--with-mailprog=NAME],
                      [use "NAME -t" for mail transport]),
              ,with_mailprog=yes)
 if test x"$with_mailprog" = xyes ; then
     AC_PATH_PROG(SENDMAIL,sendmail,,$PATH:/usr/sbin:/usr/libexec:/usr/lib)
 elif test x"$with_mailprog" != xno ; then
     AC_MSG_CHECKING([for a mail transport program])
     AC_SUBST(SENDMAIL,$with_mailprog)
     AC_MSG_RESULT($with_mailprog)
 fi
 AC_DEFINE_UNQUOTED(NAME_OF_SENDMAIL,"$SENDMAIL",
                    [Tool with sendmail -t interface])
 
 
 #
 # Construct a printable name of the OS
 #
 case "${host}" in
     *-mingw32ce*)
         PRINTABLE_OS_NAME="W32CE"
         ;;
     *-mingw32*)
         PRINTABLE_OS_NAME="MingW32"
         ;;
     *-*-cygwin*)
         PRINTABLE_OS_NAME="Cygwin"
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         PRINTABLE_OS_NAME="OS/2"
         ;;
     i?86-*-msdosdjgpp*)
         PRINTABLE_OS_NAME="MSDOS/DJGPP"
         try_dynload=no
         ;;
     *-linux*)
         PRINTABLE_OS_NAME="GNU/Linux"
         ;;
     *)
         PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
         ;;
 esac
 AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
                    [A human readable text with the name of the OS])
 
 
 #
 # Checking for iconv
 #
 if test "$require_iconv" = yes; then
   AM_ICONV
 else
   LIBICONV=
   LTLIBICONV=
   AC_SUBST(LIBICONV)
   AC_SUBST(LTLIBICONV)
 fi
 
 
 #
 # Check for gettext
 #
 # This is "GNU gnupg" - The project-id script from gettext
 #                       needs this string
 #
 AC_MSG_NOTICE([checking for gettext])
 AM_PO_SUBDIRS
 AM_GNU_GETTEXT_VERSION([0.17])
 if test "$try_gettext" = yes; then
   AM_GNU_GETTEXT([external],[need-ngettext])
 
   # gettext requires some extra checks.  These really should be part of
   # the basic AM_GNU_GETTEXT macro.  TODO: move other gettext-specific
   # function checks to here.
 
   AC_CHECK_FUNCS(strchr)
 else
   USE_NLS=no
   USE_INCLUDED_LIBINTL=no
   BUILD_INCLUDED_LIBINTL=no
   POSUB=po
   AC_SUBST(USE_NLS)
   AC_SUBST(USE_INCLUDED_LIBINTL)
   AC_SUBST(BUILD_INCLUDED_LIBINTL)
   AC_SUBST(POSUB)
 fi
 
 # We use HAVE_LANGINFO_CODESET in a couple of places.
 AM_LANGINFO_CODESET
 
 # Checks required for our use of locales
 gt_LC_MESSAGES
 
 
 #
 # SELinux support
 #
 if test "$selinux_support" = yes ; then
   AC_DEFINE(ENABLE_SELINUX_HACKS,1,[Define to enable SELinux support])
 fi
 
 
 #
 # Checks for header files.
 #
 AC_MSG_NOTICE([checking for header files])
 AC_HEADER_STDC
 AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h \
                   pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h     \
                   stdint.h signal.h util.h libutil.h termios.h \
                   ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h])
 
 AC_HEADER_TIME
 
 
 #
 # Checks for typedefs, structures, and compiler characteristics.
 #
 AC_MSG_NOTICE([checking for system characteristics])
 AC_C_CONST
 AC_C_INLINE
 AC_C_VOLATILE
 AC_TYPE_SIZE_T
 AC_TYPE_MODE_T
 AC_TYPE_SIGNAL
 AC_DECL_SYS_SIGLIST
 
 gl_HEADER_SYS_SOCKET
 gl_TYPE_SOCKLEN_T
 
 AC_SEARCH_LIBS([inet_addr], [nsl])
 
 AC_ARG_ENABLE(endian-check,
               AC_HELP_STRING([--disable-endian-check],
 	      [disable the endian check and trust the OS provided macros]),
 	      endiancheck=$enableval,endiancheck=yes)
 
 if test x"$endiancheck" = xyes ; then
   GNUPG_CHECK_ENDIAN
 fi
 
 # fixme: we should get rid of the byte type
 GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
 
 AC_CHECK_SIZEOF(unsigned short)
 AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_SIZEOF(unsigned long)
 AC_CHECK_SIZEOF(unsigned long long)
 AC_HEADER_TIME
 AC_CHECK_SIZEOF(time_t,,[[
 #include <stdio.h>
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
 #else
 # if HAVE_SYS_TIME_H
 #  include <sys/time.h>
 # else
 #  include <time.h>
 # endif
 #endif
 ]])
 GNUPG_TIME_T_UNSIGNED
 
 
 if test "$ac_cv_sizeof_unsigned_short" = "0" \
    || test "$ac_cv_sizeof_unsigned_int" = "0" \
    || test "$ac_cv_sizeof_unsigned_long" = "0"; then
     AC_MSG_WARN([Hmmm, something is wrong with the sizes - using defaults]);
 fi
 
 
 #
 # Checks for library functions.
 #
 AC_MSG_NOTICE([checking for library functions])
 AC_CHECK_DECLS(getpagesize)
 AC_FUNC_FSEEKO
 AC_FUNC_VPRINTF
 AC_FUNC_FORK
 AC_CHECK_FUNCS([atexit canonicalize_file_name clock_gettime ctermid  \
                 fcntl flockfile fsync ftello ftruncate funlockfile   \
                 getaddrinfo getenv getpagesize getpwnam getpwuid     \
                 getrlimit getrusage gettimeofday gmtime_r            \
                 inet_ntop inet_pton isascii lstat                    \
                 memicmp memmove memrchr mmap nl_langinfo pipe        \
                 raise rand setenv setlocale setrlimit sigaction      \
                 sigprocmask stat stpcpy strcasecmp strerror strftime \
                 stricmp strlwr strncasecmp strpbrk strsep            \
                 strtol strtoul strtoull tcgetattr timegm times       \
                 ttyname unsetenv wait4 waitpid ])
 
 # On some systems (e.g. Solaris) nanosleep requires linking to librl.
 # Given that we use nanosleep only as an optimization over a select
 # based wait function we want it only if it is available in libc.
 _save_libs="$LIBS"
 AC_SEARCH_LIBS([nanosleep], [],
                [AC_DEFINE(HAVE_NANOSLEEP,1,
                 [Define to 1 if you have the `nanosleep' function in libc.])])
 LIBS="$_save_libs"
 
 
 # See whether libc supports the Linux inotify interface
 case "${host}" in
     *-*-linux*)
         AC_CHECK_FUNCS([inotify_init])
         ;;
 esac
 
 
 if test "$have_android_system" = yes; then
    # On Android ttyname is a stub but prints an error message.
    AC_DEFINE(HAVE_BROKEN_TTYNAME,1,
              [Defined if ttyname does not work properly])
 fi
 
 AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>])
 
 # Dirmngr requires mmap on Unix systems.
 if test $ac_cv_func_mmap != yes -a $mmap_needed = yes; then
   AC_MSG_ERROR([[Sorry, the current implementation requires mmap.]])
 fi
 
 
 #
 # Check for the getsockopt SO_PEERCRED, etc.
 #
 AC_CHECK_MEMBERS([struct ucred.pid, struct ucred.cr_pid, struct sockpeercred.pid], [], [], [#include <sys/types.h>
 #include <sys/socket.h> ])
 
 # (Open)Solaris
 AC_CHECK_FUNCS([getpeerucred])
 
 
 #
 # W32 specific test
 #
 GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
 
 #
 # Sanity check regex.  Tests adapted from mutt.
 #
 AC_MSG_CHECKING([whether regular expression support is requested])
 AC_ARG_ENABLE(regex,
   AC_HELP_STRING([--disable-regex],
     [do not handle regular expressions in trust signatures]),
   use_regex=$enableval, use_regex=yes)
 AC_MSG_RESULT($use_regex)
 
 if test "$use_regex" = yes ; then
   _cppflags="${CPPFLAGS}"
   _ldflags="${LDFLAGS}"
   AC_ARG_WITH(regex,
      AC_HELP_STRING([--with-regex=DIR],[look for regex in DIR]),
       [
       if test -d "$withval" ; then
         CPPFLAGS="${CPPFLAGS} -I$withval/include"
         LDFLAGS="${LDFLAGS} -L$withval/lib"
       fi
       ],withval="")
 
   # Does the system have regex functions at all?
   AC_SEARCH_LIBS([regcomp], [regex])
   AC_CHECK_FUNC(regcomp, gnupg_cv_have_regex=yes, gnupg_cv_have_regex=no)
 
   if test $gnupg_cv_have_regex = no; then
     use_regex=no
   else
     if test x"$cross_compiling" = xyes; then
-      AC_MSG_WARN([cross compiling; assuming regexp libray is not broken])
+      AC_MSG_WARN([cross compiling; assuming regexp library is not broken])
     else
       AC_CACHE_CHECK([whether your system's regexp library is broken],
        [gnupg_cv_regex_broken],
        AC_TRY_RUN([
 #include <unistd.h>
 #include <regex.h>
 main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
        gnupg_cv_regex_broken=no, gnupg_cv_regex_broken=yes, gnupg_cv_regex_broken=yes))
 
       if test $gnupg_cv_regex_broken = yes; then
         AC_MSG_WARN([your regex is broken - disabling regex use])
         use_regex=no
       fi
     fi
   fi
   CPPFLAGS="${_cppflags}"
   LDFLAGS="${_ldflags}"
 fi
 
 if test "$use_regex" != yes ; then
   AC_DEFINE(DISABLE_REGEX,1, [Define to disable regular expression support])
 fi
 AM_CONDITIONAL(DISABLE_REGEX, test x"$use_regex" != xyes)
 
 
 
 #
 # Do we have zlib? Must do it here because Solaris failed
 # when compiling a conftest (due to the "-lz" from LIBS).
 # Note that we combine zlib and bzlib2 in ZLIBS.
 #
 if test "$use_zip" = yes ; then
   _cppflags="${CPPFLAGS}"
   _ldflags="${LDFLAGS}"
   AC_ARG_WITH(zlib,
     [  --with-zlib=DIR         use libz in DIR],[
       if test -d "$withval"; then
         CPPFLAGS="${CPPFLAGS} -I$withval/include"
         LDFLAGS="${LDFLAGS} -L$withval/lib"
       fi
     ])
 
   AC_CHECK_HEADER(zlib.h,
      AC_CHECK_LIB(z, deflateInit2_,
        [
        ZLIBS="-lz"
        AC_DEFINE(HAVE_ZIP,1, [Defined if ZIP and ZLIB are supported])
        ],
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
 fi
 
 
 #
 # Check whether we can support bzip2
 #
 if test "$use_bzip2" = yes ; then
   _cppflags="${CPPFLAGS}"
   _ldflags="${LDFLAGS}"
   AC_ARG_WITH(bzip2,
      AC_HELP_STRING([--with-bzip2=DIR],[look for bzip2 in DIR]),
       [
       if test -d "$withval" ; then
         CPPFLAGS="${CPPFLAGS} -I$withval/include"
         LDFLAGS="${LDFLAGS} -L$withval/lib"
       fi
       ],withval="")
 
   # Checking alongside stdio.h as an early version of bzip2 (1.0)
   # required stdio.h to be included before bzlib.h, and Solaris 9 is
   # woefully out of date.
   if test "$withval" != no ; then
      AC_CHECK_HEADER(bzlib.h,
         AC_CHECK_LIB(bz2,BZ2_bzCompressInit,
   	  [
 	  have_bz2=yes
 	  ZLIBS="$ZLIBS -lbz2"
 	  AC_DEFINE(HAVE_BZIP2,1,
 		  [Defined if the bz2 compression library is available])
 	  ],
 	  CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
 	  CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags},[#include <stdio.h>])
   fi
 fi
 AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
 AC_SUBST(ZLIBS)
 
 
 # Check for readline support
 GNUPG_CHECK_READLINE
 
 
 if test "$development_version" = yes; then
     AC_DEFINE(IS_DEVELOPMENT_VERSION,1,
             [Defined if this is not a regular release])
 fi
 
 if test "$USE_MAINTAINER_MODE" = "yes"; then
     AC_DEFINE(MAINTAINER_MODE,1,
             [Defined if this build is in maintainer mode])
 fi
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
 GNUPG_CHECK_GNUMAKE
 
 # Add some extra libs here so that previous tests don't fail for
 # mysterious reasons - the final link step should bail out.
 # W32SOCKLIBS is also defined so that if can be used for tools not
 # requiring any network stuff but linking to code in libcommon which
 # tracks in winsock stuff (e.g. init_common_subsystems).
 if test "$have_w32_system" = yes; then
    if test "$have_w32ce_system" = yes; then
      W32SOCKLIBS="-lws2"
    else
      W32SOCKLIBS="-lws2_32"
    fi
    NETLIBS="${NETLIBS} ${W32SOCKLIBS}"
 fi
 
 AC_SUBST(NETLIBS)
 AC_SUBST(W32SOCKLIBS)
 
 #
 # Setup gcc specific options
 #
 USE_C99_CFLAGS=
 AC_MSG_NOTICE([checking for cc features])
 if test "$GCC" = yes; then
     mycflags=
     mycflags_save=$CFLAGS
 
     # Check whether gcc does not emit a diagnositc for unknown -Wno-*
     # options.  This is the case for gcc >= 4.6
     AC_MSG_CHECKING([if gcc ignores unknown -Wno-* options])
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6 )
 #kickerror
 #endif]],[])],[_gcc_silent_wno=yes],[_gcc_silent_wno=no])
     AC_MSG_RESULT($_gcc_silent_wno)
 
     # Note that it is okay to use CFLAGS here because these are just
     # warning options and the user should have a chance of overriding
     # them.
     if test "$USE_MAINTAINER_MODE" = "yes"; then
         mycflags="$mycflags -O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
         mycflags="$mycflags -Wformat -Wno-format-y2k -Wformat-security"
         if test x"$_gcc_silent_wno" = xyes ; then
           _gcc_wopt=yes
         else
           AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
           CFLAGS="-Wno-missing-field-initializers"
           AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
                             [_gcc_wopt=yes],[_gcc_wopt=no])
           AC_MSG_RESULT($_gcc_wopt)
         fi
         if test x"$_gcc_wopt" = xyes ; then
           mycflags="$mycflags -W -Wno-sign-compare -Wno-format-zero-length"
           mycflags="$mycflags -Wno-missing-field-initializers"
         fi
 
         AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
         CFLAGS="-Wdeclaration-after-statement"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
         AC_MSG_RESULT($_gcc_wopt)
         if test x"$_gcc_wopt" = xyes ; then
           mycflags="$mycflags -Wdeclaration-after-statement"
         fi
 
         AC_MSG_CHECKING([if gcc supports -Wlogical-op])
         CFLAGS="-Wlogical-op -Werror"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
         AC_MSG_RESULT($_gcc_wopt)
         if test x"$_gcc_wopt" = xyes ; then
           mycflags="$mycflags -Wlogical-op"
         fi
 
         AC_MSG_CHECKING([if gcc supports -Wvla])
         CFLAGS="-Wvla"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
         AC_MSG_RESULT($_gcc_wopt)
         if test x"$_gcc_wopt" = xyes ; then
           mycflags="$mycflags -Wvla"
         fi
 
     else
         mycflags="$mycflags -Wall"
     fi
 
     if test x"$_gcc_silent_wno" = xyes ; then
       _gcc_psign=yes
     else
       AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
       CFLAGS="-Wno-pointer-sign"
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
                         [_gcc_psign=yes],[_gcc_psign=no])
       AC_MSG_RESULT($_gcc_psign)
     fi
     if test x"$_gcc_psign" = xyes ; then
        mycflags="$mycflags -Wno-pointer-sign"
     fi
 
     AC_MSG_CHECKING([if gcc supports -Wpointer-arith])
     CFLAGS="-Wpointer-arith"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
     AC_MSG_RESULT($_gcc_psign)
     if test x"$_gcc_psign" = xyes ; then
        mycflags="$mycflags -Wpointer-arith"
     fi
 
     CFLAGS="$mycflags $mycflags_save"
     if test "$use_libdns" = yes; then
        # dirmngr/dns.{c,h} require C99 and GNU extensions.  */
        USE_C99_CFLAGS="-std=gnu99"
     fi
 fi
 
 AC_SUBST(USE_C99_CFLAGS)
 
 
 #
 # This is handy for debugging so the compiler doesn't rearrange
 # things and eliminate variables.
 #
 AC_ARG_ENABLE(optimization,
    AC_HELP_STRING([--disable-optimization],
                   [disable compiler optimization]),
                   [if test $enableval = no ; then
                       CFLAGS=`echo $CFLAGS | sed s/-O[[1-9]]\ /-O0\ /g`
                    fi])
 
 #
 # log_debug has certain requirements which might hamper portability.
 # Thus we use an option to enable it.
 #
 AC_MSG_CHECKING([whether to enable log_clock])
 AC_ARG_ENABLE(log_clock,
               AC_HELP_STRING([--enable-log-clock],
                              [enable log_clock timestamps]),
               enable_log_clock=$enableval, enable_log_clock=no)
 AC_MSG_RESULT($enable_log_clock)
 if test "$enable_log_clock" = yes ; then
   AC_DEFINE(ENABLE_LOG_CLOCK,1,[Defined to use log_clock timestamps])
 fi
 
 # Add -Werror to CFLAGS.  This hack can be used to avoid problems with
 # misbehaving autoconf tests in case the user supplied -Werror.
 #
 AC_ARG_ENABLE(werror,
    AC_HELP_STRING([--enable-werror],
                   [append -Werror to CFLAGS]),
                   [if test $enableval = yes ; then
                       CFLAGS="$CFLAGS -Werror"
                    fi])
 
 #
 # Configure option --enable-all-tests
 #
 AC_MSG_CHECKING([whether "make check" shall run all tests])
 AC_ARG_ENABLE(all-tests,
               AC_HELP_STRING([--enable-all-tests],
                              [let "make check" run all tests]),
               run_all_tests=$enableval, run_all_tests=no)
 AC_MSG_RESULT($run_all_tests)
 if test "$run_all_tests" = "yes"; then
     AC_DEFINE(RUN_ALL_TESTS,1,
             [Defined if "make check" shall run all tests])
 fi
 
 #
 # We do not want support for the GNUPG_BUILDDIR environment variable
 # in a released version.  However, our regression tests suite requires
 # this and thus we build with support for it during "make distcheck".
 # This configure option implements this along with the top Makefile's
 # AM_DISTCHECK_CONFIGURE_FLAGS.
 #
 gnupg_builddir_envvar=no
 AC_ARG_ENABLE(gnupg-builddir-envvar,,
               gnupg_builddir_envvar=$enableval)
 if test x"$gnupg_builddir_envvar" = x"yes"; then
    AC_DEFINE(ENABLE_GNUPG_BUILDDIR_ENVVAR, 1,
       [This is only used with "make distcheck"])
 fi
 
 
 #
 # To avoid problems with systemd cleaning up the /run/user directory,
 # this option will make GnuPG try to use /run/gnupg/user as socket dir
 # before /run/user
 #
 AC_ARG_ENABLE(run-gnupg-user-socket,
     AC_HELP_STRING([--enable-run-gnupg-user-socket],
                    [try /run/gnupg/user for sockets prior to /run/user]),
     use_run_gnupg_user_socket=$enableval)
 if test x"$use_run_gnupg_user_socket" = x"yes"; then
    AC_DEFINE(USE_RUN_GNUPG_USER_SOCKET, 1,
             [If defined try /run/gnupg/user before /run/user])
 fi
 
 
 #
 # Decide what to build
 #
 
 build_scdaemon_extra=""
 if test "$build_scdaemon" = "yes"; then
   if test $have_libusb = no; then
      build_scdaemon_extra="without internal CCID driver"
   fi
   if test -n "$build_scdaemon_extra"; then
      build_scdaemon_extra="(${build_scdaemon_extra})"
   fi
 fi
 
 
 #
 # Set variables for use by automake makefiles.
 #
 AM_CONDITIONAL(BUILD_GPG,         test "$build_gpg" = "yes")
 AM_CONDITIONAL(BUILD_GPGSM,       test "$build_gpgsm" = "yes")
 AM_CONDITIONAL(BUILD_AGENT,       test "$build_agent" = "yes")
 AM_CONDITIONAL(BUILD_SCDAEMON,    test "$build_scdaemon" = "yes")
 AM_CONDITIONAL(BUILD_G13,         test "$build_g13" = "yes")
 AM_CONDITIONAL(BUILD_DIRMNGR,     test "$build_dirmngr" = "yes")
 AM_CONDITIONAL(BUILD_DOC,         test "$build_doc" = "yes")
 AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
 AM_CONDITIONAL(BUILD_GPGTAR,      test "$build_gpgtar" = "yes")
 AM_CONDITIONAL(BUILD_WKS_TOOLS,   test "$build_wks_tools" = "yes")
 
 AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)
 AM_CONDITIONAL(NO_TRUST_MODELS,     test "$use_trust_models" = no)
 AM_CONDITIONAL(USE_TOFU,            test "$use_tofu" = yes)
 
 #
 # Set some defines for use gpgconf.
 #
 if test "$build_gpg" = yes ; then
     AC_DEFINE(BUILD_WITH_GPG,1,[Defined if GPG is to be build])
 fi
 if test "$build_gpgsm" = yes ; then
     AC_DEFINE(BUILD_WITH_GPGSM,1,[Defined if GPGSM is to be build])
 fi
 if test "$build_agent" = yes ; then
     AC_DEFINE(BUILD_WITH_AGENT,1,[Defined if GPG-AGENT is to be build])
 fi
 if test "$build_scdaemon" = yes ; then
     AC_DEFINE(BUILD_WITH_SCDAEMON,1,[Defined if SCDAEMON is to be build])
 fi
 if test "$build_dirmngr" = yes ; then
     AC_DEFINE(BUILD_WITH_DIRMNGR,1,[Defined if DIRMNGR is to be build])
 fi
 if test "$build_g13" = yes ; then
     AC_DEFINE(BUILD_WITH_G13,1,[Defined if G13 is to be build])
 fi
 
 
 #
 # Define Name strings
 #
 AC_DEFINE_UNQUOTED(GNUPG_NAME, "GnuPG", [The name of the project])
 
 AC_DEFINE_UNQUOTED(GPG_NAME, "gpg", [The name of the OpenPGP tool])
 AC_DEFINE_UNQUOTED(GPG_DISP_NAME, "GnuPG", [The displayed name of gpg])
 
 AC_DEFINE_UNQUOTED(GPGSM_NAME, "gpgsm", [The name of the S/MIME tool])
 AC_DEFINE_UNQUOTED(GPGSM_DISP_NAME, "GPGSM", [The displayed name of gpgsm])
 
 AC_DEFINE_UNQUOTED(GPG_AGENT_NAME, "gpg-agent", [The name of the agent])
 AC_DEFINE_UNQUOTED(GPG_AGENT_DISP_NAME, "GPG Agent",
                                         [The displayed name of gpg-agent])
 
 AC_DEFINE_UNQUOTED(SCDAEMON_NAME, "scdaemon", [The name of the scdaemon])
 AC_DEFINE_UNQUOTED(SCDAEMON_DISP_NAME, "SCDaemon",
                                        [The displayed name of scdaemon])
 
 AC_DEFINE_UNQUOTED(DIRMNGR_NAME, "dirmngr", [The name of the dirmngr])
 AC_DEFINE_UNQUOTED(DIRMNGR_DISP_NAME, "DirMngr",
                                       [The displayed name of dirmngr])
 
 AC_DEFINE_UNQUOTED(G13_NAME, "g13", [The name of the g13 tool])
 AC_DEFINE_UNQUOTED(G13_DISP_NAME, "G13", [The displayed name of g13])
 
 AC_DEFINE_UNQUOTED(GPGCONF_NAME, "gpgconf", [The name of the gpgconf tool])
 AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
                                       [The displayed name of gpgconf])
 
 AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
 
 AC_DEFINE_UNQUOTED(GPG_AGENT_SOCK_NAME, "S.gpg-agent",
                    [The name of the agent socket])
 AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra",
                    [The name of the agent socket for remote access])
 AC_DEFINE_UNQUOTED(GPG_AGENT_BROWSER_SOCK_NAME, "S.gpg-agent.browser",
                    [The name of the agent socket for browsers])
 AC_DEFINE_UNQUOTED(GPG_AGENT_SSH_SOCK_NAME, "S.gpg-agent.ssh",
                    [The name of the agent socket for ssh])
 AC_DEFINE_UNQUOTED(DIRMNGR_INFO_NAME, "DIRMNGR_INFO",
                    [The name of the dirmngr info envvar])
 AC_DEFINE_UNQUOTED(SCDAEMON_SOCK_NAME, "S.scdaemon",
                    [The name of the SCdaemon socket])
 AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr",
                    [The name of the dirmngr socket])
 AC_DEFINE_UNQUOTED(DIRMNGR_DEFAULT_KEYSERVER,
                    "hkps://hkps.pool.sks-keyservers.net",
       [The default keyserver for dirmngr to use, if none is explicitly given])
 
 AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix])
 
 if test "$have_w32_system" = yes; then
   AC_DEFINE_UNQUOTED(GNUPG_REGISTRY_DIR, "Software\\\\GNU\\\\GnuPG",
                      [The directory part of the W32 registry keys])
 fi
 
 
 #
 # Provide information about the build.
 #
 BUILD_REVISION="mym4_revision"
 AC_SUBST(BUILD_REVISION)
 AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
                    [GIT commit id revision used to build this package])
 
 changequote(,)dnl
 BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
 changequote([,])dnl
 BUILD_VERSION="${BUILD_VERSION}mym4_revision_dec"
 BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
 AC_SUBST(BUILD_VERSION)
 AC_SUBST(BUILD_FILEVERSION)
 
 AC_ARG_ENABLE([build-timestamp],
   AC_HELP_STRING([--enable-build-timestamp],
                  [set an explicit build timestamp for reproducibility.
                   (default is the current time in ISO-8601 format)]),
      [if test "$enableval" = "yes"; then
         BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
       else
         BUILD_TIMESTAMP="$enableval"
       fi
       BUILD_HOSTNAME="$ac_hostname"],
      [BUILD_TIMESTAMP="<none>"
       BUILD_HOSTNAME="<anon>"])
 AC_SUBST(BUILD_TIMESTAMP)
 AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
                    [The time this package was configured for a build])
 AC_SUBST(BUILD_HOSTNAME)
 
 
 #
 # Print errors here so that they are visible all
 # together and the user can acquire them all together.
 #
 die=no
 if test "$have_gpg_error" = "no"; then
    die=yes
    AC_MSG_NOTICE([[
 ***
 *** You need libgpg-error to build this program.
 **  This library is for example available at
 ***   https://gnupg.org/ftp/gcrypt/libgpg-error
 *** (at least version $NEED_GPG_ERROR_VERSION is required.)
 ***]])
 fi
 if test "$have_libgcrypt" = "no"; then
    die=yes
    AC_MSG_NOTICE([[
 ***
 *** You need libgcrypt to build this program.
 **  This library is for example available at
 ***   https://gnupg.org/ftp/gcrypt/libgcrypt/
 *** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) is required.)
 ***]])
 fi
 if test "$have_libassuan" = "no"; then
    die=yes
    AC_MSG_NOTICE([[
 ***
 *** You need libassuan to build this program.
 *** This library is for example available at
 ***   https://gnupg.org/ftp/gcrypt/libassuan/
 *** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required).
 ***]])
 fi
 if test "$have_ksba" = "no"; then
     die=yes
     AC_MSG_NOTICE([[
 ***
 *** You need libksba to build this program.
 *** This library is for example available at
 ***   https://gnupg.org/ftp/gcrypt/libksba/
 *** (at least version $NEED_KSBA_VERSION using API $NEED_KSBA_API is required).
 ***]])
 fi
 if test "$gnupg_have_ldap" = yes; then
   if test "$have_w32ce_system" = yes; then
     AC_MSG_NOTICE([[
 *** Note that CeGCC might be broken, a package fixing this is:
 ***    http://files.kolab.org/local/windows-ce/
 ***                           source/wldap32_0.1-mingw32ce.orig.tar.gz
 ***                           binary/wldap32-ce-arm-dev_0.1-1_all.deb
 ***]])
    fi
 fi
 if test "$have_npth" = "no"; then
     die=yes
     AC_MSG_NOTICE([[
 ***
 *** It is now required to build with support for the
 *** New Portable Threads Library (nPth). Please install this
 *** library first.  The library is for example available at
 ***   https://gnupg.org/ftp/gcrypt/npth/
 *** (at least version $NEED_NPTH_VERSION (API $NEED_NPTH_API) is required).
 ***]])
 fi
 
 if test "$require_iconv" = yes; then
   if test "$am_func_iconv" != yes; then
     die=yes
     AC_MSG_NOTICE([[
 ***
 *** The system does not provide a working iconv function.  Please
 *** install a suitable library; for example GNU Libiconv which is
 *** available at:
 ***   https://ftp.gnu.org/gnu/libiconv/
 ***]])
   fi
 fi
 
 if test "$use_ccid_driver" = yes; then
   if test "$have_libusb" != yes; then
     die=yes
     AC_MSG_NOTICE([[
 ***
 *** You need libusb to build the internal ccid driver.  Please
 *** install a libusb suitable for your system.
 ***]])
   fi
 fi
 
 if test "$die" = "yes"; then
     AC_MSG_ERROR([[
 ***
 *** Required libraries not found. Please consult the above messages
 *** and install them before running configure again.
 ***]])
 fi
 
 
 
 AC_CONFIG_FILES([ m4/Makefile
 Makefile
 po/Makefile.in
 common/Makefile
 common/w32info-rc.h
 kbx/Makefile
 g10/Makefile
 sm/Makefile
 agent/Makefile
 scd/Makefile
 g13/Makefile
 dirmngr/Makefile
 tools/gpg-zip
 tools/Makefile
 doc/Makefile
 tests/Makefile
 tests/gpgscm/Makefile
 tests/openpgp/Makefile
 tests/migrations/Makefile
 tests/gpgsm/Makefile
 tests/gpgme/Makefile
 tests/pkits/Makefile
 g10/gpg.w32-manifest
 ])
 
 
 AC_OUTPUT
 
 
 echo "
         GnuPG v${VERSION} has been configured as follows:
 
         Revision:  mym4_revision  (mym4_revision_dec)
         Platform:  $PRINTABLE_OS_NAME ($host)
 
         OpenPGP:   $build_gpg
         S/MIME:    $build_gpgsm
         Agent:     $build_agent
         Smartcard: $build_scdaemon $build_scdaemon_extra
         G13:       $build_g13
         Dirmngr:   $build_dirmngr
         Gpgtar:    $build_gpgtar
         WKS tools: $build_wks_tools
 
         Protect tool:      $show_gnupg_protect_tool_pgm
         LDAP wrapper:      $show_gnupg_dirmngr_ldap_pgm
         Default agent:     $show_gnupg_agent_pgm
         Default pinentry:  $show_gnupg_pinentry_pgm
         Default scdaemon:  $show_gnupg_scdaemon_pgm
         Default dirmngr:   $show_gnupg_dirmngr_pgm
 
         Dirmngr auto start:  $dirmngr_auto_start
         Readline support:    $gnupg_cv_have_readline
         LDAP support:        $gnupg_have_ldap
         TLS support:         $use_tls_library
         TOFU support:        $use_tofu
         Tor support:         $show_tor_support
 "
 if test x"$use_regex" != xyes ; then
 echo "
         Warning: No regular expression support available.
                  OpenPGP trust signatures won't work.
                  gpg-check-pattern will not be built.
 "
 fi
 if test "x${gpg_config_script_warn}" != x; then
 cat <<G10EOF
         Warning: Mismatches between the target platform and the
                  to be used libraries have been detected for:
                   ${gpg_config_script_warn}
                  Please check above for more warning messages.
 
 G10EOF
 fi
diff --git a/doc/Notes b/doc/Notes
index 19241b7b7..33ef29278 100644
--- a/doc/Notes
+++ b/doc/Notes
@@ -1,245 +1,245 @@
 
-Add an infor page for watchgnupg.
+Add an info page for watchgnupg.
 
 > * How to mark a CA certificate as trusted.
 
 There are two ways: 
 
   1. Let gpg-agent do this for you.  Since version 1.9.9 you need to
      add the option --allow-mark-trusted  gpg-agent.conf or when
      invoking gpg-agent.  Every time gpgsm notices an untrusted root
      certificate gpg-agent will pop up a dialog to ask whether this
      certificate should be trusted.  This is similar to whatmost
      browsers do.
 
      The disadvantage of this method and the reason why
      --allow-mark-trusted is required is that the list of trusted root
      certificates will grow, because almost all user will just hit
      "yes, I trust" and "yes, I verified the fingerprint" without
      understanding that this is a very serious decision.
 
   2. Use your editor.  Edit the file ~/.gnupg/trustlist.txt and add
      the fingerprints of the trusted root certificates. There are
      comments on the top explaining the simple format.  The current
      CVS version allows for colons in the fingerprint, so you can
      easily cut and paste it from wherever you know that this is the
      correct fingerprint.
 
 An example for an entry in the trustlist.txt is:
 
   # CN=PCA-1-Verwaltung,O=PKI-1-Verwaltung,C=de
   3EEE3D8BB7F0FE5C9F5804A3A7E51BCE98209DF9 S
 
 This is in fact one that probably made its way into the file using the
 first method.  As usual a # indicates a comment.  The trailing S means
 that this is to be used for (X.509).
 
 It is not possible to trust intermediate CA certificates; gpgsm always
 checks the entire chain of certificates.
 
 > * How to import a key and bind it to some certificate already
 >   imported.  Alternatively, import key and certificate together, from
 >   a pkcs12 blob, or pkcs8 + certificate blobs, or whatever.
 >   Alternatively, don't import the key at all, but specify location of
 >   key using a parameter when signing.
 
 You always need to import the key; there is something similar to a
 keyring (here called a keybox: ~/.gnupg/pubring.kbx).
 
 Importing a key either from a binary or ascii armored (PEM) certificate
 file or from a cert-only signature file is done using
 
   gpg --import FILE
 
 or
 
   gpg --import < FILE
 
 In general you should first import the root certificates and then down
 to the end user certificate.  You may put all into one file and gpgsm
-will do the right thing in this case independend of the order.  
+will do the right thing in this case independent of the order.
 
 While verifying a signature, all included certificates are
 automagically imported.
 
 To import from a pkcs#12 file you may use the same command; if a
 private key is contained in that file, you will be asked for the
 transport passphrases as well as for the new passphrase used to
 protect it in gpg-agent's private key storage
 (~/.gnupg/private-keys-v1.d/). Note that the pkcs#12 support is very
 basic but sufficient for certificates exported from Mozilla, OpenSSL
 and MS Outlook.
 
 Background info on private keys:
 
 If you want to look at the private key you first need to know the name
 of the keyfile.  Run the command "gpgsm -K --with-key-data [KEYID]" and
 you get an output like:
 
   crs::1024:1:CF8[..]6D:20040105T184908:2006[...]:09::CN=ZS[....]::esES:
   fpr:::::::::3B50BF2BDAF2[...]1AE6796D:::2812[...]508F21F065E65E44:
   grp:::::::::C92DB9CFD588ADE846BE3AC4E7A2E1B11A4A2ADB:
   uid:::::::::CN=Werner Koch,OU=test,O=g10 Code,C=de::
   uid:::::::::<wk@g10code.de>::
 
-This should be familar to advanced gpg-users; see doc/DETAILS in gpg
+This should be familiar to advanced gpg-users; see doc/DETAILS in gpg
 1.3 (CVS HEAD) for a description of the records.  The value in the
 "grp" tagged record is the so called keygrip and you should find a
 file ~/.gnupg/private-keys-v1.d/C92DB9CFD588ADE846BE3AC4E7A2E1B11A4A2ADB.key
 with the private and public key in an S-expression like format.  The
 gpg-protect-tool may be used to display it in a human readable format:
 
   $ gpgsm --call-protect-tool ~/.gnupg/private-keys-v1.d/C9[...]B.key 
   (protected-private-key 
    (rsa 
     (n #00C16B6E807C47BB[...]10487#)
     (e #010001#)
     (protected openpgp-s2k3-sha1-aes-cbc 
      (
       (sha1 "Hvü9Qt^Ç" "96")
       #2B17DC766AEA2568EE0C688E18F9757E#)
      #65A4FF9F30750A1300[...]7#)
     )
    )
   
 The current CVS version of gpgsm has a command --dump-keys which lists
 more details of a key including the keygrip so you don't need to use
 the colon format if you want to manually debug things.
 
   $ gpgsm --dump-keys
   Serial number: 01
          Issuer: CN=Trust Anchor,O=Test Certificates,C=US
         Subject: CN=Trust Anchor,O=Test Certificates,C=US
        sha1_fpr: 66:8A:47:56:A2:DC:88:FF:DA:B8:95:E1:3C:63:37:55:5F:0A:F7:BF
         md5_fpr: 03:01:3B:BB:EC:6C:5D:48:88:4C:95:63:99:84:ED:C0
         keygrip: 6A082B3063F6DA6D68B2994AB11B4328FD6206D2
       notBefore: 2001-04-19 14:57:20
        notAfter: 2011-04-19 14:57:20
        hashAlgo: 1.2.840.113549.1.1.5 (sha1WithRSAEncryption)
         keyType: 1024 bit RSA
       authKeyId: [none]
        keyUsage: certSign crlSign
     extKeyUsage: [none]
        policies: [none]
     chainLength: unlimited
           crlDP: [none]
        authInfo: [none]
        subjInfo: [none]
            extn: 2.5.29.14 (subjectKeyIdentifier)  [22 octets]
   
 > * How to import a CRL
 
 CRLs are managed by the dirmngr which is a separate package.  The idea
 is to eventaully turn it into a system daemon, so that on a multi-user
 machine CRLs are handled more efficiently.  As of now the dirmngr
 needs service from gpgsm thus it is best to call it through gpgsm:
 
   gpgsm --call-dirmngr LOAD /absolute/filename/to/a/CRL/file
 
 See the dirmngr README and manual for further details.
 
 If you don't want to check CRLs, use the option --diable-crl-checks
 with gpgsm.
 
 > I'm trying to replace the S/MIME support in OpenSSL with gpgsm for the
 > MUA Gnus.
 
 Great; I'd love it.
 
 > Perhaps I shouldn't be using gpgsm directly?  gpgme didn't seem to
 > have a command line front end.
 
 For Gnus it makes sense to use gpgsm directly.  Enhancing pgg to
 support gpgsm should not be that hard.  Things you need to take care
 off are: Warn if GPG_AGENT_INFO has not been set, because this will
 call gpg-agent for each operation and obviously does not cache the
 passphrase them. If GPG_AGENT_INFO has been set, also disable the
 passphrase code for gpg and pass --use-agent to gpg - this way gpg
 benefits from the passphrase caching and the pinentry.
 
 You may want to look at gpgconf (tools/README.gpgconf) to provide a
 customization interface for gpgsm, gpg-agent and dirmngr.
 
 
 Module Overview
 ================ 
 
 gpgsm 
         libgpg-error
         libgcrypt 
         libksba
         libassuan [statically linked]
         [Standard system libraries]
 
 gpg-agent
         libgpg-error
         libgcrypt
         libassuan [statically linked]
         libpth    [system library]
         [Standard system libraries]
 
 scdaemon 
         libgpg-error
         libgcrypt
         libksba
         libassuan [statically linked]
         libusb    [system library, optional]
         libopensc [system library, optional]
         [For reader access libpcsclite or a CT-API library may be
          linked at runtime (controllable by scdaemon.conf)]
         [Standard system libraries]
 
 gpg-protect-tool 
         libgpg-error
         libgcrypt
         [Standard system libraries]
 
 dirmngr 
         libgpg-error
         libgcrypt
         libksba
         libassuan [statically linked]
         libldap [system library]
         liblber [system library]
         libsasl [system library, required by libldap]
         libdb2  [system library, required by libsasl]
         libcrypt [system library, required by libsasl - OOPS]
         libpam  [system library, required by libsasl]
         [Standard system libraries]
 
 pinentry-curses 
         libncurses
         [Standard system libraries]
         [Independent Assuan code is source included]
 
 pinentry-gtk    
         libncurses
         [GTK+ and X libraries]
         [Standard system libraries]
         [Independent Assuan code is source included]
 
 pinentry-qt 
         libncurses
         [QT and X libraries]
         [Standard system libraries]
         [Independent Assuan code is source included]
 
 gpgme
         [Standard system libraries]
         [gpgsm is required at runtime]       
         [Independent Assuan code is source included]
 
 libgpg-error
         [none]
         
 libgcrypt 
         libgpg-error
 
 libksba
         libgpg-error
 
 libassuan 
         [none]
 
 
 
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 76be5286c..f5910a884 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -1,1182 +1,1182 @@
 @c Copyright (C) 2002 Klar"alvdalens Datakonsult AB
 @c Copyright (C) 2004, 2005, 2006, 2007 g10 Code GmbH
 @c This is part of the GnuPG manual.
 @c For copying conditions, see the file gnupg.texi.
 
 @include defs.inc
 
 @node Invoking DIRMNGR
 @chapter Invoking DIRMNGR
 @cindex DIRMNGR command options
 @cindex command options
 @cindex options, DIRMNGR command
 
 @manpage dirmngr.8
 @ifset manverb
 .B dirmngr
 \- CRL and OCSP daemon
 @end ifset
 
 @mansect synopsis
 @ifset manverb
 .B  dirmngr
 .RI [ options ]
 .I command
 .RI [ args ]
 @end ifset
 
 @mansect description
 Since version 2.1 of GnuPG, @command{dirmngr} takes care of accessing
 the OpenPGP keyservers.  As with previous versions it is also used as
 a server for managing and downloading certificate revocation lists
 (CRLs) for X.509 certificates, downloading X.509 certificates, and
 providing access to OCSP providers.  Dirmngr is invoked internally by
 @command{gpg}, @command{gpgsm}, or via the @command{gpg-connect-agent}
 tool.
 
 @manpause
 @noindent
 @xref{Option Index},for an index to @command{DIRMNGR}'s commands and
 options.
 @mancont
 
 @menu
 * Dirmngr Commands::      List of all commands.
 * Dirmngr Options::       List of all options.
 * Dirmngr Configuration:: Configuration files.
 * Dirmngr Signals::       Use of signals.
 * Dirmngr Examples::      Some usage examples.
 * Dirmngr Protocol::      The protocol dirmngr uses.
 @end menu
 
 
 @node Dirmngr Commands
 @section Commands
 @mansect commands
 
 Commands are not distinguished from options except for the fact that
 only one command is allowed.
 
 @table @gnupgtabopt
 @item --version
 @opindex version
 Print the program version and licensing information.  Note that you cannot
 abbreviate this command.
 
 @item --help, -h
 @opindex help
 Print a usage message summarizing the most useful command-line options.
 Note that you cannot abbreviate this command.
 
 @item --dump-options
 @opindex dump-options
 Print a list of all available options and commands.  Note that you cannot
 abbreviate this command.
 
 @item --server
 @opindex server
 Run in server mode and wait for commands on the @code{stdin}.  The
 default mode is to create a socket and listen for commands there.
 This is only used for testing.
 
 @item --daemon
 @opindex daemon
 Run in background daemon mode and listen for commands on a socket.
 This is the way @command{dirmngr} is started on demand by the other
 GnuPG components.  To force starting @command{dirmngr} it is in
 general best to use @code{gpgconf --launch dirmngr}.
 
 @item --supervised
 @opindex supervised
 Run in the foreground, sending logs to stderr, and listening on file
 descriptor 3, which must already be bound to a listening socket.  This
 is useful when running under systemd or other similar process
 supervision schemes.  This option is not supported on Windows.
 
 @item --list-crls
 @opindex list-crls
 List the contents of the CRL cache on @code{stdout}. This is probably
 only useful for debugging purposes.
 
 @item --load-crl @var{file}
 @opindex load-crl
 This command requires a filename as additional argument, and it will
 make Dirmngr try to import the CRL in @var{file} into it's cache.
 Note, that this is only possible if Dirmngr is able to retrieve the
 CA's certificate directly by its own means.  In general it is better
 to use @code{gpgsm}'s @code{--call-dirmngr loadcrl filename} command
 so that @code{gpgsm} can help dirmngr.
 
 @item --fetch-crl @var{url}
 @opindex fetch-crl
 This command requires an URL as additional argument, and it will make
 dirmngr try to retrieve and import the CRL from that @var{url} into
 it's cache.  This is mainly useful for debugging purposes.  The
 @command{dirmngr-client} provides the same feature for a running dirmngr.
 
 @item --shutdown
 @opindex shutdown
 This commands shuts down an running instance of Dirmngr.  This command
 has currently no effect.
 
 @item --flush
 @opindex flush
 This command removes all CRLs from Dirmngr's cache.  Client requests
 will thus trigger reading of fresh CRLs.
 
 @end table
 
 
 @mansect options
 @node Dirmngr Options
 @section Option Summary
 
 Note that all long options with the exception of @option{--options}
 and @option{--homedir} may also be given in the configuration file
 after stripping off the two leading dashes.
 
 @table @gnupgtabopt
 
 @item --options @var{file}
 @opindex options
 Reads configuration from @var{file} instead of from the default
 per-user configuration file.  The default configuration file is named
 @file{dirmngr.conf} and expected in the home directory.
 
 @item --homedir @var{dir}
 @opindex options
 Set the name of the home directory to @var{dir}.  This option is only
 effective when used on the command line.  The default is
 the directory named @file{.gnupg} directly below the home directory
 of the user unless the environment variable @code{GNUPGHOME} has been set
 in which case its value will be used.  Many kinds of data are stored within
 this directory.
 
 
 @item -v
 @item --verbose
 @opindex v
 @opindex verbose
 Outputs additional information while running.
 You can increase the verbosity by giving several
 verbose commands to @sc{dirmngr}, such as @option{-vv}.
 
 
 @item --log-file @var{file}
 @opindex log-file
 Append all logging output to @var{file}.  This is very helpful in
 seeing what the agent actually does.  Use @file{socket://} to log to
 socket.
 
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems.  @var{level} may be a
 numeric value or by a keyword:
 
 @table @code
 @item none
 No debugging at all.  A value of less than 1 may be used instead of
 the keyword.
 @item basic
 Some basic debug messages.  A value between 1 and 2 may be used
 instead of the keyword.
 @item advanced
 More verbose debug messages.  A value between 3 and 5 may be used
 instead of the keyword.
 @item expert
 Even more detailed messages.  A value between 6 and 8 may be used
 instead of the keyword.
 @item guru
 All of the debug messages you can get. A value greater than 8 may be
 used instead of the keyword.  The creation of hash tracing files is
 only enabled if the keyword is used.
 @end table
 
 How these messages are mapped to the actual debugging flags is not
 specified and may change with newer releases of this program. They are
 however carefully selected to best aid in debugging.
 
 @item --debug @var{flags}
 @opindex debug
 Set debugging flags.  This option is only useful for debugging and its
 behavior may change with a new release.  All flags are or-ed and may
 be given in C syntax (e.g. 0x0042) or as a comma separated list of
 flag names.  To get a list of all supported flags the single word
 "help" can be used.
 
 @item --debug-all
 @opindex debug-all
 Same as @code{--debug=0xffffffff}
 
 @item --tls-debug @var{level}
 @opindex tls-debug
 Enable debugging of the TLS layer at @var{level}.  The details of the
 debug level depend on the used TLS library and are not set in stone.
 
 @item --debug-wait @var{n}
 @opindex debug-wait
 When running in server mode, wait @var{n} seconds before entering the
 actual processing loop and print the pid.  This gives time to attach a
 debugger.
 
 @item --disable-check-own-socket
 @opindex disable-check-own-socket
 On some platforms @command{dirmngr} is able to detect the removal of
 its socket file and shutdown itself.  This option disable this
 self-test for debugging purposes.
 
 @item -s
 @itemx --sh
 @itemx -c
 @itemx --csh
 @opindex s
 @opindex sh
 @opindex c
 @opindex csh
 Format the info output in daemon mode for use with the standard Bourne
 shell respective the C-shell. The default is to guess it based on the
 environment variable @code{SHELL} which is in almost all cases
 sufficient.
 
 @item --force
 @opindex force
 Enabling this option forces loading of expired CRLs; this is only
 useful for debugging.
 
 @item --use-tor
 @itemx --no-use-tor
 @opindex use-tor
 @opindex no-use-tor
 The option @option{--use-tor} switches Dirmngr and thus GnuPG into
 ``Tor mode'' to route all network access via Tor (an anonymity
 network).  Certain other features are disabled in this mode.  The
 effect of @option{--use-tor} cannot be overridden by any other command
 or even be reloading gpg-agent.  The use of @option{--no-use-tor}
 disables the use of Tor.  The default is to use Tor if it is available
 on startup or after reloading dirmngr.
 
 @item --standard-resolver
 @opindex standard-resolver
 This option forces the use of the system's standard DNS resolver code.
 This is mainly used for debugging.  Note that on Windows a standard
 resolver is not used and all DNS access will return the error ``Not
 Implemented'' if this function is used.
 
 @item --recursive-resolver
 @opindex recursive-resolver
 When possible use a recursive resolver instead of a stub resolver.
 
 @item --resolver-timeout @var{n}
 @opindex resolver-timeout
 Set the timeout for the DNS resolver to N seconds.  The default are 30
 seconds.
 
 @item --connect-timeout @var{n}
 @item --connect-quick-timeout @var{n}
 @opindex connect-timeout
 @opindex connect-quick-timeout
 Set the timeout for HTTP and generic TCP connection attempts to N
 seconds.  The value set with the quick variant is used when the
 --quick option has been given to certain Assuan commands.  The quick
 value is capped at the value of the regular connect timeout.  The
 default values are 15 and 2 seconds.  Note that the timeout values are
 for each connection attempt; the connection code will attempt to
 connect all addresses listed for a server.
 
 @item --listen-backlog @var{n}
 @opindex listen-backlog
 Set the size of the queue for pending connections.  The default is 64.
 
 @item --allow-version-check
 @opindex allow-version-check
 Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
 the list of current software versions.  If this option is enabled
 the list is retrieved in case the local
 copy does not exist or is older than 5 to 7 days.  See the option
 @option{--query-swdb} of the command @command{gpgconf} for more
 details.  Note, that regardless of this option a version check can
 always be triggered using this command:
 
 @example
        gpg-connect-agent --dirmngr 'loadswdb --force' /bye
 @end example
 
 
 @item --keyserver @var{name}
 @opindex keyserver
 Use @var{name} as your keyserver.  This is the server that @command{gpg}
 communicates with to receive keys, send keys, and search for
 keys.  The format of the @var{name} is a URI:
 `scheme:[//]keyservername[:port]' The scheme is the type of keyserver:
 "hkp" for the HTTP (or compatible) keyservers, "ldap" for the LDAP
 keyservers, or "mailto" for the Graff email keyserver. Note that your
 particular installation of GnuPG may have other keyserver types
 available as well. Keyserver schemes are case-insensitive. After the
 keyserver name, optional keyserver configuration options may be
 provided.  These are the same as the @option{--keyserver-options} of
 @command{gpg}, but apply only to this particular keyserver.
 
 Most keyservers synchronize with each other, so there is generally no
 need to send keys to more than one server. The keyserver
 @code{hkp://keys.gnupg.net} uses round robin DNS to give a different
 keyserver each time you use it.
 
 If exactly two keyservers are configured and only one is a Tor hidden
 service (.onion), Dirmngr selects the keyserver to use depending on
 whether Tor is locally running or not.  The check for a running Tor is
 done for each new connection.
 
 If no keyserver is explicitly configured, dirmngr will use the
 built-in default of hkps://hkps.pool.sks-keyservers.net.
 
 @item --nameserver @var{ipaddr}
 @opindex nameserver
 In ``Tor mode'' Dirmngr uses a public resolver via Tor to resolve DNS
 names.  If the default public resolver, which is @code{8.8.8.8}, shall
 not be used a different one can be given using this option.  Note that
 a numerical IP address must be given (IPv6 or IPv4) and that no error
 checking is done for @var{ipaddr}.
 
 @item --disable-ipv4
 @item --disable-ipv6
 @opindex disable-ipv4
 @opindex disable-ipv6
 Disable the use of all IPv4 or IPv6 addresses.
 
 @item --disable-ldap
 @opindex disable-ldap
 Entirely disables the use of LDAP.
 
 @item --disable-http
 @opindex disable-http
 Entirely disables the use of HTTP.
 
 @item --ignore-http-dp
 @opindex ignore-http-dp
 When looking for the location of a CRL, the to be tested certificate
 usually contains so called @dfn{CRL Distribution Point} (DP) entries
 which are URLs describing the way to access the CRL.  The first found DP
 entry is used.  With this option all entries using the @acronym{HTTP}
 scheme are ignored when looking for a suitable DP.
 
 @item --ignore-ldap-dp
 @opindex ignore-ldap-dp
 This is similar to @option{--ignore-http-dp} but ignores entries using
 the @acronym{LDAP} scheme.  Both options may be combined resulting in
 ignoring DPs entirely.
 
 @item --ignore-ocsp-service-url
 @opindex ignore-ocsp-service-url
 Ignore all OCSP URLs contained in the certificate.  The effect is to
 force the use of the default responder.
 
 @item --honor-http-proxy
 @opindex honor-http-proxy
 If the environment variable @env{http_proxy} has been set, use its
 value to access HTTP servers.
 
 @item --http-proxy @var{host}[:@var{port}]
 @opindex http-proxy
 @efindex http_proxy
 Use @var{host} and @var{port} to access HTTP servers.  The use of this
 option overrides the environment variable @env{http_proxy} regardless
 whether @option{--honor-http-proxy} has been set.
 
 
 @item --ldap-proxy @var{host}[:@var{port}]
 @opindex ldap-proxy
 Use @var{host} and @var{port} to connect to LDAP servers.  If @var{port}
 is omitted, port 389 (standard LDAP port) is used.  This overrides any
 specified host and port part in a LDAP URL and will also be used if host
 and port have been omitted from the URL.
 
 @item --only-ldap-proxy
 @opindex only-ldap-proxy
 Never use anything else but the LDAP "proxy" as configured with
 @option{--ldap-proxy}.  Usually @command{dirmngr} tries to use other
 configured LDAP server if the connection using the "proxy" failed.
 
 
 @item --ldapserverlist-file @var{file}
 @opindex ldapserverlist-file
 Read the list of LDAP servers to consult for CRLs and certificates from
 file instead of the default per-user ldap server list file. The default
 value for @var{file} is @file{dirmngr_ldapservers.conf}.
 
 This server list file contains one LDAP server per line in the format
 
 @sc{hostname:port:username:password:base_dn}
 
 Lines starting with a  @samp{#} are comments.
 
 Note that as usual all strings entered are expected to be UTF-8 encoded.
 Obviously this will lead to problems if the password has originally been
 encoded as Latin-1.  There is no other solution here than to put such a
 password in the binary encoding into the file (i.e. non-ascii characters
 won't show up readable).@footnote{The @command{gpgconf} tool might be
 helpful for frontends as it enables editing this configuration file using
 percent-escaped strings.}
 
 
 @item --ldaptimeout @var{secs}
 @opindex ldaptimeout
 Specify the number of seconds to wait for an LDAP query before timing
 out.  The default are 15 seconds.  0 will never timeout.
 
 
 @item --add-servers
 @opindex add-servers
 This option makes dirmngr add any servers it discovers when validating
 certificates against CRLs to the internal list of servers to consult for
 certificates and CRLs.
 
 This option is useful when trying to validate a certificate that has
 a CRL distribution point that points to a server that is not already
 listed in the ldapserverlist. Dirmngr will always go to this server and
 try to download the CRL, but chances are high that the certificate used
 to sign the CRL is located on the same server. So if dirmngr doesn't add
 that new server to list, it will often not be able to verify the
 signature of the CRL unless the @code{--add-servers} option is used.
 
 Note: The current version of dirmngr has this option disabled by default.
 
 
 @item --allow-ocsp
 @opindex allow-ocsp
 This option enables OCSP support if requested by the client.
 
 OCSP requests are rejected by default because they may violate the
 privacy of the user; for example it is possible to track the time when
 a user is reading a mail.
 
 
 @item --ocsp-responder @var{url}
 @opindex ocsp-responder
 Use @var{url} as the default OCSP Responder if the certificate does
 not contain information about an assigned responder.  Note, that
 @code{--ocsp-signer} must also be set to a valid certificate.
 
 @item --ocsp-signer @var{fpr}|@var{file}
 @opindex ocsp-signer
 Use the certificate with the fingerprint @var{fpr} to check the
 responses of the default OCSP Responder.  Alternatively a filename can be
 given in which case the response is expected to be signed by one of the
 certificates described in that file.  Any argument which contains a
 slash, dot or tilde is considered a filename.  Usual filename expansion
 takes place: A tilde at the start followed by a slash is replaced by the
 content of @env{HOME}, no slash at start describes a relative filename
 which will be searched at the home directory.  To make sure that the
 @var{file} is searched in the home directory, either prepend the name
 with "./" or use a name which contains a dot.
 
 If a response has been signed by a certificate described by these
 fingerprints no further check upon the validity of this certificate is
 done.
 
 The format of the @var{FILE} is a list of SHA-1 fingerprint, one per
 line with optional colons between the bytes.  Empty lines and lines
 prefix with a hash mark are ignored.
 
 
 @item --ocsp-max-clock-skew @var{n}
 @opindex ocsp-max-clock-skew
 The number of seconds a skew between the OCSP responder and them local
 clock is accepted.  Default is 600 (10 minutes).
 
 @item --ocsp-max-period @var{n}
 @opindex ocsp-max-period
 Seconds a response is at maximum considered valid after the time given
 in the thisUpdate field.  Default is 7776000 (90 days).
 
 @item --ocsp-current-period @var{n}
 @opindex ocsp-current-period
 The number of seconds an OCSP response is considered valid after the
 time given in the NEXT_UPDATE datum.  Default is 10800 (3 hours).
 
 
 @item --max-replies @var{n}
 @opindex max-replies
 Do not return more that @var{n} items in one query.  The default is
 10.
 
 @item --ignore-cert-extension @var{oid}
 @opindex ignore-cert-extension
 Add @var{oid} to the list of ignored certificate extensions.  The
 @var{oid} is expected to be in dotted decimal form, like
 @code{2.5.29.3}.  This option may be used more than once.  Critical
 flagged certificate extensions matching one of the OIDs in the list
 are treated as if they are actually handled and thus the certificate
 won't be rejected due to an unknown critical extension.  Use this
 option with care because extensions are usually flagged as critical
 for a reason.
 
 @item --hkp-cacert @var{file}
 Use the root certificates in @var{file} for verification of the TLS
 certificates used with @code{hkps} (keyserver access over TLS).  If
 the file is in PEM format a suffix of @code{.pem} is expected for
 @var{file}.  This option may be given multiple times to add more
 root certificates.  Tilde expansion is supported.
 
 If no @code{hkp-cacert} directive is present, dirmngr will make a
 reasonable choice: if the keyserver in question is the special pool
 @code{hkps.pool.sks-keyservers.net}, it will use the bundled root
 certificate for that pool.  Otherwise, it will use the system CAs.
 
 @end table
 
 
 @c
 @c Dirmngr Configuration
 @c
 @mansect files
 @node Dirmngr Configuration
 @section Configuration
 
 Dirmngr makes use of several directories when running in daemon mode:
 There are a few configuration files whih control the operation of
 dirmngr.  By default they may all be found in the current home
 directory (@pxref{option --homedir}).
 
 @table @file
 
 @item dirmngr.conf
 @efindex dirmngr.conf
 This is the standard configuration file read by @command{dirmngr} on
 startup.  It may contain any valid long option; the leading two dashes
 may not be entered and the option may not be abbreviated.  This file
 is also read after a @code{SIGHUP} however not all options will
 actually have an effect.  This default name may be changed on the
 command line (@pxref{option --options}).  You should backup this file.
 
 @item /etc/gnupg/trusted-certs
 This directory should be filled with certificates of Root CAs you
 are trusting in checking the CRLs and signing OCSP Responses.
 
 Usually these are the same certificates you use with the applications
 making use of dirmngr.  It is expected that each of these certificate
 files contain exactly one @acronym{DER} encoded certificate in a file
 with the suffix @file{.crt} or @file{.der}.  @command{dirmngr} reads
 those certificates on startup and when given a SIGHUP.  Certificates
 which are not readable or do not make up a proper X.509 certificate
 are ignored; see the log file for details.
 
 Applications using dirmngr (e.g. gpgsm) can request these
 certificates to complete a trust chain in the same way as with the
 extra-certs directory (see below).
 
 Note that for OCSP responses the certificate specified using the option
 @option{--ocsp-signer} is always considered valid to sign OCSP requests.
 
 @item /etc/gnupg/extra-certs
 This directory may contain extra certificates which are preloaded
 into the internal cache on startup. Applications using dirmngr (e.g. gpgsm)
 can request cached certificates to complete a trust chain.
 This is convenient in cases you have a couple intermediate CA certificates
 or certificates usually used to sign OCSP responses.
 These certificates are first tried before going
 out to the net to look for them.  These certificates must also be
 @acronym{DER} encoded and suffixed with @file{.crt} or @file{.der}.
 
 @item ~/.gnupg/crls.d
 This directory is used to store cached CRLs.  The @file{crls.d}
 part will be created by dirmngr if it does not exists but you need to
 make sure that the upper directory exists.
 
 @end table
 @manpause
 
 To be able to see what's going on you should create the configure file
 @file{~/gnupg/dirmngr.conf} with at least one line:
 
 @example
 log-file ~/dirmngr.log
 @end example
 
 To be able to perform OCSP requests you probably want to add the line:
 
 @example
 allow-ocsp
 @end example
 
 To make sure that new options are read and that after the installation
 of a new GnuPG versions the installed dirmngr is running, you may want
 to kill an existing dirmngr first:
 
 @example
 gpgconf --kill dirmngr
 @end example
 
 You may check the log file to see whether all desired root
 certificates have been loaded correctly.
 
 
 @c
 @c Dirmngr Signals
 @c
 @mansect signals
 @node Dirmngr Signals
 @section Use of signals
 
 A running @command{dirmngr} may be controlled by signals, i.e. using
 the @command{kill} command to send a signal to the process.
 
 Here is a list of supported signals:
 
 @table @gnupgtabopt
 
 @item SIGHUP
 @cpindex SIGHUP
 This signal flushes all internally cached CRLs as well as any cached
 certificates.  Then the certificate cache is reinitialized as on
 startup.  Options are re-read from the configuration file.  Instead of
 sending this signal it is better to use
 @example
 gpgconf --reload dirmngr
 @end example
 
 @item SIGTERM
 @cpindex SIGTERM
 Shuts down the process but waits until all current requests are
 fulfilled.  If the process has received 3 of these signals and requests
 are still pending, a shutdown is forced.  You may also use
 @example
 gpgconf --kill dirmngr
 @end example
 instead of this signal
 
 @item SIGINT
 @cpindex SIGINT
 Shuts down the process immediately.
 
 
 @item SIGUSR1
 @cpindex SIGUSR1
 This prints some caching statistics to the log file.
 
 @end table
 
 
 
 @c
 @c  Examples
 @c
 @mansect examples
 @node Dirmngr Examples
 @section Examples
 
 Here is an example on how to show dirmngr's internal table of OpenPGP
 keyserver addresses.  The output is intended for debugging purposes
 and not part of a defined API.
 
 @example
   gpg-connect-agent --dirmngr 'keyserver --hosttable' /bye
 @end example
 
 To inhibit the use of a particular host you have noticed in one of the
 keyserver pools, you may use
 
 @example
  gpg-connect-agent --dirmngr 'keyserver --dead pgpkeys.bnd.de' /bye
 @end example
 
 The description of the @code{keyserver} command can be printed using
 
 @example
  gpg-connect-agent --dirmngr 'help keyserver' /bye
 @end example
 
 
 
 @c
 @c  Assuan Protocol
 @c
 @manpause
 @node Dirmngr Protocol
 @section Dirmngr's Assuan Protocol
 
 Assuan is the IPC protocol used to access dirmngr.  This is a
 description of the commands implemented by dirmngr.
 
 @menu
 * Dirmngr LOOKUP::      Look up a certificate via LDAP
 * Dirmngr ISVALID::     Validate a certificate using a CRL or OCSP.
 * Dirmngr CHECKCRL::    Validate a certificate using a CRL.
 * Dirmngr CHECKOCSP::   Validate a certificate using OCSP.
 * Dirmngr CACHECERT::   Put a certificate into the internal cache.
 * Dirmngr VALIDATE::    Validate a certificate for debugging.
 @end menu
 
 @node Dirmngr LOOKUP
 @subsection Return the certificate(s) found
 
 Lookup certificate.  To allow multiple patterns (which are ORed)
 quoting is required: Spaces are to be translated into "+" or into
 "%20"; obviously this requires that the usual escape quoting rules
 are applied.  The server responds with:
 
 @example
   S: D <DER encoded certificate>
   S: END
   S: D <second DER encoded certificate>
   S: END
   S: OK
 @end example
 
 In this example 2 certificates are returned.  The server may return
 any number of certificates; OK will also be returned when no
 certificates were found.  The dirmngr might return a status line
 
 @example
   S: S TRUNCATED <n>
 @end example
 
 
 To indicate that the output was truncated to N items due to a
 limitation of the server or by an arbitrary set limit.
 
 The option @option{--url} may be used if instead of a search pattern a
 complete URL to the certificate is known:
 
 @example
   C: LOOKUP --url CN%3DWerner%20Koch,o%3DIntevation%20GmbH,c%3DDE?userCertificate
 @end example
 
 If the option @option{--cache-only} is given, no external lookup is done
 so that only certificates from the cache are returned.
 
 With the option @option{--single}, the first and only the first match
 will be returned.  Unless option @option{--cache-only} is also used, no
 local lookup will be done in this case.
 
 
 
 @node Dirmngr ISVALID
 @subsection Validate a certificate using a CRL or OCSP
 
 @example
   ISVALID [--only-ocsp] [--force-default-responder] @var{certid}|@var{certfpr}
 @end example
 
 Check whether the certificate described by the @var{certid} has been
 revoked.  Due to caching, the Dirmngr is able to answer immediately in
 most cases.
 
 The @var{certid} is a hex encoded string consisting of two parts,
 delimited by a single dot.  The first part is the SHA-1 hash of the
 issuer name and the second part the serial number.
 
 Alternatively the certificate's SHA-1 fingerprint @var{certfpr} may be
 given in which case an OCSP request is done before consulting the CRL.
 If the option @option{--only-ocsp} is given, no fallback to a CRL check
 will be used.  If the option @option{--force-default-responder} is
 given, only the default OCSP responder will be used and any other
 methods of obtaining an OCSP responder URL won't be used.
 
 @noindent
 Common return values are:
 
 @table @code
 @item GPG_ERR_NO_ERROR (0)
 This is the positive answer: The certificate is not revoked and we have
 an up-to-date revocation list for that certificate.  If OCSP was used
 the responder confirmed that the certificate has not been revoked.
 
 @item GPG_ERR_CERT_REVOKED
 This is the negative answer: The certificate has been revoked.  Either
 it is in a CRL and that list is up to date or an OCSP responder informed
 us that it has been revoked.
 
 @item GPG_ERR_NO_CRL_KNOWN
 No CRL is known for this certificate or the CRL is not valid or out of
 date.
 
 @item GPG_ERR_NO_DATA
 The OCSP responder returned an ``unknown'' status.  This means that it
 is not aware of the certificate's status.
 
 @item GPG_ERR_NOT_SUPPORTED
 This is commonly seen if OCSP support has not been enabled in the
 configuration.
 @end table
 
 If DirMngr has not enough information about the given certificate (which
 is the case for not yet cached certificates), it will inquire the
 missing data:
 
 @example
   S: INQUIRE SENDCERT <CertID>
   C: D <DER encoded certificate>
   C: END
 @end example
 
 A client should be aware that DirMngr may ask for more than one
 certificate.
 
 If Dirmngr has a certificate but the signature of the certificate
 could not been validated because the root certificate is not known to
 dirmngr as trusted, it may ask back to see whether the client trusts
 this the root certificate:
 
 @example
   S: INQUIRE ISTRUSTED <CertHexfpr>
   C: D 1
   C: END
 @end example
 
 Only this answer will let Dirmngr consider the certificate as valid.
 
 
 @node Dirmngr CHECKCRL
 @subsection Validate a certificate using a CRL
 
 Check whether the certificate with FINGERPRINT (SHA-1 hash of the
 entire X.509 certificate blob) is valid or not by consulting the CRL
 responsible for this certificate.  If the fingerprint has not been
 given or the certificate is not known, the function inquires the
 certificate using:
 
 @example
   S: INQUIRE TARGETCERT
   C: D <DER encoded certificate>
   C: END
 @end example
 
 Thus the caller is expected to return the certificate for the request
 (which should match FINGERPRINT) as a binary blob.  Processing then
 takes place without further interaction; in particular dirmngr tries
 to locate other required certificate by its own mechanism which
 includes a local certificate store as well as a list of trusted root
 certificates.
 
 @noindent
 The return code is 0 for success; i.e. the certificate has not been
 revoked or one of the usual error codes from libgpg-error.
 
 @node Dirmngr CHECKOCSP
 @subsection Validate a certificate using OCSP
 
 @example
   CHECKOCSP [--force-default-responder] [@var{fingerprint}]
 @end example
 
 Check whether the certificate with @var{fingerprint} (the SHA-1 hash of
 the entire X.509 certificate blob) is valid by consulting the appropriate
 OCSP responder.  If the fingerprint has not been given or the
 certificate is not known by Dirmngr, the function inquires the
 certificate using:
 
 @example
   S: INQUIRE TARGETCERT
   C: D <DER encoded certificate>
   C: END
 @end example
 
 Thus the caller is expected to return the certificate for the request
 (which should match @var{fingerprint}) as a binary blob.  Processing
 then takes place without further interaction; in particular dirmngr
 tries to locate other required certificates by its own mechanism which
 includes a local certificate store as well as a list of trusted root
 certificates.
 
 If the option @option{--force-default-responder} is given, only the
 default OCSP responder is used.  This option is the per-command variant
 of the global option @option{--ignore-ocsp-service-url}.
 
 
 @noindent
 The return code is 0 for success; i.e. the certificate has not been
 revoked or one of the usual error codes from libgpg-error.
 
 @node Dirmngr CACHECERT
 @subsection Put a certificate into the internal cache
 
 Put a certificate into the internal cache.  This command might be
 useful if a client knows in advance certificates required for a test and
 wants to make sure they get added to the internal cache.  It is also
 helpful for debugging.  To get the actual certificate, this command
 immediately inquires it using
 
 @example
   S: INQUIRE TARGETCERT
   C: D <DER encoded certificate>
   C: END
 @end example
 
 Thus the caller is expected to return the certificate for the request
 as a binary blob.
 
 @noindent
 The return code is 0 for success; i.e. the certificate has not been
 successfully cached or one of the usual error codes from libgpg-error.
 
 @node Dirmngr VALIDATE
 @subsection Validate a certificate for debugging
 
 Validate a certificate using the certificate validation function used
 internally by dirmngr.  This command is only useful for debugging.  To
 get the actual certificate, this command immediately inquires it using
 
 @example
   S: INQUIRE TARGETCERT
   C: D <DER encoded certificate>
   C: END
 @end example
 
 Thus the caller is expected to return the certificate for the request
 as a binary blob.
 
 
 @mansect see also
 @ifset isman
 @command{gpgsm}(1),
 @command{dirmngr-client}(1)
 @end ifset
 @include see-also-note.texi
 
 @c
 @c !!! UNDER CONSTRUCTION !!!
 @c
 @c
 @c @section Verifying a Certificate
 @c
 @c There are several ways to request services from Dirmngr.  Almost all of
 @c them are done using the Assuan protocol.  What we describe here is the
 @c Assuan command CHECKCRL as used for example by the dirmnr-client tool if
 @c invoked as
 @c
 @c @example
 @c   dirmngr-client foo.crt
 @c @end example
 @c
 @c This command will send an Assuan request to an already running Dirmngr
 @c instance.  foo.crt is expected to be a standard X.509 certificate and
 @c dirmngr will receive the Assuan command
 @c
 @c @example
 @c    CHECKCRL @var [{fingerprint}]
 @c @end example
 @c
 @c @var{fingerprint} is optional and expected to be the SHA-1 has of the
 @c DER encoding of the certificate under question.  It is to be HEX
 @c encoded.  The rationale for sending the fingerprint is that it allows
 @c dirmngr to reply immediately if it has already cached such a request.  If
 @c this is not the case and no certificate has been found in dirmngr's
 @c internal certificate storage, dirmngr will request the certificate using
 @c the Assuan inquiry
 @c
 @c @example
 @c       INQUIRE TARGETCERT
 @c @end example
 @c
 @c The caller (in our example dirmngr-client) is then expected to return
 @c the certificate for the request (which should match @var{fingerprint})
 @c as a binary blob.
 @c
 @c Dirmngr now passes control to @code{crl_cache_cert_isvalid}.  This
 @c function checks whether a CRL item exists for target certificate.  These
 @c CRL items are kept in a database of already loaded and verified CRLs.
 @c This mechanism is called the CRL cache.  Obviously timestamps are kept
 @c there with each item to cope with the expiration date of the CRL.  The
 @c possible return values are: @code{0} to indicate that a valid CRL is
 @c available for the certificate and the certificate itself is not listed
 @c in this CRL, @code{GPG_ERR_CERT_REVOKED} to indicate that the certificate is
 @c listed in the CRL or @code{GPG_ERR_NO_CRL_KNOWN} in cases where no CRL or no
 @c information is available.  The first two codes are immediately returned to
 @c the caller and the processing of this request has been done.
 @c
 @c Only the @code{GPG_ERR_NO_CRL_KNOWN} needs more attention: Dirmngr now
 @c calls @code{clr_cache_reload_crl} and if this succeeds calls
 @c @code{crl_cache_cert_isvald) once more.  All further errors are
 @c immediately returned to the caller.
 @c
 @c @code{crl_cache_reload_crl} is the actual heart of the CRL management.
 @c It locates the corresponding CRL for the target certificate, reads and
 @c verifies this CRL and stores it in the CRL cache.  It works like this:
 @c
 @c * Loop over all crlDPs in the target certificate.
 @c     * If the crlDP is invalid immediately terminate the loop.
 @c     * Loop over all names in the current crlDP.
 @c         * If the URL scheme is unknown or not enabled
 @c           (--ignore-http-dp, --ignore-ldap-dp) continues with
 @c           the next name.
 @c         * @code{crl_fetch} is called to actually retrieve the CRL.
 @c           In case of problems this name is ignore and we continue with
 @c           the next name.  Note that @code{crl_fetch} does only return
 @c           a descriptor for the CRL for further reading so does the CRL
 @c           does not yet end up in memory.
 @c         * @code{crl_cache_insert} is called with that descriptor to
 @c           actually read the CRL into the cache. See below for a
 @c           description of this function.  If there is any error (e.g. read
 @c           problem, CRL not correctly signed or verification of signature
 @c           not possible), this descriptor is rejected and we continue
 @c           with the next name.  If the CRL has been successfully loaded,
 @c           the loop is terminated.
 @c * If no crlDP has been found in the previous loop use a default CRL.
 @c   Note, that if any crlDP has been found but loading of the CRL failed,
 @c   this condition is not true.
 @c     * Try to load a CRL from all configured servers (ldapservers.conf)
 @c       in turn.  The first server returning a CRL is used.
 @c     * @code(crl_cache_insert) is then used to actually insert the CRL
 @c       into the cache.  If this failed we give up immediately without
 @c       checking the rest of the servers from the first step.
 @c * Ready.
 @c
 @c
 @c The @code{crl_cache_insert} function takes care of reading the bulk of
 @c the CRL, parsing it and checking the signature.  It works like this: A
 @c new database file is created using a temporary file name.  The CRL
 @c parsing machinery is started and all items of the CRL are put into
 @c this database file.  At the end the issuer certificate of the CRL
 @c needs to be retrieved.  Three cases are to be distinguished:
 @c
 @c  a) An authorityKeyIdentifier with an issuer and serialno exits: The
 @c     certificate is retrieved using @code{find_cert_bysn}.  If
 @c     the certificate is in the certificate cache, it is directly
 @c     returned. Then the requester (i.e. the client who requested the
 @c     CRL check) is asked via the Assuan inquiry ``SENDCERT'' whether
 @c     he can provide this certificate.  If this succeed the returned
 @c     certificate gets cached and returned.  Note, that dirmngr does not
 @c     verify in any way whether the expected certificate is returned.
 @c     It is in the interest of the client to return a useful certificate
 @c     as otherwise the service request will fail due to a bad signature.
 @c     The last way to get the certificate is by looking it up at
 @c     external resources.  This is done using the @code{ca_cert_fetch}
 @c     and @code{fetch_next_ksba_cert} and comparing the returned
 @c     certificate to match the requested issuer and seriano (This is
 @c     needed because the LDAP layer may return several certificates as
 @c     LDAP as no standard way to retrieve by serial number).
 @c
 @c  b) An authorityKeyIdentifier with a key ID exists: The certificate is
 @c     retrieved using @code{find_cert_bysubject}.  If the certificate is
 @c     in the certificate cache, it is directly returned.  Then the
 @c     requester is asked via the Assuan inquiry ``SENDCERT_SKI'' whether
 @c     he can provide this certificate.  If this succeed the returned
 @c     certificate gets cached and returned.  Note, that dirmngr does not
 @c     verify in any way whether the expected certificate is returned.
 @c     It is in the interest of the client to return a useful certificate
 @c     as otherwise the service request will fail due to a bad signature.
 @c     The last way to get the certificate is by looking it up at
 @c     external resources.  This is done using the @code{ca_cert_fetch}
 @c     and @code{fetch_next_ksba_cert} and comparing the returned
 @c     certificate to match the requested subject and key ID.
 @c
 @c  c) No authorityKeyIdentifier exits: The certificate is retrieved
 @c     using @code{find_cert_bysubject} without the key ID argument.  If
 @c     the certificate is in the certificate cache the first one with a
 @c     matching subject is directly returned.  Then the requester is
 @c     asked via the Assuan inquiry ``SENDCERT'' and an exact
 @c     specification of the subject whether he can
 @c     provide this certificate.  If this succeed the returned
 @c     certificate gets cached and returned.  Note, that dirmngr does not
 @c     verify in any way whether the expected certificate is returned.
 @c     It is in the interest of the client to return a useful certificate
 @c     as otherwise the service request will fail due to a bad signature.
 @c     The last way to get the certificate is by looking it up at
 @c     external resources.  This is done using the @code{ca_cert_fetch}
 @c     and @code{fetch_next_ksba_cert} and comparing the returned
 @c     certificate to match the requested subject; the first certificate
 @c     with a matching subject is then returned.
 @c
 @c If no certificate was found, the function returns with the error
 @c GPG_ERR_MISSING_CERT.  Now the signature is verified.  If this fails,
 @c the erro is returned.  On success the @code{validate_cert_chain} is
 @c used to verify that the certificate is actually valid.
 @c
 @c Here we may encounter a recursive situation:
 @c @code{validate_cert_chain} needs to look at other certificates and
 @c also at CRLs to check whether these other certificates and well, the
 @c CRL issuer certificate itself are not revoked.  FIXME: We need to make
 @c sure that @code{validate_cert_chain} does not try to lookup the CRL we
 @c are currently processing. This would be a catch-22 and may indicate a
 @c broken PKI.  However, due to overlapping expiring times and imprecise
 @c clocks this may actually happen.
 @c
 @c For historical reasons the Assuan command ISVALID is a bit different
 @c to CHECKCRL but this is mainly due to different calling conventions.
 @c In the end the same fucntionality is used, albeit hidden by a couple
 @c of indirection and argument and result code mangling.  It furthere
 @c ingetrages OCSP checking depending on options are the way it is
-@c called.  GPGSM still uses this command but might eventuall switch over
+@c called.  GPGSM still uses this command but might eventually switch over
 @c to CHECKCRL and CHECKOCSP so that ISVALID can be retired.
 @c
 @c
 @c @section Validating a certificate
 @c
 @c We describe here how the internal function @code{validate_cert_chain}
 @c works. Note that mainly testing purposes this functionality may be
 @c called directly using @cmd{dirmngr-client --validate @file{foo.crt}}.
 @c
 @c The function takes the target certificate and a mode argument as
 @c parameters and returns an error code and optionally the closes
 @c expiration time of all certificates in the chain.
 @c
 @c We first check that the certificate may be used for the requested
 @c purpose (i.e. OCSP or CRL signing).  If this is not the case
 @c GPG_ERR_WRONG_KEY_USAGE is returned.
 @c
 @c The next step is to find the trust anchor (root certificate) and to
 @c assemble the chain in memory: Starting with the target certificate,
 @c the expiration time is checked against the current date, unknown
 @c critical extensions are detected and certificate policies are matched
 @c (We only allow 2.289.9.9 but I have no clue about that OID and from
 @c where I got it - it does not even seem to be assigned - debug cruft?).
 @c
 @c Now if this certificate is a self-signed one, we have reached the
 @c trust anchor.  In this case we check that the signature is good, the
 @c certificate is allowed to act as a CA, that it is a trusted one (by
 @c checking whether it is has been put into the trusted-certs
 @c configuration directory) and finally prepend into to our list
 @c representing the certificate chain.  This steps ends then.
 @c
 @c If it is not a self-signed certificate, we check that the chain won't
 @c get too long (current limit is 100), if this is the case we terminate
 @c with the error GPG_ERR_BAD_CERT_CHAIN.
 @c
 @c Now the issuer's certificate is looked up: If an
 @c authorityKeyIdentifier is available, this one is used to locate the
 @c certificate either using issuer and serialnumber or subject DN
 @c (i.e. the issuer's DN) and the keyID.  The functions
 @c @code{find_cert_bysn) and @code{find_cert_bysubject} are used
 @c respectively. The have already been described above under the
 @c description of @code{crl_cache_insert}.  If no certificate was found
 @c or with no authorityKeyIdentifier, only the cache is consulted using
 @c @code{get_cert_bysubject}.  The latter is done under the assumption
 @c that a matching certificate has explicitly been put into the
 @c certificate cache.  If the issuer's certificate could not be found,
 @c the validation terminates with the error code @code{GPG_ERR_MISSING_CERT}.
 @c
 @c If the issuer's certificate has been found, the signature of the
 @c actual certificate is checked and in case this fails the error
 @c #code{GPG_ERR_BAD_CERT_CHAIN} is returned.  If the signature checks out, the
 @c maximum chain length of the issuing certificate is checked as well as
 @c the capability of the certificate (i.e. whether he may be used for
 @c certificate signing).  Then the certificate is prepended to our list
 @c representing the certificate chain.  Finally the loop is continued now
 @c with the issuer's certificate as the current certificate.
 @c
 @c After the end of the loop and if no error as been encountered
 @c (i.e. the certificate chain has been assempled correctly), a check is
 @c done whether any certificate expired or a critical policy has not been
 @c met.  In any of these cases the validation terminates with an
 @c appropriate error.
 @c
 @c Finally the function @code{check_revocations} is called to verify no
 @c certificate in the assempled chain has been revoked: This is an
 @c recursive process because a CRL has to be checked for each certificate
 @c in the chain except for the root certificate, of which we already know
 @c that it is trusted and we avoid checking a CRL here due to common
 @c setup problems and the assumption that a revoked root certificate has
 @c been removed from the list of trusted certificates.
 @c
 @c
 @c
 @c
 @c @section Looking up certificates through LDAP.
 @c
 @c This describes the LDAP layer to retrieve certificates.
 @c the functions @code{ca_cert_fetch} and @code{fetch_next_ksba_cert} are
 @c used for this.  The first one starts a search and the second one is
 @c used to retrieve certificate after certificate.
 @c
 
 
diff --git a/doc/gpg.texi b/doc/gpg.texi
index ba1df4bfb..dedb8cc42 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1,4260 +1,4260 @@
 @c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 @c               2008, 2009, 2010 Free Software Foundation, Inc.
 @c This is part of the GnuPG manual.
 @c For copying conditions, see the file gnupg.texi.
 
 @include defs.inc
 
 @node Invoking GPG
 @chapter Invoking GPG
 @cindex GPG command options
 @cindex command options
 @cindex options, GPG command
 
 
 @c Begin standard stuff
 @ifclear gpgtwohack
 @manpage gpg.1
 @ifset manverb
 .B gpg
 \- OpenPGP encryption and signing tool
 @end ifset
 
 @mansect synopsis
 @ifset manverb
 .B  gpg
 .RB [ \-\-homedir
 .IR dir ]
 .RB [ \-\-options
 .IR file ]
 .RI [ options ]
 .I command
 .RI [ args ]
 @end ifset
 @end ifclear
 @c End standard stuff
 
 @c Begin gpg2 hack stuff
 @ifset gpgtwohack
 @manpage gpg2.1
 @ifset manverb
 .B gpg2
 \- OpenPGP encryption and signing tool
 @end ifset
 
 @mansect synopsis
 @ifset manverb
 .B  gpg2
 .RB [ \-\-homedir
 .IR dir ]
 .RB [ \-\-options
 .IR file ]
 .RI [ options ]
 .I command
 .RI [ args ]
 @end ifset
 @end ifset
 @c End gpg2 hack stuff
 
 
 @mansect description
 @command{@gpgname} is the OpenPGP part of the GNU Privacy Guard (GnuPG). It
 is a tool to provide digital encryption and signing services using the
 OpenPGP standard. @command{@gpgname} features complete key management and
 all the bells and whistles you would expect from a full OpenPGP
 implementation.
 
 There are two main versions of GnuPG: GnuPG 1.x and GnuPG 2.x.  GnuPG
 2.x supports modern encryption algorithms and thus should be preferred
 over GnuPG 1.x.  You only need to use GnuPG 1.x if your platform
 doesn't support GnuPG 2.x, or you need support for some features that
 GnuPG 2.x has deprecated, e.g., decrypting data created with PGP-2
 keys.
 
 @ifclear gpgtwohack
 If you are looking for version 1 of GnuPG, you may find that version
 installed under the name @command{gpg1}.
 @end ifclear
 @ifset gpgtwohack
 In contrast to the standalone command @command{gpg} from GnuPG 1.x,
 the 2.x version is commonly installed under the name
 @command{@gpgname}.
 @end ifset
 
 @manpause
 
 @xref{Option Index}, for an index to @command{@gpgname}'s commands and options.
 @mancont
 
 @menu
 * GPG Commands::            List of all commands.
 * GPG Options::             List of all options.
 * GPG Configuration::       Configuration files.
 * GPG Examples::            Some usage examples.
 
 Developer information:
 * Unattended Usage of GPG:: Using @command{gpg} from other programs.
 @end menu
 
 @c * GPG Protocol::        The protocol the server mode uses.
 
 
 @c *******************************************
 @c ***************            ****************
 @c ***************  COMMANDS  ****************
 @c ***************            ****************
 @c *******************************************
 @mansect commands
 @node GPG Commands
 @section Commands
 
 Commands are not distinguished from options except for the fact that
 only one command is allowed.  Generally speaking, irrelevant options
 are silently ignored, and may not be checked for correctness.
 
 @command{@gpgname} may be run with no commands. In this case it will
 perform a reasonable action depending on the type of file it is given
 as input (an encrypted message is decrypted, a signature is verified,
 a file containing keys is listed, etc.).
 
 
 @menu
 * General GPG Commands::        Commands not specific to the functionality.
 * Operational GPG Commands::    Commands to select the type of operation.
 * OpenPGP Key Management::      How to manage your keys.
 @end menu
 
 
 @c *******************************************
 @c **********  GENERAL COMMANDS  *************
 @c *******************************************
 @node General GPG Commands
 @subsection Commands not specific to the function
 
 @table @gnupgtabopt
 @item --version
 @opindex version
 Print the program version and licensing information.  Note that you
 cannot abbreviate this command.
 
 @item --help
 @itemx -h
 @opindex help
 Print a usage message summarizing the most useful command-line options.
 Note that you cannot arbitrarily abbreviate this command
 (though you can use its short form @option{-h}).
 
 @item --warranty
 @opindex warranty
 Print warranty information.
 
 @item --dump-options
 @opindex dump-options
 Print a list of all available options and commands.  Note that you cannot
 abbreviate this command.
 @end table
 
 
 @c *******************************************
 @c ********  OPERATIONAL COMMANDS  ***********
 @c *******************************************
 @node Operational GPG Commands
 @subsection Commands to select the type of operation
 
 
 @table @gnupgtabopt
 
 @item --sign
 @itemx -s
 @opindex sign
 Sign a message. This command may be combined with @option{--encrypt}
 (to sign and encrypt a message), @option{--symmetric} (to sign and
 symmetrically encrypt a message), or both @option{--encrypt} and
 @option{--symmetric} (to sign and encrypt a message that can be
 decrypted using a secret key or a passphrase).  The signing key is
 chosen by default or can be set explicitly using the
 @option{--local-user} and @option{--default-key} options.
 
 @item --clear-sign
 @opindex clear-sign
 @itemx --clearsign
 @opindex clearsign
 Make a cleartext signature.  The content in a cleartext signature is
 readable without any special software. OpenPGP software is only needed
 to verify the signature.  cleartext signatures may modify end-of-line
 whitespace for platform independence and are not intended to be
 reversible.  The signing key is chosen by default or can be set
 explicitly using the @option{--local-user} and @option{--default-key}
 options.
 
 
 @item --detach-sign
 @itemx -b
 @opindex detach-sign
 Make a detached signature.
 
 @item --encrypt
 @itemx -e
 @opindex encrypt
 Encrypt data to one or more public keys. This command may be combined
 with @option{--sign} (to sign and encrypt a message),
 @option{--symmetric} (to encrypt a message that can decrypted using a
 secret key or a passphrase), or @option{--sign} and
 @option{--symmetric} together (for a signed message that can be
 decrypted using a secret key or a passphrase).  @option{--recipient}
 and related options specify which public keys to use for encryption.
 
 @item --symmetric
 @itemx -c
 @opindex symmetric
 Encrypt with a symmetric cipher using a passphrase. The default
 symmetric cipher used is @value{GPGSYMENCALGO}, but may be chosen with the
 @option{--cipher-algo} option. This command may be combined with
 @option{--sign} (for a signed and symmetrically encrypted message),
 @option{--encrypt} (for a message that may be decrypted via a secret key
 or a passphrase), or @option{--sign} and @option{--encrypt} together
 (for a signed message that may be decrypted via a secret key or a
 passphrase).  @command{@gpgname} caches the passphrase used for
 symmetric encryption so that a decrypt operation may not require that
 the user needs to enter the passphrase.  The option
 @option{--no-symkey-cache} can be used to disable this feature.
 
 @item --store
 @opindex store
 Store only (make a simple literal data packet).
 
 @item --decrypt
 @itemx -d
 @opindex decrypt
 Decrypt the file given on the command line (or STDIN if no file
 is specified) and write it to STDOUT (or the file specified with
 @option{--output}). If the decrypted file is signed, the signature is also
 verified. This command differs from the default operation, as it never
 writes to the filename which is included in the file and it rejects
 files that don't begin with an encrypted message.
 
 @item --verify
 @opindex verify
 Assume that the first argument is a signed file and verify it without
 generating any output.  With no arguments, the signature packet is
 read from STDIN.  If only one argument is given, the specified file is
 expected to include a complete signature.
 
 With more than one argument, the first argument should specify a file
 with a detached signature and the remaining files should contain the
 signed data. To read the signed data from STDIN, use @samp{-} as the
 second filename.  For security reasons, a detached signature will not
 read the signed material from STDIN if not explicitly specified.
 
 Note: If the option @option{--batch} is not used, @command{@gpgname}
 may assume that a single argument is a file with a detached signature,
 and it will try to find a matching data file by stripping certain
 suffixes.  Using this historical feature to verify a detached
 signature is strongly discouraged; you should always specify the data file
 explicitly.
 
 Note: When verifying a cleartext signature, @command{@gpgname} verifies
 only what makes up the cleartext signed data and not any extra data
 outside of the cleartext signature or the header lines directly following
 the dash marker line.  The option @code{--output} may be used to write
 out the actual signed data, but there are other pitfalls with this
 format as well.  It is suggested to avoid cleartext signatures in
 favor of detached signatures.
 
 Note: Sometimes the use of the @command{gpgv} tool is easier than
 using the full-fledged @command{gpg} with this option.  @command{gpgv}
 is designed to compare signed data against a list of trusted keys and
 returns with success only for a good signature.  It has its own manual
 page.
 
 
 @item --multifile
 @opindex multifile
 This modifies certain other commands to accept multiple files for
 processing on the command line or read from STDIN with each filename on
 a separate line. This allows for many files to be processed at
 once. @option{--multifile} may currently be used along with
 @option{--verify}, @option{--encrypt}, and @option{--decrypt}. Note that
 @option{--multifile --verify} may not be used with detached signatures.
 
 @item --verify-files
 @opindex verify-files
 Identical to @option{--multifile --verify}.
 
 @item --encrypt-files
 @opindex encrypt-files
 Identical to @option{--multifile --encrypt}.
 
 @item --decrypt-files
 @opindex decrypt-files
 Identical to @option{--multifile --decrypt}.
 
 @item --list-keys
 @itemx -k
 @itemx --list-public-keys
 @opindex list-keys
 List the specified keys.  If no keys are specified, then all keys from
 the configured public keyrings are listed.
 
 Never use the output of this command in scripts or other programs.
 The output is intended only for humans and its format is likely to
 change.  The @option{--with-colons} option emits the output in a
 stable, machine-parseable format, which is intended for use by scripts
 and other programs.
 
 @item --list-secret-keys
 @itemx -K
 @opindex list-secret-keys
 List the specified secret keys.  If no keys are specified, then all
 known secret keys are listed.  A @code{#} after the initial tags
 @code{sec} or @code{ssb} means that the secret key or subkey is
 currently not usable.  We also say that this key has been taken
 offline (for example, a primary key can be taken offline by exporting
 the key using the command @option{--export-secret-subkeys}).  A
 @code{>} after these tags indicate that the key is stored on a
 smartcard.  See also @option{--list-keys}.
 
 @item --check-signatures
 @opindex check-signatures
 @itemx --check-sigs
 @opindex check-sigs
 Same as @option{--list-keys}, but the key signatures are verified and
 listed too.  Note that for performance reasons the revocation status
 of a signing key is not shown.  This command has the same effect as
 using @option{--list-keys} with @option{--with-sig-check}.
 
 The status of the verification is indicated by a flag directly
 following the "sig" tag (and thus before the flags described below.  A
 "!" indicates that the signature has been successfully verified, a "-"
 denotes a bad signature and a "%" is used if an error occurred while
 checking the signature (e.g. a non supported algorithm).  Signatures
 where the public key is not available are not listed; to see their
 keyids the command @option{--list-sigs} can be used.
 
 For each signature listed, there are several flags in between the
 signature status flag and keyid.  These flags give additional
 information about each key signature.  From left to right, they are
 the numbers 1-3 for certificate check level (see
 @option{--ask-cert-level}), "L" for a local or non-exportable
 signature (see @option{--lsign-key}), "R" for a nonRevocable signature
 (see the @option{--edit-key} command "nrsign"), "P" for a signature
 that contains a policy URL (see @option{--cert-policy-url}), "N" for a
 signature that contains a notation (see @option{--cert-notation}), "X"
 for an eXpired signature (see @option{--ask-cert-expire}), and the
 numbers 1-9 or "T" for 10 and above to indicate trust signature levels
 (see the @option{--edit-key} command "tsign").
 
 
 @item --locate-keys
 @opindex locate-keys
 Locate the keys given as arguments.  This command basically uses the
 same algorithm as used when locating keys for encryption or signing and
 may thus be used to see what keys @command{@gpgname} might use.  In
 particular external methods as defined by @option{--auto-key-locate} may
 be used to locate a key.  Only public keys are listed.
 
 @item --show-keys
 @opindex show-keys
 This commands takes OpenPGP keys as input and prints information about
 them in the same way the command @option{--list-keys} does for locally
 stored key.  In addition the list options @code{show-unusable-uids},
 @code{show-unusable-subkeys}, @code{show-notations} and
 @code{show-policy-urls} are also enabled.  As usual for automated
 processing, this command should be combined with the option
 @option{--with-colons}.
 
 @item --fingerprint
 @opindex fingerprint
 List all keys (or the specified ones) along with their
 fingerprints. This is the same output as @option{--list-keys} but with
 the additional output of a line with the fingerprint. May also be
 combined with @option{--check-signatures}.  If this
 command is given twice, the fingerprints of all secondary keys are
 listed too.  This command also forces pretty printing of fingerprints
 if the keyid format has been set to "none".
 
 @item --list-packets
 @opindex list-packets
 List only the sequence of packets.  This command is only useful for
 debugging.  When used with option @option{--verbose} the actual MPI
 values are dumped and not only their lengths.  Note that the output of
 this command may change with new releases.
 
 
 @item --edit-card
 @opindex edit-card
 @itemx --card-edit
 @opindex card-edit
 Present a menu to work with a smartcard. The subcommand "help" provides
 an overview on available commands. For a detailed description, please
 see the Card HOWTO at
 https://gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO .
 
 @item --card-status
 @opindex card-status
 Show the content of the smart card.
 
 @item --change-pin
 @opindex change-pin
 Present a menu to allow changing the PIN of a smartcard. This
 functionality is also available as the subcommand "passwd" with the
 @option{--edit-card} command.
 
 @item --delete-keys @var{name}
 @opindex delete-keys
 Remove key from the public keyring. In batch mode either @option{--yes} is
 required or the key must be specified by fingerprint. This is a
 safeguard against accidental deletion of multiple keys.
 
 @item --delete-secret-keys @var{name}
 @opindex delete-secret-keys
 Remove key from the secret keyring. In batch mode the key must be
 specified by fingerprint.  The option @option{--yes} can be used to
 advice gpg-agent not to request a confirmation.  This extra
 pre-caution is done because @command{@gpgname} can't be sure that the
 secret key (as controlled by gpg-agent) is only used for the given
 OpenPGP public key.
 
 
 @item --delete-secret-and-public-key @var{name}
 @opindex delete-secret-and-public-key
 Same as @option{--delete-key}, but if a secret key exists, it will be
 removed first. In batch mode the key must be specified by fingerprint.
 The option @option{--yes} can be used to advice gpg-agent not to
 request a confirmation.
 
 @item --export
 @opindex export
 Either export all keys from all keyrings (default keyrings and those
 registered via option @option{--keyring}), or if at least one name is given,
 those of the given name. The exported keys are written to STDOUT or to the
 file given with option @option{--output}.  Use together with
 @option{--armor} to mail those keys.
 
 @item --send-keys @var{keyIDs}
 @opindex send-keys
 Similar to @option{--export} but sends the keys to a keyserver.
 Fingerprints may be used instead of key IDs.  Option
 @option{--keyserver} must be used to give the name of this
 keyserver. Don't send your complete keyring to a keyserver --- select
 only those keys which are new or changed by you.  If no @var{keyIDs}
 are given, @command{@gpgname} does nothing.
 
 @item --export-secret-keys
 @itemx --export-secret-subkeys
 @opindex export-secret-keys
 @opindex export-secret-subkeys
 Same as @option{--export}, but exports the secret keys instead.  The
 exported keys are written to STDOUT or to the file given with option
 @option{--output}.  This command is often used along with the option
 @option{--armor} to allow for easy printing of the key for paper backup;
 however the external tool @command{paperkey} does a better job of
 creating backups on paper.  Note that exporting a secret key can be a
 security risk if the exported keys are sent over an insecure channel.
 
 The second form of the command has the special property to render the
 secret part of the primary key useless; this is a GNU extension to
 OpenPGP and other implementations can not be expected to successfully
 import such a key.  Its intended use is in generating a full key with
 an additional signing subkey on a dedicated machine.  This command
 then exports the key without the primary key to the main machine.
 
 GnuPG may ask you to enter the passphrase for the key.  This is
 required, because the internal protection method of the secret key is
 different from the one specified by the OpenPGP protocol.
 
 @item --export-ssh-key
 @opindex export-ssh-key
 This command is used to export a key in the OpenSSH public key format.
 It requires the specification of one key by the usual means and
 exports the latest valid subkey which has an authentication capability
 to STDOUT or to the file given with option @option{--output}.  That
 output can directly be added to ssh's @file{authorized_key} file.
 
 By specifying the key to export using a key ID or a fingerprint
 suffixed with an exclamation mark (!), a specific subkey or the
 primary key can be exported.  This does not even require that the key
 has the authentication capability flag set.
 
 @item --import
 @itemx --fast-import
 @opindex import
 Import/merge keys. This adds the given keys to the
 keyring. The fast version is currently just a synonym.
 
 There are a few other options which control how this command works.
 Most notable here is the @option{--import-options merge-only} option
 which does not insert new keys but does only the merging of new
 signatures, user-IDs and subkeys.
 
 @item --receive-keys @var{keyIDs}
 @opindex receive-keys
 @itemx --recv-keys @var{keyIDs}
 @opindex recv-keys
 Import the keys with the given @var{keyIDs} from a keyserver. Option
 @option{--keyserver} must be used to give the name of this keyserver.
 
 @item --refresh-keys
 @opindex refresh-keys
 Request updates from a keyserver for keys that already exist on the
 local keyring. This is useful for updating a key with the latest
 signatures, user IDs, etc. Calling this with no arguments will refresh
 the entire keyring. Option @option{--keyserver} must be used to give the
 name of the keyserver for all keys that do not have preferred keyservers
 set (see @option{--keyserver-options honor-keyserver-url}).
 
 @item --search-keys @var{names}
 @opindex search-keys
 Search the keyserver for the given @var{names}. Multiple names given here will
 be joined together to create the search string for the keyserver.
 Option @option{--keyserver} must be used to give the name of this
 keyserver.  Keyservers that support different search methods allow using
 the syntax specified in "How to specify a user ID" below. Note that
 different keyserver types support different search methods. Currently
 only LDAP supports them all.
 
 @item --fetch-keys @var{URIs}
 @opindex fetch-keys
 Retrieve keys located at the specified @var{URIs}. Note that different
 installations of GnuPG may support different protocols (HTTP, FTP,
 LDAP, etc.).  When using HTTPS the system provided root certificates
 are used by this command.
 
 @item --update-trustdb
 @opindex update-trustdb
 Do trust database maintenance. This command iterates over all keys and
 builds the Web of Trust. This is an interactive command because it may
 have to ask for the "ownertrust" values for keys. The user has to give
 an estimation of how far she trusts the owner of the displayed key to
 correctly certify (sign) other keys. GnuPG only asks for the ownertrust
 value if it has not yet been assigned to a key. Using the
 @option{--edit-key} menu, the assigned value can be changed at any time.
 
 @item --check-trustdb
 @opindex check-trustdb
 Do trust database maintenance without user interaction. From time to
 time the trust database must be updated so that expired keys or
 signatures and the resulting changes in the Web of Trust can be
 tracked. Normally, GnuPG will calculate when this is required and do it
 automatically unless @option{--no-auto-check-trustdb} is set. This
 command can be used to force a trust database check at any time. The
 processing is identical to that of @option{--update-trustdb} but it
 skips keys with a not yet defined "ownertrust".
 
 For use with cron jobs, this command can be used together with
 @option{--batch} in which case the trust database check is done only if
 a check is needed. To force a run even in batch mode add the option
 @option{--yes}.
 
 @anchor{option --export-ownertrust}
 @item --export-ownertrust
 @opindex export-ownertrust
 Send the ownertrust values to STDOUT. This is useful for backup purposes
 as these values are the only ones which can't be re-created from a
 corrupted trustdb.  Example:
 @c man:.RS
 @example
   @gpgname{} --export-ownertrust > otrust.txt
 @end example
 @c man:.RE
 
 
 @item --import-ownertrust
 @opindex import-ownertrust
 Update the trustdb with the ownertrust values stored in @code{files} (or
 STDIN if not given); existing values will be overwritten.  In case of a
 severely damaged trustdb and if you have a recent backup of the
 ownertrust values (e.g. in the file @file{otrust.txt}), you may re-create
 the trustdb using these commands:
 @c man:.RS
 @example
   cd ~/.gnupg
   rm trustdb.gpg
   @gpgname{} --import-ownertrust < otrust.txt
 @end example
 @c man:.RE
 
 
 @item --rebuild-keydb-caches
 @opindex rebuild-keydb-caches
 When updating from version 1.0.6 to 1.0.7 this command should be used
 to create signature caches in the keyring. It might be handy in other
 situations too.
 
 @item --print-md @var{algo}
 @itemx --print-mds
 @opindex print-md
 Print message digest of algorithm @var{algo} for all given files or STDIN.
 With the second form (or a deprecated "*" for @var{algo}) digests for all
 available algorithms are printed.
 
 @item --gen-random @var{0|1|2} @var{count}
 @opindex gen-random
 Emit @var{count} random bytes of the given quality level 0, 1 or 2. If
 @var{count} is not given or zero, an endless sequence of random bytes
 will be emitted.  If used with @option{--armor} the output will be
 base64 encoded.  PLEASE, don't use this command unless you know what
 you are doing; it may remove precious entropy from the system!
 
 @item --gen-prime @var{mode}  @var{bits}
 @opindex gen-prime
 Use the source, Luke :-). The output format is subject to change
 with ant release.
 
 
 @item --enarmor
 @itemx --dearmor
 @opindex enarmor
 @opindex dearmor
 Pack or unpack an arbitrary input into/from an OpenPGP ASCII armor.
 This is a GnuPG extension to OpenPGP and in general not very useful.
 
 @item --tofu-policy @{auto|good|unknown|bad|ask@}  @var{keys}
 @opindex tofu-policy
 Set the TOFU policy for all the bindings associated with the specified
 @var{keys}.  For more information about the meaning of the policies,
 @pxref{trust-model-tofu}.  The @var{keys} may be specified either by their
 fingerprint (preferred) or their keyid.
 
 @c @item --server
 @c @opindex server
 @c Run gpg in server mode.  This feature is not yet ready for use and
 @c thus not documented.
 
 @end table
 
 
-@c *******************************************
-@c *******  KEY MANGEMENT COMMANDS  **********
-@c *******************************************
+@c ********************************************
+@c *******  KEY MANAGEMENT COMMANDS  **********
+@c ********************************************
 @node OpenPGP Key Management
 @subsection How to manage your keys
 
 This section explains the main commands for key management.
 
 @table @gnupgtabopt
 
 @item --quick-generate-key @var{user-id} [@var{algo} [@var{usage} [@var{expire}]]]
 @itemx --quick-gen-key
 @opindex quick-generate-key
 @opindex quick-gen-key
 This is a simple command to generate a standard key with one user id.
 In contrast to @option{--generate-key} the key is generated directly
 without the need to answer a bunch of prompts.  Unless the option
 @option{--yes} is given, the key creation will be canceled if the
 given user id already exists in the keyring.
 
 If invoked directly on the console without any special options an
 answer to a ``Continue?'' style confirmation prompt is required.  In
 case the user id already exists in the keyring a second prompt to
 force the creation of the key will show up.
 
 If @var{algo} or @var{usage} are given, only the primary key is
 created and no prompts are shown.  To specify an expiration date but
 still create a primary and subkey use ``default'' or
 ``future-default'' for @var{algo} and ``default'' for @var{usage}.
 For a description of these optional arguments see the command
 @code{--quick-add-key}.  The @var{usage} accepts also the value
 ``cert'' which can be used to create a certification only primary key;
 the default is to a create certification and signing key.
 
 The @var{expire} argument can be used to specify an expiration date
 for the key.  Several formats are supported; commonly the ISO formats
 ``YYYY-MM-DD'' or ``YYYYMMDDThhmmss'' are used.  To make the key
 expire in N seconds, N days, N weeks, N months, or N years use
 ``seconds=N'', ``Nd'', ``Nw'', ``Nm'', or ``Ny'' respectively.  Not
 specifying a value, or using ``-'' results in a key expiring in a
 reasonable default interval.  The values ``never'', ``none'' can be
 used for no expiration date.
 
 If this command is used with @option{--batch},
 @option{--pinentry-mode} has been set to @code{loopback}, and one of
 the passphrase options (@option{--passphrase},
 @option{--passphrase-fd}, or @option{passphrase-file}) is used, the
 supplied passphrase is used for the new key and the agent does not ask
 for it.  To create a key without any protection @code{--passphrase ''}
 may be used.
 
 Note that it is possible to create a primary key and a subkey using
 non-default algorithms by using ``default'' and changing the default
 parameters using the option @option{--default-new-key-algo}.
 
 @item --quick-set-expire @var{fpr} @var{expire} [*|@var{subfprs}]
 @opindex quick-set-expire
 With two arguments given, directly set the expiration time of the
 primary key identified by @var{fpr} to @var{expire}.  To remove the
 expiration time @code{0} can be used.  With three arguments and the
 third given as an asterisk, the expiration time of all non-revoked and
 not yet expired subkeys are set to @var{expire}.  With more than two
 arguments and a list of fingerprints given for @var{subfprs}, all
 non-revoked subkeys matching these fingerprints are set to
 @var{expire}.
 
 
 @item --quick-add-key @var{fpr} [@var{algo} [@var{usage} [@var{expire}]]]
 @opindex quick-add-key
 Directly add a subkey to the key identified by the fingerprint
 @var{fpr}.  Without the optional arguments an encryption subkey is
 added.  If any of the arguments are given a more specific subkey is
 added.
 
 @var{algo} may be any of the supported algorithms or curve names
 given in the format as used by key listings.  To use the default
 algorithm the string ``default'' or ``-'' can be used.  Supported
 algorithms are ``rsa'', ``dsa'', ``elg'', ``ed25519'', ``cv25519'',
 and other ECC curves.  For example the string ``rsa'' adds an RSA key
 with the default key length; a string ``rsa4096'' requests that the
 key length is 4096 bits.  The string ``future-default'' is an alias
 for the algorithm which will likely be used as default algorithm in
 future versions of gpg.  To list the supported ECC curves the command
 @code{gpg --with-colons --list-config curve} can be used.
 
 Depending on the given @var{algo} the subkey may either be an
 encryption subkey or a signing subkey.  If an algorithm is capable of
 signing and encryption and such a subkey is desired, a @var{usage}
 string must be given.  This string is either ``default'' or ``-'' to
 keep the default or a comma delimited list (or space delimited list)
 of keywords: ``sign'' for a signing subkey, ``auth'' for an
 authentication subkey, and ``encr'' for an encryption subkey
 (``encrypt'' can be used as alias for ``encr'').  The valid
 combinations depend on the algorithm.
 
 The @var{expire} argument can be used to specify an expiration date
 for the key.  Several formats are supported; commonly the ISO formats
 ``YYYY-MM-DD'' or ``YYYYMMDDThhmmss'' are used.  To make the key
 expire in N seconds, N days, N weeks, N months, or N years use
 ``seconds=N'', ``Nd'', ``Nw'', ``Nm'', or ``Ny'' respectively.  Not
 specifying a value, or using ``-'' results in a key expiring in a
 reasonable default interval.  The values ``never'', ``none'' can be
 used for no expiration date.
 
 @item --generate-key
 @opindex generate-key
 @itemx --gen-key
 @opindex gen-key
 Generate a new key pair using the current default parameters.  This is
 the standard command to create a new key.  In addition to the key a
 revocation certificate is created and stored in the
 @file{openpgp-revocs.d} directory below the GnuPG home directory.
 
 @item --full-generate-key
 @opindex full-generate-key
 @itemx --full-gen-key
 @opindex full-gen-key
 Generate a new key pair with dialogs for all options.  This is an
 extended version of @option{--generate-key}.
 
 There is also a feature which allows you to create keys in batch
 mode. See the manual section ``Unattended key generation'' on how
 to use this.
 
 
 @item --generate-revocation @var{name}
 @opindex generate-revocation
 @itemx --gen-revoke @var{name}
 @opindex gen-revoke
 Generate a revocation certificate for the complete key.  To only revoke
 a subkey or a key signature, use the @option{--edit} command.
 
 This command merely creates the revocation certificate so that it can
 be used to revoke the key if that is ever needed.  To actually revoke
 a key the created revocation certificate needs to be merged with the
 key to revoke.  This is done by importing the revocation certificate
 using the @option{--import} command.  Then the revoked key needs to be
 published, which is best done by sending the key to a keyserver
 (command @option{--send-key}) and by exporting (@option{--export}) it
 to a file which is then send to frequent communication partners.
 
 
 @item --generate-designated-revocation @var{name}
 @opindex generate-designated-revocation
 @itemx --desig-revoke @var{name}
 @opindex desig-revoke
 Generate a designated revocation certificate for a key. This allows a
 user (with the permission of the keyholder) to revoke someone else's
 key.
 
 
 @item --edit-key
 @opindex edit-key
 Present a menu which enables you to do most of the key management
 related tasks.  It expects the specification of a key on the command
 line.
 
 @c ******** Begin Edit-key Options **********
 @table @asis
 
   @item uid @var{n}
   @opindex keyedit:uid
   Toggle selection of user ID or photographic user ID with index @var{n}.
   Use @code{*} to select all and @code{0} to deselect all.
 
   @item key @var{n}
   @opindex keyedit:key
   Toggle selection of subkey with index @var{n} or key ID @var{n}.
   Use @code{*} to select all and @code{0} to deselect all.
 
   @item sign
   @opindex keyedit:sign
   Make a signature on key of user @code{name}. If the key is not yet
   signed by the default user (or the users given with @option{-u}), the program
   displays the information of the key again, together with its
   fingerprint and asks whether it should be signed. This question is
   repeated for all users specified with
   @option{-u}.
 
   @item lsign
   @opindex keyedit:lsign
   Same as "sign" but the signature is marked as non-exportable and will
   therefore never be used by others. This may be used to make keys
   valid only in the local environment.
 
   @item nrsign
   @opindex keyedit:nrsign
   Same as "sign" but the signature is marked as non-revocable and can
   therefore never be revoked.
 
   @item tsign
   @opindex keyedit:tsign
   Make a trust signature. This is a signature that combines the notions
   of certification (like a regular signature), and trust (like the
   "trust" command). It is generally only useful in distinct communities
   or groups.  For more information please read the sections
   ``Trust Signature'' and ``Regular Expression'' in RFC-4880.
 @end table
 
 @c man:.RS
 Note that "l" (for local / non-exportable), "nr" (for non-revocable,
 and "t" (for trust) may be freely mixed and prefixed to "sign" to
 create a signature of any type desired.
 @c man:.RE
 
 If the option @option{--only-sign-text-ids} is specified, then any
 non-text based user ids (e.g., photo IDs) will not be selected for
 signing.
 
 @table @asis
 
   @item delsig
   @opindex keyedit:delsig
   Delete a signature. Note that it is not possible to retract a signature,
   once it has been send to the public (i.e. to a keyserver).  In that case
   you better use @code{revsig}.
 
   @item revsig
   @opindex keyedit:revsig
   Revoke a signature. For every signature which has been generated by
   one of the secret keys, GnuPG asks whether a revocation certificate
   should be generated.
 
   @item check
   @opindex keyedit:check
   Check the signatures on all selected user IDs.  With the extra
   option @code{selfsig} only self-signatures are shown.
 
   @item adduid
   @opindex keyedit:adduid
   Create an additional user ID.
 
   @item addphoto
   @opindex keyedit:addphoto
   Create a photographic user ID. This will prompt for a JPEG file that
   will be embedded into the user ID. Note that a very large JPEG will make
   for a very large key. Also note that some programs will display your
   JPEG unchanged (GnuPG), and some programs will scale it to fit in a
   dialog box (PGP).
 
   @item showphoto
   @opindex keyedit:showphoto
   Display the selected photographic user ID.
 
   @item deluid
   @opindex keyedit:deluid
   Delete a user ID or photographic user ID.  Note that it is not
   possible to retract a user id, once it has been send to the public
   (i.e. to a keyserver).  In that case you better use @code{revuid}.
 
   @item revuid
   @opindex keyedit:revuid
   Revoke a user ID or photographic user ID.
 
   @item primary
   @opindex keyedit:primary
   Flag the current user id as the primary one, removes the primary user
   id flag from all other user ids and sets the timestamp of all affected
   self-signatures one second ahead. Note that setting a photo user ID
   as primary makes it primary over other photo user IDs, and setting a
   regular user ID as primary makes it primary over other regular user
   IDs.
 
   @item keyserver
   @opindex keyedit:keyserver
   Set a preferred keyserver for the specified user ID(s). This allows
   other users to know where you prefer they get your key from. See
   @option{--keyserver-options honor-keyserver-url} for more on how this
   works.  Setting a value of "none" removes an existing preferred
   keyserver.
 
   @item notation
   @opindex keyedit:notation
   Set a name=value notation for the specified user ID(s). See
   @option{--cert-notation} for more on how this works. Setting a value of
   "none" removes all notations, setting a notation prefixed with a minus
   sign (-) removes that notation, and setting a notation name (without the
   =value) prefixed with a minus sign removes all notations with that name.
 
   @item pref
   @opindex keyedit:pref
   List preferences from the selected user ID. This shows the actual
   preferences, without including any implied preferences.
 
   @item showpref
   @opindex keyedit:showpref
   More verbose preferences listing for the selected user ID. This shows
   the preferences in effect by including the implied preferences of 3DES
   (cipher), SHA-1 (digest), and Uncompressed (compression) if they are
   not already included in the preference list. In addition, the
   preferred keyserver and signature notations (if any) are shown.
 
   @item setpref @var{string}
   @opindex keyedit:setpref
   Set the list of user ID preferences to @var{string} for all (or just
   the selected) user IDs. Calling setpref with no arguments sets the
   preference list to the default (either built-in or set via
   @option{--default-preference-list}), and calling setpref with "none"
   as the argument sets an empty preference list. Use @command{@gpgname
   --version} to get a list of available algorithms. Note that while you
   can change the preferences on an attribute user ID (aka "photo ID"),
   GnuPG does not select keys via attribute user IDs so these preferences
   will not be used by GnuPG.
 
   When setting preferences, you should list the algorithms in the order
   which you'd like to see them used by someone else when encrypting a
   message to your key.  If you don't include 3DES, it will be
   automatically added at the end.  Note that there are many factors that
   go into choosing an algorithm (for example, your key may not be the
   only recipient), and so the remote OpenPGP application being used to
   send to you may or may not follow your exact chosen order for a given
   message.  It will, however, only choose an algorithm that is present
   on the preference list of every recipient key.  See also the
   INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS section below.
 
   @item addkey
   @opindex keyedit:addkey
   Add a subkey to this key.
 
   @item addcardkey
   @opindex keyedit:addcardkey
   Generate a subkey on a card and add it to this key.
 
   @item keytocard
   @opindex keyedit:keytocard
   Transfer the selected secret subkey (or the primary key if no subkey
   has been selected) to a smartcard. The secret key in the keyring will
   be replaced by a stub if the key could be stored successfully on the
   card and you use the save command later. Only certain key types may be
   transferred to the card. A sub menu allows you to select on what card
   to store the key. Note that it is not possible to get that key back
   from the card - if the card gets broken your secret key will be lost
   unless you have a backup somewhere.
 
   @item bkuptocard @var{file}
   @opindex keyedit:bkuptocard
   Restore the given @var{file} to a card. This command may be used to restore a
   backup key (as generated during card initialization) to a new card. In
   almost all cases this will be the encryption key. You should use this
   command only with the corresponding public key and make sure that the
   file given as argument is indeed the backup to restore. You should then
   select 2 to restore as encryption key.  You will first be asked to enter
   the passphrase of the backup key and then for the Admin PIN of the card.
 
   @item delkey
   @opindex keyedit:delkey
   Remove a subkey (secondary key). Note that it is not possible to retract
   a subkey, once it has been send to the public (i.e. to a keyserver).  In
   that case you better use @code{revkey}.  Also note that this only
   deletes the public part of a key.
 
   @item revkey
   @opindex keyedit:revkey
   Revoke a subkey.
 
   @item expire
   @opindex keyedit:expire
   Change the key or subkey expiration time. If a subkey is selected, the
   expiration time of this subkey will be changed. With no selection, the
   key expiration of the primary key is changed.
 
   @item trust
   @opindex keyedit:trust
   Change the owner trust value for the key. This updates the trust-db
   immediately and no save is required.
 
   @item disable
   @itemx enable
   @opindex keyedit:disable
   @opindex keyedit:enable
   Disable or enable an entire key. A disabled key can not normally be
   used for encryption.
 
   @item addrevoker
   @opindex keyedit:addrevoker
   Add a designated revoker to the key. This takes one optional argument:
   "sensitive". If a designated revoker is marked as sensitive, it will
   not be exported by default (see export-options).
 
   @item passwd
   @opindex keyedit:passwd
   Change the passphrase of the secret key.
 
   @item toggle
   @opindex keyedit:toggle
   This is dummy command which exists only for backward compatibility.
 
   @item clean
   @opindex keyedit:clean
   Compact (by removing all signatures except the selfsig) any user ID
   that is no longer usable (e.g. revoked, or expired). Then, remove any
   signatures that are not usable by the trust calculations.
   Specifically, this removes any signature that does not validate, any
   signature that is superseded by a later signature, revoked signatures,
   and signatures issued by keys that are not present on the keyring.
 
   @item minimize
   @opindex keyedit:minimize
   Make the key as small as possible. This removes all signatures from
   each user ID except for the most recent self-signature.
 
   @item change-usage
   @opindex keyedit:change-usage
   Change the usage flags (capabilities) of the primary key or of
   subkeys.  These usage flags (e.g. Certify, Sign, Authenticate,
   Encrypt) are set during key creation.  Sometimes it is useful to
   have the opportunity to change them (for example to add
   Authenticate) after they have been created.  Please take care when
   doing this; the allowed usage flags depend on the key algorithm.
 
   @item cross-certify
   @opindex keyedit:cross-certify
   Add cross-certification signatures to signing subkeys that may not
   currently have them. Cross-certification signatures protect against a
   subtle attack against signing subkeys. See
   @option{--require-cross-certification}.  All new keys generated have
   this signature by default, so this command is only useful to bring
   older keys up to date.
 
   @item save
   @opindex keyedit:save
   Save all changes to the keyrings and quit.
 
   @item quit
   @opindex keyedit:quit
   Quit the program without updating the
   keyrings.
 @end table
 
 @c man:.RS
 The listing shows you the key with its secondary keys and all user
 IDs.  The primary user ID is indicated by a dot, and selected keys or
 user IDs are indicated by an asterisk.  The trust
 value is displayed with the primary key: "trust" is the assigned owner
 trust and "validity" is the calculated validity of the key.  Validity
 values are also displayed for all user IDs.
 For possible values of trust, @pxref{trust-values}.
 @c man:.RE
 @c ******** End Edit-key Options **********
 
 @item --sign-key @var{name}
 @opindex sign-key
 Signs a public key with your secret key. This is a shortcut version of
 the subcommand "sign" from @option{--edit}.
 
 @item --lsign-key @var{name}
 @opindex lsign-key
 Signs a public key with your secret key but marks it as
 non-exportable. This is a shortcut version of the subcommand "lsign"
 from @option{--edit-key}.
 
 @item --quick-sign-key @var{fpr} [@var{names}]
 @itemx --quick-lsign-key @var{fpr} [@var{names}]
 @opindex quick-sign-key
 @opindex quick-lsign-key
 Directly sign a key from the passphrase without any further user
 interaction.  The @var{fpr} must be the verified primary fingerprint
 of a key in the local keyring. If no @var{names} are given, all
 useful user ids are signed; with given [@var{names}] only useful user
 ids matching one of theses names are signed.  By default, or if a name
 is prefixed with a '*', a case insensitive substring match is used.
 If a name is prefixed with a '=' a case sensitive exact match is done.
 
 The command @option{--quick-lsign-key} marks the signatures as
 non-exportable.  If such a non-exportable signature already exists the
 @option{--quick-sign-key} turns it into a exportable signature.
 
 This command uses reasonable defaults and thus does not provide the
 full flexibility of the "sign" subcommand from @option{--edit-key}.
 Its intended use is to help unattended key signing by utilizing a list
 of verified fingerprints.
 
 @item --quick-add-uid  @var{user-id} @var{new-user-id}
 @opindex quick-add-uid
 This command adds a new user id to an existing key.  In contrast to
 the interactive sub-command @code{adduid} of @option{--edit-key} the
 @var{new-user-id} is added verbatim with only leading and trailing
 white space removed, it is expected to be UTF-8 encoded, and no checks
 on its form are applied.
 
 @item --quick-revoke-uid  @var{user-id} @var{user-id-to-revoke}
 @opindex quick-revoke-uid
 This command revokes a user ID on an existing key.  It cannot be used
 to revoke the last user ID on key (some non-revoked user ID must
 remain), with revocation reason ``User ID is no longer valid''.  If
 you want to specify a different revocation reason, or to supply
 supplementary revocation text, you should use the interactive
 sub-command @code{revuid} of @option{--edit-key}.
 
 @item --quick-set-primary-uid  @var{user-id} @var{primary-user-id}
 @opindex quick-set-primary-uid
 This command sets or updates the primary user ID flag on an existing
 key.  @var{user-id} specifies the key and @var{primary-user-id} the
 user ID which shall be flagged as the primary user ID.  The primary
 user ID flag is removed from all other user ids and the timestamp of
 all affected self-signatures is set one second ahead.
 
 
 @item --change-passphrase @var{user-id}
 @opindex change-passphrase
 @itemx --passwd @var{user-id}
 @opindex passwd
 Change the passphrase of the secret key belonging to the certificate
 specified as @var{user-id}.  This is a shortcut for the sub-command
 @code{passwd} of the edit key menu.  When using together with the
 option @option{--dry-run} this will not actually change the passphrase
 but check that the current passphrase is correct.
 
 @end table
 
 
 @c *******************************************
 @c ***************            ****************
 @c ***************  OPTIONS   ****************
 @c ***************            ****************
 @c *******************************************
 @mansect options
 @node GPG Options
 @section Option Summary
 
 @command{@gpgname} features a bunch of options to control the exact
 behaviour and to change the default configuration.
 
 @menu
 * GPG Configuration Options::   How to change the configuration.
 * GPG Key related Options::     Key related options.
 * GPG Input and Output::        Input and Output.
 * OpenPGP Options::             OpenPGP protocol specific options.
 * Compliance Options::          Compliance options.
 * GPG Esoteric Options::        Doing things one usually doesn't want to do.
 * Deprecated Options::          Deprecated options.
 @end menu
 
 Long options can be put in an options file (default
 "~/.gnupg/gpg.conf"). Short option names will not work - for example,
 "armor" is a valid option for the options file, while "a" is not. Do not
 write the 2 dashes, but simply the name of the option and any required
 arguments. Lines with a hash ('#') as the first non-white-space
 character are ignored. Commands may be put in this file too, but that is
 not generally useful as the command will execute automatically with
 every execution of gpg.
 
 Please remember that option parsing stops as soon as a non-option is
 encountered, you can explicitly stop parsing by using the special option
 @option{--}.
 
 @c *******************************************
 @c ********  CONFIGURATION OPTIONS  **********
 @c *******************************************
 @node GPG Configuration Options
 @subsection How to change the configuration
 
 These options are used to change the configuration and are usually found
 in the option file.
 
 @table @gnupgtabopt
 
 @item --default-key @var{name}
 @opindex default-key
 Use @var{name} as the default key to sign with. If this option is not
 used, the default key is the first key found in the secret keyring.
 Note that @option{-u} or @option{--local-user} overrides this option.
 This option may be given multiple times.  In this case, the last key
 for which a secret key is available is used.  If there is no secret
 key available for any of the specified values, GnuPG will not emit an
 error message but continue as if this option wasn't given.
 
 @item --default-recipient @var{name}
 @opindex default-recipient
 Use @var{name} as default recipient if option @option{--recipient} is
 not used and don't ask if this is a valid one. @var{name} must be
 non-empty.
 
 @item --default-recipient-self
 @opindex default-recipient-self
 Use the default key as default recipient if option @option{--recipient} is not
 used and don't ask if this is a valid one. The default key is the first
 one from the secret keyring or the one set with @option{--default-key}.
 
 @item --no-default-recipient
 @opindex no-default-recipient
 Reset @option{--default-recipient} and @option{--default-recipient-self}.
 
 @item -v, --verbose
 @opindex verbose
 Give more information during processing. If used
 twice, the input data is listed in detail.
 
 @item --no-verbose
 @opindex no-verbose
 Reset verbose level to 0.
 
 @item -q, --quiet
 @opindex quiet
 Try to be as quiet as possible.
 
 @item --batch
 @itemx --no-batch
 @opindex batch
 @opindex no-batch
 Use batch mode.  Never ask, do not allow interactive commands.
 @option{--no-batch} disables this option.  Note that even with a
 filename given on the command line, gpg might still need to read from
 STDIN (in particular if gpg figures that the input is a
 detached signature and no data file has been specified).  Thus if you
 do not want to feed data via STDIN, you should connect STDIN to
 g@file{/dev/null}.
 
 It is highly recommended to use this option along with the options
 @option{--status-fd} and @option{--with-colons} for any unattended use of
 @command{gpg}.
 
 @item --no-tty
 @opindex no-tty
 Make sure that the TTY (terminal) is never used for any output.
 This option is needed in some cases because GnuPG sometimes prints
 warnings to the TTY even if @option{--batch} is used.
 
 @item --yes
 @opindex yes
 Assume "yes" on most questions.
 
 @item --no
 @opindex no
 Assume "no" on most questions.
 
 
 @item --list-options @var{parameters}
 @opindex list-options
 This is a space or comma delimited string that gives options used when
 listing keys and signatures (that is, @option{--list-keys},
 @option{--check-signatures}, @option{--list-public-keys},
 @option{--list-secret-keys}, and the @option{--edit-key} functions).
 Options can be prepended with a @option{no-} (after the two dashes) to
 give the opposite meaning.  The options are:
 
 @table @asis
 
   @item show-photos
   @opindex list-options:show-photos
   Causes @option{--list-keys}, @option{--check-signatures},
   @option{--list-public-keys}, and @option{--list-secret-keys} to
   display any photo IDs attached to the key.  Defaults to no. See also
   @option{--photo-viewer}.  Does not work with @option{--with-colons}:
   see @option{--attribute-fd} for the appropriate way to get photo data
   for scripts and other frontends.
 
   @item show-usage
   @opindex list-options:show-usage
   Show usage information for keys and subkeys in the standard key
   listing.  This is a list of letters indicating the allowed usage for a
   key (@code{E}=encryption, @code{S}=signing, @code{C}=certification,
   @code{A}=authentication).  Defaults to yes.
 
   @item show-policy-urls
   @opindex list-options:show-policy-urls
   Show policy URLs in the  @option{--check-signatures}
   listings.  Defaults to no.
 
   @item show-notations
   @itemx show-std-notations
   @itemx show-user-notations
   @opindex list-options:show-notations
   @opindex list-options:show-std-notations
   @opindex list-options:show-user-notations
   Show all, IETF standard, or user-defined signature notations in the
   @option{--check-signatures} listings. Defaults to no.
 
   @item show-keyserver-urls
   @opindex list-options:show-keyserver-urls
   Show any preferred keyserver URL in the
   @option{--check-signatures} listings. Defaults to no.
 
   @item show-uid-validity
   @opindex list-options:show-uid-validity
   Display the calculated validity of user IDs during key listings.
   Defaults to yes.
 
   @item show-unusable-uids
   @opindex list-options:show-unusable-uids
   Show revoked and expired user IDs in key listings. Defaults to no.
 
   @item show-unusable-subkeys
   @opindex list-options:show-unusable-subkeys
   Show revoked and expired subkeys in key listings. Defaults to no.
 
   @item show-keyring
   @opindex list-options:show-keyring
   Display the keyring name at the head of key listings to show which
   keyring a given key resides on. Defaults to no.
 
   @item show-sig-expire
   @opindex list-options:show-sig-expire
   Show signature expiration dates (if any) during
   @option{--check-signatures} listings. Defaults to no.
 
   @item show-sig-subpackets
   @opindex list-options:show-sig-subpackets
   Include signature subpackets in the key listing. This option can take an
   optional argument list of the subpackets to list. If no argument is
   passed, list all subpackets. Defaults to no. This option is only
   meaningful when using @option{--with-colons} along with
   @option{--check-signatures}.
 
 @end table
 
 @item --verify-options @var{parameters}
 @opindex verify-options
 This is a space or comma delimited string that gives options used when
 verifying signatures. Options can be prepended with a `no-' to give
 the opposite meaning. The options are:
 
 @table @asis
 
   @item show-photos
   @opindex verify-options:show-photos
   Display any photo IDs present on the key that issued the signature.
   Defaults to no. See also @option{--photo-viewer}.
 
   @item show-policy-urls
   @opindex verify-options:show-policy-urls
   Show policy URLs in the signature being verified. Defaults to yes.
 
   @item show-notations
   @itemx show-std-notations
   @itemx show-user-notations
   @opindex verify-options:show-notations
   @opindex verify-options:show-std-notations
   @opindex verify-options:show-user-notations
   Show all, IETF standard, or user-defined signature notations in the
   signature being verified. Defaults to IETF standard.
 
   @item show-keyserver-urls
   @opindex verify-options:show-keyserver-urls
   Show any preferred keyserver URL in the signature being verified.
   Defaults to yes.
 
   @item show-uid-validity
   @opindex verify-options:show-uid-validity
   Display the calculated validity of the user IDs on the key that issued
   the signature. Defaults to yes.
 
   @item show-unusable-uids
   @opindex verify-options:show-unusable-uids
   Show revoked and expired user IDs during signature verification.
   Defaults to no.
 
   @item show-primary-uid-only
   @opindex verify-options:show-primary-uid-only
   Show only the primary user ID during signature verification.  That is
   all the AKA lines as well as photo Ids are not shown with the signature
   verification status.
 
   @item pka-lookups
   @opindex verify-options:pka-lookups
   Enable PKA lookups to verify sender addresses. Note that PKA is based
   on DNS, and so enabling this option may disclose information on when
   and what signatures are verified or to whom data is encrypted. This
   is similar to the "web bug" described for the @option{--auto-key-retrieve}
   option.
 
   @item pka-trust-increase
   @opindex verify-options:pka-trust-increase
   Raise the trust in a signature to full if the signature passes PKA
   validation. This option is only meaningful if pka-lookups is set.
 @end table
 
 @item --enable-large-rsa
 @itemx --disable-large-rsa
 @opindex enable-large-rsa
 @opindex disable-large-rsa
 With --generate-key and --batch, enable the creation of RSA secret keys as
 large as 8192 bit.  Note: 8192 bit is more than is generally
 recommended.  These large keys don't significantly improve security,
 but they are more expensive to use, and their signatures and
 certifications are larger.  This option is only available if the
 binary was build with large-secmem support.
 
 @item --enable-dsa2
 @itemx --disable-dsa2
 @opindex enable-dsa2
 @opindex disable-dsa2
 Enable hash truncation for all DSA keys even for old DSA Keys up to
 1024 bit.  This is also the default with @option{--openpgp}.  Note
 that older versions of GnuPG also required this flag to allow the
 generation of DSA larger than 1024 bit.
 
 @item --photo-viewer @var{string}
 @opindex photo-viewer
 This is the command line that should be run to view a photo ID. "%i"
 will be expanded to a filename containing the photo. "%I" does the
 same, except the file will not be deleted once the viewer exits.
 Other flags are "%k" for the key ID, "%K" for the long key ID, "%f"
 for the key fingerprint, "%t" for the extension of the image type
 (e.g. "jpg"), "%T" for the MIME type of the image (e.g. "image/jpeg"),
 "%v" for the single-character calculated validity of the image being
 viewed (e.g. "f"), "%V" for the calculated validity as a string (e.g.
 "full"), "%U" for a base32 encoded hash of the user ID,
 and "%%" for an actual percent sign. If neither %i or %I are present,
 then the photo will be supplied to the viewer on standard input.
 
 The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k'
 STDIN". Note that if your image viewer program is not secure, then
 executing it from GnuPG does not make it secure.
 
 @item --exec-path @var{string}
 @opindex exec-path
 @efindex PATH
 Sets a list of directories to search for photo viewers and keyserver
 helpers. If not provided, keyserver helpers use the compiled-in
 default directory, and photo viewers use the @code{PATH} environment
 variable.
 Note, that on W32 system this value is ignored when searching for
 keyserver helpers.
 
 @item --keyring @var{file}
 @opindex keyring
 Add @var{file} to the current list of keyrings. If @var{file} begins
 with a tilde and a slash, these are replaced by the $HOME directory. If
 the filename does not contain a slash, it is assumed to be in the GnuPG
 home directory ("~/.gnupg" if @option{--homedir} or $GNUPGHOME is not
 used).
 
 Note that this adds a keyring to the current list. If the intent is to
 use the specified keyring alone, use @option{--keyring} along with
 @option{--no-default-keyring}.
 
 If the option @option{--no-keyring} has been used no keyrings will
 be used at all.
 
 
 @item --secret-keyring @var{file}
 @opindex secret-keyring
 This is an obsolete option and ignored.  All secret keys are stored in
 the @file{private-keys-v1.d} directory below the GnuPG home directory.
 
 @item --primary-keyring @var{file}
 @opindex primary-keyring
 Designate @var{file} as the primary public keyring. This means that
 newly imported keys (via @option{--import} or keyserver
 @option{--recv-from}) will go to this keyring.
 
 @item --trustdb-name @var{file}
 @opindex trustdb-name
 Use @var{file} instead of the default trustdb. If @var{file} begins
 with a tilde and a slash, these are replaced by the $HOME directory. If
 the filename does not contain a slash, it is assumed to be in the GnuPG
 home directory (@file{~/.gnupg} if @option{--homedir} or $GNUPGHOME is
 not used).
 
 @include opt-homedir.texi
 
 
 @item --display-charset @var{name}
 @opindex display-charset
 Set the name of the native character set. This is used to convert
 some informational strings like user IDs to the proper UTF-8 encoding.
 Note that this has nothing to do with the character set of data to be
 encrypted or signed; GnuPG does not recode user-supplied data. If
 this option is not used, the default character set is determined from
 the current locale. A verbosity level of 3 shows the chosen set.
 Valid values for @var{name} are:
 
 @table @asis
 
   @item iso-8859-1
   @opindex display-charset:iso-8859-1
   This is the Latin 1 set.
 
   @item iso-8859-2
   @opindex display-charset:iso-8859-2
   The Latin 2 set.
 
   @item iso-8859-15
   @opindex display-charset:iso-8859-15
   This is currently an alias for
   the Latin 1 set.
 
   @item koi8-r
   @opindex display-charset:koi8-r
   The usual Russian set (RFC-1489).
 
   @item utf-8
   @opindex display-charset:utf-8
   Bypass all translations and assume
   that the OS uses native UTF-8 encoding.
 @end table
 
 @item --utf8-strings
 @itemx --no-utf8-strings
 @opindex utf8-strings
 Assume that command line arguments are given as UTF-8 strings. The
 default (@option{--no-utf8-strings}) is to assume that arguments are
 encoded in the character set as specified by
 @option{--display-charset}. These options affect all following
 arguments. Both options may be used multiple times.
 
 @anchor{gpg-option --options}
 @item --options @var{file}
 @opindex options
 Read options from @var{file} and do not try to read them from the
 default options file in the homedir (see @option{--homedir}). This
 option is ignored if used in an options file.
 
 @item --no-options
 @opindex no-options
 Shortcut for @option{--options /dev/null}. This option is detected
 before an attempt to open an option file.  Using this option will also
 prevent the creation of a @file{~/.gnupg} homedir.
 
 @item -z @var{n}
 @itemx --compress-level @var{n}
 @itemx --bzip2-compress-level @var{n}
 @opindex compress-level
 @opindex bzip2-compress-level
 Set compression level to @var{n} for the ZIP and ZLIB compression
 algorithms. The default is to use the default compression level of zlib
 (normally 6). @option{--bzip2-compress-level} sets the compression level
 for the BZIP2 compression algorithm (defaulting to 6 as well). This is a
 different option from @option{--compress-level} since BZIP2 uses a
 significant amount of memory for each additional compression level.
 @option{-z} sets both. A value of 0 for @var{n} disables compression.
 
 @item --bzip2-decompress-lowmem
 @opindex bzip2-decompress-lowmem
 Use a different decompression method for BZIP2 compressed files. This
 alternate method uses a bit more than half the memory, but also runs
 at half the speed. This is useful under extreme low memory
 circumstances when the file was originally compressed at a high
 @option{--bzip2-compress-level}.
 
 
 @item --mangle-dos-filenames
 @itemx --no-mangle-dos-filenames
 @opindex mangle-dos-filenames
 @opindex no-mangle-dos-filenames
 Older version of Windows cannot handle filenames with more than one
 dot. @option{--mangle-dos-filenames} causes GnuPG to replace (rather
 than add to) the extension of an output filename to avoid this
 problem. This option is off by default and has no effect on non-Windows
 platforms.
 
 @item --ask-cert-level
 @itemx --no-ask-cert-level
 @opindex ask-cert-level
 When making a key signature, prompt for a certification level. If this
 option is not specified, the certification level used is set via
 @option{--default-cert-level}. See @option{--default-cert-level} for
 information on the specific levels and how they are
 used. @option{--no-ask-cert-level} disables this option. This option
 defaults to no.
 
 @item --default-cert-level @var{n}
 @opindex default-cert-level
 The default to use for the check level when signing a key.
 
 0 means you make no particular claim as to how carefully you verified
 the key.
 
 1 means you believe the key is owned by the person who claims to own
 it but you could not, or did not verify the key at all. This is
 useful for a "persona" verification, where you sign the key of a
 pseudonymous user.
 
 2 means you did casual verification of the key. For example, this
 could mean that you verified the key fingerprint and checked the
 user ID on the key against a photo ID.
 
 3 means you did extensive verification of the key. For example, this
 could mean that you verified the key fingerprint with the owner of the
 key in person, and that you checked, by means of a hard to forge
 document with a photo ID (such as a passport) that the name of the key
 owner matches the name in the user ID on the key, and finally that you
 verified (by exchange of email) that the email address on the key
 belongs to the key owner.
 
 Note that the examples given above for levels 2 and 3 are just that:
 examples. In the end, it is up to you to decide just what "casual"
 and "extensive" mean to you.
 
 This option defaults to 0 (no particular claim).
 
 @item --min-cert-level
 @opindex min-cert-level
 When building the trust database, treat any signatures with a
 certification level below this as invalid. Defaults to 2, which
 disregards level 1 signatures. Note that level 0 "no particular
 claim" signatures are always accepted.
 
 @item --trusted-key @var{long key ID}
 @opindex trusted-key
 Assume that the specified key (which must be given
 as a full 8 byte key ID) is as trustworthy as one of
 your own secret keys. This option is useful if you
 don't want to keep your secret keys (or one of them)
 online but still want to be able to check the validity of a given
 recipient's or signator's key.
 
 @item --trust-model @{pgp|classic|tofu|tofu+pgp|direct|always|auto@}
 @opindex trust-model
 Set what trust model GnuPG should follow. The models are:
 
 @table @asis
 
   @item pgp
   @opindex trust-model:pgp
   This is the Web of Trust combined with trust signatures as used in PGP
   5.x and later. This is the default trust model when creating a new
   trust database.
 
   @item classic
   @opindex trust-model:classic
   This is the standard Web of Trust as introduced by PGP 2.
 
   @item tofu
   @opindex trust-model:tofu
   @anchor{trust-model-tofu}
   TOFU stands for Trust On First Use.  In this trust model, the first
   time a key is seen, it is memorized.  If later another key with a
   user id with the same email address is seen, both keys are marked as
   suspect.  In that case, the next time either is used, a warning is
   displayed describing the conflict, why it might have occurred
   (either the user generated a new key and failed to cross sign the
   old and new keys, the key is forgery, or a man-in-the-middle attack
   is being attempted), and the user is prompted to manually confirm
   the validity of the key in question.
 
   Because a potential attacker is able to control the email address
   and thereby circumvent the conflict detection algorithm by using an
   email address that is similar in appearance to a trusted email
   address, whenever a message is verified, statistics about the number
   of messages signed with the key are shown.  In this way, a user can
   easily identify attacks using fake keys for regular correspondents.
 
   When compared with the Web of Trust, TOFU offers significantly
   weaker security guarantees.  In particular, TOFU only helps ensure
   consistency (that is, that the binding between a key and email
   address doesn't change).  A major advantage of TOFU is that it
   requires little maintenance to use correctly.  To use the web of
   trust properly, you need to actively sign keys and mark users as
   trusted introducers.  This is a time-consuming process and anecdotal
   evidence suggests that even security-conscious users rarely take the
   time to do this thoroughly and instead rely on an ad-hoc TOFU
   process.
 
   In the TOFU model, policies are associated with bindings between
   keys and email addresses (which are extracted from user ids and
   normalized).  There are five policies, which can be set manually
   using the @option{--tofu-policy} option.  The default policy can be
   set using the @option{--tofu-default-policy} option.
 
   The TOFU policies are: @code{auto}, @code{good}, @code{unknown},
   @code{bad} and @code{ask}.  The @code{auto} policy is used by
   default (unless overridden by @option{--tofu-default-policy}) and
   marks a binding as marginally trusted.  The @code{good},
   @code{unknown} and @code{bad} policies mark a binding as fully
   trusted, as having unknown trust or as having trust never,
   respectively.  The @code{unknown} policy is useful for just using
   TOFU to detect conflicts, but to never assign positive trust to a
   binding.  The final policy, @code{ask} prompts the user to indicate
   the binding's trust.  If batch mode is enabled (or input is
   inappropriate in the context), then the user is not prompted and the
   @code{undefined} trust level is returned.
 
   @item tofu+pgp
   @opindex trust-model:tofu+pgp
   This trust model combines TOFU with the Web of Trust.  This is done
   by computing the trust level for each model and then taking the
   maximum trust level where the trust levels are ordered as follows:
   @code{unknown < undefined < marginal < fully < ultimate < expired <
   never}.
 
   By setting @option{--tofu-default-policy=unknown}, this model can be
   used to implement the web of trust with TOFU's conflict detection
   algorithm, but without its assignment of positive trust values,
   which some security-conscious users don't like.
 
   @item direct
   @opindex trust-model:direct
   Key validity is set directly by the user and not calculated via the
   Web of Trust.  This model is solely based on the key and does
   not distinguish user IDs.  Note that when changing to another trust
   model the trust values assigned to a key are transformed into
   ownertrust values, which also indicate how you trust the owner of
   the key to sign other keys.
 
   @item always
   @opindex trust-model:always
   Skip key validation and assume that used keys are always fully
   valid. You generally won't use this unless you are using some
   external validation scheme. This option also suppresses the
   "[uncertain]" tag printed with signature checks when there is no
   evidence that the user ID is bound to the key.  Note that this
   trust model still does not allow the use of expired, revoked, or
   disabled keys.
 
   @item auto
   @opindex trust-model:auto
   Select the trust model depending on whatever the internal trust
   database says. This is the default model if such a database already
   exists.  Note that a tofu trust model is not considered here and
   must be enabled explicitly.
 @end table
 
 @item --auto-key-locate @var{mechanisms}
 @itemx --no-auto-key-locate
 @opindex auto-key-locate
 GnuPG can automatically locate and retrieve keys as needed using this
 option.  This happens when encrypting to an email address (in the
 "user@@example.com" form), and there are no "user@@example.com" keys
 on the local keyring.  This option takes any number of the mechanisms
 listed below, in the order they are to be tried.  Instead of listing
 the mechanisms as comma delimited arguments, the option may also be
 given several times to add more mechanism.  The option
 @option{--no-auto-key-locate} or the mechanism "clear" resets the
 list.  The default is "local,wkd".
 
 @table @asis
 
   @item cert
   Locate a key using DNS CERT, as specified in RFC-4398.
 
   @item pka
   Locate a key using DNS PKA.
 
   @item dane
   Locate a key using DANE, as specified
   in draft-ietf-dane-openpgpkey-05.txt.
 
   @item wkd
   Locate a key using the Web Key Directory protocol.
 
   @item ldap
   Using DNS Service Discovery, check the domain in question for any LDAP
   keyservers to use.  If this fails, attempt to locate the key using the
   PGP Universal method of checking @samp{ldap://keys.(thedomain)}.
 
   @item keyserver
   Locate a key using whatever keyserver is defined using the
   @option{--keyserver} option.
 
   @item keyserver-URL
   In addition, a keyserver URL as used in the @option{--keyserver} option
   may be used here to query that particular keyserver.
 
   @item local
   Locate the key using the local keyrings.  This mechanism allows the user to
   select the order a local key lookup is done.  Thus using
   @samp{--auto-key-locate local} is identical to
   @option{--no-auto-key-locate}.
 
   @item nodefault
   This flag disables the standard local key lookup, done before any of the
   mechanisms defined by the @option{--auto-key-locate} are tried.  The
   position of this mechanism in the list does not matter.  It is not
   required if @code{local} is also used.
 
   @item clear
   Clear all defined mechanisms.  This is useful to override
   mechanisms given in a config file.
 
 @end table
 
 
 @item --auto-key-retrieve
 @itemx --no-auto-key-retrieve
 @opindex auto-key-retrieve
 @opindex no-auto-key-retrieve
 These options enable or disable the automatic retrieving of keys from
 a keyserver when verifying signatures made by keys that are not on the
 local keyring.  The default is @option{--no-auto-key-retrieve}.
 
 If the method "wkd" is included in the list of methods given to
 @option{auto-key-locate}, the signer's user ID is part of the
 signature, and the option @option{--disable-signer-uid} is not used,
 the "wkd" method may also be used to retrieve a key.
 
 Note that this option makes a "web bug" like behavior possible.
 Keyserver or Web Key Directory operators can see which keys you
 request, so by sending you a message signed by a brand new key (which
 you naturally will not have on your local keyring), the operator can
 tell both your IP address and the time when you verified the
 signature.
 
 @item --keyid-format @{none|short|0xshort|long|0xlong@}
 @opindex keyid-format
 Select how to display key IDs.  "none" does not show the key ID at all
 but shows the fingerprint in a separate line.  "short" is the
 traditional 8-character key ID.  "long" is the more accurate (but less
 convenient) 16-character key ID.  Add an "0x" to either to include an
 "0x" at the beginning of the key ID, as in 0x99242560.  Note that this
 option is ignored if the option @option{--with-colons} is used.
 
 @item --keyserver @var{name}
 @opindex keyserver
 This option is deprecated - please use the @option{--keyserver} in
 @file{dirmngr.conf} instead.
 
 Use @var{name} as your keyserver. This is the server that
 @option{--receive-keys}, @option{--send-keys}, and @option{--search-keys}
 will communicate with to receive keys from, send keys to, and search for
 keys on. The format of the @var{name} is a URI:
 `scheme:[//]keyservername[:port]' The scheme is the type of keyserver:
 "hkp" for the HTTP (or compatible) keyservers, "ldap" for the LDAP
 keyservers, or "mailto" for the Graff email keyserver. Note that your
 particular installation of GnuPG may have other keyserver types
 available as well. Keyserver schemes are case-insensitive. After the
 keyserver name, optional keyserver configuration options may be
 provided. These are the same as the global @option{--keyserver-options}
 from below, but apply only to this particular keyserver.
 
 Most keyservers synchronize with each other, so there is generally no
 need to send keys to more than one server. The keyserver
 @code{hkp://keys.gnupg.net} uses round robin DNS to give a different
 keyserver each time you use it.
 
 @item --keyserver-options @{@var{name}=@var{value}@}
 @opindex keyserver-options
 This is a space or comma delimited string that gives options for the
 keyserver. Options can be prefixed with a `no-' to give the opposite
 meaning. Valid import-options or export-options may be used here as
 well to apply to importing (@option{--recv-key}) or exporting
 (@option{--send-key}) a key from a keyserver. While not all options
 are available for all keyserver types, some common options are:
 
 @table @asis
 
   @item include-revoked
   When searching for a key with @option{--search-keys}, include keys that
   are marked on the keyserver as revoked. Note that not all keyservers
   differentiate between revoked and unrevoked keys, and for such
   keyservers this option is meaningless. Note also that most keyservers do
   not have cryptographic verification of key revocations, and so turning
   this option off may result in skipping keys that are incorrectly marked
   as revoked.
 
   @item include-disabled
   When searching for a key with @option{--search-keys}, include keys that
   are marked on the keyserver as disabled. Note that this option is not
   used with HKP keyservers.
 
   @item auto-key-retrieve
   This is an obsolete alias for the option @option{auto-key-retrieve}.
   Please do not use it; it will be removed in future versions..
 
   @item honor-keyserver-url
   When using @option{--refresh-keys}, if the key in question has a preferred
   keyserver URL, then use that preferred keyserver to refresh the key
   from. In addition, if auto-key-retrieve is set, and the signature
   being verified has a preferred keyserver URL, then use that preferred
   keyserver to fetch the key from. Note that this option introduces a
   "web bug": The creator of the key can see when the keys is
   refreshed.  Thus this option is not enabled by default.
 
   @item honor-pka-record
   If @option{--auto-key-retrieve} is used, and the signature being
   verified has a PKA record, then use the PKA information to fetch
   the key. Defaults to "yes".
 
   @item include-subkeys
   When receiving a key, include subkeys as potential targets. Note that
   this option is not used with HKP keyservers, as they do not support
   retrieving keys by subkey id.
 
   @item timeout
   Tell the keyserver helper program how long (in seconds) to try and
   perform a keyserver action before giving up. Note that performing
   multiple actions at the same time uses this timeout value per action.
   For example, when retrieving multiple keys via @option{--receive-keys}, the
   timeout applies separately to each key retrieval, and not to the
   @option{--receive-keys} command as a whole. Defaults to 30 seconds.
 
   @item http-proxy=@var{value}
   This option is deprecated.
   Set the proxy to use for HTTP and HKP keyservers.
   This overrides any proxy defined in @file{dirmngr.conf}.
 
   @item verbose
   This option has no more function since GnuPG 2.1.  Use the
   @code{dirmngr} configuration options instead.
 
   @item debug
   This option has no more function since GnuPG 2.1.  Use the
   @code{dirmngr} configuration options instead.
 
   @item check-cert
   This option has no more function since GnuPG 2.1.  Use the
   @code{dirmngr} configuration options instead.
 
   @item ca-cert-file
   This option has no more function since GnuPG 2.1.  Use the
   @code{dirmngr} configuration options instead.
 
 @end table
 
 @item --completes-needed @var{n}
 @opindex compliant-needed
 Number of completely trusted users to introduce a new
 key signer (defaults to 1).
 
 @item --marginals-needed @var{n}
 @opindex marginals-needed
 Number of marginally trusted users to introduce a new
 key signer (defaults to 3)
 
 @item --tofu-default-policy @{auto|good|unknown|bad|ask@}
 @opindex tofu-default-policy
 The default TOFU policy (defaults to @code{auto}).  For more
 information about the meaning of this option, @pxref{trust-model-tofu}.
 
 @item --max-cert-depth @var{n}
 @opindex max-cert-depth
 Maximum depth of a certification chain (default is 5).
 
 @item --no-sig-cache
 @opindex no-sig-cache
 Do not cache the verification status of key signatures.
 Caching gives a much better performance in key listings. However, if
 you suspect that your public keyring is not safe against write
 modifications, you can use this option to disable the caching. It
 probably does not make sense to disable it because all kind of damage
 can be done if someone else has write access to your public keyring.
 
 @item --auto-check-trustdb
 @itemx --no-auto-check-trustdb
 @opindex auto-check-trustdb
 If GnuPG feels that its information about the Web of Trust has to be
 updated, it automatically runs the @option{--check-trustdb} command
 internally.  This may be a time consuming
 process. @option{--no-auto-check-trustdb} disables this option.
 
 @item --use-agent
 @itemx --no-use-agent
 @opindex use-agent
 This is dummy option. @command{@gpgname} always requires the agent.
 
 @item --gpg-agent-info
 @opindex gpg-agent-info
 This is dummy option. It has no effect when used with @command{@gpgname}.
 
 
 @item --agent-program @var{file}
 @opindex agent-program
 Specify an agent program to be used for secret key operations.  The
 default value is determined by running @command{gpgconf} with the
 option @option{--list-dirs}.  Note that the pipe symbol (@code{|}) is
 used for a regression test suite hack and may thus not be used in the
 file name.
 
 @item --dirmngr-program @var{file}
 @opindex dirmngr-program
 Specify a dirmngr program to be used for keyserver access.  The
 default value is @file{@value{BINDIR}/dirmngr}.
 
 @item --disable-dirmngr
 Entirely disable the use of the Dirmngr.
 
 @item --no-autostart
 @opindex no-autostart
 Do not start the gpg-agent or the dirmngr if it has not yet been
 started and its service is required.  This option is mostly useful on
 machines where the connection to gpg-agent has been redirected to
 another machines.  If dirmngr is required on the remote machine, it
 may be started manually using @command{gpgconf --launch dirmngr}.
 
 @item --lock-once
 @opindex lock-once
 Lock the databases the first time a lock is requested
 and do not release the lock until the process
 terminates.
 
 @item --lock-multiple
 @opindex lock-multiple
 Release the locks every time a lock is no longer
 needed. Use this to override a previous @option{--lock-once}
 from a config file.
 
 @item --lock-never
 @opindex lock-never
 Disable locking entirely. This option should be used only in very
 special environments, where it can be assured that only one process
 is accessing those files. A bootable floppy with a stand-alone
 encryption system will probably use this. Improper usage of this
 option may lead to data and key corruption.
 
 @item --exit-on-status-write-error
 @opindex exit-on-status-write-error
 This option will cause write errors on the status FD to immediately
 terminate the process. That should in fact be the default but it never
 worked this way and thus we need an option to enable this, so that the
 change won't break applications which close their end of a status fd
 connected pipe too early. Using this option along with
 @option{--enable-progress-filter} may be used to cleanly cancel long
 running gpg operations.
 
 @item --limit-card-insert-tries @var{n}
 @opindex limit-card-insert-tries
 With @var{n} greater than 0 the number of prompts asking to insert a
 smartcard gets limited to N-1. Thus with a value of 1 gpg won't at
 all ask to insert a card if none has been inserted at startup. This
 option is useful in the configuration file in case an application does
 not know about the smartcard support and waits ad infinitum for an
 inserted card.
 
 @item --no-random-seed-file
 @opindex no-random-seed-file
 GnuPG uses a file to store its internal random pool over invocations.
 This makes random generation faster; however sometimes write operations
 are not desired. This option can be used to achieve that with the cost of
 slower random generation.
 
 @item --no-greeting
 @opindex no-greeting
 Suppress the initial copyright message.
 
 @item --no-secmem-warning
 @opindex no-secmem-warning
 Suppress the warning about "using insecure memory".
 
 @item --no-permission-warning
 @opindex permission-warning
 Suppress the warning about unsafe file and home directory (@option{--homedir})
 permissions. Note that the permission checks that GnuPG performs are
 not intended to be authoritative, but rather they simply warn about
 certain common permission problems. Do not assume that the lack of a
 warning means that your system is secure.
 
 Note that the warning for unsafe @option{--homedir} permissions cannot be
 suppressed in the gpg.conf file, as this would allow an attacker to
 place an unsafe gpg.conf file in place, and use this file to suppress
 warnings about itself. The @option{--homedir} permissions warning may only be
 suppressed on the command line.
 
 @item --require-secmem
 @itemx --no-require-secmem
 @opindex require-secmem
 Refuse to run if GnuPG cannot get secure memory. Defaults to no
 (i.e. run, but give a warning).
 
 
 @item --require-cross-certification
 @itemx --no-require-cross-certification
 @opindex require-cross-certification
 When verifying a signature made from a subkey, ensure that the cross
 certification "back signature" on the subkey is present and valid.  This
 protects against a subtle attack against subkeys that can sign.
 Defaults to @option{--require-cross-certification} for
 @command{@gpgname}.
 
 @item --expert
 @itemx --no-expert
 @opindex expert
 Allow the user to do certain nonsensical or "silly" things like
 signing an expired or revoked key, or certain potentially incompatible
 things like generating unusual key types. This also disables certain
 warning messages about potentially incompatible actions. As the name
 implies, this option is for experts only. If you don't fully
 understand the implications of what it allows you to do, leave this
 off. @option{--no-expert} disables this option.
 
 @end table
 
 
 @c *******************************************
 @c ********  KEY RELATED OPTIONS  ************
 @c *******************************************
 @node GPG Key related Options
 @subsection Key related options
 
 @table @gnupgtabopt
 
 @item --recipient @var{name}
 @itemx -r
 @opindex recipient
 Encrypt for user id @var{name}. If this option or
 @option{--hidden-recipient} is not specified, GnuPG asks for the user-id
 unless @option{--default-recipient} is given.
 
 @item --hidden-recipient @var{name}
 @itemx -R
 @opindex hidden-recipient
 Encrypt for user ID @var{name}, but hide the key ID of this user's
 key. This option helps to hide the receiver of the message and is a
 limited countermeasure against traffic analysis. If this option or
 @option{--recipient} is not specified, GnuPG asks for the user ID unless
 @option{--default-recipient} is given.
 
 @item --recipient-file @var{file}
 @itemx -f
 @opindex recipient-file
 This option is similar to @option{--recipient} except that it
 encrypts to a key stored in the given file.  @var{file} must be the
 name of a file containing exactly one key.  @command{@gpgname} assumes that
 the key in this file is fully valid.
 
 @item --hidden-recipient-file @var{file}
 @itemx -F
 @opindex hidden-recipient-file
 This option is similar to @option{--hidden-recipient} except that it
 encrypts to a key stored in the given file.  @var{file} must be the
 name of a file containing exactly one key.  @command{@gpgname} assumes that
 the key in this file is fully valid.
 
 @item --encrypt-to @var{name}
 @opindex encrypt-to
 Same as @option{--recipient} but this one is intended for use in the
 options file and may be used with your own user-id as an
 "encrypt-to-self". These keys are only used when there are other
 recipients given either by use of @option{--recipient} or by the asked
 user id.  No trust checking is performed for these user ids and even
 disabled keys can be used.
 
 @item --hidden-encrypt-to @var{name}
 @opindex hidden-encrypt-to
 Same as @option{--hidden-recipient} but this one is intended for use in the
 options file and may be used with your own user-id as a hidden
 "encrypt-to-self". These keys are only used when there are other
 recipients given either by use of @option{--recipient} or by the asked user id.
 No trust checking is performed for these user ids and even disabled
 keys can be used.
 
 @item --no-encrypt-to
 @opindex no-encrypt-to
 Disable the use of all @option{--encrypt-to} and
 @option{--hidden-encrypt-to} keys.
 
 @item --group @{@var{name}=@var{value}@}
 @opindex group
 Sets up a named group, which is similar to aliases in email programs.
 Any time the group name is a recipient (@option{-r} or
 @option{--recipient}), it will be expanded to the values
 specified. Multiple groups with the same name are automatically merged
 into a single group.
 
 The values are @code{key IDs} or fingerprints, but any key description
 is accepted. Note that a value with spaces in it will be treated as
 two different values. Note also there is only one level of expansion
 --- you cannot make an group that points to another group. When used
 from the command line, it may be necessary to quote the argument to
 this option to prevent the shell from treating it as multiple
 arguments.
 
 @item --ungroup @var{name}
 @opindex ungroup
 Remove a given entry from the @option{--group} list.
 
 @item --no-groups
 @opindex no-groups
 Remove all entries from the @option{--group} list.
 
 @item --local-user @var{name}
 @itemx -u
 @opindex local-user
 Use @var{name} as the key to sign with. Note that this option overrides
 @option{--default-key}.
 
 @item --sender @var{mbox}
 @opindex sender
 This option has two purposes.  @var{mbox} must either be a complete
 user id with a proper mail address or just a mail address.  When
 creating a signature this option tells gpg the user id of a key used
 to make a signature if the key was not directly specified by a user
 id.  When verifying a signature the @var{mbox} is used to restrict the
 information printed by the TOFU code to matching user ids.
 
 @item --try-secret-key @var{name}
 @opindex try-secret-key
 For hidden recipients GPG needs to know the keys to use for trial
 decryption.  The key set with @option{--default-key} is always tried
 first, but this is often not sufficient.  This option allows setting more
 keys to be used for trial decryption.  Although any valid user-id
 specification may be used for @var{name} it makes sense to use at least
 the long keyid to avoid ambiguities.  Note that gpg-agent might pop up a
 pinentry for a lot keys to do the trial decryption.  If you want to stop
 all further trial decryption you may use close-window button instead of
 the cancel button.
 
 @item --try-all-secrets
 @opindex try-all-secrets
 Don't look at the key ID as stored in the message but try all secret
 keys in turn to find the right decryption key. This option forces the
 behaviour as used by anonymous recipients (created by using
 @option{--throw-keyids} or @option{--hidden-recipient}) and might come
 handy in case where an encrypted message contains a bogus key ID.
 
 @item --skip-hidden-recipients
 @itemx --no-skip-hidden-recipients
 @opindex skip-hidden-recipients
 @opindex no-skip-hidden-recipients
 During decryption skip all anonymous recipients.  This option helps in
 the case that people use the hidden recipients feature to hide their
 own encrypt-to key from others.  If one has many secret keys this
 may lead to a major annoyance because all keys are tried in turn to
 decrypt something which was not really intended for it.  The drawback
 of this option is that it is currently not possible to decrypt a
 message which includes real anonymous recipients.
 
 
 @end table
 
 @c *******************************************
 @c ********  INPUT AND OUTPUT  ***************
 @c *******************************************
 @node GPG Input and Output
 @subsection Input and Output
 
 @table @gnupgtabopt
 
 @item --armor
 @itemx -a
 @opindex armor
 Create ASCII armored output.  The default is to create the binary
 OpenPGP format.
 
 @item --no-armor
 @opindex no-armor
 Assume the input data is not in ASCII armored format.
 
 @item --output @var{file}
 @itemx -o @var{file}
 @opindex output
 Write output to @var{file}.  To write to stdout use @code{-} as the
 filename.
 
 @item --max-output @var{n}
 @opindex max-output
 This option sets a limit on the number of bytes that will be generated
 when processing a file. Since OpenPGP supports various levels of
 compression, it is possible that the plaintext of a given message may be
 significantly larger than the original OpenPGP message. While GnuPG
 works properly with such messages, there is often a desire to set a
 maximum file size that will be generated before processing is forced to
 stop by the OS limits. Defaults to 0, which means "no limit".
 
 @item --chunk-size @var{n}
 @opindex chunk-size
 The AEAD encryption mode encrypts the data in chunks so that a
 receiving side can check for transmission errors or tampering at the
 end of each chunk and does not need to delay this until all data has
 been received.  The used chunk size is 2^@var{n} byte.  The lowest
 allowed value for @var{n} is 6 (64 byte) and the largest is the
 default of 27 which creates chunks not larger than 128 MiB.
 
 @item --input-size-hint @var{n}
 @opindex input-size-hint
 This option can be used to tell GPG the size of the input data in
 bytes.  @var{n} must be a positive base-10 number.  This option is
 only useful if the input is not taken from a file.  GPG may use this
 hint to optimize its buffer allocation strategy.  It is also used by
 the @option{--status-fd} line ``PROGRESS'' to provide a value for
 ``total'' if that is not available by other means.
 
 @item --key-origin @var{string}[,@var{url}]
 @opindex key-origin
 gpg can track the origin of a key. Certain origins are implicitly
 known (e.g. keyserver, web key directory) and set.  For a standard
 import the origin of the keys imported can be set with this option.
 To list the possible values use "help" for @var{string}.  Some origins
 can store an optional @var{url} argument.  That URL can appended to
 @var{string} after a comma.
 
 @item --import-options @var{parameters}
 @opindex import-options
 This is a space or comma delimited string that gives options for
 importing keys. Options can be prepended with a `no-' to give the
 opposite meaning. The options are:
 
 @table @asis
 
   @item import-local-sigs
   Allow importing key signatures marked as "local". This is not
   generally useful unless a shared keyring scheme is being used.
   Defaults to no.
 
   @item keep-ownertrust
   Normally possible still existing ownertrust values of a key are
   cleared if a key is imported.  This is in general desirable so that
   a formerly deleted key does not automatically gain an ownertrust
   values merely due to import.  On the other hand it is sometimes
   necessary to re-import a trusted set of keys again but keeping
   already assigned ownertrust values.  This can be achieved by using
   this option.
 
   @item repair-pks-subkey-bug
   During import, attempt to repair the damage caused by the PKS keyserver
   bug (pre version 0.9.6) that mangles keys with multiple subkeys. Note
   that this cannot completely repair the damaged key as some crucial data
   is removed by the keyserver, but it does at least give you back one
   subkey. Defaults to no for regular @option{--import} and to yes for
   keyserver @option{--receive-keys}.
 
   @item import-show
   @itemx show-only
   Show a listing of the key as imported right before it is stored.
   This can be combined with the option @option{--dry-run} to only look
   at keys; the option @option{show-only} is a shortcut for this
   combination.  The command @option{--show-keys} is another shortcut
   for this.  Note that suffixes like '#' for "sec" and "sbb" lines
   may or may not be printed.
 
   @item import-export
   Run the entire import code but instead of storing the key to the
   local keyring write it to the output.  The export options
   @option{export-pka} and @option{export-dane} affect the output.  This
   option can be used to remove all invalid parts from a key without the
   need to store it.
 
   @item merge-only
   During import, allow key updates to existing keys, but do not allow
   any new keys to be imported. Defaults to no.
 
   @item import-clean
   After import, compact (remove all signatures except the
   self-signature) any user IDs from the new key that are not usable.
   Then, remove any signatures from the new key that are not usable.
   This includes signatures that were issued by keys that are not present
   on the keyring. This option is the same as running the @option{--edit-key}
   command "clean" after import. Defaults to no.
 
   @item import-drop-uids
   Do not import any user ids or their binding signatures.  This option
   can be used to update only the subkeys or other non-user id related
   information.
 
   @item repair-keys.  After import, fix various problems with the
   keys.  For example, this reorders signatures, and strips duplicate
   signatures.  Defaults to yes.
 
   @item import-minimal
   Import the smallest key possible. This removes all signatures except
   the most recent self-signature on each user ID. This option is the
   same as running the @option{--edit-key} command "minimize" after import.
   Defaults to no.
 
   @item restore
   @itemx import-restore
   Import in key restore mode.  This imports all data which is usually
   skipped during import; including all GnuPG specific data.  All other
   contradicting options are overridden.
 @end table
 
 @item --import-filter @{@var{name}=@var{expr}@}
 @itemx --export-filter @{@var{name}=@var{expr}@}
 @opindex import-filter
 @opindex export-filter
 These options define an import/export filter which are applied to the
 imported/exported keyblock right before it will be stored/written.
 @var{name} defines the type of filter to use, @var{expr} the
 expression to evaluate.  The option can be used several times which
 then appends more expression to the same @var{name}.
 
 @noindent
 The available filter types are:
 
 @table @asis
 
   @item keep-uid
   This filter will keep a user id packet and its dependent packets in
   the keyblock if the expression evaluates to true.
 
   @item drop-subkey
   This filter drops the selected subkeys.
   Currently only implemented for --export-filter.
 
   @item drop-sig
   This filter drops the selected key signatures on user ids.
   Self-signatures are not considered.
   Currently only implemented for --import-filter.
 
 @end table
 
 For the syntax of the expression see the chapter "FILTER EXPRESSIONS".
 The property names for the expressions depend on the actual filter
 type and are indicated in the following table.
 
 The available properties are:
 
 @table @asis
 
   @item uid
   A string with the user id.  (keep-uid)
 
   @item mbox
   The addr-spec part of a user id with mailbox or the empty string.
   (keep-uid)
 
   @item key_algo
   A number with the public key algorithm of a key or subkey packet.
   (drop-subkey)
 
   @item key_created
   @itemx key_created_d
   The first is the timestamp a public key or subkey packet was
   created.  The second is the same but given as an ISO string,
   e.g. "2016-08-17". (drop-subkey)
 
   @item primary
   Boolean indicating whether the user id is the primary one.  (keep-uid)
 
   @item expired
   Boolean indicating whether a user id (keep-uid), a key (drop-subkey), or a
   signature (drop-sig) expired.
 
   @item revoked
   Boolean indicating whether a user id (keep-uid) or a key (drop-subkey) has
   been revoked.
 
   @item disabled
   Boolean indicating whether a primary key is disabled. (not used)
 
   @item secret
   Boolean indicating whether a key or subkey is a secret one.
   (drop-subkey)
 
   @item usage
   A string indicating the usage flags for the subkey, from the
   sequence ``ecsa?''.  For example, a subkey capable of just signing
   and authentication would be an exact match for ``sa''. (drop-subkey)
 
   @item sig_created
   @itemx sig_created_d
   The first is the timestamp a signature packet was created.  The
   second is the same but given as an ISO date string,
   e.g. "2016-08-17". (drop-sig)
 
   @item sig_algo
   A number with the public key algorithm of a signature packet. (drop-sig)
 
   @item sig_digest_algo
   A number with the digest algorithm of a signature packet. (drop-sig)
 
 @end table
 
 @item --export-options @var{parameters}
 @opindex export-options
 This is a space or comma delimited string that gives options for
 exporting keys.  Options can be prepended with a `no-' to give the
 opposite meaning.  The options are:
 
 @table @asis
 
   @item export-local-sigs
   Allow exporting key signatures marked as "local". This is not
   generally useful unless a shared keyring scheme is being used.
   Defaults to no.
 
   @item export-attributes
   Include attribute user IDs (photo IDs) while exporting. Not
   including attribute user IDs is useful to export keys that are going
   to be used by an OpenPGP program that does not accept attribute user
   IDs.  Defaults to yes.
 
   @item export-sensitive-revkeys
   Include designated revoker information that was marked as
   "sensitive". Defaults to no.
 
   @c Since GnuPG 2.1 gpg-agent manages the secret key and thus the
   @c export-reset-subkey-passwd hack is not anymore justified.  Such use
   @c cases may be implemented using a specialized secret key export
   @c tool.
   @c @item export-reset-subkey-passwd
   @c When using the @option{--export-secret-subkeys} command, this option resets
   @c the passphrases for all exported subkeys to empty. This is useful
   @c when the exported subkey is to be used on an unattended machine where
   @c a passphrase doesn't necessarily make sense. Defaults to no.
 
   @item backup
   @itemx export-backup
   Export for use as a backup.  The exported data includes all data
   which is needed to restore the key or keys later with GnuPG.  The
   format is basically the OpenPGP format but enhanced with GnuPG
   specific data.  All other contradicting options are overridden.
 
   @item export-clean
   Compact (remove all signatures from) user IDs on the key being
   exported if the user IDs are not usable. Also, do not export any
   signatures that are not usable. This includes signatures that were
   issued by keys that are not present on the keyring. This option is
   the same as running the @option{--edit-key} command "clean" before export
   except that the local copy of the key is not modified. Defaults to
   no.
 
   @item export-minimal
   Export the smallest key possible. This removes all signatures except the
   most recent self-signature on each user ID. This option is the same as
   running the @option{--edit-key} command "minimize" before export except
   that the local copy of the key is not modified. Defaults to no.
 
   @item export-drop-uids
   Do no export any user id or attribute packets or their associates
   signatures.  Note that due to missing user ids the resulting output is
   not strictly RFC-4880 compliant.
 
   @item export-pka
   Instead of outputting the key material output PKA records suitable
   to put into DNS zone files.  An ORIGIN line is printed before each
   record to allow diverting the records to the corresponding zone file.
 
   @item export-dane
   Instead of outputting the key material output OpenPGP DANE records
   suitable to put into DNS zone files.  An ORIGIN line is printed before
   each record to allow diverting the records to the corresponding zone
   file.
 
 @end table
 
 @item --with-colons
 @opindex with-colons
 Print key listings delimited by colons. Note that the output will be
 encoded in UTF-8 regardless of any @option{--display-charset} setting. This
 format is useful when GnuPG is called from scripts and other programs
 as it is easily machine parsed. The details of this format are
 documented in the file @file{doc/DETAILS}, which is included in the GnuPG
 source distribution.
 
 @item --fixed-list-mode
 @opindex fixed-list-mode
 Do not merge primary user ID and primary key in @option{--with-colon}
 listing mode and print all timestamps as seconds since 1970-01-01.
 Since GnuPG 2.0.10, this mode is always used and thus this option is
 obsolete; it does not harm to use it though.
 
 @item --legacy-list-mode
 @opindex legacy-list-mode
 Revert to the pre-2.1 public key list mode.  This only affects the
 human readable output and not the machine interface
 (i.e. @code{--with-colons}).  Note that the legacy format does not
 convey suitable information for elliptic curves.
 
 @item --with-fingerprint
 @opindex with-fingerprint
 Same as the command @option{--fingerprint} but changes only the format
 of the output and may be used together with another command.
 
 @item --with-subkey-fingerprint
 @opindex with-subkey-fingerprint
 If a fingerprint is printed for the primary key, this option forces
 printing of the fingerprint for all subkeys.  This could also be
 achieved by using the @option{--with-fingerprint} twice but by using
 this option along with keyid-format "none" a compact fingerprint is
 printed.
 
 @item --with-icao-spelling
 @opindex with-icao-spelling
 Print the ICAO spelling of the fingerprint in addition to the hex digits.
 
 @item --with-keygrip
 @opindex with-keygrip
 Include the keygrip in the key listings.  In @code{--with-colons} mode
 this is implicitly enable for secret keys.
 
 @item --with-key-origin
 @opindex with-key-origin
 Include the locally held information on the origin and last update of
 a key in a key listing.  In @code{--with-colons} mode this is always
 printed.  This data is currently experimental and shall not be
 considered part of the stable API.
 
 @item --with-wkd-hash
 @opindex with-wkd-hash
 Print a Web Key Directory identifier along with each user ID in key
 listings.  This is an experimental feature and semantics may change.
 
 @item --with-secret
 @opindex with-secret
 Include info about the presence of a secret key in public key listings
 done with @code{--with-colons}.
 
 @end table
 
 @c *******************************************
 @c ********  OPENPGP OPTIONS  ****************
 @c *******************************************
 @node OpenPGP Options
 @subsection OpenPGP protocol specific options
 
 @table @gnupgtabopt
 
 @item -t, --textmode
 @itemx --no-textmode
 @opindex textmode
 Treat input files as text and store them in the OpenPGP canonical text
 form with standard "CRLF" line endings. This also sets the necessary
 flags to inform the recipient that the encrypted or signed data is text
 and may need its line endings converted back to whatever the local
 system uses. This option is useful when communicating between two
 platforms that have different line ending conventions (UNIX-like to Mac,
 Mac to Windows, etc). @option{--no-textmode} disables this option, and
 is the default.
 
 @item --force-v3-sigs
 @itemx --no-force-v3-sigs
 @item --force-v4-certs
 @itemx --no-force-v4-certs
 These options are obsolete and have no effect since GnuPG 2.1.
 
 @item --force-aead
 @opindex force-aead
 Force the use of AEAD encryption over MDC encryption.  AEAD is a
-modern and faster way to do authenticated encrytion than the old MDC
+modern and faster way to do authenticated encryption than the old MDC
 method.  See also options @option{--aead-algo} and
 @option{--chunk-size}.
 
 As of now this option requires the use of option @option{--rfc4880bis}
 to declare that a not yet standardized feature is used.
 
 @item --force-mdc
 @itemx --disable-mdc
 @opindex force-mdc
 @opindex disable-mdc
 These options are obsolete and have no effect since GnuPG 2.2.8.  The
 MDC is always used unless the keys indicate that an AEAD algorithm can
 be used in which case AEAD is used.  But note: If the creation of a
 legacy non-MDC message is exceptionally required, the option
 @option{--rfc2440} allows for this.
 
 @item --disable-signer-uid
 @opindex disable-signer-uid
 By default the user ID of the signing key is embedded in the data
 signature.  As of now this is only done if the signing key has been
 specified with @option{local-user} using a mail address.  This
 information can be helpful for verifier to locate the key; see
 option @option{--auto-key-retrieve}.
 
 @item --personal-cipher-preferences @var{string}
 @opindex personal-cipher-preferences
 Set the list of personal cipher preferences to @var{string}.  Use
 @command{@gpgname --version} to get a list of available algorithms,
 and use @code{none} to set no preference at all.  This allows the user
 to safely override the algorithm chosen by the recipient key
 preferences, as GPG will only select an algorithm that is usable by
 all recipients.  The most highly ranked cipher in this list is also
 used for the @option{--symmetric} encryption command.
 
 @item --personal-aead-preferences @var{string}
 @opindex personal-aead-preferences
 Set the list of personal AEAD preferences to @var{string}.  Use
 @command{@gpgname --version} to get a list of available algorithms,
 and use @code{none} to set no preference at all.  This allows the user
 to safely override the algorithm chosen by the recipient key
 preferences, as GPG will only select an algorithm that is usable by
 all recipients.  The most highly ranked cipher in this list is also
 used for the @option{--symmetric} encryption command.
 
 @item --personal-digest-preferences @var{string}
 @opindex personal-digest-preferences
 Set the list of personal digest preferences to @var{string}.  Use
 @command{@gpgname --version} to get a list of available algorithms,
 and use @code{none} to set no preference at all.  This allows the user
 to safely override the algorithm chosen by the recipient key
 preferences, as GPG will only select an algorithm that is usable by
 all recipients.  The most highly ranked digest algorithm in this list
 is also used when signing without encryption
 (e.g. @option{--clear-sign} or @option{--sign}).
 
 @item --personal-compress-preferences @var{string}
 @opindex personal-compress-preferences
 Set the list of personal compression preferences to @var{string}.
 Use @command{@gpgname --version} to get a list of available
 algorithms, and use @code{none} to set no preference at all.  This
 allows the user to safely override the algorithm chosen by the
 recipient key preferences, as GPG will only select an algorithm that
 is usable by all recipients.  The most highly ranked compression
 algorithm in this list is also used when there are no recipient keys
 to consider (e.g. @option{--symmetric}).
 
 @item --s2k-cipher-algo @var{name}
 @opindex s2k-cipher-algo
 Use @var{name} as the cipher algorithm for symmetric encryption with
 a passphrase if @option{--personal-cipher-preferences} and
 @option{--cipher-algo} are not given.  The default is @value{GPGSYMENCALGO}.
 
 @item --s2k-digest-algo @var{name}
 @opindex s2k-digest-algo
 Use @var{name} as the digest algorithm used to mangle the passphrases
 for symmetric encryption.  The default is SHA-1.
 
 @item --s2k-mode @var{n}
 @opindex s2k-mode
 Selects how passphrases for symmetric encryption are mangled. If
 @var{n} is 0 a plain passphrase (which is in general not recommended)
 will be used, a 1 adds a salt (which should not be used) to the
 passphrase and a 3 (the default) iterates the whole process a number
 of times (see @option{--s2k-count}).
 
 @item --s2k-count @var{n}
 @opindex s2k-count
 Specify how many times the passphrases mangling for symmetric
 encryption is repeated.  This value may range between 1024 and
 65011712 inclusive.  The default is inquired from gpg-agent.  Note
 that not all values in the 1024-65011712 range are legal and if an
 illegal value is selected, GnuPG will round up to the nearest legal
 value.  This option is only meaningful if @option{--s2k-mode} is set
 to the default of 3.
 
 
 @end table
 
 @c ***************************
 @c ******* Compliance ********
 @c ***************************
 @node Compliance Options
 @subsection Compliance options
 
 These options control what GnuPG is compliant to. Only one of these
 options may be active at a time. Note that the default setting of
 this is nearly always the correct one. See the INTEROPERABILITY WITH
 OTHER OPENPGP PROGRAMS section below before using one of these
 options.
 
 @table @gnupgtabopt
 
 @item --gnupg
 @opindex gnupg
 Use standard GnuPG behavior. This is essentially OpenPGP behavior
 (see @option{--openpgp}), but with some additional workarounds for common
 compatibility problems in different versions of PGP. This is the
 default option, so it is not generally needed, but it may be useful to
 override a different compliance option in the gpg.conf file.
 
 @item --openpgp
 @opindex openpgp
 Reset all packet, cipher and digest options to strict OpenPGP
 behavior. Use this option to reset all previous options like
 @option{--s2k-*}, @option{--cipher-algo}, @option{--digest-algo} and
 @option{--compress-algo} to OpenPGP compliant values. All PGP
 workarounds are disabled.
 
 @item --rfc4880
 @opindex rfc4880
 Reset all packet, cipher and digest options to strict RFC-4880
 behavior. Note that this is currently the same thing as
 @option{--openpgp}.
 
 @item --rfc4880bis
 @opindex rfc4880bis
 Enable experimental features from proposed updates to RFC-4880.  This
 option can be used in addition to the other compliance options.
 Warning: The behavior may change with any GnuPG release and created
 keys or data may not be usable with future GnuPG versions.
 
 @item --rfc2440
 @opindex rfc2440
 Reset all packet, cipher and digest options to strict RFC-2440
 behavior.  Note that by using this option encryption packets are
 created in a legacy mode without MDC protection.  This is dangerous
 and should thus only be used for experiments.  See also option
 @option{--ignore-mdc-error}.
 
 @item --pgp6
 @opindex pgp6
 This option is obsolete; it is handled as an alias for @option{--pgp7}
 
 @item --pgp7
 @opindex pgp7
-Set up all options to be as PGP 7 compliant as possible. This allowd
+Set up all options to be as PGP 7 compliant as possible. This allowed
 the ciphers IDEA, 3DES, CAST5,AES128, AES192, AES256, and TWOFISH.,
 the hashes MD5, SHA1 and RIPEMD160, and the compression algorithms
 none and ZIP.  This option implies @option{--escape-from-lines} and
 disables @option{--throw-keyids},
 
 @item --pgp8
 @opindex pgp8
 Set up all options to be as PGP 8 compliant as possible. PGP 8 is a lot
 closer to the OpenPGP standard than previous versions of PGP, so all
 this does is disable @option{--throw-keyids} and set
 @option{--escape-from-lines}.  All algorithms are allowed except for the
 SHA224, SHA384, and SHA512 digests.
 
 @item --compliance @var{string}
 @opindex compliance
 This option can be used instead of one of the options above.  Valid
 values for @var{string} are the above option names (without the double
 dash) and possibly others as shown when using "help" for @var{value}.
 
 @end table
 
 
 @c *******************************************
 @c ********  ESOTERIC OPTIONS  ***************
 @c *******************************************
 @node GPG Esoteric Options
 @subsection Doing things one usually doesn't want to do
 
 @table @gnupgtabopt
 
 @item -n
 @itemx --dry-run
 @opindex dry-run
 Don't make any changes (this is not completely implemented).
 
 @item --list-only
 @opindex list-only
 Changes the behaviour of some commands. This is like @option{--dry-run} but
 different in some cases. The semantic of this option may be extended in
 the future. Currently it only skips the actual decryption pass and
 therefore enables a fast listing of the encryption keys.
 
 @item -i
 @itemx --interactive
 @opindex interactive
 Prompt before overwriting any files.
 
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems. @var{level} may be
 a numeric value or by a keyword:
 
 @table @code
   @item none
   No debugging at all.  A value of less than 1 may be used instead of
   the keyword.
   @item basic
   Some basic debug messages.  A value between 1 and 2 may be used
   instead of the keyword.
   @item advanced
   More verbose debug messages.  A value between 3 and 5 may be used
   instead of the keyword.
   @item expert
   Even more detailed messages.  A value between 6 and 8 may be used
   instead of the keyword.
   @item guru
   All of the debug messages you can get. A value greater than 8 may be
   used instead of the keyword.  The creation of hash tracing files is
   only enabled if the keyword is used.
 @end table
 
 How these messages are mapped to the actual debugging flags is not
 specified and may change with newer releases of this program. They are
 however carefully selected to best aid in debugging.
 
 @item --debug @var{flags}
 @opindex debug
 Set debugging flags. All flags are or-ed and @var{flags} may be given
 in C syntax (e.g. 0x0042) or as a comma separated list of flag names.
 To get a list of all supported flags the single word "help" can be
 used.
 
 @item --debug-all
 @opindex debug-all
 Set all useful debugging flags.
 
 @item --debug-iolbf
 @opindex debug-iolbf
 Set stdout into line buffered mode.  This option is only honored when
 given on the command line.
 
 @item --debug-set-iobuf-size @var{n}
 @opindex debug-iolbf
 Change the buffer size of the IOBUFs to @var{n} kilobyte.  Using 0
 prints the current size.  Note well: This is a maintainer only option
 and may thus be changed or removed at any time without notice.
 
 @item --debug-allow-large-chunks
 @opindex debug-allow-large-chunks
 To facilitate in-memory decryption on the receiving site, the largest
 recommended chunk size is 128 MiB (@code{--chunk-size 27}).  This
 option allows to specify a limit of up to 4 EiB (@code{--chunk-size
 62}) for experiments.
 
 @item --faked-system-time @var{epoch}
 @opindex faked-system-time
 This option is only useful for testing; it sets the system time back or
 forth to @var{epoch} which is the number of seconds elapsed since the year
 1970.  Alternatively @var{epoch} may be given as a full ISO time string
 (e.g. "20070924T154812").
 
 If you suffix @var{epoch} with an exclamation mark (!), the system time
 will appear to be frozen at the specified time.
 
 @item --enable-progress-filter
 @opindex enable-progress-filter
 Enable certain PROGRESS status outputs. This option allows frontends
 to display a progress indicator while gpg is processing larger files.
 There is a slight performance overhead using it.
 
 @item --status-fd @var{n}
 @opindex status-fd
 Write special status strings to the file descriptor @var{n}.
 See the file DETAILS in the documentation for a listing of them.
 
 @item --status-file @var{file}
 @opindex status-file
 Same as @option{--status-fd}, except the status data is written to file
 @var{file}.
 
 @item --logger-fd @var{n}
 @opindex logger-fd
 Write log output to file descriptor @var{n} and not to STDERR.
 
 @item --log-file @var{file}
 @itemx --logger-file @var{file}
 @opindex log-file
 Same as @option{--logger-fd}, except the logger data is written to
 file @var{file}.  Use @file{socket://} to log to s socket.
 
 @item --attribute-fd @var{n}
 @opindex attribute-fd
 Write attribute subpackets to the file descriptor @var{n}. This is most
 useful for use with @option{--status-fd}, since the status messages are
 needed to separate out the various subpackets from the stream delivered
 to the file descriptor.
 
 @item --attribute-file @var{file}
 @opindex attribute-file
 Same as @option{--attribute-fd}, except the attribute data is written to
 file @var{file}.
 
 @item --comment @var{string}
 @itemx --no-comments
 @opindex comment
 Use @var{string} as a comment string in cleartext signatures and ASCII
 armored messages or keys (see @option{--armor}). The default behavior is
 not to use a comment string. @option{--comment} may be repeated multiple
 times to get multiple comment strings. @option{--no-comments} removes
 all comments.  It is a good idea to keep the length of a single comment
 below 60 characters to avoid problems with mail programs wrapping such
 lines.  Note that comment lines, like all other header lines, are not
 protected by the signature.
 
 @item --emit-version
 @itemx --no-emit-version
 @opindex emit-version
 Force inclusion of the version string in ASCII armored output.  If
 given once only the name of the program and the major number is
 emitted, given twice the minor is also emitted, given thrice
 the micro is added, and given four times an operating system identification
 is also emitted.  @option{--no-emit-version} (default) disables the version
 line.
 
 @item --sig-notation @{@var{name}=@var{value}@}
 @itemx --cert-notation @{@var{name}=@var{value}@}
 @itemx -N, --set-notation @{@var{name}=@var{value}@}
 @opindex sig-notation
 @opindex cert-notation
 @opindex set-notation
 Put the name value pair into the signature as notation data.
 @var{name} must consist only of printable characters or spaces, and
 must contain a '@@' character in the form keyname@@domain.example.com
 (substituting the appropriate keyname and domain name, of course).  This
 is to help prevent pollution of the IETF reserved notation
 namespace. The @option{--expert} flag overrides the '@@'
 check. @var{value} may be any printable string; it will be encoded in
 UTF-8, so you should check that your @option{--display-charset} is set
 correctly. If you prefix @var{name} with an exclamation mark (!), the
 notation data will be flagged as critical
 (rfc4880:5.2.3.16). @option{--sig-notation} sets a notation for data
 signatures. @option{--cert-notation} sets a notation for key signatures
 (certifications). @option{--set-notation} sets both.
 
 There are special codes that may be used in notation names. "%k" will
 be expanded into the key ID of the key being signed, "%K" into the
 long key ID of the key being signed, "%f" into the fingerprint of the
 key being signed, "%s" into the key ID of the key making the
 signature, "%S" into the long key ID of the key making the signature,
 "%g" into the fingerprint of the key making the signature (which might
 be a subkey), "%p" into the fingerprint of the primary key of the key
 making the signature, "%c" into the signature count from the OpenPGP
 smartcard, and "%%" results in a single "%". %k, %K, and %f are only
 meaningful when making a key signature (certification), and %c is only
 meaningful when using the OpenPGP smartcard.
 
 @item --known-notation @var{name}
 @opindex known-notation
 Adds @var{name} to a list of known critical signature notations.  The
 effect of this is that gpg will not mark a signature with a critical
 signature notation of that name as bad.  Note that gpg already knows
 by default about a few critical signatures notation names.
 
 @item --sig-policy-url @var{string}
 @itemx --cert-policy-url @var{string}
 @itemx --set-policy-url @var{string}
 @opindex sig-policy-url
 @opindex cert-policy-url
 @opindex set-policy-url
 Use @var{string} as a Policy URL for signatures (rfc4880:5.2.3.20).  If
 you prefix it with an exclamation mark (!), the policy URL packet will
 be flagged as critical. @option{--sig-policy-url} sets a policy url for
 data signatures. @option{--cert-policy-url} sets a policy url for key
 signatures (certifications). @option{--set-policy-url} sets both.
 
 The same %-expandos used for notation data are available here as well.
 
 @item --sig-keyserver-url @var{string}
 @opindex sig-keyserver-url
 Use @var{string} as a preferred keyserver URL for data signatures. If
 you prefix it with an exclamation mark (!), the keyserver URL packet
 will be flagged as critical.
 
 The same %-expandos used for notation data are available here as well.
 
 @item --set-filename @var{string}
 @opindex set-filename
 Use @var{string} as the filename which is stored inside messages.
 This overrides the default, which is to use the actual filename of the
 file being encrypted.  Using the empty string for @var{string}
 effectively removes the filename from the output.
 
 @item --for-your-eyes-only
 @itemx --no-for-your-eyes-only
 @opindex for-your-eyes-only
 Set the `for your eyes only' flag in the message. This causes GnuPG to
 refuse to save the file unless the @option{--output} option is given,
 and PGP to use a "secure viewer" with a claimed Tempest-resistant font
 to display the message. This option overrides @option{--set-filename}.
 @option{--no-for-your-eyes-only} disables this option.
 
 @item --use-embedded-filename
 @itemx --no-use-embedded-filename
 @opindex use-embedded-filename
 Try to create a file with a name as embedded in the data. This can be
 a dangerous option as it enables overwriting files. Defaults to no.
 
 @item --cipher-algo @var{name}
 @opindex cipher-algo
 Use @var{name} as cipher algorithm. Running the program with the
 command @option{--version} yields a list of supported algorithms. If
 this is not used the cipher algorithm is selected from the preferences
 stored with the key. In general, you do not want to use this option as
 it allows you to violate the OpenPGP standard.  The option
 @option{--personal-cipher-preferences} is the safe way to accomplish the
 same thing.
 
 @item --aead-algo @var{name}
 @opindex aead-algo
 Specify that the AEAD algorithm @var{name} is to be used.  This is
 useful for symmetric encryption where no key preference are available
-to select the AEAD algorithm.  Runing @command{@gpgname} with option
+to select the AEAD algorithm.  Running @command{@gpgname} with option
 @option{--version} shows the available AEAD algorithms.  In general,
 you do not want to use this option as it allows you to violate the
 OpenPGP standard.  The option @option{--personal-aead-preferences} is
 the safe way to accomplish the same thing.
 
 @item --digest-algo @var{name}
 @opindex digest-algo
 Use @var{name} as the message digest algorithm. Running the program
 with the command @option{--version} yields a list of supported
 algorithms. In general, you do not want to use this option as it
 allows you to violate the OpenPGP standard.  The option
 @option{--personal-digest-preferences} is the safe way to accomplish
 the same thing.
 
 @item --compress-algo @var{name}
 @opindex compress-algo
 Use compression algorithm @var{name}. "zlib" is RFC-1950 ZLIB
 compression. "zip" is RFC-1951 ZIP compression which is used by PGP.
 "bzip2" is a more modern compression scheme that can compress some
 things better than zip or zlib, but at the cost of more memory used
 during compression and decompression. "uncompressed" or "none"
 disables compression. If this option is not used, the default
 behavior is to examine the recipient key preferences to see which
 algorithms the recipient supports. If all else fails, ZIP is used for
 maximum compatibility.
 
 ZLIB may give better compression results than ZIP, as the compression
 window size is not limited to 8k. BZIP2 may give even better
 compression results than that, but will use a significantly larger
 amount of memory while compressing and decompressing. This may be
 significant in low memory situations. Note, however, that PGP (all
 versions) only supports ZIP compression. Using any algorithm other
 than ZIP or "none" will make the message unreadable with PGP. In
 general, you do not want to use this option as it allows you to
 violate the OpenPGP standard.  The option
 @option{--personal-compress-preferences} is the safe way to accomplish
 the same thing.
 
 @item --cert-digest-algo @var{name}
 @opindex cert-digest-algo
 Use @var{name} as the message digest algorithm used when signing a
 key. Running the program with the command @option{--version} yields a
 list of supported algorithms. Be aware that if you choose an algorithm
 that GnuPG supports but other OpenPGP implementations do not, then some
 users will not be able to use the key signatures you make, or quite
 possibly your entire key.
 
 @item --disable-cipher-algo @var{name}
 @opindex disable-cipher-algo
 Never allow the use of @var{name} as cipher algorithm.
 The given name will not be checked so that a later loaded algorithm
 will still get disabled.
 
 @item --disable-pubkey-algo @var{name}
 @opindex disable-pubkey-algo
 Never allow the use of @var{name} as public key algorithm.
 The given name will not be checked so that a later loaded algorithm
 will still get disabled.
 
 @item --throw-keyids
 @itemx --no-throw-keyids
 @opindex throw-keyids
 Do not put the recipient key IDs into encrypted messages. This helps to
 hide the receivers of the message and is a limited countermeasure
 against traffic analysis.@footnote{Using a little social engineering
 anyone who is able to decrypt the message can check whether one of the
 other recipients is the one he suspects.}  On the receiving side, it may
 slow down the decryption process because all available secret keys must
 be tried.  @option{--no-throw-keyids} disables this option. This option
 is essentially the same as using @option{--hidden-recipient} for all
 recipients.
 
 @item --not-dash-escaped
 @opindex not-dash-escaped
 This option changes the behavior of cleartext signatures
 so that they can be used for patch files. You should not
 send such an armored file via email because all spaces
 and line endings are hashed too. You can not use this
 option for data which has 5 dashes at the beginning of a
 line, patch files don't have this. A special armor header
 line tells GnuPG about this cleartext signature option.
 
 @item --escape-from-lines
 @itemx --no-escape-from-lines
 @opindex escape-from-lines
 Because some mailers change lines starting with "From " to ">From " it
 is good to handle such lines in a special way when creating cleartext
 signatures to prevent the mail system from breaking the signature. Note
 that all other PGP versions do it this way too.  Enabled by
 default. @option{--no-escape-from-lines} disables this option.
 
 @item --passphrase-repeat @var{n}
 @opindex passphrase-repeat
 Specify how many times @command{@gpgname} will request a new
 passphrase be repeated.  This is useful for helping memorize a
 passphrase.  Defaults to 1 repetition.
 
 @item --passphrase-fd @var{n}
 @opindex passphrase-fd
 Read the passphrase from file descriptor @var{n}. Only the first line
 will be read from file descriptor @var{n}. If you use 0 for @var{n},
 the passphrase will be read from STDIN. This can only be used if only
 one passphrase is supplied.
 
 Note that since Version 2.0 this passphrase is only used if the
 option @option{--batch} has also been given. Since Version 2.1
 the @option{--pinentry-mode} also needs to be set to @code{loopback}.
 
 @item --passphrase-file @var{file}
 @opindex passphrase-file
 Read the passphrase from file @var{file}. Only the first line will
 be read from file @var{file}. This can only be used if only one
 passphrase is supplied. Obviously, a passphrase stored in a file is
 of questionable security if other users can read this file. Don't use
 this option if you can avoid it.
 
 Note that since Version 2.0 this passphrase is only used if the
 option @option{--batch} has also been given. Since Version 2.1
 the @option{--pinentry-mode} also needs to be set to @code{loopback}.
 
 @item --passphrase @var{string}
 @opindex passphrase
 Use @var{string} as the passphrase. This can only be used if only one
 passphrase is supplied. Obviously, this is of very questionable
 security on a multi-user system. Don't use this option if you can
 avoid it.
 
 Note that since Version 2.0 this passphrase is only used if the
 option @option{--batch} has also been given. Since Version 2.1
 the @option{--pinentry-mode} also needs to be set to @code{loopback}.
 
 @item --pinentry-mode @var{mode}
 @opindex pinentry-mode
 Set the pinentry mode to @var{mode}.  Allowed values for @var{mode}
 are:
 @table @asis
   @item default
   Use the default of the agent, which is @code{ask}.
   @item ask
   Force the use of the Pinentry.
   @item cancel
   Emulate use of Pinentry's cancel button.
   @item error
   Return a Pinentry error (``No Pinentry'').
   @item loopback
   Redirect Pinentry queries to the caller.  Note that in contrast to
   Pinentry the user is not prompted again if he enters a bad password.
 @end table
 
 @item --no-symkey-cache
 @opindex no-symkey-cache
 Disable the passphrase cache used for symmetrical en- and decryption.
 This cache is based on the message specific salt value
 (cf. @option{--s2k-mode}).
 
 @item --request-origin @var{origin}
 @opindex request-origin
 Tell gpg to assume that the operation ultimately originated at
 @var{origin}.  Depending on the origin certain restrictions are applied
 and the Pinentry may include an extra note on the origin.  Supported
 values for @var{origin} are: @code{local} which is the default,
 @code{remote} to indicate a remote origin or @code{browser} for an
 operation requested by a web browser.
 
 @item --command-fd @var{n}
 @opindex command-fd
 This is a replacement for the deprecated shared-memory IPC mode.
 If this option is enabled, user input on questions is not expected
 from the TTY but from the given file descriptor. It should be used
 together with @option{--status-fd}. See the file doc/DETAILS in the source
 distribution for details on how to use it.
 
 @item --command-file @var{file}
 @opindex command-file
 Same as @option{--command-fd}, except the commands are read out of file
 @var{file}
 
 @item --allow-non-selfsigned-uid
 @itemx --no-allow-non-selfsigned-uid
 @opindex allow-non-selfsigned-uid
 Allow the import and use of keys with user IDs which are not
 self-signed. This is not recommended, as a non self-signed user ID is
 trivial to forge. @option{--no-allow-non-selfsigned-uid} disables.
 
 @item --allow-freeform-uid
 @opindex allow-freeform-uid
 Disable all checks on the form of the user ID while generating a new
 one. This option should only be used in very special environments as
 it does not ensure the de-facto standard format of user IDs.
 
 @item --ignore-time-conflict
 @opindex ignore-time-conflict
 GnuPG normally checks that the timestamps associated with keys and
 signatures have plausible values. However, sometimes a signature
 seems to be older than the key due to clock problems. This option
 makes these checks just a warning. See also @option{--ignore-valid-from} for
 timestamp issues on subkeys.
 
 @item --ignore-valid-from
 @opindex ignore-valid-from
 GnuPG normally does not select and use subkeys created in the future.
 This option allows the use of such keys and thus exhibits the
 pre-1.0.7 behaviour. You should not use this option unless there
 is some clock problem. See also @option{--ignore-time-conflict} for timestamp
 issues with signatures.
 
 @item --ignore-crc-error
 @opindex ignore-crc-error
 The ASCII armor used by OpenPGP is protected by a CRC checksum against
 transmission errors. Occasionally the CRC gets mangled somewhere on
 the transmission channel but the actual content (which is protected by
 the OpenPGP protocol anyway) is still okay. This option allows GnuPG
 to ignore CRC errors.
 
 @item --ignore-mdc-error
 @opindex ignore-mdc-error
 This option changes a MDC integrity protection failure into a warning.
 It is required to decrypt old messages which did not use an MDC.  It
 may also be useful if a message is partially garbled, but it is
 necessary to get as much data as possible out of that garbled message.
 Be aware that a missing or failed MDC can be an indication of an
 attack.  Use with great caution; see also option @option{--rfc2440}.
 
 @item --allow-weak-digest-algos
 @opindex allow-weak-digest-algos
 Signatures made with known-weak digest algorithms are normally
 rejected with an ``invalid digest algorithm'' message.  This option
 allows the verification of signatures made with such weak algorithms.
 MD5 is the only digest algorithm considered weak by default.  See also
 @option{--weak-digest} to reject other digest algorithms.
 
 @item --weak-digest @var{name}
 @opindex weak-digest
 Treat the specified digest algorithm as weak.  Signatures made over
 weak digests algorithms are normally rejected. This option can be
 supplied multiple times if multiple algorithms should be considered
 weak.  See also @option{--allow-weak-digest-algos} to disable
 rejection of weak digests.  MD5 is always considered weak, and does
 not need to be listed explicitly.
 
 @item --no-default-keyring
 @opindex no-default-keyring
 Do not add the default keyrings to the list of keyrings. Note that
 GnuPG will not operate without any keyrings, so if you use this option
 and do not provide alternate keyrings via @option{--keyring} or
 @option{--secret-keyring}, then GnuPG will still use the default public or
 secret keyrings.
 
 @item --no-keyring
 @opindex no-keyring
 Do not add use any keyrings even if specified as options.
 
 @item --skip-verify
 @opindex skip-verify
 Skip the signature verification step. This may be
 used to make the decryption faster if the signature
 verification is not needed.
 
 @item --with-key-data
 @opindex with-key-data
 Print key listings delimited by colons (like @option{--with-colons}) and
 print the public key data.
 
 @item --list-signatures
 @opindex list-signatures
 @itemx --list-sigs
 @opindex list-sigs
 Same as @option{--list-keys}, but the signatures are listed too.  This
 command has the same effect as using @option{--list-keys} with
 @option{--with-sig-list}.  Note that in contrast to
 @option{--check-signatures} the key signatures are not verified.  This
 command can be used to create a list of signing keys missing in the
 lcoal keyring; for example:
 
 @example
       gpg --list-sigs --with-colons USERID | \
         awk -F: '$1=="sig" && $2=="?" @{if($13)@{print $13@}else@{print $5@}@}'
 @end example
 
 @item --fast-list-mode
 @opindex fast-list-mode
 Changes the output of the list commands to work faster; this is achieved
 by leaving some parts empty. Some applications don't need the user ID
 and the trust information given in the listings. By using this options
 they can get a faster listing. The exact behaviour of this option may
 change in future versions.  If you are missing some information, don't
 use this option.
 
 @item --no-literal
 @opindex no-literal
 This is not for normal use. Use the source to see for what it might be useful.
 
 @item --set-filesize
 @opindex set-filesize
 This is not for normal use. Use the source to see for what it might be useful.
 
 @item --show-session-key
 @opindex show-session-key
 Display the session key used for one message. See
 @option{--override-session-key} for the counterpart of this option.
 
 We think that Key Escrow is a Bad Thing; however the user should have
 the freedom to decide whether to go to prison or to reveal the content
 of one specific message without compromising all messages ever
 encrypted for one secret key.
 
 You can also use this option if you receive an encrypted message which
 is abusive or offensive, to prove to the administrators of the
 messaging system that the ciphertext transmitted corresponds to an
 inappropriate plaintext so they can take action against the offending
 user.
 
 @item --override-session-key @var{string}
 @itemx --override-session-key-fd @var{fd}
 @opindex override-session-key
 Don't use the public key but the session key @var{string} respective
 the session key taken from the first line read from file descriptor
 @var{fd}.  The format of this string is the same as the one printed by
 @option{--show-session-key}. This option is normally not used but
 comes handy in case someone forces you to reveal the content of an
 encrypted message; using this option you can do this without handing
 out the secret key.  Note that using @option{--override-session-key}
 may reveal the session key to all local users via the global process
 table.  Often it is useful to combine this option with
 @option{--no-keyring}.
 
 @item --ask-sig-expire
 @itemx --no-ask-sig-expire
 @opindex ask-sig-expire
 When making a data signature, prompt for an expiration time. If this
 option is not specified, the expiration time set via
 @option{--default-sig-expire} is used. @option{--no-ask-sig-expire}
 disables this option.
 
 @item --default-sig-expire
 @opindex default-sig-expire
 The default expiration time to use for signature expiration. Valid
 values are "0" for no expiration, a number followed by the letter d
 (for days), w (for weeks), m (for months), or y (for years) (for
 example "2m" for two months, or "5y" for five years), or an absolute
 date in the form YYYY-MM-DD. Defaults to "0".
 
 @item --ask-cert-expire
 @itemx --no-ask-cert-expire
 @opindex ask-cert-expire
 When making a key signature, prompt for an expiration time. If this
 option is not specified, the expiration time set via
 @option{--default-cert-expire} is used. @option{--no-ask-cert-expire}
 disables this option.
 
 @item --default-cert-expire
 @opindex default-cert-expire
 The default expiration time to use for key signature expiration.
 Valid values are "0" for no expiration, a number followed by the
 letter d (for days), w (for weeks), m (for months), or y (for years)
 (for example "2m" for two months, or "5y" for five years), or an
 absolute date in the form YYYY-MM-DD. Defaults to "0".
 
 @item --default-new-key-algo @var{string}
 @opindex default-new-key-algo @var{string}
 This option can be used to change the default algorithms for key
 generation. The @var{string} is similar to the arguments required for
 the command @option{--quick-add-key} but slightly different.  For
 example the current default of @code{"rsa2048/cert,sign+rsa2048/encr"}
 (or @code{"rsa3072"}) can be changed to the value of what we currently
 call future default, which is @code{"ed25519/cert,sign+cv25519/encr"}.
 You need to consult the source code to learn the details.  Note that
 the advanced key generation commands can always be used to specify a
 key algorithm directly.
 
 @item --allow-secret-key-import
 @opindex allow-secret-key-import
 This is an obsolete option and is not used anywhere.
 
 @item --allow-multiple-messages
 @item --no-allow-multiple-messages
 These are obsolete options; they have no more effect since GnuPG 2.2.8.
 
 @item --enable-special-filenames
 @opindex enable-special-filenames
 This option enables a mode in which filenames of the form
 @file{-&n}, where n is a non-negative decimal number,
 refer to the file descriptor n and not to a file with that name.
 
 @item --no-expensive-trust-checks
 @opindex no-expensive-trust-checks
 Experimental use only.
 
 @item --preserve-permissions
 @opindex preserve-permissions
 Don't change the permissions of a secret keyring back to user
 read/write only. Use this option only if you really know what you are doing.
 
 @item --default-preference-list @var{string}
 @opindex default-preference-list
 Set the list of default preferences to @var{string}. This preference
 list is used for new keys and becomes the default for "setpref" in the
 edit menu.
 
 @item --default-keyserver-url @var{name}
 @opindex default-keyserver-url
 Set the default keyserver URL to @var{name}. This keyserver will be
 used as the keyserver URL when writing a new self-signature on a key,
 which includes key generation and changing preferences.
 
 @item --list-config
 @opindex list-config
 Display various internal configuration parameters of GnuPG. This option
 is intended for external programs that call GnuPG to perform tasks, and
 is thus not generally useful. See the file @file{doc/DETAILS} in the
 source distribution for the details of which configuration items may be
 listed. @option{--list-config} is only usable with
 @option{--with-colons} set.
 
 @item --list-gcrypt-config
 @opindex list-gcrypt-config
 Display various internal configuration parameters of Libgcrypt.
 
 @item --gpgconf-list
 @opindex gpgconf-list
 This command is similar to @option{--list-config} but in general only
 internally used by the @command{gpgconf} tool.
 
 @item --gpgconf-test
 @opindex gpgconf-test
 This is more or less dummy action.  However it parses the configuration
 file and returns with failure if the configuration file would prevent
 @command{@gpgname} from startup.  Thus it may be used to run a syntax check
 on the configuration file.
 
 @end table
 
 @c *******************************
 @c ******* Deprecated ************
 @c *******************************
 @node Deprecated Options
 @subsection Deprecated options
 
 @table @gnupgtabopt
 
 @item --show-photos
 @itemx --no-show-photos
 @opindex show-photos
 Causes @option{--list-keys}, @option{--list-signatures},
 @option{--list-public-keys}, @option{--list-secret-keys}, and verifying
 a signature to also display the photo ID attached to the key, if
 any. See also @option{--photo-viewer}. These options are deprecated. Use
 @option{--list-options [no-]show-photos} and/or @option{--verify-options
 [no-]show-photos} instead.
 
 @item --show-keyring
 @opindex show-keyring
 Display the keyring name at the head of key listings to show which
 keyring a given key resides on. This option is deprecated: use
 @option{--list-options [no-]show-keyring} instead.
 
 @item --always-trust
 @opindex always-trust
 Identical to @option{--trust-model always}. This option is deprecated.
 
 @item --show-notation
 @itemx --no-show-notation
 @opindex show-notation
 Show signature notations in the @option{--list-signatures} or @option{--check-signatures} listings
 as well as when verifying a signature with a notation in it. These
 options are deprecated. Use @option{--list-options [no-]show-notation}
 and/or @option{--verify-options [no-]show-notation} instead.
 
 @item --show-policy-url
 @itemx --no-show-policy-url
 @opindex show-policy-url
 Show policy URLs in the @option{--list-signatures} or @option{--check-signatures}
 listings as well as when verifying a signature with a policy URL in
 it. These options are deprecated. Use @option{--list-options
 [no-]show-policy-url} and/or @option{--verify-options
 [no-]show-policy-url} instead.
 
 
 @end table
 
 
 @c *******************************************
 @c ***************            ****************
 @c ***************   FILES    ****************
 @c ***************            ****************
 @c *******************************************
 @mansect files
 @node GPG Configuration
 @section Configuration files
 
 There are a few configuration files to control certain aspects of
 @command{@gpgname}'s operation. Unless noted, they are expected in the
 current home directory (@pxref{option --homedir}).
 
 @table @file
 
   @item gpg.conf
   @efindex gpg.conf
   This is the standard configuration file read by @command{@gpgname} on
   startup.  It may contain any valid long option; the leading two dashes
   may not be entered and the option may not be abbreviated.  This default
   name may be changed on the command line (@pxref{gpg-option --options}).
   You should backup this file.
 
 @end table
 
 Note that on larger installations, it is useful to put predefined files
 into the directory @file{@value{SYSCONFSKELDIR}} so that
 newly created users start up with a working configuration.
 For existing users a small
 helper script is provided to create these files (@pxref{addgnupghome}).
 
 For internal purposes @command{@gpgname} creates and maintains a few other
 files; They all live in the current home directory (@pxref{option
 --homedir}).  Only the @command{@gpgname} program may modify these files.
 
 
 @table @file
   @item ~/.gnupg
   @efindex ~/.gnupg
   This is the default home directory which is used if neither the
   environment variable @code{GNUPGHOME} nor the option
   @option{--homedir} is given.
 
   @item ~/.gnupg/pubring.gpg
   @efindex pubring.gpg
   The public keyring.  You should backup this file.
 
   @item ~/.gnupg/pubring.gpg.lock
   The lock file for the public keyring.
 
   @item ~/.gnupg/pubring.kbx
   @efindex pubring.kbx
   The public keyring using a different format.  This file is shared
   with @command{gpgsm}.  You should backup this file.
 
   @item ~/.gnupg/pubring.kbx.lock
   The lock file for @file{pubring.kbx}.
 
   @item ~/.gnupg/secring.gpg
   @efindex secring.gpg
   A secret keyring as used by GnuPG versions before 2.1.  It is not
   used by GnuPG 2.1 and later.
 
   @item ~/.gnupg/secring.gpg.lock
   The lock file for the secret keyring.
 
   @item ~/.gnupg/.gpg-v21-migrated
   @efindex .gpg-v21-migrated
   File indicating that a migration to GnuPG 2.1 has been done.
 
   @item ~/.gnupg/trustdb.gpg
   @efindex trustdb.gpg
   The trust database.  There is no need to backup this file; it is better
   to backup the ownertrust values (@pxref{option --export-ownertrust}).
 
   @item ~/.gnupg/trustdb.gpg.lock
   The lock file for the trust database.
 
   @item ~/.gnupg/random_seed
   @efindex random_seed
   A file used to preserve the state of the internal random pool.
 
   @item ~/.gnupg/openpgp-revocs.d/
   @efindex openpgp-revocs.d
   This is the directory where gpg stores pre-generated revocation
   certificates.  The file name corresponds to the OpenPGP fingerprint of
   the respective key.  It is suggested to backup those certificates and
   if the primary private key is not stored on the disk to move them to
   an external storage device.  Anyone who can access theses files is
   able to revoke the corresponding key.  You may want to print them out.
   You should backup all files in this directory and take care to keep
   this backup closed away.
 
 @end table
 
 Operation is further controlled by a few environment variables:
 
 @table @asis
 
   @item HOME
   @efindex HOME
   Used to locate the default home directory.
 
   @item GNUPGHOME
   @efindex GNUPGHOME
   If set directory used instead of "~/.gnupg".
 
   @item GPG_AGENT_INFO
   This variable is obsolete; it was used by GnuPG versions before 2.1.
 
   @item PINENTRY_USER_DATA
   @efindex PINENTRY_USER_DATA
   This value is passed via gpg-agent to pinentry.  It is useful to convey
   extra information to a custom pinentry.
 
   @item COLUMNS
   @itemx LINES
   @efindex COLUMNS
   @efindex LINES
   Used to size some displays to the full size of the screen.
 
   @item LANGUAGE
   @efindex LANGUAGE
   Apart from its use by GNU, it is used in the W32 version to override the
   language selection done through the Registry.  If used and set to a
   valid and available language name (@var{langid}), the file with the
   translation is loaded from
   @code{@var{gpgdir}/gnupg.nls/@var{langid}.mo}.  Here @var{gpgdir} is the
   directory out of which the gpg binary has been loaded.  If it can't be
   loaded the Registry is tried and as last resort the native Windows
   locale system is used.
 
 @end table
 
 When calling the gpg-agent component @command{@gpgname} sends a set of
 environment variables to gpg-agent.  The names of these variables can
 be listed using the command:
 
 @example
   gpg-connect-agent 'getinfo std_env_names' /bye | awk '$1=="D" @{print $2@}'
 @end example
 
 
 
 @c *******************************************
 @c ***************            ****************
 @c ***************  EXAMPLES  ****************
 @c ***************            ****************
 @c *******************************************
 @mansect examples
 @node GPG Examples
 @section Examples
 
 @table @asis
 
 @item gpg -se -r @code{Bob} @code{file}
 sign and encrypt for user Bob
 
 @item gpg --clear-sign @code{file}
 make a cleartext signature
 
 @item gpg -sb @code{file}
 make a detached signature
 
 @item gpg -u 0x12345678 -sb @code{file}
 make a detached signature with the key 0x12345678
 
 @item gpg --list-keys @code{user_ID}
 show keys
 
 @item gpg --fingerprint @code{user_ID}
 show fingerprint
 
 @item gpg --verify @code{pgpfile}
 @itemx gpg --verify @code{sigfile} [@code{datafile}]
 Verify the signature of the file but do not output the data unless
 requested.  The second form is used for detached signatures, where
 @code{sigfile} is the detached signature (either ASCII armored or
 binary) and @code{datafile} are the signed data; if this is not given, the name of the
 file holding the signed data is constructed by cutting off the
 extension (".asc" or ".sig") of @code{sigfile} or by asking the user
 for the filename.  If the option @option{--output} is also used the
 signed data is written to the file specified by that option; use
 @code{-} to write the signed data to stdout.
 @end table
 
 
 @c *******************************************
 @c ***************            ****************
 @c ***************  USER ID   ****************
 @c ***************            ****************
 @c *******************************************
 @mansect how to specify a user id
 @ifset isman
 @include specify-user-id.texi
 @end ifset
 
 @mansect filter expressions
 @chapheading FILTER EXPRESSIONS
 
 The options @option{--import-filter} and @option{--export-filter} use
 expressions with this syntax (square brackets indicate an optional
 part and curly braces a repetition, white space between the elements
 are allowed):
 
 @c man:.RS
 @example
   [lc] @{[@{flag@}] PROPNAME op VALUE [lc]@}
 @end example
 @c man:.RE
 
 The name of a property (@var{PROPNAME}) may only consist of letters,
 digits and underscores.  The description for the filter type
 describes which properties are defined.  If an undefined property is
 used it evaluates to the empty string.  Unless otherwise noted, the
 @var{VALUE} must always be given and may not be the empty string.  No
 quoting is defined for the value, thus the value may not contain the
 strings @code{&&} or @code{||}, which are used as logical connection
 operators.  The flag @code{--} can be used to remove this restriction.
 
 Numerical values are computed as long int; standard C notation
 applies.  @var{lc} is the logical connection operator; either
 @code{&&} for a conjunction or @code{||} for a disjunction.  A
 conjunction is assumed at the begin of an expression.  Conjunctions
 have higher precedence than disjunctions.  If @var{VALUE} starts with
 one of the characters used in any @var{op} a space after the
 @var{op} is required.
 
 @noindent
 The supported operators (@var{op}) are:
 
 @table @asis
 
   @item =~
   Substring must match.
 
   @item  !~
   Substring must not match.
 
   @item  =
   The full string must match.
 
   @item  <>
   The full string must not match.
 
   @item  ==
   The numerical value must match.
 
   @item  !=
   The numerical value must not match.
 
   @item  <=
   The numerical value of the field must be LE than the value.
 
   @item  <
   The numerical value of the field must be LT than the value.
 
   @item  >
   The numerical value of the field must be GT than the value.
 
   @item  >=
   The numerical value of the field must be GE than the value.
 
   @item  -le
   The string value of the field must be less or equal than the value.
 
   @item  -lt
   The string value of the field must be less than the value.
 
   @item  -gt
   The string value of the field must be greater than the value.
 
   @item  -ge
   The string value of the field must be greater or equal than the value.
 
   @item  -n
   True if value is not empty (no value allowed).
 
   @item  -z
   True if value is empty (no value allowed).
 
   @item  -t
   Alias for "PROPNAME != 0" (no value allowed).
 
   @item  -f
   Alias for "PROPNAME == 0" (no value allowed).
 
 @end table
 
 @noindent
 Values for @var{flag} must be space separated.  The supported flags
 are:
 
 @table @asis
   @item --
   @var{VALUE} spans to the end of the expression.
   @item -c
   The string match in this part is done case-sensitive.
 @end table
 
 The filter options concatenate several specifications for a filter of
 the same type.  For example the four options in this example:
 
 @c man:.RS
 @example
  --import-option keep-uid="uid =~ Alfa"
  --import-option keep-uid="&& uid !~ Test"
  --import-option keep-uid="|| uid =~ Alpha"
  --import-option keep-uid="uid !~ Test"
 @end example
 @c man:.RE
 
 @noindent
 which is equivalent to
 
 @c man:.RS
 @example
  --import-option \
   keep-uid="uid =~ Alfa" && uid !~ Test" || uid =~ Alpha" && "uid !~ Test"
 @end example
 @c man:.RE
 
 imports only the user ids of a key containing the strings "Alfa"
 or "Alpha" but not the string "test".
 
 @mansect trust values
 @ifset isman
 @include trust-values.texi
 @end ifset
 
 @mansect return value
 @chapheading RETURN VALUE
 
 The program returns 0 if everything was fine, 1 if at least
 a signature was bad, and other error codes for fatal errors.
 
 @mansect warnings
 @chapheading WARNINGS
 
 Use a *good* password for your user account and a *good* passphrase
 to protect your secret key. This passphrase is the weakest part of the
 whole system. Programs to do dictionary attacks on your secret keyring
 are very easy to write and so you should protect your "~/.gnupg/"
 directory very well.
 
 Keep in mind that, if this program is used over a network (telnet), it
 is *very* easy to spy out your passphrase!
 
 If you are going to verify detached signatures, make sure that the
 program knows about it; either give both filenames on the command line
 or use @samp{-} to specify STDIN.
 
 For scripted or other unattended use of @command{gpg} make sure to use
 the machine-parseable interface and not the default interface which is
 intended for direct use by humans.  The machine-parseable interface
 provides a stable and well documented API independent of the locale or
 future changes of @command{gpg}.  To enable this interface use the
 options @option{--with-colons} and @option{--status-fd}.  For certain
 operations the option @option{--command-fd} may come handy too.  See
 this man page and the file @file{DETAILS} for the specification of the
 interface.  Note that the GnuPG ``info'' pages as well as the PDF
 version of the GnuPG manual features a chapter on unattended use of
 GnuPG.  As an alternative the library @command{GPGME} can be used as a
 high-level abstraction on top of that interface.
 
 @mansect interoperability
 @chapheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS
 
 GnuPG tries to be a very flexible implementation of the OpenPGP
 standard. In particular, GnuPG implements many of the optional parts
 of the standard, such as the SHA-512 hash, and the ZLIB and BZIP2
 compression algorithms. It is important to be aware that not all
 OpenPGP programs implement these optional algorithms and that by
 forcing their use via the @option{--cipher-algo},
 @option{--digest-algo}, @option{--cert-digest-algo}, or
 @option{--compress-algo} options in GnuPG, it is possible to create a
 perfectly valid OpenPGP message, but one that cannot be read by the
 intended recipient.
 
 There are dozens of variations of OpenPGP programs available, and each
 supports a slightly different subset of these optional algorithms.
 For example, until recently, no (unhacked) version of PGP supported
 the BLOWFISH cipher algorithm. A message using BLOWFISH simply could
 not be read by a PGP user. By default, GnuPG uses the standard
 OpenPGP preferences system that will always do the right thing and
 create messages that are usable by all recipients, regardless of which
 OpenPGP program they use. Only override this safe default if you
 really know what you are doing.
 
 If you absolutely must override the safe default, or if the preferences
 on a given key are invalid for some reason, you are far better off using
 the @option{--pgp6}, @option{--pgp7}, or @option{--pgp8} options. These
 options are safe as they do not force any particular algorithms in
 violation of OpenPGP, but rather reduce the available algorithms to a
 "PGP-safe" list.
 
 @mansect bugs
 @chapheading BUGS
 
 On older systems this program should be installed as setuid(root). This
 is necessary to lock memory pages. Locking memory pages prevents the
 operating system from writing memory pages (which may contain
 passphrases or other sensitive material) to disk. If you get no
 warning message about insecure memory your operating system supports
 locking without being root. The program drops root privileges as soon
 as locked memory is allocated.
 
 Note also that some systems (especially laptops) have the ability to
 ``suspend to disk'' (also known as ``safe sleep'' or ``hibernate'').
 This writes all memory to disk before going into a low power or even
 powered off mode.  Unless measures are taken in the operating system
 to protect the saved memory, passphrases or other sensitive material
 may be recoverable from it later.
 
 Before you report a bug you should first search the mailing list
 archives for similar problems and second check whether such a bug has
 already been reported to our bug tracker at @url{https://bugs.gnupg.org}.
 
 @c *******************************************
 @c ***************              **************
 @c ***************  UNATTENDED  **************
 @c ***************              **************
 @c *******************************************
 @manpause
 @node Unattended Usage of GPG
 @section Unattended Usage
 
 @command{@gpgname} is often used as a backend engine by other software.  To help
 with this a machine interface has been defined to have an unambiguous
 way to do this.  The options @option{--status-fd} and @option{--batch}
 are almost always required for this.
 
 @menu
 * Programmatic use of GnuPG:: Programmatic use of GnuPG
 * Ephemeral home directories:: Ephemeral home directories
 * The quick key manipulation interface:: The quick key manipulation interface
 * Unattended GPG key generation::  Unattended key generation
 @end menu
 
 
 @node Programmatic use of GnuPG
 @subsection Programmatic use of GnuPG
 
 Please consider using GPGME instead of calling @command{@gpgname}
 directly.  GPGME offers a stable, backend-independent interface for
 many cryptographic operations.  It supports OpenPGP and S/MIME, and
 also allows interaction with various GnuPG components.
 
 GPGME provides a C-API, and comes with bindings for C++, Qt, and
 Python.  Bindings for other languages are available.
 
 @node Ephemeral home directories
 @subsection Ephemeral home directories
 
 Sometimes you want to contain effects of some operation, for example
 you want to import a key to inspect it, but you do not want this key
 to be added to your keyring.  In earlier versions of GnuPG, it was
 possible to specify alternate keyring files for both public and secret
 keys.  In modern GnuPG versions, however, we changed how secret keys
 are stored in order to better protect secret key material, and it was
 not possible to preserve this interface.
 
 The preferred way to do this is to use ephemeral home directories.
 This technique works across all versions of GnuPG.
 
 Create a temporary directory, create (or copy) a configuration that
 meets your needs, make @command{@gpgname} use this directory either
 using the environment variable @var{GNUPGHOME}, or the option
 @option{--homedir}.  GPGME supports this too on a per-context basis,
 by modifying the engine info of contexts.  Now execute whatever
 operation you like, import and export key material as necessary.  Once
 finished, you can delete the directory.  All GnuPG backend services
 that were started will detect this and shut down.
 
 @node The quick key manipulation interface
 @subsection The quick key manipulation interface
 
 Recent versions of GnuPG have an interface to manipulate keys without
 using the interactive command @option{--edit-key}.  This interface was
 added mainly for the benefit of GPGME (please consider using GPGME,
 see the manual subsection ``Programmatic use of GnuPG'').  This
 interface is described in the subsection ``How to manage your keys''.
 
 @node Unattended GPG key generation
 @subsection Unattended key generation
 
 The command @option{--generate-key} may be used along with the option
 @option{--batch} for unattended key generation.  This is the most
 flexible way of generating keys, but it is also the most complex one.
 Consider using the quick key manipulation interface described in the
 previous subsection ``The quick key manipulation interface''.
 
 The parameters for the key are either read from stdin or given as a
 file on the command line.  The format of the parameter file is as
 follows:
 
 @itemize @bullet
   @item Text only, line length is limited to about 1000 characters.
   @item UTF-8 encoding must be used to specify non-ASCII characters.
   @item Empty lines are ignored.
   @item Leading and trailing white space is ignored.
   @item A hash sign as the first non white space character indicates
   a comment line.
   @item Control statements are indicated by a leading percent sign, the
   arguments are separated by white space from the keyword.
   @item Parameters are specified by a keyword, followed by a colon.  Arguments
   are separated by white space.
   @item
   The first parameter must be @samp{Key-Type}; control statements may be
   placed anywhere.
   @item
   The order of the parameters does not matter except for @samp{Key-Type}
   which must be the first parameter.  The parameters are only used for
   the generated keyblock (primary and subkeys); parameters from previous
   sets are not used.  Some syntactically checks may be performed.
   @item
   Key generation takes place when either the end of the parameter file
   is reached, the next @samp{Key-Type} parameter is encountered or at the
   control statement @samp{%commit} is encountered.
 @end itemize
 
 @noindent
 Control statements:
 
 @table @asis
 
 @item %echo @var{text}
 Print @var{text} as diagnostic.
 
 @item %dry-run
 Suppress actual key generation (useful for syntax checking).
 
 @item %commit
 Perform the key generation.  Note that an implicit commit is done at
 the next @asis{Key-Type} parameter.
 
 @item %pubring @var{filename}
 Do not write the key to the default or commandline given keyring but
 to @var{filename}.  This must be given before the first commit to take
 place, duplicate specification of the same filename is ignored, the
 last filename before a commit is used.  The filename is used until a
 new filename is used (at commit points) and all keys are written to
 that file. If a new filename is given, this file is created (and
 overwrites an existing one).
 
 See the previous subsection ``Ephemeral home directories'' for a more
 robust way to contain side-effects.
 
 @item %secring @var{filename}
 This option is a no-op for GnuPG 2.1 and later.
 
 See the previous subsection ``Ephemeral home directories''.
 
 @item %ask-passphrase
 @itemx %no-ask-passphrase
 This option is a no-op for GnuPG 2.1 and later.
 
 @item %no-protection
 Using this option allows the creation of keys without any passphrase
 protection.  This option is mainly intended for regression tests.
 
 @item %transient-key
 If given the keys are created using a faster and a somewhat less
 secure random number generator.  This option may be used for keys
 which are only used for a short time and do not require full
 cryptographic strength.  It takes only effect if used together with
 the control statement @samp{%no-protection}.
 
 @end table
 
 @noindent
 General Parameters:
 
 @table @asis
 
 @item Key-Type: @var{algo}
 Starts a new parameter block by giving the type of the primary
 key. The algorithm must be capable of signing.  This is a required
 parameter.  @var{algo} may either be an OpenPGP algorithm number or a
 string with the algorithm name.  The special value @samp{default} may
 be used for @var{algo} to create the default key type; in this case a
 @samp{Key-Usage} shall not be given and @samp{default} also be used
 for @samp{Subkey-Type}.
 
 @item Key-Length: @var{nbits}
 The requested length of the generated key in bits.  The default is
 returned by running the command @samp{@gpgname --gpgconf-list}.
 
 @item Key-Grip: @var{hexstring}
 This is optional and used to generate a CSR or certificate for an
 already existing key.  Key-Length will be ignored when given.
 
 @item Key-Usage: @var{usage-list}
 Space or comma delimited list of key usages.  Allowed values are
 @samp{encrypt}, @samp{sign}, and @samp{auth}.  This is used to
 generate the key flags.  Please make sure that the algorithm is
 capable of this usage.  Note that OpenPGP requires that all primary
 keys are capable of certification, so no matter what usage is given
 here, the @samp{cert} flag will be on.  If no @samp{Key-Usage} is
 specified and the @samp{Key-Type} is not @samp{default}, all allowed
 usages for that particular algorithm are used; if it is not given but
 @samp{default} is used the usage will be @samp{sign}.
 
 @item Subkey-Type: @var{algo}
 This generates a secondary key (subkey).  Currently only one subkey
 can be handled.  See also @samp{Key-Type} above.
 
 @item Subkey-Length: @var{nbits}
 Length of the secondary key (subkey) in bits.  The default is returned
 by running the command @samp{@gpgname --gpgconf-list}.
 
 @item Subkey-Usage: @var{usage-list}
 Key usage lists for a subkey; similar to @samp{Key-Usage}.
 
 @item Passphrase: @var{string}
 If you want to specify a passphrase for the secret key, enter it here.
 Default is to use the Pinentry dialog to ask for a passphrase.
 
 @item Name-Real: @var{name}
 @itemx Name-Comment: @var{comment}
 @itemx Name-Email: @var{email}
 The three parts of a user name.  Remember to use UTF-8 encoding here.
 If you don't give any of them, no user ID is created.
 
 @item Expire-Date: @var{iso-date}|(@var{number}[d|w|m|y])
 Set the expiration date for the key (and the subkey).  It may either
 be entered in ISO date format (e.g. "20000815T145012") or as number of
 days, weeks, month or years after the creation date.  The special
 notation "seconds=N" is also allowed to specify a number of seconds
 since creation.  Without a letter days are assumed.  Note that there
 is no check done on the overflow of the type used by OpenPGP for
 timestamps.  Thus you better make sure that the given value make
 sense.  Although OpenPGP works with time intervals, GnuPG uses an
 absolute value internally and thus the last year we can represent is
 2105.
 
 @item  Creation-Date: @var{iso-date}
 Set the creation date of the key as stored in the key information and
 which is also part of the fingerprint calculation.  Either a date like
 "1986-04-26" or a full timestamp like "19860426T042640" may be used.
 The time is considered to be UTC.  The special notation "seconds=N"
 may be used to directly specify a the number of seconds since Epoch
 (Unix time).  If it is not given the current time is used.
 
 @item Preferences: @var{string}
 Set the cipher, hash, and compression preference values for this key.
 This expects the same type of string as the sub-command @samp{setpref}
 in the @option{--edit-key} menu.
 
 @item  Revoker: @var{algo}:@var{fpr} [sensitive]
 Add a designated revoker to the generated key.  Algo is the public key
 algorithm of the designated revoker (i.e. RSA=1, DSA=17, etc.)
 @var{fpr} is the fingerprint of the designated revoker.  The optional
 @samp{sensitive} flag marks the designated revoker as sensitive
 information.  Only v4 keys may be designated revokers.
 
 @item Keyserver: @var{string}
 This is an optional parameter that specifies the preferred keyserver
 URL for the key.
 
 @item Handle: @var{string}
 This is an optional parameter only used with the status lines
 KEY_CREATED and KEY_NOT_CREATED.  @var{string} may be up to 100
 characters and should not contain spaces.  It is useful for batch key
 generation to associate a key parameter block with a status line.
 
 @end table
 
 @noindent
 Here is an example on how to create a key in an ephemeral home directory:
 @smallexample
 $ export GNUPGHOME="$(mktemp -d)"
 $ cat >foo <<EOF
      %echo Generating a basic OpenPGP key
      Key-Type: DSA
      Key-Length: 1024
      Subkey-Type: ELG-E
      Subkey-Length: 1024
      Name-Real: Joe Tester
      Name-Comment: with stupid passphrase
      Name-Email: joe@@foo.bar
      Expire-Date: 0
      Passphrase: abc
      # Do a commit here, so that we can later print "done" :-)
      %commit
      %echo done
 EOF
 $ @gpgname --batch --generate-key foo
  [...]
 $ @gpgname --list-secret-keys
 /tmp/tmp.0NQxB74PEf/pubring.kbx
 -------------------------------
 sec   dsa1024 2016-12-16 [SCA]
       768E895903FC1C44045C8CB95EEBDB71E9E849D0
 uid           [ultimate] Joe Tester (with stupid passphrase) <joe@@foo.bar>
 ssb   elg1024 2016-12-16 [E]
 @end smallexample
 
 @noindent
 If you want to create a key with the default algorithms you would use
 these parameters:
 @smallexample
      %echo Generating a default key
      Key-Type: default
      Subkey-Type: default
      Name-Real: Joe Tester
      Name-Comment: with stupid passphrase
      Name-Email: joe@@foo.bar
      Expire-Date: 0
      Passphrase: abc
      # Do a commit here, so that we can later print "done" :-)
      %commit
      %echo done
 @end smallexample
 
 
 
 
 @mansect see also
 @ifset isman
 @command{gpgv}(1),
 @command{gpgsm}(1),
 @command{gpg-agent}(1)
 @end ifset
 @include see-also-note.texi
diff --git a/g10/import.c b/g10/import.c
index 6fdd53e85..23258a0a7 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1,4077 +1,4077 @@
 /* import.c - import a key into our key storage.
  * Copyright (C) 1998-2007, 2010-2011 Free Software Foundation, Inc.
  * Copyright (C) 2014, 2016, 2017  Werner Koch
  *
  * This file is part of GnuPG.
  *
  * GnuPG 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.
  *
  * GnuPG 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 <https://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
 #include "../common/status.h"
 #include "keydb.h"
 #include "../common/util.h"
 #include "trustdb.h"
 #include "main.h"
 #include "../common/i18n.h"
 #include "../common/ttyio.h"
 #include "../common/recsel.h"
 #include "keyserver-internal.h"
 #include "call-agent.h"
 #include "../common/membuf.h"
 #include "../common/init.h"
 #include "../common/mbox-util.h"
 #include "key-check.h"
 #include "key-clean.h"
 
 
 struct import_stats_s
 {
   ulong count;
   ulong no_user_id;
   ulong imported;
   ulong n_uids;
   ulong n_sigs;
   ulong n_subk;
   ulong unchanged;
   ulong n_revoc;
   ulong secret_read;
   ulong secret_imported;
   ulong secret_dups;
   ulong skipped_new_keys;
   ulong not_imported;
   ulong n_sigs_cleaned;
   ulong n_uids_cleaned;
   ulong v3keys;   /* Number of V3 keys seen.  */
 };
 
 
 /* Node flag to indicate that a user ID or a subkey has a
  * valid self-signature.  */
 #define NODE_GOOD_SELFSIG  1
 /* Node flag to indicate that a user ID or subkey has
  * an invalid self-signature.  */
 #define NODE_BAD_SELFSIG   2
 /* Node flag to indicate that the node shall be deleted.  */
 #define NODE_DELETION_MARK 4
 /* A node flag used to temporary mark a node. */
 #define NODE_FLAG_A  8
 
 
 /* An object and a global instance to store selectors created from
  * --import-filter keep-uid=EXPR.
  * --import-filter drop-sig=EXPR.
  *
  * FIXME: We should put this into the CTRL object but that requires a
  * lot more changes right now.  For now we use save and restore
  * function to temporary change them.
  */
 /* Definition of the import filters.  */
 struct import_filter_s
 {
   recsel_expr_t keep_uid;
   recsel_expr_t drop_sig;
 };
 /* The current instance.  */
 struct import_filter_s import_filter;
 
 
 static int import (ctrl_t ctrl,
                    IOBUF inp, const char* fname, struct import_stats_s *stats,
 		   unsigned char **fpr, size_t *fpr_len, unsigned int options,
 		   import_screener_t screener, void *screener_arg,
                    int origin, const char *url);
 static int read_block (IOBUF a, int with_meta,
                        PACKET **pending_pkt, kbnode_t *ret_root, int *r_v3keys);
 static void revocation_present (ctrl_t ctrl, kbnode_t keyblock);
 static gpg_error_t import_one (ctrl_t ctrl,
                        kbnode_t keyblock,
                        struct import_stats_s *stats,
                        unsigned char **fpr, size_t *fpr_len,
                        unsigned int options, int from_sk, int silent,
                        import_screener_t screener, void *screener_arg,
                        int origin, const char *url);
 static int import_secret_one (ctrl_t ctrl, kbnode_t keyblock,
                               struct import_stats_s *stats, int batch,
                               unsigned int options, int for_migration,
                               import_screener_t screener, void *screener_arg);
 static int import_revoke_cert (ctrl_t ctrl, kbnode_t node, unsigned int options,
                                struct import_stats_s *stats);
 static int chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
                           int *non_self);
 static int delete_inv_parts (ctrl_t ctrl, kbnode_t keyblock,
                              u32 *keyid, unsigned int options);
 static int any_uid_left (kbnode_t keyblock);
 static int remove_all_uids (kbnode_t *keyblock);
 static int merge_blocks (ctrl_t ctrl, unsigned int options,
                          kbnode_t keyblock_orig,
 			 kbnode_t keyblock, u32 *keyid,
                          u32 curtime, int origin, const char *url,
 			 int *n_uids, int *n_sigs, int *n_subk );
 static gpg_error_t append_new_uid (unsigned int options,
                                    kbnode_t keyblock, kbnode_t node,
                                    u32 curtime, int origin, const char *url,
                                    int *n_sigs);
 static int append_key (kbnode_t keyblock, kbnode_t node, int *n_sigs);
 static int merge_sigs (kbnode_t dst, kbnode_t src, int *n_sigs);
 static int merge_keysigs (kbnode_t dst, kbnode_t src, int *n_sigs);
 
 
 
 static void
 release_import_filter (import_filter_t filt)
 {
   recsel_release (filt->keep_uid);
   filt->keep_uid = NULL;
   recsel_release (filt->drop_sig);
   filt->drop_sig = NULL;
 }
 
 static void
 cleanup_import_globals (void)
 {
   release_import_filter (&import_filter);
 }
 
 
 int
 parse_import_options(char *str,unsigned int *options,int noisy)
 {
   struct parse_options import_opts[]=
     {
       {"import-local-sigs",IMPORT_LOCAL_SIGS,NULL,
        N_("import signatures that are marked as local-only")},
 
       {"repair-pks-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL,
        N_("repair damage from the pks keyserver during import")},
 
       {"keep-ownertrust", IMPORT_KEEP_OWNERTTRUST, NULL,
        N_("do not clear the ownertrust values during import")},
 
       {"fast-import",IMPORT_FAST,NULL,
        N_("do not update the trustdb after import")},
 
       {"import-show",IMPORT_SHOW,NULL,
        N_("show key during import")},
 
       {"merge-only",IMPORT_MERGE_ONLY,NULL,
        N_("only accept updates to existing keys")},
 
       {"import-clean",IMPORT_CLEAN,NULL,
        N_("remove unusable parts from key after import")},
 
       {"import-minimal",IMPORT_MINIMAL|IMPORT_CLEAN,NULL,
        N_("remove as much as possible from key after import")},
 
       {"import-drop-uids", IMPORT_DROP_UIDS, NULL,
        N_("Do not import user id or attribute packets")},
 
       {"import-export", IMPORT_EXPORT, NULL,
        N_("run import filters and export key immediately")},
 
       {"restore", IMPORT_RESTORE, NULL,
        N_("assume the GnuPG key backup format")},
       {"import-restore", IMPORT_RESTORE, NULL, NULL},
 
       {"repair-keys", IMPORT_REPAIR_KEYS, NULL,
        N_("repair keys on import")},
 
       /* No description to avoid string change: Fixme for 2.3 */
       {"show-only", (IMPORT_SHOW | IMPORT_DRY_RUN), NULL,
        NULL},
 
       /* Aliases for backward compatibility */
       {"allow-local-sigs",IMPORT_LOCAL_SIGS,NULL,NULL},
       {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL,NULL},
       /* dummy */
       {"import-unusable-sigs",0,NULL,NULL},
       {"import-clean-sigs",0,NULL,NULL},
       {"import-clean-uids",0,NULL,NULL},
       {"convert-sk-to-pk",0, NULL,NULL}, /* Not anymore needed due to
                                             the new design.  */
       {NULL,0,NULL,NULL}
     };
   int rc;
 
   rc = parse_options (str, options, import_opts, noisy);
   if (rc && (*options & IMPORT_RESTORE))
     {
       /* Alter other options we want or don't want for restore.  */
       *options |= (IMPORT_LOCAL_SIGS | IMPORT_KEEP_OWNERTTRUST);
       *options &= ~(IMPORT_MINIMAL | IMPORT_CLEAN
                     | IMPORT_REPAIR_PKS_SUBKEY_BUG
                     | IMPORT_MERGE_ONLY);
     }
   return rc;
 }
 
 
 /* Parse and set an import filter from string.  STRING has the format
  * "NAME=EXPR" with NAME being the name of the filter.  Spaces before
  * and after NAME are not allowed.  If this function is all called
  * several times all expressions for the same NAME are concatenated.
  * Supported filter names are:
  *
  *  - keep-uid :: If the expression evaluates to true for a certain
  *                user ID packet, that packet and all it dependencies
  *                will be imported.  The expression may use these
  *                variables:
  *
  *                - uid  :: The entire user ID.
  *                - mbox :: The mail box part of the user ID.
  *                - primary :: Evaluate to true for the primary user ID.
  */
 gpg_error_t
 parse_and_set_import_filter (const char *string)
 {
   gpg_error_t err;
 
   /* Auto register the cleanup function.  */
   register_mem_cleanup_func (cleanup_import_globals);
 
   if (!strncmp (string, "keep-uid=", 9))
     err = recsel_parse_expr (&import_filter.keep_uid, string+9);
   else if (!strncmp (string, "drop-sig=", 9))
     err = recsel_parse_expr (&import_filter.drop_sig, string+9);
   else
     err = gpg_error (GPG_ERR_INV_NAME);
 
   return err;
 }
 
 
 /* Save the current import filters, return them, and clear the current
  * filters.  Returns NULL on error and sets ERRNO.  */
 import_filter_t
 save_and_clear_import_filter (void)
 {
   import_filter_t filt;
 
   filt = xtrycalloc (1, sizeof *filt);
   if (!filt)
     return NULL;
   *filt = import_filter;
   memset (&import_filter, 0, sizeof import_filter);
 
   return filt;
 }
 
 
 /* Release the current import filters and restore them from NEWFILT.
  * Ownership of NEWFILT is moved to this function.  */
 void
 restore_import_filter (import_filter_t filt)
 {
   if (filt)
     {
       release_import_filter (&import_filter);
       import_filter = *filt;
       xfree (filt);
     }
 }
 
 
 import_stats_t
 import_new_stats_handle (void)
 {
   return xmalloc_clear ( sizeof (struct import_stats_s) );
 }
 
 
 void
 import_release_stats_handle (import_stats_t p)
 {
   xfree (p);
 }
 
 
 /* Read a key from a file.  Only the first key in the file is
  * considered and stored at R_KEYBLOCK.  FNAME is the name of the
  * file.
  */
 gpg_error_t
 read_key_from_file (ctrl_t ctrl, const char *fname, kbnode_t *r_keyblock)
 {
   gpg_error_t err;
   iobuf_t inp;
   PACKET *pending_pkt = NULL;
   kbnode_t keyblock = NULL;
   u32 keyid[2];
   int v3keys;   /* Dummy */
   int non_self; /* Dummy */
 
   (void)ctrl;
 
   *r_keyblock = NULL;
 
   inp = iobuf_open (fname);
   if (!inp)
     err = gpg_error_from_syserror ();
   else if (is_secured_file (iobuf_get_fd (inp)))
     {
       iobuf_close (inp);
       inp = NULL;
       err = gpg_error (GPG_ERR_EPERM);
     }
   else
     err = 0;
   if (err)
     {
       log_error (_("can't open '%s': %s\n"),
                  iobuf_is_pipe_filename (fname)? "[stdin]": fname,
                  gpg_strerror (err));
       if (gpg_err_code (err) == GPG_ERR_ENOENT)
         err = gpg_error (GPG_ERR_NO_PUBKEY);
       goto leave;
     }
 
   /* Push the armor filter.  */
   {
     armor_filter_context_t *afx;
     afx = new_armor_context ();
     afx->only_keyblocks = 1;
     push_armor_filter (afx, inp);
     release_armor_context (afx);
   }
 
   /* Read the first non-v3 keyblock.  */
   while (!(err = read_block (inp, 0, &pending_pkt, &keyblock, &v3keys)))
     {
       if (keyblock->pkt->pkttype == PKT_PUBLIC_KEY)
         break;
       log_info (_("skipping block of type %d\n"), keyblock->pkt->pkttype);
       release_kbnode (keyblock);
       keyblock = NULL;
     }
   if (err)
     {
       if (gpg_err_code (err) != GPG_ERR_INV_KEYRING)
         log_error (_("error reading '%s': %s\n"),
                    iobuf_is_pipe_filename (fname)? "[stdin]": fname,
                    gpg_strerror (err));
       goto leave;
     }
 
   keyid_from_pk (keyblock->pkt->pkt.public_key, keyid);
 
   if (!find_next_kbnode (keyblock, PKT_USER_ID))
     {
       err = gpg_error (GPG_ERR_NO_USER_ID);
       goto leave;
     }
 
   collapse_uids (&keyblock);
 
   clear_kbnode_flags (keyblock);
   if (chk_self_sigs (ctrl, keyblock, keyid, &non_self))
     {
       err = gpg_error (GPG_ERR_INV_KEYRING);
       goto leave;
     }
 
   if (!delete_inv_parts (ctrl, keyblock, keyid, 0) )
     {
       err = gpg_error (GPG_ERR_NO_USER_ID);
       goto leave;
     }
 
   *r_keyblock = keyblock;
   keyblock = NULL;
 
  leave:
   if (inp)
     {
       iobuf_close (inp);
       /* Must invalidate that ugly cache to actually close the file. */
       iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE, 0, (char*)fname);
     }
   release_kbnode (keyblock);
   /* FIXME: Do we need to free PENDING_PKT ? */
   return err;
 }
 
 
 
 /*
  * Import the public keys from the given filename. Input may be armored.
  * This function rejects all keys which are not validly self signed on at
  * least one userid. Only user ids which are self signed will be imported.
  * Other signatures are not checked.
  *
  * Actually this function does a merge. It works like this:
  *
  *  - get the keyblock
  *  - check self-signatures and remove all userids and their signatures
  *    without/invalid self-signatures.
  *  - reject the keyblock, if we have no valid userid.
  *  - See whether we have this key already in one of our pubrings.
  *    If not, simply add it to the default keyring.
  *  - Compare the key and the self-signatures of the new and the one in
  *    our keyring.  If they are different something weird is going on;
  *    ask what to do.
  *  - See whether we have only non-self-signature on one user id; if not
  *    ask the user what to do.
  *  - compare the signatures: If we already have this signature, check
  *    that they compare okay; if not, issue a warning and ask the user.
  *    (consider looking at the timestamp and use the newest?)
  *  - Simply add the signature.  Can't verify here because we may not have
  *    the signature's public key yet; verification is done when putting it
  *    into the trustdb, which is done automagically as soon as this pubkey
  *    is used.
  *  - Proceed with next signature.
  *
  *  Key revocation certificates have special handling.
  */
 static gpg_error_t
 import_keys_internal (ctrl_t ctrl, iobuf_t inp, char **fnames, int nnames,
 		      import_stats_t stats_handle,
                       unsigned char **fpr, size_t *fpr_len,
 		      unsigned int options,
                       import_screener_t screener, void *screener_arg,
                       int origin, const char *url)
 {
   int i;
   gpg_error_t err = 0;
   struct import_stats_s *stats = stats_handle;
 
   if (!stats)
     stats = import_new_stats_handle ();
 
   if (inp)
     {
       err = import (ctrl, inp, "[stream]", stats, fpr, fpr_len, options,
                     screener, screener_arg, origin, url);
     }
   else
     {
       if (!fnames && !nnames)
         nnames = 1;  /* Ohh what a ugly hack to jump into the loop */
 
       for (i=0; i < nnames; i++)
         {
           const char *fname = fnames? fnames[i] : NULL;
           IOBUF inp2 = iobuf_open(fname);
 
           if (!fname)
             fname = "[stdin]";
           if (inp2 && is_secured_file (iobuf_get_fd (inp2)))
             {
               iobuf_close (inp2);
               inp2 = NULL;
               gpg_err_set_errno (EPERM);
             }
           if (!inp2)
             log_error (_("can't open '%s': %s\n"), fname, strerror (errno));
           else
             {
               err = import (ctrl, inp2, fname, stats, fpr, fpr_len, options,
                            screener, screener_arg, origin, url);
               iobuf_close (inp2);
               /* Must invalidate that ugly cache to actually close it. */
               iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE, 0, (char*)fname);
               if (err)
                 log_error ("import from '%s' failed: %s\n",
                            fname, gpg_strerror (err) );
             }
           if (!fname)
             break;
 	}
     }
 
   if (!stats_handle)
     {
       if ((options & (IMPORT_SHOW | IMPORT_DRY_RUN))
           != (IMPORT_SHOW | IMPORT_DRY_RUN))
         import_print_stats (stats);
       import_release_stats_handle (stats);
     }
 
   /* If no fast import and the trustdb is dirty (i.e. we added a key
      or userID that had something other than a selfsig, a signature
      that was other than a selfsig, or any revocation), then
      update/check the trustdb if the user specified by setting
      interactive or by not setting no-auto-check-trustdb */
 
   if (!(options & IMPORT_FAST))
     check_or_update_trustdb (ctrl);
 
   return err;
 }
 
 
 void
 import_keys (ctrl_t ctrl, char **fnames, int nnames,
 	     import_stats_t stats_handle, unsigned int options,
              int origin, const char *url)
 {
   import_keys_internal (ctrl, NULL, fnames, nnames, stats_handle,
                         NULL, NULL, options, NULL, NULL, origin, url);
 }
 
 
 gpg_error_t
 import_keys_es_stream (ctrl_t ctrl, estream_t fp,
                        import_stats_t stats_handle,
                        unsigned char **fpr, size_t *fpr_len,
                        unsigned int options,
                        import_screener_t screener, void *screener_arg,
                        int origin, const char *url)
 {
   gpg_error_t err;
   iobuf_t inp;
 
   inp = iobuf_esopen (fp, "rb", 1);
   if (!inp)
     {
       err = gpg_error_from_syserror ();
       log_error ("iobuf_esopen failed: %s\n", gpg_strerror (err));
       return err;
     }
 
   err = import_keys_internal (ctrl, inp, NULL, 0, stats_handle,
                              fpr, fpr_len, options,
                              screener, screener_arg, origin, url);
 
   iobuf_close (inp);
   return err;
 }
 
 
 static int
 import (ctrl_t ctrl, IOBUF inp, const char* fname,struct import_stats_s *stats,
 	unsigned char **fpr,size_t *fpr_len, unsigned int options,
 	import_screener_t screener, void *screener_arg,
         int origin, const char *url)
 {
   PACKET *pending_pkt = NULL;
   kbnode_t keyblock = NULL;  /* Need to initialize because gcc can't
                                 grasp the return semantics of
                                 read_block. */
   int rc = 0;
   int v3keys;
 
   getkey_disable_caches ();
 
   if (!opt.no_armor) /* Armored reading is not disabled.  */
     {
       armor_filter_context_t *afx;
 
       afx = new_armor_context ();
       afx->only_keyblocks = 1;
       push_armor_filter (afx, inp);
       release_armor_context (afx);
     }
 
   while (!(rc = read_block (inp, !!(options & IMPORT_RESTORE),
                             &pending_pkt, &keyblock, &v3keys)))
     {
       stats->v3keys += v3keys;
       if (keyblock->pkt->pkttype == PKT_PUBLIC_KEY)
         rc = import_one (ctrl, keyblock,
                          stats, fpr, fpr_len, options, 0, 0,
                          screener, screener_arg, origin, url);
       else if (keyblock->pkt->pkttype == PKT_SECRET_KEY)
         rc = import_secret_one (ctrl, keyblock, stats,
                                 opt.batch, options, 0,
                                 screener, screener_arg);
       else if (keyblock->pkt->pkttype == PKT_SIGNATURE
                && IS_KEY_REV (keyblock->pkt->pkt.signature) )
         rc = import_revoke_cert (ctrl, keyblock, options, stats);
       else
         {
           log_info (_("skipping block of type %d\n"), keyblock->pkt->pkttype);
 	}
       release_kbnode (keyblock);
 
       /* fixme: we should increment the not imported counter but
          this does only make sense if we keep on going despite of
          errors.  For now we do this only if the imported key is too
          large. */
       if (gpg_err_code (rc) == GPG_ERR_TOO_LARGE
             && gpg_err_source (rc) == GPG_ERR_SOURCE_KEYBOX)
         {
           stats->not_imported++;
         }
       else if (rc)
         break;
 
       if (!(++stats->count % 100) && !opt.quiet)
         log_info (_("%lu keys processed so far\n"), stats->count );
     }
   stats->v3keys += v3keys;
   if (rc == -1)
     rc = 0;
   else if (rc && gpg_err_code (rc) != GPG_ERR_INV_KEYRING)
     log_error (_("error reading '%s': %s\n"), fname, gpg_strerror (rc));
 
   return rc;
 }
 
 
 /* Helper to migrate secring.gpg to GnuPG 2.1.  */
 gpg_error_t
 import_old_secring (ctrl_t ctrl, const char *fname)
 {
   gpg_error_t err;
   iobuf_t inp;
   PACKET *pending_pkt = NULL;
   kbnode_t keyblock = NULL;  /* Need to initialize because gcc can't
                                 grasp the return semantics of
                                 read_block. */
   struct import_stats_s *stats;
   int v3keys;
 
   inp = iobuf_open (fname);
   if (inp && is_secured_file (iobuf_get_fd (inp)))
     {
       iobuf_close (inp);
       inp = NULL;
       gpg_err_set_errno (EPERM);
     }
   if (!inp)
     {
       err = gpg_error_from_syserror ();
       log_error (_("can't open '%s': %s\n"), fname, gpg_strerror (err));
       return err;
     }
 
   getkey_disable_caches();
   stats = import_new_stats_handle ();
   while (!(err = read_block (inp, 0, &pending_pkt, &keyblock, &v3keys)))
     {
       if (keyblock->pkt->pkttype == PKT_SECRET_KEY)
         err = import_secret_one (ctrl, keyblock, stats, 1, 0, 1,
                                  NULL, NULL);
       release_kbnode (keyblock);
       if (err)
         break;
     }
   import_release_stats_handle (stats);
   if (err == -1)
     err = 0;
   else if (err && gpg_err_code (err) != GPG_ERR_INV_KEYRING)
     log_error (_("error reading '%s': %s\n"), fname, gpg_strerror (err));
   else if (err)
     log_error ("import from '%s' failed: %s\n", fname, gpg_strerror (err));
 
   iobuf_close (inp);
   iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE, 0, (char*)fname);
 
   return err;
 }
 
 
 void
 import_print_stats (import_stats_t stats)
 {
   if (!opt.quiet)
     {
       log_info(_("Total number processed: %lu\n"),
                stats->count + stats->v3keys);
       if (stats->v3keys)
         log_info(_("    skipped PGP-2 keys: %lu\n"), stats->v3keys);
       if (stats->skipped_new_keys )
         log_info(_("      skipped new keys: %lu\n"),
                  stats->skipped_new_keys );
       if (stats->no_user_id )
         log_info(_("          w/o user IDs: %lu\n"), stats->no_user_id );
       if (stats->imported)
         {
           log_info(_("              imported: %lu"), stats->imported );
           log_printf ("\n");
         }
       if (stats->unchanged )
         log_info(_("             unchanged: %lu\n"), stats->unchanged );
       if (stats->n_uids )
         log_info(_("          new user IDs: %lu\n"), stats->n_uids );
       if (stats->n_subk )
         log_info(_("           new subkeys: %lu\n"), stats->n_subk );
       if (stats->n_sigs )
         log_info(_("        new signatures: %lu\n"), stats->n_sigs );
       if (stats->n_revoc )
         log_info(_("   new key revocations: %lu\n"), stats->n_revoc );
       if (stats->secret_read )
         log_info(_("      secret keys read: %lu\n"), stats->secret_read );
       if (stats->secret_imported )
         log_info(_("  secret keys imported: %lu\n"), stats->secret_imported );
       if (stats->secret_dups )
         log_info(_(" secret keys unchanged: %lu\n"), stats->secret_dups );
       if (stats->not_imported )
         log_info(_("          not imported: %lu\n"), stats->not_imported );
       if (stats->n_sigs_cleaned)
         log_info(_("    signatures cleaned: %lu\n"),stats->n_sigs_cleaned);
       if (stats->n_uids_cleaned)
         log_info(_("      user IDs cleaned: %lu\n"),stats->n_uids_cleaned);
     }
 
   if (is_status_enabled ())
     {
       char buf[15*20];
 
       snprintf (buf, sizeof buf,
                 "%lu %lu %lu 0 %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
 		stats->count + stats->v3keys,
 		stats->no_user_id,
 		stats->imported,
 		stats->unchanged,
 		stats->n_uids,
 		stats->n_subk,
 		stats->n_sigs,
 		stats->n_revoc,
 		stats->secret_read,
 		stats->secret_imported,
 		stats->secret_dups,
 		stats->skipped_new_keys,
                 stats->not_imported,
                 stats->v3keys );
       write_status_text (STATUS_IMPORT_RES, buf);
     }
 }
 
 
 /* Return true if PKTTYPE is valid in a keyblock.  */
 static int
 valid_keyblock_packet (int pkttype)
 {
   switch (pkttype)
     {
     case PKT_PUBLIC_KEY:
     case PKT_PUBLIC_SUBKEY:
     case PKT_SECRET_KEY:
     case PKT_SECRET_SUBKEY:
     case PKT_SIGNATURE:
     case PKT_USER_ID:
     case PKT_ATTRIBUTE:
     case PKT_RING_TRUST:
       return 1;
     default:
       return 0;
     }
 }
 
 
 /****************
  * Read the next keyblock from stream A.
  * Meta data (ring trust packets) are only considered of WITH_META is set.
  * PENDING_PKT should be initialized to NULL and not changed by the caller.
  * Return: 0 = okay, -1 no more blocks or another errorcode.
  *         The int at R_V3KEY counts the number of unsupported v3
  *         keyblocks.
  */
 static int
 read_block( IOBUF a, int with_meta,
             PACKET **pending_pkt, kbnode_t *ret_root, int *r_v3keys)
 {
   int rc;
   struct parse_packet_ctx_s parsectx;
   PACKET *pkt;
   kbnode_t root = NULL;
   int in_cert, in_v3key, skip_sigs;
 
   *r_v3keys = 0;
 
   if (*pending_pkt)
     {
       root = new_kbnode( *pending_pkt );
       *pending_pkt = NULL;
       in_cert = 1;
     }
   else
     in_cert = 0;
 
   pkt = xmalloc (sizeof *pkt);
   init_packet (pkt);
   init_parse_packet (&parsectx, a);
   if (!with_meta)
     parsectx.skip_meta = 1;
   in_v3key = 0;
   skip_sigs = 0;
   while ((rc=parse_packet (&parsectx, pkt)) != -1)
     {
       if (rc && (gpg_err_code (rc) == GPG_ERR_LEGACY_KEY
                  && (pkt->pkttype == PKT_PUBLIC_KEY
                      || pkt->pkttype == PKT_SECRET_KEY)))
         {
           in_v3key = 1;
           ++*r_v3keys;
           free_packet (pkt, &parsectx);
           init_packet (pkt);
           continue;
         }
       else if (rc ) /* (ignore errors) */
         {
           skip_sigs = 0;
           if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET)
             ; /* Do not show a diagnostic.  */
           else if (gpg_err_code (rc) == GPG_ERR_INV_PACKET
                    && (pkt->pkttype == PKT_USER_ID
                        || pkt->pkttype == PKT_ATTRIBUTE))
             {
               /* This indicates a too large user id or attribute
                * packet.  We skip this packet and all following
                * signatures.  Sure, this won't allow to repair a
                * garbled keyring in case one of the signatures belong
                * to another user id.  However, this better mitigates
                * DoS using inserted user ids.  */
               skip_sigs = 1;
             }
           else if (gpg_err_code (rc) == GPG_ERR_INV_PACKET
                    && (pkt->pkttype == PKT_OLD_COMMENT
                        || pkt->pkttype == PKT_COMMENT))
             ; /* Ignore too large comment packets.  */
           else
             {
               log_error("read_block: read error: %s\n", gpg_strerror (rc) );
               rc = GPG_ERR_INV_KEYRING;
               goto ready;
             }
           free_packet (pkt, &parsectx);
           init_packet(pkt);
           continue;
 	}
 
       if (skip_sigs)
         {
           if (pkt->pkttype == PKT_SIGNATURE)
             {
               free_packet (pkt, &parsectx);
               init_packet (pkt);
               continue;
             }
           skip_sigs = 0;
         }
 
       if (in_v3key && !(pkt->pkttype == PKT_PUBLIC_KEY
                         || pkt->pkttype == PKT_SECRET_KEY))
         {
           free_packet (pkt, &parsectx);
           init_packet(pkt);
           continue;
         }
       in_v3key = 0;
 
       if (!root && pkt->pkttype == PKT_SIGNATURE
           && IS_KEY_REV (pkt->pkt.signature) )
         {
           /* This is a revocation certificate which is handled in a
            * special way.  */
           root = new_kbnode( pkt );
           pkt = NULL;
           goto ready;
         }
 
       /* Make a linked list of all packets.  */
       switch (pkt->pkttype)
         {
         case PKT_COMPRESSED:
           if (check_compress_algo (pkt->pkt.compressed->algorithm))
             {
               rc = GPG_ERR_COMPR_ALGO;
               goto ready;
             }
           else
             {
               compress_filter_context_t *cfx = xmalloc_clear( sizeof *cfx );
               pkt->pkt.compressed->buf = NULL;
               if (push_compress_filter2 (a, cfx,
                                          pkt->pkt.compressed->algorithm, 1))
                 xfree (cfx); /* e.g. in case of compression_algo NONE.  */
             }
           free_packet (pkt, &parsectx);
           init_packet(pkt);
           break;
 
         case PKT_RING_TRUST:
           /* Skip those packets unless we are in restore mode.  */
           if ((opt.import_options & IMPORT_RESTORE))
             goto x_default;
           free_packet (pkt, &parsectx);
           init_packet(pkt);
           break;
 
         case PKT_PUBLIC_KEY:
         case PKT_SECRET_KEY:
           if (in_cert ) /* Store this packet.  */
             {
               *pending_pkt = pkt;
               pkt = NULL;
               goto ready;
             }
           in_cert = 1;
           /* fall through */
         default:
         x_default:
           if (in_cert && valid_keyblock_packet (pkt->pkttype))
             {
               if (!root )
                 root = new_kbnode (pkt);
               else
                 add_kbnode (root, new_kbnode (pkt));
               pkt = xmalloc (sizeof *pkt);
             }
           else
             free_packet (pkt, &parsectx);
           init_packet(pkt);
           break;
         }
     }
 
  ready:
   if (rc == -1 && root )
     rc = 0;
 
   if (rc )
     release_kbnode( root );
   else
     *ret_root = root;
   free_packet (pkt, &parsectx);
   deinit_parse_packet (&parsectx);
   xfree( pkt );
   return rc;
 }
 
 
 /* Walk through the subkeys on a pk to find if we have the PKS
    disease: multiple subkeys with their binding sigs stripped, and the
    sig for the first subkey placed after the last subkey.  That is,
    instead of "pk uid sig sub1 bind1 sub2 bind2 sub3 bind3" we have
    "pk uid sig sub1 sub2 sub3 bind1".  We can't do anything about sub2
    and sub3, as they are already lost, but we can try and rescue sub1
    by reordering the keyblock so that it reads "pk uid sig sub1 bind1
    sub2 sub3".  Returns TRUE if the keyblock was modified. */
 static int
 fix_pks_corruption (ctrl_t ctrl, kbnode_t keyblock)
 {
   int changed = 0;
   int keycount = 0;
   kbnode_t node;
   kbnode_t last = NULL;
   kbnode_t sknode=NULL;
 
   /* First determine if we have the problem at all.  Look for 2 or
      more subkeys in a row, followed by a single binding sig. */
   for (node=keyblock; node; last=node, node=node->next)
     {
       if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
 	{
 	  keycount++;
 	  if(!sknode)
 	    sknode=node;
 	}
       else if (node->pkt->pkttype == PKT_SIGNATURE
                && IS_SUBKEY_SIG (node->pkt->pkt.signature)
                && keycount >= 2
                && !node->next)
 	{
 	  /* We might have the problem, as this key has two subkeys in
 	     a row without any intervening packets. */
 
 	  /* Sanity check */
 	  if (!last)
 	    break;
 
 	  /* Temporarily attach node to sknode. */
 	  node->next = sknode->next;
 	  sknode->next = node;
 	  last->next = NULL;
 
 	  /* Note we aren't checking whether this binding sig is a
 	     selfsig.  This is not necessary here as the subkey and
 	     binding sig will be rejected later if that is the
 	     case. */
 	  if (check_key_signature (ctrl, keyblock,node,NULL))
 	    {
 	      /* Not a match, so undo the changes. */
 	      sknode->next = node->next;
 	      last->next = node;
 	      node->next = NULL;
 	      break;
 	    }
 	  else
 	    {
               /* Mark it good so we don't need to check it again */
 	      sknode->flag |= NODE_GOOD_SELFSIG;
 	      changed = 1;
 	      break;
 	    }
 	}
       else
 	keycount = 0;
     }
 
   return changed;
 }
 
 
 /* Versions of GnuPG before 1.4.11 and 2.0.16 allowed to import bogus
    direct key signatures.  A side effect of this was that a later
    import of the same good direct key signatures was not possible
    because the cmp_signature check in merge_blocks considered them
    equal.  Although direct key signatures are now checked during
    import, there might still be bogus signatures sitting in a keyring.
    We need to detect and delete them before doing a merge.  This
    function returns the number of removed sigs.  */
 static int
 fix_bad_direct_key_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid)
 {
   gpg_error_t err;
   kbnode_t node;
   int count = 0;
 
   for (node = keyblock->next; node; node=node->next)
     {
       if (node->pkt->pkttype == PKT_USER_ID)
         break;
       if (node->pkt->pkttype == PKT_SIGNATURE
           && IS_KEY_SIG (node->pkt->pkt.signature))
         {
           err = check_key_signature (ctrl, keyblock, node, NULL);
           if (err && gpg_err_code (err) != GPG_ERR_PUBKEY_ALGO )
             {
               /* If we don't know the error, we can't decide; this is
                  not a problem because cmp_signature can't compare the
                  signature either.  */
               log_info ("key %s: invalid direct key signature removed\n",
                         keystr (keyid));
               delete_kbnode (node);
               count++;
             }
         }
     }
 
   return count;
 }
 
 
 static void
 print_import_ok (PKT_public_key *pk, unsigned int reason)
 {
   byte array[MAX_FINGERPRINT_LEN], *s;
   char buf[MAX_FINGERPRINT_LEN*2+30], *p;
   size_t i, n;
 
   snprintf (buf, sizeof buf, "%u ", reason);
   p = buf + strlen (buf);
 
   fingerprint_from_pk (pk, array, &n);
   s = array;
   for (i=0; i < n ; i++, s++, p += 2)
     sprintf (p, "%02X", *s);
 
   write_status_text (STATUS_IMPORT_OK, buf);
 }
 
 
 static void
 print_import_check (PKT_public_key * pk, PKT_user_id * id)
 {
   char * buf;
   byte fpr[24];
   u32 keyid[2];
   size_t i, n;
   size_t pos = 0;
 
   buf = xmalloc (17+41+id->len+32);
   keyid_from_pk (pk, keyid);
   sprintf (buf, "%08X%08X ", keyid[0], keyid[1]);
   pos = 17;
   fingerprint_from_pk (pk, fpr, &n);
   for (i = 0; i < n; i++, pos += 2)
     sprintf (buf+pos, "%02X", fpr[i]);
   strcat (buf, " ");
   strcat (buf, id->name);
   write_status_text (STATUS_IMPORT_CHECK, buf);
   xfree (buf);
 }
 
 
 static void
 check_prefs_warning(PKT_public_key *pk)
 {
   log_info(_("WARNING: key %s contains preferences for unavailable\n"
              "algorithms on these user IDs:\n"), keystr_from_pk(pk));
 }
 
 
 static void
 check_prefs (ctrl_t ctrl, kbnode_t keyblock)
 {
   kbnode_t node;
   PKT_public_key *pk;
   int problem=0;
 
   merge_keys_and_selfsig (ctrl, keyblock);
   pk=keyblock->pkt->pkt.public_key;
 
   for(node=keyblock;node;node=node->next)
     {
       if(node->pkt->pkttype==PKT_USER_ID
 	 && node->pkt->pkt.user_id->created
 	 && node->pkt->pkt.user_id->prefs)
 	{
 	  PKT_user_id *uid = node->pkt->pkt.user_id;
 	  prefitem_t *prefs = uid->prefs;
 	  char *user = utf8_to_native(uid->name,strlen(uid->name),0);
 
 	  for(;prefs->type;prefs++)
 	    {
 	      char num[10]; /* prefs->value is a byte, so we're over
 			       safe here */
 
 	      sprintf(num,"%u",prefs->value);
 
 	      if(prefs->type==PREFTYPE_SYM)
 		{
 		  if (openpgp_cipher_test_algo (prefs->value))
 		    {
 		      const char *algo =
                         (openpgp_cipher_test_algo (prefs->value)
                          ? num
                          : openpgp_cipher_algo_name (prefs->value));
 		      if(!problem)
 			check_prefs_warning(pk);
 		      log_info(_("         \"%s\": preference for cipher"
 				 " algorithm %s\n"), user, algo);
 		      problem=1;
 		    }
 		}
 	      else if(prefs->type==PREFTYPE_AEAD)
 		{
 		  if (openpgp_aead_test_algo (prefs->value))
 		    {
                       /* FIXME: The test below is wrong.  We should
                        * check if ...algo_name yields a "?" and
                        * only in that case use NUM.  */
 		      const char *algo =
                         (openpgp_aead_test_algo (prefs->value)
                          ? num
                          : openpgp_aead_algo_name (prefs->value));
 		      if(!problem)
 			check_prefs_warning(pk);
 		      log_info(_("         \"%s\": preference for AEAD"
 				 " algorithm %s\n"), user, algo);
 		      problem=1;
 		    }
 		}
 	      else if(prefs->type==PREFTYPE_HASH)
 		{
 		  if(openpgp_md_test_algo(prefs->value))
 		    {
 		      const char *algo =
                         (gcry_md_test_algo (prefs->value)
                          ? num
                          : gcry_md_algo_name (prefs->value));
 		      if(!problem)
 			check_prefs_warning(pk);
 		      log_info(_("         \"%s\": preference for digest"
 				 " algorithm %s\n"), user, algo);
 		      problem=1;
 		    }
 		}
 	      else if(prefs->type==PREFTYPE_ZIP)
 		{
 		  if(check_compress_algo (prefs->value))
 		    {
 		      const char *algo=compress_algo_to_string(prefs->value);
 		      if(!problem)
 			check_prefs_warning(pk);
 		      log_info(_("         \"%s\": preference for compression"
 				 " algorithm %s\n"),user,algo?algo:num);
 		      problem=1;
 		    }
 		}
 	    }
 
 	  xfree(user);
 	}
     }
 
   if(problem)
     {
       log_info(_("it is strongly suggested that you update"
 		 " your preferences and\n"));
       log_info(_("re-distribute this key to avoid potential algorithm"
 		 " mismatch problems\n"));
 
       if(!opt.batch)
 	{
 	  strlist_t sl = NULL;
           strlist_t locusr = NULL;
 	  size_t fprlen=0;
 	  byte fpr[MAX_FINGERPRINT_LEN], *p;
 	  char username[(MAX_FINGERPRINT_LEN*2)+1];
 	  unsigned int i;
 
 	  p = fingerprint_from_pk (pk,fpr,&fprlen);
 	  for(i=0;i<fprlen;i++,p++)
 	    sprintf(username+2*i,"%02X",*p);
 	  add_to_strlist(&locusr,username);
 
 	  append_to_strlist(&sl,"updpref");
 	  append_to_strlist(&sl,"save");
 
 	  keyedit_menu (ctrl, username, locusr, sl, 1, 1 );
 	  free_strlist(sl);
 	  free_strlist(locusr);
 	}
       else if(!opt.quiet)
 	log_info(_("you can update your preferences with:"
 		   " gpg --edit-key %s updpref save\n"),keystr_from_pk(pk));
     }
 }
 
 
 /* Helper for apply_*_filter in import.c and export.c.  */
 const char *
 impex_filter_getval (void *cookie, const char *propname)
 {
   /* FIXME: Malloc our static buffers and access them via PARM.  */
   struct impex_filter_parm_s *parm = cookie;
   ctrl_t ctrl = parm->ctrl;
   kbnode_t node = parm->node;
   static char numbuf[20];
   const char *result;
 
   log_assert (ctrl && ctrl->magic == SERVER_CONTROL_MAGIC);
 
   if (node->pkt->pkttype == PKT_USER_ID
       || node->pkt->pkttype == PKT_ATTRIBUTE)
     {
       PKT_user_id *uid = node->pkt->pkt.user_id;
 
       if (!strcmp (propname, "uid"))
         result = uid->name;
       else if (!strcmp (propname, "mbox"))
         {
           if (!uid->mbox)
             {
               uid->mbox = mailbox_from_userid (uid->name);
             }
           result = uid->mbox;
         }
       else if (!strcmp (propname, "primary"))
         {
           result = uid->flags.primary? "1":"0";
         }
       else if (!strcmp (propname, "expired"))
         {
           result = uid->flags.expired? "1":"0";
         }
       else if (!strcmp (propname, "revoked"))
         {
           result = uid->flags.revoked? "1":"0";
         }
       else
         result = NULL;
     }
   else if (node->pkt->pkttype == PKT_SIGNATURE)
     {
       PKT_signature *sig = node->pkt->pkt.signature;
 
       if (!strcmp (propname, "sig_created"))
         {
           snprintf (numbuf, sizeof numbuf, "%lu", (ulong)sig->timestamp);
           result = numbuf;
         }
       else if (!strcmp (propname, "sig_created_d"))
         {
           result = datestr_from_sig (sig);
         }
       else if (!strcmp (propname, "sig_algo"))
         {
           snprintf (numbuf, sizeof numbuf, "%d", sig->pubkey_algo);
           result = numbuf;
         }
       else if (!strcmp (propname, "sig_digest_algo"))
         {
           snprintf (numbuf, sizeof numbuf, "%d", sig->digest_algo);
           result = numbuf;
         }
       else if (!strcmp (propname, "expired"))
         {
           result = sig->flags.expired? "1":"0";
         }
       else
         result = NULL;
     }
   else if (node->pkt->pkttype == PKT_PUBLIC_KEY
            || node->pkt->pkttype == PKT_SECRET_KEY
            || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
            || node->pkt->pkttype == PKT_SECRET_SUBKEY)
     {
       PKT_public_key *pk = node->pkt->pkt.public_key;
 
       if (!strcmp (propname, "secret"))
         {
           result = (node->pkt->pkttype == PKT_SECRET_KEY
                     || node->pkt->pkttype == PKT_SECRET_SUBKEY)? "1":"0";
         }
       else if (!strcmp (propname, "key_algo"))
         {
           snprintf (numbuf, sizeof numbuf, "%d", pk->pubkey_algo);
           result = numbuf;
         }
       else if (!strcmp (propname, "key_created"))
         {
           snprintf (numbuf, sizeof numbuf, "%lu", (ulong)pk->timestamp);
           result = numbuf;
         }
       else if (!strcmp (propname, "key_created_d"))
         {
           result = datestr_from_pk (pk);
         }
       else if (!strcmp (propname, "expired"))
         {
           result = pk->has_expired? "1":"0";
         }
       else if (!strcmp (propname, "revoked"))
         {
           result = pk->flags.revoked? "1":"0";
         }
       else if (!strcmp (propname, "disabled"))
         {
           result = pk_is_disabled (pk)? "1":"0";
         }
       else if (!strcmp (propname, "usage"))
         {
           snprintf (numbuf, sizeof numbuf, "%s%s%s%s%s",
                     (pk->pubkey_usage & PUBKEY_USAGE_ENC)?"e":"",
                     (pk->pubkey_usage & PUBKEY_USAGE_SIG)?"s":"",
                     (pk->pubkey_usage & PUBKEY_USAGE_CERT)?"c":"",
                     (pk->pubkey_usage & PUBKEY_USAGE_AUTH)?"a":"",
                     (pk->pubkey_usage & PUBKEY_USAGE_UNKNOWN)?"?":"");
           result = numbuf;
         }
       else
         result = NULL;
     }
   else
     result = NULL;
 
   return result;
 }
 
 
 /*
  * Apply the keep-uid filter to the keyblock.  The deleted nodes are
  * marked and thus the caller should call commit_kbnode afterwards.
  * KEYBLOCK must not have any blocks marked as deleted.
  */
 static void
 apply_keep_uid_filter (ctrl_t ctrl, kbnode_t keyblock, recsel_expr_t selector)
 {
   kbnode_t node;
   struct impex_filter_parm_s parm;
 
   parm.ctrl = ctrl;
 
   for (node = keyblock->next; node; node = node->next )
     {
       if (node->pkt->pkttype == PKT_USER_ID)
         {
           parm.node = node;
           if (!recsel_select (selector, impex_filter_getval, &parm))
             {
 
               /* log_debug ("keep-uid: deleting '%s'\n", */
               /*            node->pkt->pkt.user_id->name); */
               /* The UID packet and all following packets up to the
                * next UID or a subkey.  */
               delete_kbnode (node);
               for (; node->next
                      && node->next->pkt->pkttype != PKT_USER_ID
                      && node->next->pkt->pkttype != PKT_PUBLIC_SUBKEY
                      && node->next->pkt->pkttype != PKT_SECRET_SUBKEY ;
                    node = node->next)
                 delete_kbnode (node->next);
 	    }
           /* else */
           /*   log_debug ("keep-uid: keeping '%s'\n", */
           /*              node->pkt->pkt.user_id->name); */
         }
     }
 }
 
 
 /*
  * Apply the drop-sig filter to the keyblock.  The deleted nodes are
  * marked and thus the caller should call commit_kbnode afterwards.
  * KEYBLOCK must not have any blocks marked as deleted.
  */
 static void
 apply_drop_sig_filter (ctrl_t ctrl, kbnode_t keyblock, recsel_expr_t selector)
 {
   kbnode_t node;
   int active = 0;
   u32 main_keyid[2];
   PKT_signature *sig;
   struct impex_filter_parm_s parm;
 
   parm.ctrl = ctrl;
 
   keyid_from_pk (keyblock->pkt->pkt.public_key, main_keyid);
 
   /* Loop over all signatures for user id and attribute packets which
    * are not self signatures.  */
   for (node = keyblock->next; node; node = node->next )
     {
       if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY
           || node->pkt->pkttype == PKT_SECRET_SUBKEY)
         break; /* ready.  */
       if (node->pkt->pkttype == PKT_USER_ID
           || node->pkt->pkttype == PKT_ATTRIBUTE)
         active = 1;
       if (!active)
         continue;
       if (node->pkt->pkttype != PKT_SIGNATURE)
         continue;
 
       sig = node->pkt->pkt.signature;
       if (main_keyid[0] == sig->keyid[0] || main_keyid[1] == sig->keyid[1])
         continue;  /* Skip self-signatures.  */
 
       if (IS_UID_SIG(sig) || IS_UID_REV(sig))
         {
           parm.node = node;
           if (recsel_select (selector, impex_filter_getval, &parm))
             delete_kbnode (node);
         }
     }
 }
 
 
 /* Insert a key origin into a public key packet.  */
 static gpg_error_t
 insert_key_origin_pk (PKT_public_key *pk, u32 curtime,
                       int origin, const char *url)
 {
   if (origin == KEYORG_WKD || origin == KEYORG_DANE)
     {
       /* For WKD and DANE we insert origin information also for the
        * key but we don't record the URL because we have have no use
        * for that: An update using a keyserver has higher precedence
        * and will thus update this origin info.  For refresh using WKD
        * or DANE we need to go via the User ID anyway.  Recall that we
        * are only inserting a new key. */
       pk->keyorg = origin;
       pk->keyupdate = curtime;
     }
   else if (origin == KEYORG_KS && url)
     {
       /* If the key was retrieved from a keyserver using a fingerprint
        * request we add the meta information.  Note that the use of a
        * fingerprint needs to be enforced by the caller of the import
        * function.  This is commonly triggered by verifying a modern
        * signature which has an Issuer Fingerprint signature
        * subpacket.  */
       pk->keyorg = origin;
       pk->keyupdate = curtime;
       xfree (pk->updateurl);
       pk->updateurl = xtrystrdup (url);
       if (!pk->updateurl)
         return gpg_error_from_syserror ();
     }
   else if (origin == KEYORG_FILE)
     {
       pk->keyorg = origin;
       pk->keyupdate = curtime;
     }
   else if (origin == KEYORG_URL)
     {
       pk->keyorg = origin;
       pk->keyupdate = curtime;
       if (url)
         {
           xfree (pk->updateurl);
           pk->updateurl = xtrystrdup (url);
           if (!pk->updateurl)
             return gpg_error_from_syserror ();
         }
     }
 
   return 0;
 }
 
 
 /* Insert a key origin into a user id packet.  */
 static gpg_error_t
 insert_key_origin_uid (PKT_user_id *uid, u32 curtime,
                        int origin, const char *url)
 
 {
   if (origin == KEYORG_WKD || origin == KEYORG_DANE)
     {
       /* We insert origin information on a UID only when we received
        * them via the Web Key Directory or a DANE record.  The key we
        * receive here from the WKD has been filtered to contain only
        * the user ID as looked up in the WKD.  For a DANE origin we
        * this should also be the case.  Thus we will see here only one
        * user id.  */
       uid->keyorg = origin;
       uid->keyupdate = curtime;
       if (url)
         {
           xfree (uid->updateurl);
           uid->updateurl = xtrystrdup (url);
           if (!uid->updateurl)
             return gpg_error_from_syserror ();
         }
     }
   else if (origin == KEYORG_KS && url)
     {
       /* If the key was retrieved from a keyserver using a fingerprint
        * request we mark that also in the user ID.  However we do not
        * store the keyserver URL in the UID.  A later update (merge)
        * from a more trusted source will replace this info.  */
       uid->keyorg = origin;
       uid->keyupdate = curtime;
     }
   else if (origin == KEYORG_FILE)
     {
       uid->keyorg = origin;
       uid->keyupdate = curtime;
     }
   else if (origin == KEYORG_URL)
     {
       uid->keyorg = origin;
       uid->keyupdate = curtime;
     }
 
   return 0;
 }
 
 
 /* Apply meta data to KEYBLOCK.  This sets the origin of the key to
  * ORIGIN and the updateurl to URL.  Note that this function is only
  * used for a new key, that is not when we are merging keys.  */
 static gpg_error_t
 insert_key_origin (kbnode_t keyblock, int origin, const char *url)
 {
   gpg_error_t err;
   kbnode_t node;
   u32 curtime = make_timestamp ();
 
   for (node = keyblock; node; node = node->next)
     {
       if (is_deleted_kbnode (node))
         ;
       else if (node->pkt->pkttype == PKT_PUBLIC_KEY)
         {
           err = insert_key_origin_pk (node->pkt->pkt.public_key, curtime,
                                       origin, url);
           if (err)
             return err;
         }
       else if (node->pkt->pkttype == PKT_USER_ID)
         {
           err = insert_key_origin_uid (node->pkt->pkt.user_id, curtime,
                                        origin, url);
           if (err)
             return err;
         }
     }
 
   return 0;
 }
 
 
 /* Update meta data on KEYBLOCK.  This updates the key origin on the
  * public key according to ORIGIN and URL.  The UIDs are already
  * updated when this function is called.  */
 static gpg_error_t
 update_key_origin (kbnode_t keyblock, u32 curtime, int origin, const char *url)
 {
   PKT_public_key *pk;
 
   log_assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY);
   pk = keyblock->pkt->pkt.public_key;
 
   if (pk->keyupdate > curtime)
     ; /* Don't do it for a time warp.  */
   else if (origin == KEYORG_WKD || origin == KEYORG_DANE)
     {
       /* We only update the origin info if they either have never been
        * set or are the origin was the same as the new one.  If this
        * is WKD we also update the UID to show from which user id this
        * was updated.  */
       if (!pk->keyorg || pk->keyorg == KEYORG_WKD || pk->keyorg == KEYORG_DANE)
         {
           pk->keyorg = origin;
           pk->keyupdate = curtime;
           xfree (pk->updateurl);
           pk->updateurl = NULL;
           if (origin == KEYORG_WKD && url)
             {
               pk->updateurl = xtrystrdup (url);
               if (!pk->updateurl)
                 return gpg_error_from_syserror ();
             }
         }
     }
   else if (origin == KEYORG_KS)
     {
       /* All updates from a keyserver are considered to have the
        * freshed key.  Thus we always set the new key origin.  */
       pk->keyorg = origin;
       pk->keyupdate = curtime;
       xfree (pk->updateurl);
       pk->updateurl = NULL;
       if (url)
         {
           pk->updateurl = xtrystrdup (url);
           if (!pk->updateurl)
             return gpg_error_from_syserror ();
         }
     }
   else if (origin == KEYORG_FILE)
     {
       /* Updates from a file are considered to be fresh.  */
       pk->keyorg = origin;
       pk->keyupdate = curtime;
       xfree (pk->updateurl);
       pk->updateurl = NULL;
     }
   else if (origin == KEYORG_URL)
     {
       /* Updates from a URL are considered to be fresh.  */
       pk->keyorg = origin;
       pk->keyupdate = curtime;
       xfree (pk->updateurl);
       pk->updateurl = NULL;
       if (url)
         {
           pk->updateurl = xtrystrdup (url);
           if (!pk->updateurl)
             return gpg_error_from_syserror ();
         }
     }
 
   return 0;
 }
 
 
 /*
  * Try to import one keyblock. Return an error only in serious cases,
  * but never for an invalid keyblock.  It uses log_error to increase
  * the internal errorcount, so that invalid input can be detected by
  * programs which called gpg.  If SILENT is no messages are printed -
  * even most error messages are suppressed.  ORIGIN is the origin of
  * the key (0 for unknown) and URL the corresponding URL.
  */
 static gpg_error_t
 import_one (ctrl_t ctrl,
             kbnode_t keyblock, struct import_stats_s *stats,
 	    unsigned char **fpr, size_t *fpr_len, unsigned int options,
 	    int from_sk, int silent,
             import_screener_t screener, void *screener_arg,
             int origin, const char *url)
 {
   gpg_error_t err = 0;
   PKT_public_key *pk;
   kbnode_t node, uidnode;
   kbnode_t keyblock_orig = NULL;
   byte fpr2[MAX_FINGERPRINT_LEN];
   size_t fpr2len;
   u32 keyid[2];
   int new_key = 0;
   int mod_key = 0;
   int same_key = 0;
   int non_self = 0;
   size_t an;
   char pkstrbuf[PUBKEY_STRING_SIZE];
   int merge_keys_done = 0;
   int any_filter = 0;
   KEYDB_HANDLE hd = NULL;
 
   /* If show-only is active we don't won't any extra output.  */
   if ((options & (IMPORT_SHOW | IMPORT_DRY_RUN)))
     silent = 1;
 
   /* Get the key and print some info about it. */
   node = find_kbnode( keyblock, PKT_PUBLIC_KEY );
   if (!node )
     BUG();
 
   pk = node->pkt->pkt.public_key;
 
   fingerprint_from_pk (pk, fpr2, &fpr2len);
   for (an = fpr2len; an < MAX_FINGERPRINT_LEN; an++)
     fpr2[an] = 0;
   keyid_from_pk( pk, keyid );
   uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
 
   if (opt.verbose && !opt.interactive && !silent)
     {
       log_info( "pub  %s/%s %s  ",
                 pubkey_string (pk, pkstrbuf, sizeof pkstrbuf),
                 keystr_from_pk(pk), datestr_from_pk(pk) );
       if (uidnode)
         print_utf8_buffer (log_get_stream (),
                            uidnode->pkt->pkt.user_id->name,
                            uidnode->pkt->pkt.user_id->len );
       log_printf ("\n");
     }
 
 
   /* Unless import-drop-uids has been requested we don't allow import
    * of a key without UIDs.  */
   if (!uidnode && !(options & IMPORT_DROP_UIDS))
     {
       if (!silent)
         log_error( _("key %s: no user ID\n"), keystr_from_pk(pk));
       return 0;
     }
 
   if (screener && screener (keyblock, screener_arg))
     {
       log_error (_("key %s: %s\n"), keystr_from_pk (pk),
                  _("rejected by import screener"));
       return 0;
     }
 
   if (opt.interactive && !silent)
     {
       if (is_status_enabled())
         print_import_check (pk, uidnode->pkt->pkt.user_id);
       merge_keys_and_selfsig (ctrl, keyblock);
       tty_printf ("\n");
       show_basic_key_info (ctrl, keyblock);
       tty_printf ("\n");
       if (!cpr_get_answer_is_yes ("import.okay",
                                   "Do you want to import this key? (y/N) "))
         return 0;
     }
 
   /* Remove or collapse the user ids.  */
   if ((options & IMPORT_DROP_UIDS))
     remove_all_uids (&keyblock);
   else
     collapse_uids (&keyblock);
 
   /* Clean the key that we're about to import, to cut down on things
      that we have to clean later.  This has no practical impact on the
      end result, but does result in less logging which might confuse
      the user. */
   if ((options & IMPORT_CLEAN))
     {
       merge_keys_and_selfsig (ctrl, keyblock);
       clean_all_uids (ctrl, keyblock,
                       opt.verbose, (options&IMPORT_MINIMAL), NULL, NULL);
       clean_all_subkeys (ctrl, keyblock, opt.verbose, KEY_CLEAN_NONE,
                          NULL, NULL);
     }
 
   clear_kbnode_flags( keyblock );
 
   if ((options&IMPORT_REPAIR_PKS_SUBKEY_BUG)
       && fix_pks_corruption (ctrl, keyblock)
       && opt.verbose)
     log_info (_("key %s: PKS subkey corruption repaired\n"),
               keystr_from_pk(pk));
 
   if ((options & IMPORT_REPAIR_KEYS))
     key_check_all_keysigs (ctrl, 1, keyblock, 0, 0);
 
   if (chk_self_sigs (ctrl, keyblock, keyid, &non_self))
     return 0;  /* Invalid keyblock - error already printed.  */
 
   /* If we allow such a thing, mark unsigned uids as valid */
   if (opt.allow_non_selfsigned_uid)
     {
       for (node=keyblock; node; node = node->next )
         if (node->pkt->pkttype == PKT_USER_ID
             && !(node->flag & NODE_GOOD_SELFSIG)
             && !(node->flag & NODE_BAD_SELFSIG) )
           {
             char *user=utf8_to_native(node->pkt->pkt.user_id->name,
                                       node->pkt->pkt.user_id->len,0);
             /* Fake a good signature status for the user id.  */
             node->flag |= NODE_GOOD_SELFSIG;
             log_info( _("key %s: accepted non self-signed user ID \"%s\"\n"),
                       keystr_from_pk(pk),user);
             xfree(user);
 	  }
     }
 
   /* Delete invalid parts and without the drop option bail out if
    * there are no user ids.  */
   if (!delete_inv_parts (ctrl, keyblock, keyid, options)
       && !(options & IMPORT_DROP_UIDS) )
     {
       if (!silent)
         {
           log_error( _("key %s: no valid user IDs\n"), keystr_from_pk(pk));
           if (!opt.quiet )
             log_info(_("this may be caused by a missing self-signature\n"));
         }
       stats->no_user_id++;
       return 0;
     }
 
   /* Get rid of deleted nodes.  */
   commit_kbnode (&keyblock);
 
   /* Apply import filter.  */
   if (import_filter.keep_uid)
     {
       apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid);
       commit_kbnode (&keyblock);
       any_filter = 1;
     }
   if (import_filter.drop_sig)
     {
       apply_drop_sig_filter (ctrl, keyblock, import_filter.drop_sig);
       commit_kbnode (&keyblock);
       any_filter = 1;
     }
 
   /* If we ran any filter we need to check that at least one user id
    * is left in the keyring.  Note that we do not use log_error in
    * this case. */
   if (any_filter && !any_uid_left (keyblock))
     {
       if (!opt.quiet )
         log_info ( _("key %s: no valid user IDs\n"), keystr_from_pk (pk));
       stats->no_user_id++;
       return 0;
     }
 
   /* Show the key in the form it is merged or inserted.  We skip this
    * if "import-export" is also active without --armor or the output
    * file has explicily been given. */
   if ((options & IMPORT_SHOW)
       && !((options & IMPORT_EXPORT) && !opt.armor && !opt.outfile))
     {
       merge_keys_and_selfsig (ctrl, keyblock);
       merge_keys_done = 1;
       /* Note that we do not want to show the validity because the key
        * has not yet imported.  */
       list_keyblock_direct (ctrl, keyblock, from_sk, 0,
                             opt.fingerprint || opt.with_fingerprint, 1);
       es_fflush (es_stdout);
     }
 
   /* Write the keyblock to the output and do not actually import.  */
   if ((options & IMPORT_EXPORT))
     {
       if (!merge_keys_done)
         {
           merge_keys_and_selfsig (ctrl, keyblock);
           merge_keys_done = 1;
         }
       err = write_keyblock_to_output (keyblock, opt.armor, opt.export_options);
       goto leave;
     }
 
   if (opt.dry_run || (options & IMPORT_DRY_RUN))
     goto leave;
 
   /* Do we have this key already in one of our pubrings ? */
   err = get_keyblock_byfprint_fast (&keyblock_orig, &hd,
                                     fpr2, fpr2len, 1/*locked*/);
   if ((err
        && gpg_err_code (err) != GPG_ERR_NO_PUBKEY
        && gpg_err_code (err) != GPG_ERR_UNUSABLE_PUBKEY)
       || !hd)
     {
       /* The !hd above is to catch a misbehaving function which
        * returns NO_PUBKEY for failing to allocate a handle.  */
       if (!silent)
         log_error (_("key %s: public key not found: %s\n"),
                    keystr(keyid), gpg_strerror (err));
     }
   else if (err && (opt.import_options&IMPORT_MERGE_ONLY) )
     {
       if (opt.verbose && !silent )
         log_info( _("key %s: new key - skipped\n"), keystr(keyid));
       err = 0;
       stats->skipped_new_keys++;
     }
   else if (err)  /* Insert this key. */
     {
       /* Note: ERR can only be NO_PUBKEY or UNUSABLE_PUBKEY.  */
       int n_sigs_cleaned, n_uids_cleaned;
 
       err = keydb_locate_writable (hd);
       if (err)
         {
           log_error (_("no writable keyring found: %s\n"), gpg_strerror (err));
           err = gpg_error (GPG_ERR_GENERAL);
           goto leave;
 	}
       if (opt.verbose > 1 )
         log_info (_("writing to '%s'\n"), keydb_get_resource_name (hd) );
 
       if ((options & IMPORT_CLEAN))
         {
           merge_keys_and_selfsig (ctrl, keyblock);
           clean_all_uids (ctrl, keyblock, opt.verbose, (options&IMPORT_MINIMAL),
                           &n_uids_cleaned,&n_sigs_cleaned);
           clean_all_subkeys (ctrl, keyblock, opt.verbose, KEY_CLEAN_NONE,
                              NULL, NULL);
         }
 
       /* Unless we are in restore mode apply meta data to the
        * keyblock.  Note that this will never change the first packet
        * and thus the address of KEYBLOCK won't change.  */
       if ( !(options & IMPORT_RESTORE) )
         {
           err = insert_key_origin (keyblock, origin, url);
           if (err)
             {
               log_error ("insert_key_origin failed: %s\n", gpg_strerror (err));
               err = gpg_error (GPG_ERR_GENERAL);
               goto leave;
             }
         }
 
       err = keydb_insert_keyblock (hd, keyblock );
       if (err)
         log_error (_("error writing keyring '%s': %s\n"),
                    keydb_get_resource_name (hd), gpg_strerror (err));
       else if (!(opt.import_options & IMPORT_KEEP_OWNERTTRUST))
         {
           /* This should not be possible since we delete the
              ownertrust when a key is deleted, but it can happen if
              the keyring and trustdb are out of sync.  It can also
              be made to happen with the trusted-key command and by
              importing and locally exported key. */
 
           clear_ownertrusts (ctrl, pk);
           if (non_self)
             revalidation_mark (ctrl);
         }
 
       /* Release the handle and thus unlock the keyring asap.  */
       keydb_release (hd);
       hd = NULL;
 
       /* We are ready.  */
       if (!opt.quiet && !silent)
         {
           char *p = get_user_id_byfpr_native (ctrl, fpr2);
           log_info (_("key %s: public key \"%s\" imported\n"),
                     keystr(keyid), p);
           xfree(p);
         }
       if (is_status_enabled())
         {
           char *us = get_long_user_id_string (ctrl, keyid);
           write_status_text( STATUS_IMPORTED, us );
           xfree(us);
           print_import_ok (pk, 1);
         }
       stats->imported++;
       new_key = 1;
     }
   else /* Key already exists - merge.  */
     {
       int n_uids, n_sigs, n_subk, n_sigs_cleaned, n_uids_cleaned;
       u32 curtime = make_timestamp ();
 
       /* Compare the original against the new key; just to be sure nothing
        * weird is going on */
       if (cmp_public_keys (keyblock_orig->pkt->pkt.public_key, pk))
         {
           if (!silent)
             log_error( _("key %s: doesn't match our copy\n"),keystr(keyid));
           goto leave;
         }
 
       /* Make sure the original direct key sigs are all sane.  */
       n_sigs_cleaned = fix_bad_direct_key_sigs (ctrl, keyblock_orig, keyid);
       if (n_sigs_cleaned)
         commit_kbnode (&keyblock_orig);
 
       /* Try to merge KEYBLOCK into KEYBLOCK_ORIG.  */
       clear_kbnode_flags( keyblock_orig );
       clear_kbnode_flags( keyblock );
       n_uids = n_sigs = n_subk = n_uids_cleaned = 0;
       err = merge_blocks (ctrl, options, keyblock_orig, keyblock, keyid,
                           curtime, origin, url,
                           &n_uids, &n_sigs, &n_subk );
       if (err)
         goto leave;
 
       if ((options & IMPORT_CLEAN))
         {
           merge_keys_and_selfsig (ctrl, keyblock_orig);
           clean_all_uids (ctrl, keyblock_orig, opt.verbose,
                           (options&IMPORT_MINIMAL),
                           &n_uids_cleaned,&n_sigs_cleaned);
           clean_all_subkeys (ctrl, keyblock_orig, opt.verbose, KEY_CLEAN_NONE,
                              NULL, NULL);
         }
 
       if (n_uids || n_sigs || n_subk || n_sigs_cleaned || n_uids_cleaned)
         {
           /* Unless we are in restore mode apply meta data to the
            * keyblock.  Note that this will never change the first packet
            * and thus the address of KEYBLOCK won't change.  */
           if ( !(options & IMPORT_RESTORE) )
             {
               err = update_key_origin (keyblock_orig, curtime, origin, url);
               if (err)
                 {
                   log_error ("update_key_origin failed: %s\n",
                              gpg_strerror (err));
                   goto leave;
                 }
             }
 
           mod_key = 1;
           /* KEYBLOCK_ORIG has been updated; write */
           err = keydb_update_keyblock (ctrl, hd, keyblock_orig);
           if (err)
             log_error (_("error writing keyring '%s': %s\n"),
                        keydb_get_resource_name (hd), gpg_strerror (err));
           else if (non_self)
             revalidation_mark (ctrl);
 
           /* Release the handle and thus unlock the keyring asap.  */
           keydb_release (hd);
           hd = NULL;
 
           /* We are ready.  */
           if (!opt.quiet && !silent)
             {
               char *p = get_user_id_byfpr_native (ctrl, fpr2);
               if (n_uids == 1 )
                 log_info( _("key %s: \"%s\" 1 new user ID\n"),
                           keystr(keyid),p);
               else if (n_uids )
                 log_info( _("key %s: \"%s\" %d new user IDs\n"),
                           keystr(keyid),p,n_uids);
               if (n_sigs == 1 )
                 log_info( _("key %s: \"%s\" 1 new signature\n"),
                           keystr(keyid), p);
               else if (n_sigs )
                 log_info( _("key %s: \"%s\" %d new signatures\n"),
                           keystr(keyid), p, n_sigs );
               if (n_subk == 1 )
                 log_info( _("key %s: \"%s\" 1 new subkey\n"),
                           keystr(keyid), p);
               else if (n_subk )
                 log_info( _("key %s: \"%s\" %d new subkeys\n"),
                           keystr(keyid), p, n_subk );
               if (n_sigs_cleaned==1)
                 log_info(_("key %s: \"%s\" %d signature cleaned\n"),
                          keystr(keyid),p,n_sigs_cleaned);
               else if (n_sigs_cleaned)
                 log_info(_("key %s: \"%s\" %d signatures cleaned\n"),
                          keystr(keyid),p,n_sigs_cleaned);
               if (n_uids_cleaned==1)
                 log_info(_("key %s: \"%s\" %d user ID cleaned\n"),
                          keystr(keyid),p,n_uids_cleaned);
               else if (n_uids_cleaned)
                 log_info(_("key %s: \"%s\" %d user IDs cleaned\n"),
                          keystr(keyid),p,n_uids_cleaned);
               xfree(p);
             }
 
           stats->n_uids +=n_uids;
           stats->n_sigs +=n_sigs;
           stats->n_subk +=n_subk;
           stats->n_sigs_cleaned +=n_sigs_cleaned;
           stats->n_uids_cleaned +=n_uids_cleaned;
 
           if (is_status_enabled () && !silent)
             print_import_ok (pk, ((n_uids?2:0)|(n_sigs?4:0)|(n_subk?8:0)));
 	}
       else
         {
           /* Release the handle and thus unlock the keyring asap.  */
           keydb_release (hd);
           hd = NULL;
 
           /* FIXME: We do not track the time we last checked a key for
            * updates.  To do this we would need to rewrite even the
            * keys which have no changes.  Adding this would be useful
            * for the automatic update of expired keys via the WKD in
            * case the WKD still carries the expired key.  See
            * get_best_pubkey_byname.  */
           same_key = 1;
           if (is_status_enabled ())
             print_import_ok (pk, 0);
 
           if (!opt.quiet && !silent)
             {
               char *p = get_user_id_byfpr_native (ctrl, fpr2);
               log_info( _("key %s: \"%s\" not changed\n"),keystr(keyid),p);
               xfree(p);
             }
 
           stats->unchanged++;
         }
     }
 
  leave:
   keydb_release (hd);
   if (mod_key || new_key || same_key)
     {
       /* A little explanation for this: we fill in the fingerprint
          when importing keys as it can be useful to know the
          fingerprint in certain keyserver-related cases (a keyserver
          asked for a particular name, but the key doesn't have that
          name).  However, in cases where we're importing more than
          one key at a time, we cannot know which key to fingerprint.
          In these cases, rather than guessing, we do not
          fingerprinting at all, and we must hope the user ID on the
          keys are useful.  Note that we need to do this for new
          keys, merged keys and even for unchanged keys.  This is
          required because for example the --auto-key-locate feature
          may import an already imported key and needs to know the
          fingerprint of the key in all cases.  */
       if (fpr)
         {
           xfree (*fpr);
           /* Note that we need to compare against 0 here because
              COUNT gets only incremented after returning from this
              function.  */
           if (!stats->count)
             *fpr = fingerprint_from_pk (pk, NULL, fpr_len);
           else
             *fpr = NULL;
         }
     }
 
   /* Now that the key is definitely incorporated into the keydb, we
      need to check if a designated revocation is present or if the
      prefs are not rational so we can warn the user. */
 
   if (mod_key)
     {
       revocation_present (ctrl, keyblock_orig);
       if (!from_sk && have_secret_key_with_kid (keyid))
         check_prefs (ctrl, keyblock_orig);
     }
   else if (new_key)
     {
       revocation_present (ctrl, keyblock);
       if (!from_sk && have_secret_key_with_kid (keyid))
         check_prefs (ctrl, keyblock);
     }
 
   release_kbnode( keyblock_orig );
 
   return err;
 }
 
 
 /* Transfer all the secret keys in SEC_KEYBLOCK to the gpg-agent.  The
    function prints diagnostics and returns an error code.  If BATCH is
    true the secret keys are stored by gpg-agent in the transfer format
    (i.e. no re-protection and aksing for passphrases). */
 gpg_error_t
 transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats,
                       kbnode_t sec_keyblock, int batch, int force)
 {
   gpg_error_t err = 0;
   void *kek = NULL;
   size_t keklen;
   kbnode_t ctx = NULL;
   kbnode_t node;
   PKT_public_key *main_pk, *pk;
   struct seckey_info *ski;
   int nskey;
   membuf_t mbuf;
   int i, j;
   void *format_args[2*PUBKEY_MAX_NSKEY];
   gcry_sexp_t skey, prot, tmpsexp;
   gcry_sexp_t curve = NULL;
   unsigned char *transferkey = NULL;
   size_t transferkeylen;
   gcry_cipher_hd_t cipherhd = NULL;
   unsigned char *wrappedkey = NULL;
   size_t wrappedkeylen;
   char *cache_nonce = NULL;
   int stub_key_skipped = 0;
 
   /* Get the current KEK.  */
   err = agent_keywrap_key (ctrl, 0, &kek, &keklen);
   if (err)
     {
       log_error ("error getting the KEK: %s\n", gpg_strerror (err));
       goto leave;
     }
 
   /* Prepare a cipher context.  */
   err = gcry_cipher_open (&cipherhd, GCRY_CIPHER_AES128,
                           GCRY_CIPHER_MODE_AESWRAP, 0);
   if (!err)
     err = gcry_cipher_setkey (cipherhd, kek, keklen);
   if (err)
     goto leave;
   xfree (kek);
   kek = NULL;
 
   main_pk = NULL;
   while ((node = walk_kbnode (sec_keyblock, &ctx, 0)))
     {
       if (node->pkt->pkttype != PKT_SECRET_KEY
           && node->pkt->pkttype != PKT_SECRET_SUBKEY)
         continue;
       pk = node->pkt->pkt.public_key;
       if (!main_pk)
         main_pk = pk;
 
       /* Make sure the keyids are available.  */
       keyid_from_pk (pk, NULL);
       if (node->pkt->pkttype == PKT_SECRET_KEY)
         {
           pk->main_keyid[0] = pk->keyid[0];
           pk->main_keyid[1] = pk->keyid[1];
         }
       else
         {
           pk->main_keyid[0] = main_pk->keyid[0];
           pk->main_keyid[1] = main_pk->keyid[1];
         }
 
 
       ski = pk->seckey_info;
       if (!ski)
         BUG ();
 
       if (stats)
         {
           stats->count++;
           stats->secret_read++;
         }
 
       /* We ignore stub keys.  The way we handle them in other parts
          of the code is by asking the agent whether any secret key is
          available for a given keyblock and then concluding that we
          have a secret key; all secret (sub)keys of the keyblock the
          agent does not know of are then stub keys.  This works also
          for card stub keys.  The learn command or the card-status
          command may be used to check with the agent whether a card
          has been inserted and a stub key is in turn generated by the
          agent.  */
       if (ski->s2k.mode == 1001 || ski->s2k.mode == 1002)
         {
           stub_key_skipped = 1;
           continue;
         }
 
       /* Convert our internal secret key object into an S-expression.  */
       nskey = pubkey_get_nskey (pk->pubkey_algo);
       if (!nskey || nskey > PUBKEY_MAX_NSKEY)
         {
           err = gpg_error (GPG_ERR_BAD_SECKEY);
           log_error ("internal error: %s\n", gpg_strerror (err));
           goto leave;
         }
 
       init_membuf (&mbuf, 50);
       put_membuf_str (&mbuf, "(skey");
       if (pk->pubkey_algo == PUBKEY_ALGO_ECDSA
           || pk->pubkey_algo == PUBKEY_ALGO_EDDSA
           || pk->pubkey_algo == PUBKEY_ALGO_ECDH)
         {
           /* The ECC case.  */
           char *curvestr = openpgp_oid_to_str (pk->pkey[0]);
           if (!curvestr)
             err = gpg_error_from_syserror ();
           else
             {
               const char *curvename = openpgp_oid_to_curve (curvestr, 1);
               gcry_sexp_release (curve);
               err = gcry_sexp_build (&curve, NULL, "(curve %s)",
                                      curvename?curvename:curvestr);
               xfree (curvestr);
               if (!err)
                 {
                   j = 0;
                   /* Append the public key element Q.  */
                   put_membuf_str (&mbuf, " _ %m");
                   format_args[j++] = pk->pkey + 1;
 
                   /* Append the secret key element D.  For ECDH we
                      skip PKEY[2] because this holds the KEK which is
                      not needed by gpg-agent.  */
                   i = pk->pubkey_algo == PUBKEY_ALGO_ECDH? 3 : 2;
                   if (gcry_mpi_get_flag (pk->pkey[i], GCRYMPI_FLAG_USER1))
                     put_membuf_str (&mbuf, " e %m");
                   else
                     put_membuf_str (&mbuf, " _ %m");
                   format_args[j++] = pk->pkey + i;
                 }
             }
         }
       else
         {
           /* Standard case for the old (non-ECC) algorithms.  */
           for (i=j=0; i < nskey; i++)
             {
               if (!pk->pkey[i])
                 continue; /* Protected keys only have NPKEY+1 elements.  */
 
               if (gcry_mpi_get_flag (pk->pkey[i], GCRYMPI_FLAG_USER1))
                 put_membuf_str (&mbuf, " e %m");
               else
                 put_membuf_str (&mbuf, " _ %m");
               format_args[j++] = pk->pkey + i;
             }
         }
       put_membuf_str (&mbuf, ")");
       put_membuf (&mbuf, "", 1);
       if (err)
         xfree (get_membuf (&mbuf, NULL));
       else
         {
           char *format = get_membuf (&mbuf, NULL);
           if (!format)
             err = gpg_error_from_syserror ();
           else
             err = gcry_sexp_build_array (&skey, NULL, format, format_args);
           xfree (format);
         }
       if (err)
         {
           log_error ("error building skey array: %s\n", gpg_strerror (err));
           goto leave;
         }
 
       if (ski->is_protected)
         {
           char countbuf[35];
 
           /* FIXME: Support AEAD */
           /* Note that the IVLEN may be zero if we are working on a
              dummy key.  We can't express that in an S-expression and
              thus we send dummy data for the IV.  */
           snprintf (countbuf, sizeof countbuf, "%lu",
                     (unsigned long)ski->s2k.count);
           err = gcry_sexp_build
             (&prot, NULL,
              " (protection %s %s %b %d %s %b %s)\n",
              ski->sha1chk? "sha1":"sum",
              openpgp_cipher_algo_name (ski->algo),
              ski->ivlen? (int)ski->ivlen:1,
              ski->ivlen? ski->iv: (const unsigned char*)"X",
              ski->s2k.mode,
              openpgp_md_algo_name (ski->s2k.hash_algo),
              (int)sizeof (ski->s2k.salt), ski->s2k.salt,
              countbuf);
         }
       else
         err = gcry_sexp_build (&prot, NULL, " (protection none)\n");
 
       tmpsexp = NULL;
       xfree (transferkey);
       transferkey = NULL;
       if (!err)
         err = gcry_sexp_build (&tmpsexp, NULL,
                                "(openpgp-private-key\n"
                                " (version %d)\n"
                                " (algo %s)\n"
                                " %S%S\n"
                                " (csum %d)\n"
                                " %S)\n",
                                pk->version,
                                openpgp_pk_algo_name (pk->pubkey_algo),
                                curve, skey,
                                (int)(unsigned long)ski->csum, prot);
       gcry_sexp_release (skey);
       gcry_sexp_release (prot);
       if (!err)
         err = make_canon_sexp_pad (tmpsexp, 1, &transferkey, &transferkeylen);
       gcry_sexp_release (tmpsexp);
       if (err)
         {
           log_error ("error building transfer key: %s\n", gpg_strerror (err));
           goto leave;
         }
 
       /* Wrap the key.  */
       wrappedkeylen = transferkeylen + 8;
       xfree (wrappedkey);
       wrappedkey = xtrymalloc (wrappedkeylen);
       if (!wrappedkey)
         err = gpg_error_from_syserror ();
       else
         err = gcry_cipher_encrypt (cipherhd, wrappedkey, wrappedkeylen,
                                    transferkey, transferkeylen);
       if (err)
         goto leave;
       xfree (transferkey);
       transferkey = NULL;
 
       /* Send the wrapped key to the agent.  */
       {
         char *desc = gpg_format_keydesc (ctrl, pk, FORMAT_KEYDESC_IMPORT, 1);
         err = agent_import_key (ctrl, desc, &cache_nonce,
                                 wrappedkey, wrappedkeylen, batch, force,
 				pk->keyid, pk->main_keyid, pk->pubkey_algo);
         xfree (desc);
       }
       if (!err)
         {
           if (opt.verbose)
             log_info (_("key %s: secret key imported\n"),
                       keystr_from_pk_with_sub (main_pk, pk));
           if (stats)
             stats->secret_imported++;
         }
       else if ( gpg_err_code (err) == GPG_ERR_EEXIST )
         {
           if (opt.verbose)
             log_info (_("key %s: secret key already exists\n"),
                       keystr_from_pk_with_sub (main_pk, pk));
           err = 0;
           if (stats)
             stats->secret_dups++;
         }
       else
         {
           log_error (_("key %s: error sending to agent: %s\n"),
                      keystr_from_pk_with_sub (main_pk, pk),
                      gpg_strerror (err));
           if (gpg_err_code (err) == GPG_ERR_CANCELED
               || gpg_err_code (err) == GPG_ERR_FULLY_CANCELED)
             break; /* Don't try the other subkeys.  */
         }
     }
 
   if (!err && stub_key_skipped)
     /* We need to notify user how to migrate stub keys.  */
     err = gpg_error (GPG_ERR_NOT_PROCESSED);
 
  leave:
   gcry_sexp_release (curve);
   xfree (cache_nonce);
   xfree (wrappedkey);
   xfree (transferkey);
   gcry_cipher_close (cipherhd);
   xfree (kek);
   return err;
 }
 
 
 /* Walk a secret keyblock and produce a public keyblock out of it.
    Returns a new node or NULL on error. */
 static kbnode_t
 sec_to_pub_keyblock (kbnode_t sec_keyblock)
 {
   kbnode_t pub_keyblock = NULL;
   kbnode_t ctx = NULL;
   kbnode_t secnode, pubnode;
 
   while ((secnode = walk_kbnode (sec_keyblock, &ctx, 0)))
     {
       if (secnode->pkt->pkttype == PKT_SECRET_KEY
           || secnode->pkt->pkttype == PKT_SECRET_SUBKEY)
 	{
 	  /* Make a public key.  */
 	  PACKET *pkt;
           PKT_public_key *pk;
 
 	  pkt = xtrycalloc (1, sizeof *pkt);
           pk = pkt? copy_public_key (NULL, secnode->pkt->pkt.public_key): NULL;
           if (!pk)
             {
               xfree (pkt);
 	      release_kbnode (pub_keyblock);
               return NULL;
             }
 	  if (secnode->pkt->pkttype == PKT_SECRET_KEY)
 	    pkt->pkttype = PKT_PUBLIC_KEY;
 	  else
 	    pkt->pkttype = PKT_PUBLIC_SUBKEY;
 	  pkt->pkt.public_key = pk;
 
 	  pubnode = new_kbnode (pkt);
 	}
       else
 	{
 	  pubnode = clone_kbnode (secnode);
 	}
 
       if (!pub_keyblock)
 	pub_keyblock = pubnode;
       else
 	add_kbnode (pub_keyblock, pubnode);
     }
 
   return pub_keyblock;
 }
 
 /****************
  * Ditto for secret keys.  Handling is simpler than for public keys.
  * We allow secret key importing only when allow is true, this is so
  * that a secret key can not be imported accidentally and thereby tampering
  * with the trust calculation.
  */
 static int
 import_secret_one (ctrl_t ctrl, kbnode_t keyblock,
                    struct import_stats_s *stats, int batch, unsigned int options,
                    int for_migration,
                    import_screener_t screener, void *screener_arg)
 {
   PKT_public_key *pk;
   struct seckey_info *ski;
   kbnode_t node, uidnode;
   u32 keyid[2];
   int rc = 0;
   int nr_prev;
   kbnode_t pub_keyblock;
   char pkstrbuf[PUBKEY_STRING_SIZE];
 
   /* Get the key and print some info about it */
   node = find_kbnode (keyblock, PKT_SECRET_KEY);
   if (!node)
     BUG ();
 
   pk = node->pkt->pkt.public_key;
 
   keyid_from_pk (pk, keyid);
   uidnode = find_next_kbnode (keyblock, PKT_USER_ID);
 
   if (screener && screener (keyblock, screener_arg))
     {
       log_error (_("secret key %s: %s\n"), keystr_from_pk (pk),
                  _("rejected by import screener"));
       return 0;
   }
 
   if (opt.verbose && !for_migration)
     {
       log_info ("sec  %s/%s %s   ",
                 pubkey_string (pk, pkstrbuf, sizeof pkstrbuf),
                 keystr_from_pk (pk), datestr_from_pk (pk));
       if (uidnode)
         print_utf8_buffer (log_get_stream (), uidnode->pkt->pkt.user_id->name,
                            uidnode->pkt->pkt.user_id->len);
       log_printf ("\n");
     }
   stats->secret_read++;
 
   if ((options & IMPORT_NO_SECKEY))
     {
       if (!for_migration)
         log_error (_("importing secret keys not allowed\n"));
       return 0;
     }
 
   if (!uidnode)
     {
       if (!for_migration)
         log_error( _("key %s: no user ID\n"), keystr_from_pk (pk));
       return 0;
     }
 
   ski = pk->seckey_info;
   if (!ski)
     {
       /* Actually an internal error.  */
       log_error ("key %s: secret key info missing\n", keystr_from_pk (pk));
       return 0;
     }
 
   /* A quick check to not import keys with an invalid protection
      cipher algorithm (only checks the primary key, though).  */
   if (ski->algo > 110)
     {
       if (!for_migration)
         log_error (_("key %s: secret key with invalid cipher %d"
                      " - skipped\n"), keystr_from_pk (pk), ski->algo);
       return 0;
     }
 
 #ifdef ENABLE_SELINUX_HACKS
   if (1)
     {
       /* We don't allow importing secret keys because that may be used
          to put a secret key into the keyring and the user might later
          be tricked into signing stuff with that key.  */
       log_error (_("importing secret keys not allowed\n"));
       return 0;
     }
 #endif
 
   clear_kbnode_flags (keyblock);
 
   nr_prev = stats->skipped_new_keys;
 
   /* Make a public key out of the key. */
   pub_keyblock = sec_to_pub_keyblock (keyblock);
   if (!pub_keyblock)
     log_error ("key %s: failed to create public key from secret key\n",
                    keystr_from_pk (pk));
   else
     {
       /* Note that this outputs an IMPORT_OK status message for the
 	 public key block, and below we will output another one for
 	 the secret keys.  FIXME?  */
       import_one (ctrl, pub_keyblock, stats,
 		  NULL, NULL, options, 1, for_migration,
                   screener, screener_arg, 0, NULL);
 
       /* Fixme: We should check for an invalid keyblock and
 	 cancel the secret key import in this case.  */
       release_kbnode (pub_keyblock);
 
       /* At least we cancel the secret key import when the public key
 	 import was skipped due to MERGE_ONLY option and a new
 	 key.  */
       if (!(opt.dry_run || (options & IMPORT_DRY_RUN))
           && stats->skipped_new_keys <= nr_prev)
 	{
           /* Read the keyblock again to get the effects of a merge.  */
           /* Fixme: we should do this based on the fingerprint or
              even better let import_one return the merged
              keyblock.  */
           node = get_pubkeyblock (ctrl, keyid);
           if (!node)
             log_error ("key %s: failed to re-lookup public key\n",
                        keystr_from_pk (pk));
           else
             {
               gpg_error_t err;
 
               /* transfer_secret_keys collects subkey stats.  */
               struct import_stats_s subkey_stats = {0};
 
               err = transfer_secret_keys (ctrl, &subkey_stats, keyblock,
                                           batch, 0);
               if (gpg_err_code (err) == GPG_ERR_NOT_PROCESSED)
                 {
                   /* TRANSLATORS: For smartcard, each private key on
                      host has a reference (stub) to a smartcard and
                      actual private key data is stored on the card.  A
                      single smartcard can have up to three private key
                      data.  Importing private key stub is always
                      skipped in 2.1, and it returns
                      GPG_ERR_NOT_PROCESSED.  Instead, user should be
                      suggested to run 'gpg --card-status', then,
                      references to a card will be automatically
                      created again.  */
                   log_info (_("To migrate '%s', with each smartcard, "
                               "run: %s\n"), "secring.gpg", "gpg --card-status");
                   err = 0;
                 }
               if (!err)
                 {
 		  int status = 16;
                   if (!opt.quiet)
                     log_info (_("key %s: secret key imported\n"),
                               keystr_from_pk (pk));
 		  if (subkey_stats.secret_imported)
                     {
                       status |= 1;
                       stats->secret_imported += 1;
                     }
 		  if (subkey_stats.secret_dups)
                     stats->secret_dups += 1;
 
                   if (is_status_enabled ())
                     print_import_ok (pk, status);
                   check_prefs (ctrl, node);
                 }
               release_kbnode (node);
             }
         }
     }
 
   return rc;
 }
 
 
 
 /* Return the recocation reason from signature SIG.  If no revocation
  * reason is availabale 0 is returned, in other cases the reason
  * (0..255).  If R_REASON is not NULL a malloced textual
  * representation of the code is stored there.  If R_COMMENT is not
  * NULL the comment from the reason is stored there and its length at
  * R_COMMENTLEN.  Note that the value at R_COMMENT is not filtered but
  * user supplied data in UTF8; thus it needs to be escaped for display
  * purposes.  Both return values are either NULL or a malloced
  * string/buffer.  */
 int
 get_revocation_reason (PKT_signature *sig, char **r_reason,
                        char **r_comment, size_t *r_commentlen)
 {
   int reason_seq = 0;
   size_t reason_n;
   const byte *reason_p;
   char reason_code_buf[20];
   const char *reason_text = NULL;
   int reason_code = 0;
 
   if (r_reason)
     *r_reason = NULL;
   if (r_comment)
     *r_comment = NULL;
 
   /* Skip over empty reason packets.  */
   while ((reason_p = enum_sig_subpkt (sig->hashed, SIGSUBPKT_REVOC_REASON,
                                       &reason_n, &reason_seq, NULL))
          && !reason_n)
     ;
   if (reason_p)
     {
       reason_code = *reason_p;
       reason_n--; reason_p++;
       switch (reason_code)
         {
         case 0x00: reason_text = _("No reason specified"); break;
         case 0x01: reason_text = _("Key is superseded");   break;
         case 0x02: reason_text = _("Key has been compromised"); break;
         case 0x03: reason_text = _("Key is no longer used"); break;
         case 0x20: reason_text = _("User ID is no longer valid"); break;
         default:
           snprintf (reason_code_buf, sizeof reason_code_buf,
                     "code=%02x", reason_code);
           reason_text = reason_code_buf;
           break;
         }
 
       if (r_reason)
         *r_reason = xstrdup (reason_text);
 
       if (r_comment && reason_n)
         {
           *r_comment = xmalloc (reason_n);
           memcpy (*r_comment, reason_p, reason_n);
           *r_commentlen = reason_n;
         }
     }
 
   return reason_code;
 }
 
 
 /* List the recocation signature as a "rvs" record.  SIGRC shows the
  * character from the signature verification or 0 if no public key was
  * found.  */
 static void
 list_standalone_revocation (ctrl_t ctrl, PKT_signature *sig, int sigrc)
 {
   char *siguid = NULL;
   size_t siguidlen = 0;
   char *issuer_fpr = NULL;
   int reason_code = 0;
   char *reason_text = NULL;
   char *reason_comment = NULL;
   size_t reason_commentlen;
 
   if (sigrc != '%' && sigrc != '?' && !opt.fast_list_mode)
     {
       int nouid;
       siguid = get_user_id (ctrl, sig->keyid, &siguidlen, &nouid);
       if (nouid)
         sigrc = '?';
     }
 
   reason_code = get_revocation_reason (sig, &reason_text,
                                        &reason_comment, &reason_commentlen);
 
   if (opt.with_colons)
     {
       es_fputs ("rvs:", es_stdout);
       if (sigrc)
         es_putc (sigrc, es_stdout);
       es_fprintf (es_stdout, "::%d:%08lX%08lX:%s:%s:::",
                   sig->pubkey_algo,
                   (ulong) sig->keyid[0], (ulong) sig->keyid[1],
                   colon_datestr_from_sig (sig),
                   colon_expirestr_from_sig (sig));
 
       if (siguid)
         es_write_sanitized (es_stdout, siguid, siguidlen, ":", NULL);
 
       es_fprintf (es_stdout, ":%02x%c", sig->sig_class,
                   sig->flags.exportable ? 'x' : 'l');
       if (reason_text)
         es_fprintf (es_stdout, ",%02x", reason_code);
       es_fputs ("::", es_stdout);
 
       if ((issuer_fpr = issuer_fpr_string (sig)))
         es_fputs (issuer_fpr, es_stdout);
 
       es_fprintf (es_stdout, ":::%d:", sig->digest_algo);
 
       if (reason_comment)
         {
           es_fputs ("::::", es_stdout);
           es_write_sanitized (es_stdout, reason_comment, reason_commentlen,
                               ":", NULL);
           es_putc (':', es_stdout);
         }
       es_putc ('\n', es_stdout);
 
       if (opt.show_subpackets)
         print_subpackets_colon (sig);
     }
   else /* Human readable. */
     {
       es_fputs ("rvs", es_stdout);
       es_fprintf (es_stdout, "%c%c %c%c%c%c%c%c %s %s",
 		  sigrc, (sig->sig_class - 0x10 > 0 &&
 			  sig->sig_class - 0x10 <
 			  4) ? '0' + sig->sig_class - 0x10 : ' ',
 		  sig->flags.exportable ? ' ' : 'L',
 		  sig->flags.revocable ? ' ' : 'R',
 		  sig->flags.policy_url ? 'P' : ' ',
 		  sig->flags.notation ? 'N' : ' ',
 		  sig->flags.expired ? 'X' : ' ',
 		  (sig->trust_depth > 9) ? 'T' : (sig->trust_depth >
 						  0) ? '0' +
 		  sig->trust_depth : ' ', keystr (sig->keyid),
 		  datestr_from_sig (sig));
       if (siguid)
         {
           es_fprintf (es_stdout, "  ");
           print_utf8_buffer (es_stdout, siguid, siguidlen);
         }
       es_putc ('\n', es_stdout);
 
       if (sig->flags.policy_url
           && (opt.list_options & LIST_SHOW_POLICY_URLS))
         show_policy_url (sig, 3, 0);
 
       if (sig->flags.notation && (opt.list_options & LIST_SHOW_NOTATIONS))
         show_notation (sig, 3, 0,
                        ((opt.list_options & LIST_SHOW_STD_NOTATIONS) ? 1 : 0)
                        +
                        ((opt.list_options & LIST_SHOW_USER_NOTATIONS) ? 2 : 0));
 
       if (sig->flags.pref_ks
           && (opt.list_options & LIST_SHOW_KEYSERVER_URLS))
         show_keyserver_url (sig, 3, 0);
 
       if (reason_text)
         {
           es_fprintf (es_stdout, "      %s%s\n",
                       _("reason for revocation: "), reason_text);
           if (reason_comment)
             {
               const byte *s, *s_lf;
               size_t n, n_lf;
 
               s = reason_comment;
               n = reason_commentlen;
               s_lf = NULL;
               do
                 {
                   /* We don't want any empty lines, so we skip them.  */
                   for (;n && *s == '\n'; s++, n--)
                     ;
                   if (n)
                     {
                       s_lf = memchr (s, '\n', n);
                       n_lf = s_lf? s_lf - s : n;
                       es_fprintf (es_stdout, "         %s",
                                   _("revocation comment: "));
                       es_write_sanitized (es_stdout, s, n_lf, NULL, NULL);
                       es_putc ('\n', es_stdout);
                       s += n_lf; n -= n_lf;
                     }
                 } while (s_lf);
             }
         }
     }
 
   es_fflush (es_stdout);
 
   xfree (reason_text);
   xfree (reason_comment);
   xfree (siguid);
   xfree (issuer_fpr);
 }
 
 
 /****************
  * Import a revocation certificate; this is a single signature packet.
  */
 static int
 import_revoke_cert (ctrl_t ctrl, kbnode_t node, unsigned int options,
                     struct import_stats_s *stats)
 {
   PKT_public_key *pk = NULL;
   kbnode_t onode;
   kbnode_t keyblock = NULL;
   KEYDB_HANDLE hd = NULL;
   u32 keyid[2];
   int rc = 0;
   int sigrc = 0;
   int silent;
 
   /* No error output for --show-keys.  */
   silent = (options & (IMPORT_SHOW | IMPORT_DRY_RUN));
 
   log_assert (!node->next );
   log_assert (node->pkt->pkttype == PKT_SIGNATURE );
   log_assert (IS_KEY_REV (node->pkt->pkt.signature));
 
   keyid[0] = node->pkt->pkt.signature->keyid[0];
   keyid[1] = node->pkt->pkt.signature->keyid[1];
 
   pk = xmalloc_clear( sizeof *pk );
   rc = get_pubkey (ctrl, pk, keyid );
   if (gpg_err_code (rc) == GPG_ERR_NO_PUBKEY )
     {
       if (!silent)
         log_error (_("key %s: no public key -"
                      " can't apply revocation certificate\n"), keystr(keyid));
       rc = 0;
       goto leave;
     }
   else if (rc )
     {
       log_error (_("key %s: public key not found: %s\n"),
                  keystr(keyid), gpg_strerror (rc));
       goto leave;
     }
 
   /* Read the original keyblock. */
   hd = keydb_new ();
   if (!hd)
     {
       rc = gpg_error_from_syserror ();
       goto leave;
     }
 
   {
     byte afp[MAX_FINGERPRINT_LEN];
     size_t an;
 
     fingerprint_from_pk (pk, afp, &an);
     while (an < MAX_FINGERPRINT_LEN)
       afp[an++] = 0;
     rc = keydb_search_fpr (hd, afp);
   }
   if (rc)
     {
       log_error (_("key %s: can't locate original keyblock: %s\n"),
                  keystr(keyid), gpg_strerror (rc));
       goto leave;
     }
   rc = keydb_get_keyblock (hd, &keyblock );
   if (rc)
     {
       log_error (_("key %s: can't read original keyblock: %s\n"),
                  keystr(keyid), gpg_strerror (rc));
       goto leave;
     }
 
   /* it is okay, that node is not in keyblock because
    * check_key_signature works fine for sig_class 0x20 (KEY_REV) in
    * this special case.  SIGRC is only used for IMPORT_SHOW.  */
   rc = check_key_signature (ctrl, keyblock, node, NULL);
   switch (gpg_err_code (rc))
     {
     case 0:                       sigrc = '!'; break;
     case GPG_ERR_BAD_SIGNATURE:   sigrc = '-'; break;
     case GPG_ERR_NO_PUBKEY:       sigrc = '?'; break;
     case GPG_ERR_UNUSABLE_PUBKEY: sigrc = '?'; break;
     default:                      sigrc = '%'; break;
     }
   if (rc )
     {
       if (!silent)
         log_error (_("key %s: invalid revocation certificate"
                      ": %s - rejected\n"), keystr(keyid), gpg_strerror (rc));
       goto leave;
     }
 
   /* check whether we already have this */
   for(onode=keyblock->next; onode; onode=onode->next ) {
     if (onode->pkt->pkttype == PKT_USER_ID )
       break;
     else if (onode->pkt->pkttype == PKT_SIGNATURE
              && !cmp_signatures(node->pkt->pkt.signature,
                                 onode->pkt->pkt.signature))
       {
         rc = 0;
         goto leave; /* yes, we already know about it */
       }
   }
 
   /* insert it */
   insert_kbnode( keyblock, clone_kbnode(node), 0 );
 
   /* and write the keyblock back unless in dry run mode.  */
   if (!(opt.dry_run || (options & IMPORT_DRY_RUN)))
     {
       rc = keydb_update_keyblock (ctrl, hd, keyblock );
       if (rc)
         log_error (_("error writing keyring '%s': %s\n"),
                    keydb_get_resource_name (hd), gpg_strerror (rc) );
       keydb_release (hd);
       hd = NULL;
 
       /* we are ready */
       if (!opt.quiet )
         {
           char *p=get_user_id_native (ctrl, keyid);
           log_info( _("key %s: \"%s\" revocation certificate imported\n"),
                     keystr(keyid),p);
           xfree(p);
         }
 
       /* If the key we just revoked was ultimately trusted, remove its
        * ultimate trust.  This doesn't stop the user from putting the
        * ultimate trust back, but is a reasonable solution for now. */
       if (get_ownertrust (ctrl, pk) == TRUST_ULTIMATE)
         clear_ownertrusts (ctrl, pk);
 
       revalidation_mark (ctrl);
     }
   stats->n_revoc++;
 
  leave:
   if ((options & IMPORT_SHOW))
     list_standalone_revocation (ctrl, node->pkt->pkt.signature, sigrc);
 
   keydb_release (hd);
   release_kbnode( keyblock );
   free_public_key( pk );
   return rc;
 }
 
 
 /* Loop over the KEYBLOCK and check all self signatures.  KEYID is the
  * keyid of the primary key for reporting purposes. On return the
  * following bits in the node flags are set:
  *
  * - NODE_GOOD_SELFSIG  :: User ID or subkey has a self-signature
  * - NODE_BAD_SELFSIG   :: Used ID or subkey has an invalid self-signature
  * - NODE_DELETION_MARK :: This node shall be deleted
  *
  * NON_SELF is set to true if there are any sigs other than self-sigs
  * in this keyblock.
  *
  * Returns 0 on success or -1 (but not an error code) if the keyblock
  * is invalid.
  */
 static int
 chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
 {
   kbnode_t knode = NULL;   /* The node of the current subkey.  */
   PKT_public_key *subpk = NULL; /* and its packet. */
   kbnode_t bsnode = NULL;  /* Subkey binding signature node.  */
   u32 bsdate = 0;          /* Timestamp of that node.   */
   kbnode_t rsnode = NULL;  /* Subkey recocation signature node.  */
-  u32 rsdate = 0;          /* Timestamp of tha node.  */
+  u32 rsdate = 0;          /* Timestamp of that node.  */
   PKT_signature *sig;
   int rc;
   kbnode_t n;
 
   for (n=keyblock; (n = find_next_kbnode (n, 0)); )
     {
       if (n->pkt->pkttype == PKT_PUBLIC_SUBKEY)
 	{
 	  knode = n;
           subpk = knode->pkt->pkt.public_key;
 	  bsdate = 0;
 	  rsdate = 0;
 	  bsnode = NULL;
 	  rsnode = NULL;
 	  continue;
 	}
 
       if ( n->pkt->pkttype != PKT_SIGNATURE )
         continue;
 
       sig = n->pkt->pkt.signature;
       if ( keyid[0] != sig->keyid[0] || keyid[1] != sig->keyid[1] )
         {
           *non_self = 1;
           continue;
         }
 
       /* This just caches the sigs for later use.  That way we
          import a fully-cached key which speeds things up. */
       if (!opt.no_sig_cache)
         check_key_signature (ctrl, keyblock, n, NULL);
 
       if ( IS_UID_SIG(sig) || IS_UID_REV(sig) )
         {
           kbnode_t unode = find_prev_kbnode( keyblock, n, PKT_USER_ID );
           if ( !unode )
             {
               log_error( _("key %s: no user ID for signature\n"),
                          keystr(keyid));
               return -1;  /* The complete keyblock is invalid.  */
             }
 
           /* If it hasn't been marked valid yet, keep trying.  */
           if (!(unode->flag & NODE_GOOD_SELFSIG))
             {
               rc = check_key_signature (ctrl, keyblock, n, NULL);
               if ( rc )
                 {
                   if ( opt.verbose )
                     {
                       char *p = utf8_to_native
                         (unode->pkt->pkt.user_id->name,
                          strlen (unode->pkt->pkt.user_id->name),0);
                       log_info (gpg_err_code(rc) == GPG_ERR_PUBKEY_ALGO ?
                                 _("key %s: unsupported public key "
                                   "algorithm on user ID \"%s\"\n"):
                                 _("key %s: invalid self-signature "
                                   "on user ID \"%s\"\n"),
                                 keystr (keyid),p);
                       xfree (p);
                     }
                 }
               else
                 unode->flag |= NODE_GOOD_SELFSIG;
             }
         }
       else if (IS_KEY_SIG (sig))
         {
           rc = check_key_signature (ctrl, keyblock, n, NULL);
           if ( rc )
             {
               if (opt.verbose)
                 log_info (gpg_err_code (rc) == GPG_ERR_PUBKEY_ALGO ?
                           _("key %s: unsupported public key algorithm\n"):
                           _("key %s: invalid direct key signature\n"),
                           keystr (keyid));
               n->flag |= NODE_DELETION_MARK;
             }
         }
       else if ( IS_SUBKEY_SIG (sig) )
         {
           /* Note that this works based solely on the timestamps like
              the rest of gpg.  If the standard gets revocation
              targets, this may need to be revised.  */
 
           if ( !knode )
             {
               if (opt.verbose)
                 log_info (_("key %s: no subkey for key binding\n"),
                           keystr (keyid));
               n->flag |= NODE_DELETION_MARK;
             }
           else
             {
               rc = check_key_signature (ctrl, keyblock, n, NULL);
               if ( rc )
                 {
                   if (opt.verbose)
                     {
                       keyid_from_pk (subpk, NULL);
                       log_info (gpg_err_code (rc) == GPG_ERR_PUBKEY_ALGO ?
                                 _("key %s: unsupported public key"
                                   " algorithm\n"):
                                 _("key %s: invalid subkey binding\n"),
                                 keystr_with_sub (keyid, subpk->keyid));
                     }
                   n->flag |= NODE_DELETION_MARK;
                 }
               else
                 {
                   /* It's valid, so is it newer? */
                   if (sig->timestamp >= bsdate)
                     {
                       knode->flag |= NODE_GOOD_SELFSIG; /* Subkey is valid.  */
                       if (bsnode)
                         {
                           /* Delete the last binding sig since this
                              one is newer */
                           bsnode->flag |= NODE_DELETION_MARK;
                           if (opt.verbose)
                             {
                               keyid_from_pk (subpk, NULL);
                               log_info (_("key %s: removed multiple subkey"
                                           " binding\n"),
                                         keystr_with_sub (keyid, subpk->keyid));
                             }
                         }
 
                       bsnode = n;
                       bsdate = sig->timestamp;
                     }
                   else
                     n->flag |= NODE_DELETION_MARK; /* older */
                 }
             }
         }
       else if ( IS_SUBKEY_REV (sig) )
         {
           /* We don't actually mark the subkey as revoked right now,
              so just check that the revocation sig is the most recent
              valid one.  Note that we don't care if the binding sig is
              newer than the revocation sig.  See the comment in
              getkey.c:merge_selfsigs_subkey for more.  */
           if ( !knode )
             {
               if (opt.verbose)
                 log_info (_("key %s: no subkey for key revocation\n"),
                           keystr(keyid));
               n->flag |= NODE_DELETION_MARK;
             }
           else
             {
               rc = check_key_signature (ctrl, keyblock, n, NULL);
               if ( rc )
                 {
                   if(opt.verbose)
                     log_info (gpg_err_code (rc) == GPG_ERR_PUBKEY_ALGO ?
                               _("key %s: unsupported public"
                                 " key algorithm\n"):
                               _("key %s: invalid subkey revocation\n"),
                               keystr(keyid));
                   n->flag |= NODE_DELETION_MARK;
                 }
               else
                 {
                   /* It's valid, so is it newer? */
                   if (sig->timestamp >= rsdate)
                     {
                       if (rsnode)
                         {
                           /* Delete the last revocation sig since
                              this one is newer.  */
                           rsnode->flag |= NODE_DELETION_MARK;
                           if (opt.verbose)
                             log_info (_("key %s: removed multiple subkey"
                                         " revocation\n"),keystr(keyid));
                         }
 
                       rsnode = n;
                       rsdate = sig->timestamp;
                     }
                   else
                     n->flag |= NODE_DELETION_MARK; /* older */
                 }
             }
         }
     }
 
   return 0;
 }
 
 
 /* Delete all parts which are invalid and those signatures whose
  * public key algorithm is not available in this implementation; but
  * consider RSA as valid, because parse/build_packets knows about it.
  *
  * Returns: True if at least one valid user-id is left over.
  */
 static int
 delete_inv_parts (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
                   unsigned int options)
 {
   kbnode_t node;
   int nvalid=0, uid_seen=0, subkey_seen=0;
   PKT_public_key *pk;
 
   for (node=keyblock->next; node; node = node->next )
     {
       if (node->pkt->pkttype == PKT_USER_ID)
         {
           uid_seen = 1;
           if ((node->flag & NODE_BAD_SELFSIG)
               || !(node->flag & NODE_GOOD_SELFSIG))
             {
               if (opt.verbose )
                 {
                   char *p=utf8_to_native(node->pkt->pkt.user_id->name,
                                          node->pkt->pkt.user_id->len,0);
                   log_info( _("key %s: skipped user ID \"%s\"\n"),
                             keystr(keyid),p);
                   xfree(p);
                 }
               delete_kbnode( node ); /* the user-id */
               /* and all following packets up to the next user-id */
               while (node->next
                      && node->next->pkt->pkttype != PKT_USER_ID
                      && node->next->pkt->pkttype != PKT_PUBLIC_SUBKEY
                      && node->next->pkt->pkttype != PKT_SECRET_SUBKEY ){
                 delete_kbnode( node->next );
                 node = node->next;
               }
 	    }
           else
             nvalid++;
 	}
       else if (   node->pkt->pkttype == PKT_PUBLIC_SUBKEY
                || node->pkt->pkttype == PKT_SECRET_SUBKEY )
         {
           if ((node->flag & NODE_BAD_SELFSIG)
               || !(node->flag & NODE_GOOD_SELFSIG))
             {
               if (opt.verbose )
                 {
                   pk = node->pkt->pkt.public_key;
                   keyid_from_pk (pk, NULL);
                   log_info (_("key %s: skipped subkey\n"),
                             keystr_with_sub (keyid, pk->keyid));
                 }
 
               delete_kbnode( node ); /* the subkey */
               /* and all following signature packets */
               while (node->next
                      && node->next->pkt->pkttype == PKT_SIGNATURE ) {
                 delete_kbnode( node->next );
                 node = node->next;
               }
 	    }
           else
             subkey_seen = 1;
 	}
       else if (node->pkt->pkttype == PKT_SIGNATURE
                && openpgp_pk_test_algo (node->pkt->pkt.signature->pubkey_algo)
                && node->pkt->pkt.signature->pubkey_algo != PUBKEY_ALGO_RSA )
         {
           delete_kbnode( node ); /* build_packet() can't handle this */
         }
       else if (node->pkt->pkttype == PKT_SIGNATURE
                && !node->pkt->pkt.signature->flags.exportable
                && !(options&IMPORT_LOCAL_SIGS)
                && !have_secret_key_with_kid (node->pkt->pkt.signature->keyid))
         {
           /* here we violate the rfc a bit by still allowing
            * to import non-exportable signature when we have the
            * the secret key used to create this signature - it
            * seems that this makes sense */
           if(opt.verbose)
             log_info( _("key %s: non exportable signature"
                         " (class 0x%02X) - skipped\n"),
                       keystr(keyid), node->pkt->pkt.signature->sig_class );
           delete_kbnode( node );
         }
       else if (node->pkt->pkttype == PKT_SIGNATURE
                && IS_KEY_REV (node->pkt->pkt.signature))
         {
           if (uid_seen )
             {
               if(opt.verbose)
                 log_info( _("key %s: revocation certificate"
                             " at wrong place - skipped\n"),keystr(keyid));
               delete_kbnode( node );
             }
           else
             {
 	      /* If the revocation cert is from a different key than
                  the one we're working on don't check it - it's
                  probably from a revocation key and won't be
                  verifiable with this key anyway. */
 
 	      if(node->pkt->pkt.signature->keyid[0]==keyid[0]
                  && node->pkt->pkt.signature->keyid[1]==keyid[1])
 		{
 		  int rc = check_key_signature (ctrl, keyblock, node, NULL);
 		  if (rc )
 		    {
 		      if(opt.verbose)
 			log_info( _("key %s: invalid revocation"
 				    " certificate: %s - skipped\n"),
 				  keystr(keyid), gpg_strerror (rc));
 		      delete_kbnode( node );
 		    }
 		}
 	    }
 	}
       else if (node->pkt->pkttype == PKT_SIGNATURE
                && (IS_SUBKEY_SIG (node->pkt->pkt.signature)
                    || IS_SUBKEY_REV (node->pkt->pkt.signature))
                && !subkey_seen )
         {
           if(opt.verbose)
             log_info( _("key %s: subkey signature"
                         " in wrong place - skipped\n"), keystr(keyid));
           delete_kbnode( node );
         }
       else if (node->pkt->pkttype == PKT_SIGNATURE
                && !IS_CERT(node->pkt->pkt.signature))
         {
           if(opt.verbose)
             log_info(_("key %s: unexpected signature class (0x%02X) -"
                        " skipped\n"),keystr(keyid),
                      node->pkt->pkt.signature->sig_class);
           delete_kbnode(node);
 	  }
       else if ((node->flag & NODE_DELETION_MARK))
         delete_kbnode( node );
     }
 
   /* note: because keyblock is the public key, it is never marked
    * for deletion and so keyblock cannot change */
   commit_kbnode( &keyblock );
   return nvalid;
 }
 
 /* This function returns true if any UID is left in the keyring.  */
 static int
 any_uid_left (kbnode_t keyblock)
 {
   kbnode_t node;
 
   for (node=keyblock->next; node; node = node->next)
     if (node->pkt->pkttype == PKT_USER_ID)
       return 1;
   return 0;
 }
 
 
 
 /* Delete all user ids from KEYBLOCK.
  * Returns: True if the keyblock has changed.  */
 static int
 remove_all_uids (kbnode_t *keyblock)
 {
   kbnode_t node;
   int any = 0;
 
   for (node = *keyblock; node; node = node->next)
     {
       if (is_deleted_kbnode (node))
 	continue;
 
       if (node->pkt->pkttype != PKT_USER_ID)
 	continue;
 
       /* We are at the first user id.  Delete everything up to the
        * first subkey.  */
       for (; node; node = node->next)
 	{
 	  if (is_deleted_kbnode (node))
 	    continue;
 
 	  if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY
               || node->pkt->pkttype == PKT_SECRET_SUBKEY)
 	    break;
           delete_kbnode (node);
           any = 1;
 	}
       break;  /* All done.  */
     }
 
   commit_kbnode (keyblock);
   return any;
 }
 
 
 /*
  * It may happen that the imported keyblock has duplicated user IDs.
  * We check this here and collapse those user IDs together with their
  * sigs into one.
  * Returns: True if the keyblock has changed.
  */
 int
 collapse_uids (kbnode_t *keyblock)
 {
   kbnode_t uid1;
   int any=0;
 
   for(uid1=*keyblock;uid1;uid1=uid1->next)
     {
       kbnode_t uid2;
 
       if(is_deleted_kbnode(uid1))
 	continue;
 
       if(uid1->pkt->pkttype!=PKT_USER_ID)
 	continue;
 
       for(uid2=uid1->next;uid2;uid2=uid2->next)
 	{
 	  if(is_deleted_kbnode(uid2))
 	    continue;
 
 	  if(uid2->pkt->pkttype!=PKT_USER_ID)
 	    continue;
 
 	  if(cmp_user_ids(uid1->pkt->pkt.user_id,
 			  uid2->pkt->pkt.user_id)==0)
 	    {
 	      /* We have a duplicated uid */
 	      kbnode_t sig1,last;
 
 	      any=1;
 
 	      /* Now take uid2's signatures, and attach them to
 		 uid1 */
 	      for(last=uid2;last->next;last=last->next)
 		{
 		  if(is_deleted_kbnode(last))
 		    continue;
 
 		  if(last->next->pkt->pkttype==PKT_USER_ID
 		     || last->next->pkt->pkttype==PKT_PUBLIC_SUBKEY
 		     || last->next->pkt->pkttype==PKT_SECRET_SUBKEY)
 		    break;
 		}
 
 	      /* Snip out uid2 */
 	      (find_prev_kbnode(*keyblock,uid2,0))->next=last->next;
 
 	      /* Now put uid2 in place as part of uid1 */
 	      last->next=uid1->next;
 	      uid1->next=uid2;
 	      delete_kbnode(uid2);
 
 	      /* Now dedupe uid1 */
 	      for(sig1=uid1->next;sig1;sig1=sig1->next)
 		{
 		  kbnode_t sig2;
 
 		  if(is_deleted_kbnode(sig1))
 		    continue;
 
 		  if(sig1->pkt->pkttype==PKT_USER_ID
 		     || sig1->pkt->pkttype==PKT_PUBLIC_SUBKEY
 		     || sig1->pkt->pkttype==PKT_SECRET_SUBKEY)
 		    break;
 
 		  if(sig1->pkt->pkttype!=PKT_SIGNATURE)
 		    continue;
 
 		  for(sig2=sig1->next,last=sig1;sig2;last=sig2,sig2=sig2->next)
 		    {
 		      if(is_deleted_kbnode(sig2))
 			continue;
 
 		      if(sig2->pkt->pkttype==PKT_USER_ID
 			 || sig2->pkt->pkttype==PKT_PUBLIC_SUBKEY
 			 || sig2->pkt->pkttype==PKT_SECRET_SUBKEY)
 			break;
 
 		      if(sig2->pkt->pkttype!=PKT_SIGNATURE)
 			continue;
 
 		      if(cmp_signatures(sig1->pkt->pkt.signature,
 					sig2->pkt->pkt.signature)==0)
 			{
 			  /* We have a match, so delete the second
 			     signature */
 			  delete_kbnode(sig2);
 			  sig2=last;
 			}
 		    }
 		}
 	    }
 	}
     }
 
   commit_kbnode(keyblock);
 
   if(any && !opt.quiet)
     {
       const char *key="???";
 
       if ((uid1 = find_kbnode (*keyblock, PKT_PUBLIC_KEY)) )
 	key = keystr_from_pk (uid1->pkt->pkt.public_key);
       else if ((uid1 = find_kbnode( *keyblock, PKT_SECRET_KEY)) )
 	key = keystr_from_pk (uid1->pkt->pkt.public_key);
 
       log_info (_("key %s: duplicated user ID detected - merged\n"), key);
     }
 
   return any;
 }
 
 
 /* Check for a 0x20 revocation from a revocation key that is not
    present.  This may be called without the benefit of merge_xxxx so
    you can't rely on pk->revkey and friends. */
 static void
 revocation_present (ctrl_t ctrl, kbnode_t keyblock)
 {
   kbnode_t onode, inode;
   PKT_public_key *pk = keyblock->pkt->pkt.public_key;
 
   for(onode=keyblock->next;onode;onode=onode->next)
     {
       /* If we reach user IDs, we're done. */
       if(onode->pkt->pkttype==PKT_USER_ID)
 	break;
 
       if (onode->pkt->pkttype == PKT_SIGNATURE
           && IS_KEY_SIG (onode->pkt->pkt.signature)
           && onode->pkt->pkt.signature->revkey)
 	{
 	  int idx;
 	  PKT_signature *sig=onode->pkt->pkt.signature;
 
 	  for(idx=0;idx<sig->numrevkeys;idx++)
 	    {
 	      u32 keyid[2];
 
 	      keyid_from_fingerprint (ctrl, sig->revkey[idx].fpr,
                                       MAX_FINGERPRINT_LEN, keyid);
 
 	      for(inode=keyblock->next;inode;inode=inode->next)
 		{
 		  /* If we reach user IDs, we're done. */
 		  if(inode->pkt->pkttype==PKT_USER_ID)
 		    break;
 
 		  if (inode->pkt->pkttype == PKT_SIGNATURE
                       && IS_KEY_REV (inode->pkt->pkt.signature)
                       && inode->pkt->pkt.signature->keyid[0]==keyid[0]
                       && inode->pkt->pkt.signature->keyid[1]==keyid[1])
 		    {
 		      /* Okay, we have a revocation key, and a
                        * revocation issued by it.  Do we have the key
                        * itself?  */
                       gpg_error_t err;
 
 		      err = get_pubkey_byfprint_fast (NULL,
                                                       sig->revkey[idx].fpr,
                                                       MAX_FINGERPRINT_LEN);
 		      if (gpg_err_code (err) == GPG_ERR_NO_PUBKEY
                           || gpg_err_code (err) == GPG_ERR_UNUSABLE_PUBKEY)
 			{
 			  char *tempkeystr = xstrdup (keystr_from_pk (pk));
 
 			  /* No, so try and get it */
 			  if ((opt.keyserver_options.options
                                & KEYSERVER_AUTO_KEY_RETRIEVE)
                               && keyserver_any_configured (ctrl))
 			    {
 			      log_info(_("WARNING: key %s may be revoked:"
 					 " fetching revocation key %s\n"),
 				       tempkeystr,keystr(keyid));
 			      keyserver_import_fprint (ctrl,
                                                        sig->revkey[idx].fpr,
                                                        MAX_FINGERPRINT_LEN,
                                                        opt.keyserver, 0);
 
 			      /* Do we have it now? */
 			      err = get_pubkey_byfprint_fast (NULL,
 						     sig->revkey[idx].fpr,
 						     MAX_FINGERPRINT_LEN);
 			    }
 
 			  if (gpg_err_code (err) == GPG_ERR_NO_PUBKEY
                               || gpg_err_code (err) == GPG_ERR_UNUSABLE_PUBKEY)
 			    log_info(_("WARNING: key %s may be revoked:"
 				       " revocation key %s not present.\n"),
 				     tempkeystr,keystr(keyid));
 
 			  xfree(tempkeystr);
 			}
 		    }
 		}
 	    }
 	}
     }
 }
 
 
 /*
  * compare and merge the blocks
  *
  * o compare the signatures: If we already have this signature, check
  *   that they compare okay; if not, issue a warning and ask the user.
  * o Simply add the signature.	Can't verify here because we may not have
  *   the signature's public key yet; verification is done when putting it
  *   into the trustdb, which is done automagically as soon as this pubkey
  *   is used.
  * Note: We indicate newly inserted packets with NODE_FLAG_A.
  */
 static int
 merge_blocks (ctrl_t ctrl, unsigned int options,
               kbnode_t keyblock_orig, kbnode_t keyblock,
               u32 *keyid, u32 curtime, int origin, const char *url,
 	      int *n_uids, int *n_sigs, int *n_subk )
 {
   kbnode_t onode, node;
   int rc, found;
 
   /* 1st: handle revocation certificates */
   for (node=keyblock->next; node; node=node->next )
     {
       if (node->pkt->pkttype == PKT_USER_ID )
         break;
       else if (node->pkt->pkttype == PKT_SIGNATURE
                && IS_KEY_REV (node->pkt->pkt.signature))
         {
           /* check whether we already have this */
           found = 0;
           for (onode=keyblock_orig->next; onode; onode=onode->next)
             {
               if (onode->pkt->pkttype == PKT_USER_ID )
                 break;
               else if (onode->pkt->pkttype == PKT_SIGNATURE
                        && IS_KEY_REV (onode->pkt->pkt.signature)
                        && !cmp_signatures(onode->pkt->pkt.signature,
                                           node->pkt->pkt.signature))
                 {
                   found = 1;
                   break;
                 }
 	    }
           if (!found)
             {
               kbnode_t n2 = clone_kbnode(node);
               insert_kbnode( keyblock_orig, n2, 0 );
               n2->flag |= NODE_FLAG_A;
               ++*n_sigs;
               if(!opt.quiet)
                 {
                   char *p = get_user_id_native (ctrl, keyid);
                   log_info(_("key %s: \"%s\" revocation"
                              " certificate added\n"), keystr(keyid),p);
                   xfree(p);
                 }
 	    }
 	}
     }
 
   /* 2nd: merge in any direct key (0x1F) sigs */
   for(node=keyblock->next; node; node=node->next)
     {
       if (node->pkt->pkttype == PKT_USER_ID )
         break;
       else if (node->pkt->pkttype == PKT_SIGNATURE
                && IS_KEY_SIG (node->pkt->pkt.signature))
         {
           /* check whether we already have this */
           found = 0;
           for (onode=keyblock_orig->next; onode; onode=onode->next)
             {
               if (onode->pkt->pkttype == PKT_USER_ID)
                 break;
               else if (onode->pkt->pkttype == PKT_SIGNATURE
                        && IS_KEY_SIG (onode->pkt->pkt.signature)
                        && !cmp_signatures(onode->pkt->pkt.signature,
                                           node->pkt->pkt.signature))
                 {
                   found = 1;
                   break;
 		}
 	    }
           if (!found )
             {
               kbnode_t n2 = clone_kbnode(node);
               insert_kbnode( keyblock_orig, n2, 0 );
               n2->flag |= NODE_FLAG_A;
               ++*n_sigs;
               if(!opt.quiet)
                 log_info( _("key %s: direct key signature added\n"),
                           keystr(keyid));
             }
 	}
     }
 
   /* 3rd: try to merge new certificates in */
   for (onode=keyblock_orig->next; onode; onode=onode->next)
     {
       if (!(onode->flag & NODE_FLAG_A) && onode->pkt->pkttype == PKT_USER_ID)
         {
           /* find the user id in the imported keyblock */
           for (node=keyblock->next; node; node=node->next)
             if (node->pkt->pkttype == PKT_USER_ID
                 && !cmp_user_ids( onode->pkt->pkt.user_id,
                                   node->pkt->pkt.user_id ) )
               break;
           if (node ) /* found: merge */
             {
               rc = merge_sigs (onode, node, n_sigs);
               if (rc )
                 return rc;
 	    }
 	}
     }
 
   /* 4th: add new user-ids */
   for (node=keyblock->next; node; node=node->next)
     {
       if (node->pkt->pkttype == PKT_USER_ID)
         {
           /* do we have this in the original keyblock */
           for (onode=keyblock_orig->next; onode; onode=onode->next )
             if (onode->pkt->pkttype == PKT_USER_ID
                 && !cmp_user_ids( onode->pkt->pkt.user_id,
                                   node->pkt->pkt.user_id ) )
               break;
           if (!onode ) /* this is a new user id: append */
             {
               rc = append_new_uid (options, keyblock_orig, node,
                                    curtime, origin, url, n_sigs);
               if (rc )
                 return rc;
               ++*n_uids;
 	    }
 	}
     }
 
   /* 5th: add new subkeys */
   for (node=keyblock->next; node; node=node->next)
     {
       onode = NULL;
       if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
         {
           /* do we have this in the original keyblock? */
           for(onode=keyblock_orig->next; onode; onode=onode->next)
             if (onode->pkt->pkttype == PKT_PUBLIC_SUBKEY
                 && !cmp_public_keys( onode->pkt->pkt.public_key,
                                      node->pkt->pkt.public_key))
               break;
           if (!onode ) /* This is a new subkey: append.  */
             {
               rc = append_key (keyblock_orig, node, n_sigs);
               if (rc)
                 return rc;
               ++*n_subk;
 	    }
 	}
       else if (node->pkt->pkttype == PKT_SECRET_SUBKEY)
         {
           /* do we have this in the original keyblock? */
           for (onode=keyblock_orig->next; onode; onode=onode->next )
             if (onode->pkt->pkttype == PKT_SECRET_SUBKEY
                 && !cmp_public_keys (onode->pkt->pkt.public_key,
                                      node->pkt->pkt.public_key) )
               break;
           if (!onode ) /* This is a new subkey: append.  */
             {
               rc = append_key (keyblock_orig, node, n_sigs);
               if (rc )
                 return rc;
               ++*n_subk;
 	    }
 	}
     }
 
   /* 6th: merge subkey certificates */
   for (onode=keyblock_orig->next; onode; onode=onode->next)
     {
       if (!(onode->flag & NODE_FLAG_A)
           && (onode->pkt->pkttype == PKT_PUBLIC_SUBKEY
               || onode->pkt->pkttype == PKT_SECRET_SUBKEY))
         {
           /* find the subkey in the imported keyblock */
           for(node=keyblock->next; node; node=node->next)
             {
               if ((node->pkt->pkttype == PKT_PUBLIC_SUBKEY
                    || node->pkt->pkttype == PKT_SECRET_SUBKEY)
                   && !cmp_public_keys( onode->pkt->pkt.public_key,
                                        node->pkt->pkt.public_key ) )
                 break;
 	    }
           if (node) /* Found: merge.  */
             {
               rc = merge_keysigs( onode, node, n_sigs);
               if (rc )
                 return rc;
 	    }
 	}
     }
 
   return 0;
 }
 
 
 /* Helper function for merge_blocks.
  *
  * Append the new userid starting with NODE and all signatures to
  * KEYBLOCK.  ORIGIN and URL conveys the usual key origin info.  The
  * integer at N_SIGS is updated with the number of new signatures.
  */
 static gpg_error_t
 append_new_uid (unsigned int options,
                 kbnode_t keyblock, kbnode_t node, u32 curtime,
                 int origin, const char *url, int *n_sigs)
 {
   gpg_error_t err;
   kbnode_t n;
   kbnode_t n_where = NULL;
 
   log_assert (node->pkt->pkttype == PKT_USER_ID);
 
   /* Find the right position for the new user id and its signatures.  */
   for (n = keyblock; n; n_where = n, n = n->next)
     {
       if (n->pkt->pkttype == PKT_PUBLIC_SUBKEY
           || n->pkt->pkttype == PKT_SECRET_SUBKEY )
         break;
     }
   if (!n)
     n_where = NULL;
 
   /* and append/insert */
   while (node)
     {
       /* we add a clone to the original keyblock, because this
        * one is released first. */
       n = clone_kbnode(node);
       if (n->pkt->pkttype == PKT_USER_ID
           && !(options & IMPORT_RESTORE) )
         {
           err = insert_key_origin_uid (n->pkt->pkt.user_id,
                                        curtime, origin, url);
           if (err)
             return err;
         }
 
       if (n_where)
         {
           insert_kbnode( n_where, n, 0 );
           n_where = n;
 	}
       else
         add_kbnode( keyblock, n );
       n->flag |= NODE_FLAG_A;
       node->flag |= NODE_FLAG_A;
       if (n->pkt->pkttype == PKT_SIGNATURE )
         ++*n_sigs;
 
       node = node->next;
       if (node && node->pkt->pkttype != PKT_SIGNATURE )
         break;
     }
 
   return 0;
 }
 
 
 /* Helper function for merge_blocks
  * Merge the sigs from SRC onto DST. SRC and DST are both a PKT_USER_ID.
  * (how should we handle comment packets here?)
  */
 static int
 merge_sigs (kbnode_t dst, kbnode_t src, int *n_sigs)
 {
   kbnode_t n, n2;
   int found = 0;
 
   log_assert (dst->pkt->pkttype == PKT_USER_ID);
   log_assert (src->pkt->pkttype == PKT_USER_ID);
 
   for (n=src->next; n && n->pkt->pkttype != PKT_USER_ID; n = n->next)
     {
       if (n->pkt->pkttype != PKT_SIGNATURE )
         continue;
       if (IS_SUBKEY_SIG (n->pkt->pkt.signature)
           || IS_SUBKEY_REV (n->pkt->pkt.signature) )
         continue; /* skip signatures which are only valid on subkeys */
 
       found = 0;
       for (n2=dst->next; n2 && n2->pkt->pkttype != PKT_USER_ID; n2 = n2->next)
         if (!cmp_signatures(n->pkt->pkt.signature,n2->pkt->pkt.signature))
           {
             found++;
             break;
           }
       if (!found )
         {
           /* This signature is new or newer, append N to DST.
            * We add a clone to the original keyblock, because this
            * one is released first */
           n2 = clone_kbnode(n);
           insert_kbnode( dst, n2, PKT_SIGNATURE );
           n2->flag |= NODE_FLAG_A;
           n->flag |= NODE_FLAG_A;
           ++*n_sigs;
 	}
     }
 
   return 0;
 }
 
 
 /* Helper function for merge_blocks
  * Merge the sigs from SRC onto DST. SRC and DST are both a PKT_xxx_SUBKEY.
  */
 static int
 merge_keysigs (kbnode_t dst, kbnode_t src, int *n_sigs)
 {
   kbnode_t n, n2;
   int found = 0;
 
   log_assert (dst->pkt->pkttype == PKT_PUBLIC_SUBKEY
               || dst->pkt->pkttype == PKT_SECRET_SUBKEY);
 
   for (n=src->next; n ; n = n->next)
     {
       if (n->pkt->pkttype == PKT_PUBLIC_SUBKEY
           || n->pkt->pkttype == PKT_PUBLIC_KEY )
         break;
       if (n->pkt->pkttype != PKT_SIGNATURE )
         continue;
 
       found = 0;
       for (n2=dst->next; n2; n2 = n2->next)
         {
           if (n2->pkt->pkttype == PKT_PUBLIC_SUBKEY
               || n2->pkt->pkttype == PKT_PUBLIC_KEY )
             break;
           if (n2->pkt->pkttype == PKT_SIGNATURE
               && (n->pkt->pkt.signature->keyid[0]
                   == n2->pkt->pkt.signature->keyid[0])
               && (n->pkt->pkt.signature->keyid[1]
                   == n2->pkt->pkt.signature->keyid[1])
               && (n->pkt->pkt.signature->timestamp
                   <= n2->pkt->pkt.signature->timestamp)
               && (n->pkt->pkt.signature->sig_class
                   == n2->pkt->pkt.signature->sig_class))
             {
               found++;
               break;
 	    }
 	}
       if (!found )
         {
           /* This signature is new or newer, append N to DST.
            * We add a clone to the original keyblock, because this
            * one is released first */
           n2 = clone_kbnode(n);
           insert_kbnode( dst, n2, PKT_SIGNATURE );
           n2->flag |= NODE_FLAG_A;
           n->flag |= NODE_FLAG_A;
           ++*n_sigs;
 	}
     }
 
   return 0;
 }
 
 
 /* Helper function for merge_blocks.
  * Append the subkey starting with NODE and all signatures to KEYBLOCK.
  * Mark all new and copied packets by setting flag bit 0.
  */
 static int
 append_key (kbnode_t keyblock, kbnode_t node, int *n_sigs)
 {
   kbnode_t n;
 
   log_assert (node->pkt->pkttype == PKT_PUBLIC_SUBKEY
               || node->pkt->pkttype == PKT_SECRET_SUBKEY);
 
   while (node)
     {
       /* we add a clone to the original keyblock, because this
        * one is released first */
       n = clone_kbnode(node);
       add_kbnode( keyblock, n );
       n->flag |= NODE_FLAG_A;
       node->flag |= NODE_FLAG_A;
       if (n->pkt->pkttype == PKT_SIGNATURE )
         ++*n_sigs;
 
       node = node->next;
       if (node && node->pkt->pkttype != PKT_SIGNATURE )
         break;
     }
 
   return 0;
 }
diff --git a/kbx/mkerrors b/kbx/mkerrors
index 629485ae0..c0bca108c 100755
--- a/kbx/mkerrors
+++ b/kbx/mkerrors
@@ -1,70 +1,70 @@
 #!/bin/sh
 # mkerrors - Extract error strings from assuan.h
 #            and create C source for assuan_strerror
 #	Copyright (C) 2001 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
 # GnuPG 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.
 #
 # GnuPG 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/>.
 
 cat <<EOF
 /* Generated automatically by mkerrors */
 /* Do not edit! */
 
 #include <stdio.h>
 #include "keybox-defs.h"
 
 /**
  * keybox_strerror:
  * @err:  Error code
  *
- * This function returns a textual representaion of the given
+ * This function returns a textual representation of the given
  * errorcode. If this is an unknown value, a string with the value
  * is returned (Beware: it is hold in a static buffer).
  *
  * Return value: String with the error description.
  **/
 const char *
 keybox_strerror (KeyboxError err)
 {
   const char *s;
   static char buf[25];
 
   switch (err)
     {
 EOF
 
 awk '
 /KEYBOX_No_Error/    { okay=1 }
 !okay              {next}
 /}/                { exit 0 }
 /KEYBOX_[A-Za-z_]*/ { print_code($1) }
 
 
 function print_code( s )
 {
 printf "    case %s: s=\"", s ;
 gsub(/_/, " ", s );
 printf "%s\"; break;\n", tolower(substr(s,8));
 }
 '
 
 cat <<EOF
     default:  sprintf (buf, "ec=%d", err ); s=buf; break;
     }
 
   return s;
 }
 
 EOF
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 1661204c2..8ba24b71a 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -1,121 +1,121 @@
 # gpg-error.m4 - autoconf macro to detect libgpg-error.
 # Copyright (C) 2002, 2003, 2004, 2011, 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
 # modifications, as long as this notice is preserved.
 #
 # This file 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.
 #
 # Last-changed: 2014-10-02
 
 
 dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl
 dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
 dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS.  The _MT_ variants are
-dnl used for programs requireing real multi thread support.
+dnl used for programs requiring real multi thread support.
 dnl
 dnl If a prefix option is not used, the config script is first
 dnl searched in $SYSROOT/bin and then along $PATH.  If the used
 dnl config script does not match the host specification the script
 dnl is added to the gpg_config_script_warn variable.
 dnl
 AC_DEFUN([AM_PATH_GPG_ERROR],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
   gpg_error_config_prefix=""
   dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
   dnl since that is consistent with how our three siblings use the directory/
   dnl package name in --with-$dir_name-prefix=PFX.
   AC_ARG_WITH(libgpg-error-prefix,
               AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
                              [prefix where GPG Error is installed (optional)]),
               [gpg_error_config_prefix="$withval"])
 
   dnl Accept --with-gpg-error-prefix and make it work the same as
   dnl --with-libgpg-error-prefix above, for backwards compatibility,
   dnl but do not document this old, inconsistently-named option.
   AC_ARG_WITH(gpg-error-prefix,,
               [gpg_error_config_prefix="$withval"])
 
   if test x"${GPG_ERROR_CONFIG}" = x ; then
      if test x"${gpg_error_config_prefix}" != x ; then
         GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
      else
        case "${SYSROOT}" in
          /*)
            if test -x "${SYSROOT}/bin/gpg-error-config" ; then
              GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
            fi
            ;;
          '')
            ;;
           *)
            AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
            ;;
        esac
      fi
   fi
 
   AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
   min_gpg_error_version=ifelse([$1], ,0.0,$1)
   AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
   ok=no
   if test "$GPG_ERROR_CONFIG" != "no" \
      && test -f "$GPG_ERROR_CONFIG" ; then
     req_major=`echo $min_gpg_error_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_gpg_error_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
     major=`echo $gpg_error_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $gpg_error_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
     if test "$major" -gt "$req_major"; then
         ok=yes
     else
         if test "$major" -eq "$req_major"; then
             if test "$minor" -ge "$req_minor"; then
                ok=yes
             fi
         fi
     fi
   fi
   if test $ok = yes; then
     GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
     GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
     GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
     GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
     AC_MSG_RESULT([yes ($gpg_error_config_version)])
     ifelse([$2], , :, [$2])
     gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
     if test x"$gpg_error_config_host" != xnone ; then
       if test x"$gpg_error_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
 *** The config script $GPG_ERROR_CONFIG was
 *** built for $gpg_error_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-gpg-error-prefix
 *** to specify a matching config script or use \$SYSROOT.
 ***]])
         gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
       fi
     fi
   else
     GPG_ERROR_CFLAGS=""
     GPG_ERROR_LIBS=""
     GPG_ERROR_MT_CFLAGS=""
     GPG_ERROR_MT_LIBS=""
     AC_MSG_RESULT(no)
     ifelse([$3], , :, [$3])
   fi
   AC_SUBST(GPG_ERROR_CFLAGS)
   AC_SUBST(GPG_ERROR_LIBS)
   AC_SUBST(GPG_ERROR_MT_CFLAGS)
   AC_SUBST(GPG_ERROR_MT_LIBS)
 ])
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 3e14e6744..8cb49a391 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -1,123 +1,123 @@
 # ksba.m4 - autoconf macro to detect ksba
 #       Copyright (C) 2002 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
 # modifications, as long as this notice is preserved.
 #
 # This file 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.
 
 
 dnl AM_PATH_KSBA([MINIMUM-VERSION,
 dnl              [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionally prefixed
 dnl with the API version to also check the API compatibility. Example:
 dnl a MINIMUM-VERSION of 1:1.0.7 won't pass the test unless the installed
 dnl version of libksba is at least 1.0.7 *and* the API number is 1.  Using
 dnl this feature prevents building against newer versions of libksba
 dnl with a changed API.
 dnl
 AC_DEFUN([AM_PATH_KSBA],
 [AC_REQUIRE([AC_CANONICAL_HOST])
  AC_ARG_WITH(ksba-prefix,
             AC_HELP_STRING([--with-ksba-prefix=PFX],
                            [prefix where KSBA is installed (optional)]),
      ksba_config_prefix="$withval", ksba_config_prefix="")
   if test x$ksba_config_prefix != x ; then
      ksba_config_args="$ksba_config_args --prefix=$ksba_config_prefix"
      if test x${KSBA_CONFIG+set} != xset ; then
         KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
      fi
   fi
 
   AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
   tmp=ifelse([$1], ,1:1.0.0,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_ksba_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
      min_ksba_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
   else
      req_ksba_api=0
      min_ksba_version="$tmp"
   fi
 
   AC_MSG_CHECKING(for KSBA - version >= $min_ksba_version)
   ok=no
   if test "$KSBA_CONFIG" != "no" ; then
     req_major=`echo $min_ksba_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_ksba_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $min_ksba_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
     ksba_config_version=`$KSBA_CONFIG $ksba_config_args --version`
     major=`echo $ksba_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $ksba_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
     micro=`echo $ksba_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
     if test "$major" -gt "$req_major"; then
         ok=yes
     else
         if test "$major" -eq "$req_major"; then
             if test "$minor" -gt "$req_minor"; then
                ok=yes
             else
                if test "$minor" -eq "$req_minor"; then
                    if test "$micro" -ge "$req_micro"; then
                      ok=yes
                    fi
                fi
             fi
         fi
     fi
   fi
   if test $ok = yes; then
     AC_MSG_RESULT([yes ($ksba_config_version)])
   else
     AC_MSG_RESULT(no)
   fi
   if test $ok = yes; then
      # Even if we have a recent libksba, we should check that the
      # API is compatible.
      if test "$req_ksba_api" -gt 0 ; then
         tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
         if test "$tmp" -gt 0 ; then
            AC_MSG_CHECKING([KSBA API version])
            if test "$req_ksba_api" -eq "$tmp" ; then
              AC_MSG_RESULT(okay)
            else
              ok=no
              AC_MSG_RESULT([does not match.  want=$req_ksba_api got=$tmp.])
            fi
         fi
      fi
   fi
   if test $ok = yes; then
     KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags`
     KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs`
     ifelse([$2], , :, [$2])
     libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none`
     if test x"$libksba_config_host" != xnone ; then
       if test x"$libksba_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
 *** The config script $LIBKSBA_CONFIG was
 *** built for $libksba_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libksba-prefix
 *** to specify a matching config script.
 ***]])
       fi
     fi
   else
     KSBA_CFLAGS=""
     KSBA_LIBS=""
     ifelse([$3], , :, [$3])
   fi
   AC_SUBST(KSBA_CFLAGS)
   AC_SUBST(KSBA_LIBS)
 ])
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index d89fe1137..dd167f814 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -1,143 +1,143 @@
 # libgcrypt.m4 - Autoconf macros to detect libgcrypt
 # Copyright (C) 2002, 2003, 2004, 2011, 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
 # modifications, as long as this notice is preserved.
 #
 # This file 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.
 #
 # Last-changed: 2014-10-02
 
 
 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionally prefixed
 dnl with the API version to also check the API compatibility. Example:
 dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
 dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
 dnl this feature prevents building against newer versions of libgcrypt
 dnl with a changed API.
 dnl
 dnl If a prefix option is not used, the config script is first
 dnl searched in $SYSROOT/bin and then along $PATH.  If the used
 dnl config script does not match the host specification the script
 dnl is added to the gpg_config_script_warn variable.
 dnl
 AC_DEFUN([AM_PATH_LIBGCRYPT],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
   AC_ARG_WITH(libgcrypt-prefix,
             AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
                            [prefix where LIBGCRYPT is installed (optional)]),
      libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
   if test x"${LIBGCRYPT_CONFIG}" = x ; then
      if test x"${libgcrypt_config_prefix}" != x ; then
         LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
      else
        case "${SYSROOT}" in
          /*)
            if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
              LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
            fi
            ;;
          '')
            ;;
           *)
            AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
            ;;
        esac
      fi
   fi
 
   AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
   tmp=ifelse([$1], ,1:1.2.0,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
      min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
   else
      req_libgcrypt_api=0
      min_libgcrypt_version="$tmp"
   fi
 
   AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
   ok=no
   if test "$LIBGCRYPT_CONFIG" != "no" ; then
     req_major=`echo $min_libgcrypt_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_libgcrypt_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $min_libgcrypt_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
     libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
     major=`echo $libgcrypt_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $libgcrypt_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
     micro=`echo $libgcrypt_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
     if test "$major" -gt "$req_major"; then
         ok=yes
     else
         if test "$major" -eq "$req_major"; then
             if test "$minor" -gt "$req_minor"; then
                ok=yes
             else
                if test "$minor" -eq "$req_minor"; then
                    if test "$micro" -ge "$req_micro"; then
                      ok=yes
                    fi
                fi
             fi
         fi
     fi
   fi
   if test $ok = yes; then
     AC_MSG_RESULT([yes ($libgcrypt_config_version)])
   else
     AC_MSG_RESULT(no)
   fi
   if test $ok = yes; then
      # If we have a recent libgcrypt, we should also check that the
      # API is compatible
      if test "$req_libgcrypt_api" -gt 0 ; then
         tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
         if test "$tmp" -gt 0 ; then
            AC_MSG_CHECKING([LIBGCRYPT API version])
            if test "$req_libgcrypt_api" -eq "$tmp" ; then
              AC_MSG_RESULT([okay])
            else
              ok=no
              AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
            fi
         fi
      fi
   fi
   if test $ok = yes; then
     LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
     LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
     ifelse([$2], , :, [$2])
     libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
     if test x"$libgcrypt_config_host" != xnone ; then
       if test x"$libgcrypt_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
 *** The config script $LIBGCRYPT_CONFIG was
 *** built for $libgcrypt_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libgcrypt-prefix
 *** to specify a matching config script or use \$SYSROOT.
 ***]])
         gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
       fi
     fi
   else
     LIBGCRYPT_CFLAGS=""
     LIBGCRYPT_LIBS=""
     ifelse([$3], , :, [$3])
   fi
   AC_SUBST(LIBGCRYPT_CFLAGS)
   AC_SUBST(LIBGCRYPT_LIBS)
 ])
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index 0a30d9200..4a4b5da30 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.m4
@@ -1,137 +1,137 @@
 dnl Autoconf macros for NTBTLS
 dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; as a special exception the author gives
 dnl unlimited permission to copy and/or distribute it, with or without
 dnl modifications, as long as this notice is preserved.
 dnl
 dnl This file is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
 dnl AM_PATH_NTBTLS([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl
 dnl Test for NTBTLS and define NTBTLS_CFLAGS and NTBTLS_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionally prefixed
 dnl with the API version to also check the API compatibility. Example:
 dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
 dnl version of ntbtls is at least 1.2.5 *and* the API number is 1.  Using
 dnl this feature prevents building against newer versions of ntbtls
 dnl with a changed API.
 dnl
 AC_DEFUN([AM_PATH_NTBTLS],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
   AC_ARG_WITH(ntbtls-prefix,
             AC_HELP_STRING([--with-ntbtls-prefix=PFX],
                            [prefix where NTBTLS is installed (optional)]),
      ntbtls_config_prefix="$withval", ntbtls_config_prefix="")
   if test x"${NTBTLS_CONFIG}" = x ; then
      if test x"${ntbtls_config_prefix}" != x ; then
         NTBTLS_CONFIG="${ntbtls_config_prefix}/bin/ntbtls-config"
      else
        case "${SYSROOT}" in
          /*)
            if test -x "${SYSROOT}/bin/ntbtls-config" ; then
              NTBTLS_CONFIG="${SYSROOT}/bin/ntbtls-config"
            fi
            ;;
          '')
            ;;
           *)
            AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
            ;;
        esac
      fi
   fi
 
   AC_PATH_PROG(NTBTLS_CONFIG, ntbtls-config, no)
   tmp=ifelse([$1], ,1:1.0.0,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_ntbtls_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
      min_ntbtls_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
   else
      req_ntbtls_api=0
      min_ntbtls_version="$tmp"
   fi
 
   AC_MSG_CHECKING(for NTBTLS - version >= $min_ntbtls_version)
   ok=no
   if test "$NTBTLS_CONFIG" != "no" ; then
     req_major=`echo $min_ntbtls_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_ntbtls_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $min_ntbtls_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
     ntbtls_config_version=`$NTBTLS_CONFIG --version`
     major=`echo $ntbtls_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $ntbtls_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
     micro=`echo $ntbtls_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
     if test "$major" -gt "$req_major"; then
         ok=yes
     else
         if test "$major" -eq "$req_major"; then
             if test "$minor" -gt "$req_minor"; then
                ok=yes
             else
                if test "$minor" -eq "$req_minor"; then
                    if test "$micro" -ge "$req_micro"; then
                      ok=yes
                    fi
                fi
             fi
         fi
     fi
   fi
   if test $ok = yes; then
     AC_MSG_RESULT([yes ($ntbtls_config_version)])
   else
     AC_MSG_RESULT(no)
   fi
   if test $ok = yes; then
      # If we have a recent ntbtls, we should also check that the
      # API is compatible
      if test "$req_ntbtls_api" -gt 0 ; then
         tmp=`$NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
         if test "$tmp" -gt 0 ; then
            AC_MSG_CHECKING([NTBTLS API version])
            if test "$req_ntbtls_api" -eq "$tmp" ; then
              AC_MSG_RESULT([okay])
            else
              ok=no
              AC_MSG_RESULT([does not match. want=$req_ntbtls_api got=$tmp])
            fi
         fi
      fi
   fi
   if test $ok = yes; then
     NTBTLS_CFLAGS=`$NTBTLS_CONFIG --cflags`
     NTBTLS_LIBS=`$NTBTLS_CONFIG --libs`
     ifelse([$2], , :, [$2])
     ntbtls_config_host=`$NTBTLS_CONFIG --host 2>/dev/null || echo none`
     if test x"$ntbtls_config_host" != xnone ; then
       if test x"$ntbtls_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
 *** The config script $NTBTLS_CONFIG was
 *** built for $ntbtls_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-ntbtls-prefix
 *** to specify a matching config script or use \$SYSROOT.
 ***]])
         gpg_config_script_warn="$gpg_config_script_warn ntbtls"
       fi
     fi
   else
     NTBTLS_CFLAGS=""
     NTBTLS_LIBS=""
     ifelse([$3], , :, [$3])
   fi
   AC_SUBST(NTBTLS_CFLAGS)
   AC_SUBST(NTBTLS_LIBS)
 ])
diff --git a/sm/certchain.c b/sm/certchain.c
index 708e9371c..79d98c736 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -1,2154 +1,2154 @@
 /* certchain.c - certificate chain validation
  * Copyright (C) 2001, 2002, 2003, 2004, 2005,
  *               2006, 2007, 2008, 2011 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG 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.
  *
  * GnuPG 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 <https://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
 #include <stdarg.h>
 #include <assert.h>
 
 #include "gpgsm.h"
 #include <gcrypt.h>
 #include <ksba.h>
 
 #include "keydb.h"
 #include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */
 #include "../common/i18n.h"
 #include "../common/tlv.h"
 
 
 /* Object to keep track of certain root certificates. */
 struct marktrusted_info_s
 {
   struct marktrusted_info_s *next;
   unsigned char fpr[20];
 };
 static struct marktrusted_info_s *marktrusted_info;
 
 
 /* While running the validation function we want to keep track of the
    certificates in the chain.  This type is used for that.  */
 struct chain_item_s
 {
   struct chain_item_s *next;
   ksba_cert_t cert;      /* The certificate.  */
   int is_root;           /* The certificate is the root certificate.  */
 };
 typedef struct chain_item_s *chain_item_t;
 
 
 static int is_root_cert (ksba_cert_t cert,
                          const char *issuerdn, const char *subjectdn);
 static int get_regtp_ca_info (ctrl_t ctrl, ksba_cert_t cert, int *chainlen);
 
 
 /* This function returns true if we already asked during this session
    whether the root certificate CERT shall be marked as trusted.  */
 static int
 already_asked_marktrusted (ksba_cert_t cert)
 {
   unsigned char fpr[20];
   struct marktrusted_info_s *r;
 
   gpgsm_get_fingerprint (cert, GCRY_MD_SHA1, fpr, NULL);
   /* No context switches in the loop! */
   for (r=marktrusted_info; r; r= r->next)
     if (!memcmp (r->fpr, fpr, 20))
       return 1;
   return 0;
 }
 
 /* Flag certificate CERT as already asked whether it shall be marked
    as trusted.  */
 static void
 set_already_asked_marktrusted (ksba_cert_t cert)
 {
  unsigned char fpr[20];
  struct marktrusted_info_s *r;
 
  gpgsm_get_fingerprint (cert, GCRY_MD_SHA1, fpr, NULL);
  for (r=marktrusted_info; r; r= r->next)
    if (!memcmp (r->fpr, fpr, 20))
      return; /* Already marked. */
  r = xtrycalloc (1, sizeof *r);
  if (!r)
    return;
  memcpy (r->fpr, fpr, 20);
  r->next = marktrusted_info;
  marktrusted_info = r;
 }
 
 /* If LISTMODE is true, print FORMAT using LISTMODE to FP.  If
    LISTMODE is false, use the string to print an log_info or, if
    IS_ERROR is true, and log_error. */
 static void
 do_list (int is_error, int listmode, estream_t fp, const char *format, ...)
 {
   va_list arg_ptr;
 
   va_start (arg_ptr, format) ;
   if (listmode)
     {
       if (fp)
         {
           es_fputs ("  [", fp);
           es_vfprintf (fp, format, arg_ptr);
           es_fputs ("]\n", fp);
         }
     }
   else
     {
       log_logv (is_error? GPGRT_LOGLVL_ERROR: GPGRT_LOGLVL_INFO,
                 format, arg_ptr);
       log_printf ("\n");
     }
   va_end (arg_ptr);
 }
 
 /* Return 0 if A and B are equal. */
 static int
 compare_certs (ksba_cert_t a, ksba_cert_t b)
 {
   const unsigned char *img_a, *img_b;
   size_t len_a, len_b;
 
   img_a = ksba_cert_get_image (a, &len_a);
   if (!img_a)
     return 1;
   img_b = ksba_cert_get_image (b, &len_b);
   if (!img_b)
     return 1;
   return !(len_a == len_b && !memcmp (img_a, img_b, len_a));
 }
 
 
 /* Return true if CERT has the validityModel extensions and defines
    the use of the chain model.  */
 static int
 has_validation_model_chain (ksba_cert_t cert, int listmode, estream_t listfp)
 {
   gpg_error_t err;
   int idx, yes;
   const char *oid;
   size_t off, derlen, objlen, hdrlen;
   const unsigned char *der;
   int class, tag, constructed, ndef;
   char *oidbuf;
 
   for (idx=0; !(err=ksba_cert_get_extension (cert, idx,
                                              &oid, NULL, &off, &derlen));idx++)
     if (!strcmp (oid, "1.3.6.1.4.1.8301.3.5") )
       break;
   if (err)
     return 0; /* Not found.  */
   der = ksba_cert_get_image (cert, NULL);
   if (!der)
     {
       err = gpg_error (GPG_ERR_INV_OBJ); /* Oops  */
       goto leave;
     }
   der += off;
 
   err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > derlen || tag != TAG_SEQUENCE))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
   derlen = objlen;
   err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > derlen || tag != TAG_OBJECT_ID))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
   oidbuf = ksba_oid_to_str (der, objlen);
   if (!oidbuf)
     {
       err = gpg_error_from_syserror ();
       goto leave;
     }
 
   if (opt.verbose)
     do_list (0, listmode, listfp,
              _("validation model requested by certificate: %s"),
               !strcmp (oidbuf, "1.3.6.1.4.1.8301.3.5.1")? _("chain") :
               !strcmp (oidbuf, "1.3.6.1.4.1.8301.3.5.2")? _("shell") :
               /* */                                       oidbuf);
   yes = !strcmp (oidbuf, "1.3.6.1.4.1.8301.3.5.1");
   ksba_free (oidbuf);
   return yes;
 
 
  leave:
   log_error ("error parsing validityModel: %s\n", gpg_strerror (err));
   return 0;
 }
 
 
 
 static int
 unknown_criticals (ksba_cert_t cert, int listmode, estream_t fp)
 {
   static const char *known[] = {
     "2.5.29.15", /* keyUsage */
     "2.5.29.17", /* subjectAltName
                     Japanese DoCoMo certs mark them as critical.  PKIX
                     only requires them as critical if subjectName is
                     empty.  I don't know whether our code gracefully
                     handles such empry subjectNames but that is
                     another story. */
     "2.5.29.19", /* basic Constraints */
     "2.5.29.32", /* certificatePolicies */
     "2.5.29.37", /* extendedKeyUsage - handled by certlist.c */
     "1.3.6.1.4.1.8301.3.5", /* validityModel - handled here. */
     NULL
   };
   int rc = 0, i, idx, crit;
   const char *oid;
   gpg_error_t err;
   int unsupported;
   strlist_t sl;
 
   for (idx=0; !(err=ksba_cert_get_extension (cert, idx,
                                              &oid, &crit, NULL, NULL));idx++)
     {
       if (!crit)
         continue;
       for (i=0; known[i] && strcmp (known[i],oid); i++)
         ;
       unsupported = !known[i];
 
       /* If this critical extension is not supported.  Check the list
          of to be ignored extensions to see whether we claim that it
          is supported.  */
       if (unsupported && opt.ignored_cert_extensions)
         {
           for (sl=opt.ignored_cert_extensions;
                sl && strcmp (sl->d, oid); sl = sl->next)
             ;
           if (sl)
             unsupported = 0;
         }
       if (unsupported)
         {
           do_list (1, listmode, fp,
                    _("critical certificate extension %s is not supported"),
                    oid);
           rc = gpg_error (GPG_ERR_UNSUPPORTED_CERT);
         }
     }
   /* We ignore the error codes EOF as well as no-value. The later will
      occur for certificates with no extensions at all. */
   if (err
       && gpg_err_code (err) != GPG_ERR_EOF
       && gpg_err_code (err) != GPG_ERR_NO_VALUE)
     rc = err;
 
   return rc;
 }
 
 
 /* Check whether CERT is an allowed certificate.  This requires that
    CERT matches all requirements for such a CA, i.e. the
    BasicConstraints extension.  The function returns 0 on success and
    the allowed length of the chain at CHAINLEN. */
 static int
 allowed_ca (ctrl_t ctrl,
             ksba_cert_t cert, int *chainlen, int listmode, estream_t fp)
 {
   gpg_error_t err;
   int flag;
 
   err = ksba_cert_is_ca (cert, &flag, chainlen);
   if (err)
     return err;
   if (!flag)
     {
       if (get_regtp_ca_info (ctrl, cert, chainlen))
         {
           /* Note that dirmngr takes a different way to cope with such
              certs. */
           return 0; /* RegTP issued certificate. */
         }
 
       do_list (1, listmode, fp,_("issuer certificate is not marked as a CA"));
       return gpg_error (GPG_ERR_BAD_CA_CERT);
     }
   return 0;
 }
 
 
 static int
 check_cert_policy (ksba_cert_t cert, int listmode, estream_t fplist)
 {
   gpg_error_t err;
   char *policies;
   FILE *fp;
   int any_critical;
 
   err = ksba_cert_get_cert_policies (cert, &policies);
   if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     return 0; /* No policy given. */
   if (err)
     return err;
 
   /* STRING is a line delimited list of certificate policies as stored
      in the certificate.  The line itself is colon delimited where the
      first field is the OID of the policy and the second field either
      N or C for normal or critical extension */
 
   if (opt.verbose > 1 && !listmode)
     log_info ("certificate's policy list: %s\n", policies);
 
   /* The check is very minimal but won't give false positives */
   any_critical = !!strstr (policies, ":C");
 
   if (!opt.policy_file)
     {
       xfree (policies);
       if (any_critical)
         {
           do_list (1, listmode, fplist,
                    _("critical marked policy without configured policies"));
           return gpg_error (GPG_ERR_NO_POLICY_MATCH);
         }
       return 0;
     }
 
   fp = fopen (opt.policy_file, "r");
   if (!fp)
     {
       if (opt.verbose || errno != ENOENT)
         log_info (_("failed to open '%s': %s\n"),
                   opt.policy_file, strerror (errno));
       xfree (policies);
       /* With no critical policies this is only a warning */
       if (!any_critical)
         {
           if (!opt.quiet)
             do_list (0, listmode, fplist,
                      _("Note: non-critical certificate policy not allowed"));
           return 0;
         }
       do_list (1, listmode, fplist,
                _("certificate policy not allowed"));
       return gpg_error (GPG_ERR_NO_POLICY_MATCH);
     }
 
   for (;;)
     {
       int c;
       char *p, line[256];
       char *haystack, *allowed;
 
       /* read line */
       do
         {
           if (!fgets (line, DIM(line)-1, fp) )
             {
               gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
 
               xfree (policies);
               if (feof (fp))
                 {
                   fclose (fp);
                   /* With no critical policies this is only a warning */
                   if (!any_critical)
                     {
                       do_list (0, listmode, fplist,
                      _("Note: non-critical certificate policy not allowed"));
                       return 0;
                     }
                   do_list (1, listmode, fplist,
                            _("certificate policy not allowed"));
                   return gpg_error (GPG_ERR_NO_POLICY_MATCH);
                 }
               fclose (fp);
               return tmperr;
             }
 
           if (!*line || line[strlen(line)-1] != '\n')
             {
               /* eat until end of line */
               while ( (c=getc (fp)) != EOF && c != '\n')
                 ;
               fclose (fp);
               xfree (policies);
               return gpg_error (*line? GPG_ERR_LINE_TOO_LONG
                                      : GPG_ERR_INCOMPLETE_LINE);
             }
 
           /* Allow for empty lines and spaces */
           for (p=line; spacep (p); p++)
             ;
         }
       while (!*p || *p == '\n' || *p == '#');
 
       /* Parse line.  Note that the line has always a LF and spacep
          does not consider a LF a space.  Thus strpbrk will always
          succeed.  */
       for (allowed=line; spacep (allowed); allowed++)
         ;
       p = strpbrk (allowed, " :\n");
       if (!*p || p == allowed)
         {
           fclose (fp);
           xfree (policies);
           return gpg_error (GPG_ERR_CONFIGURATION);
         }
       *p = 0; /* strip the rest of the line */
       /* See whether we find ALLOWED (which is an OID) in POLICIES */
       for (haystack=policies; (p=strstr (haystack, allowed)); haystack = p+1)
         {
           if ( !(p == policies || p[-1] == '\n') )
             continue; /* Does not match the begin of a line. */
           if (p[strlen (allowed)] != ':')
             continue; /* The length does not match. */
           /* Yep - it does match so return okay. */
           fclose (fp);
           xfree (policies);
           return 0;
         }
     }
 }
 
 
 /* Helper function for find_up.  This resets the key handle and search
    for an issuer ISSUER with a subjectKeyIdentifier of KEYID.  Returns
    0 on success or -1 when not found. */
 static int
 find_up_search_by_keyid (ctrl_t ctrl, KEYDB_HANDLE kh,
                          const char *issuer, ksba_sexp_t keyid)
 {
   int rc;
   ksba_cert_t cert = NULL;
   ksba_sexp_t subj = NULL;
   int anyfound = 0;
   ksba_isotime_t not_before, last_not_before;
 
   keydb_search_reset (kh);
   while (!(rc = keydb_search_subject (ctrl, kh, issuer)))
     {
       ksba_cert_release (cert); cert = NULL;
       rc = keydb_get_cert (kh, &cert);
       if (rc)
         {
           log_error ("keydb_get_cert() failed: rc=%d\n", rc);
           rc = -1;
           break;
         }
       xfree (subj);
       if (!ksba_cert_get_subj_key_id (cert, NULL, &subj))
         {
           if (!cmp_simple_canon_sexp (keyid, subj))
             {
               /* Found matching cert. */
               rc = ksba_cert_get_validity (cert, 0, not_before);
               if (rc)
                 {
                   log_error ("keydb_get_validity() failed: rc=%d\n", rc);
                   rc = -1;
                   break;
                 }
 
               if (!anyfound || strcmp (last_not_before, not_before) < 0)
                 {
                   /* This certificate is the first one found or newer
                      than the previous one.  This copes with
                      re-issuing CA certificates while keeping the same
                      key information.  */
                   anyfound = 1;
                   gnupg_copy_time (last_not_before, not_before);
                   keydb_push_found_state (kh);
                 }
             }
         }
     }
 
   if (anyfound)
     {
       /* Take the last saved one.  */
       keydb_pop_found_state (kh);
       rc = 0;  /* Ignore EOF or other error after the first cert.  */
     }
 
   ksba_cert_release (cert);
   xfree (subj);
   return rc? -1:0;
 }
 
 
 struct find_up_store_certs_s
 {
   ctrl_t ctrl;
   int count;
 };
 
 static void
 find_up_store_certs_cb (void *cb_value, ksba_cert_t cert)
 {
   struct find_up_store_certs_s *parm = cb_value;
 
   if (keydb_store_cert (parm->ctrl, cert, 1, NULL))
     log_error ("error storing issuer certificate as ephemeral\n");
   parm->count++;
 }
 
 
 /* Helper for find_up().  Locate the certificate for ISSUER using an
    external lookup.  KH is the keydb context we are currently using.
    On success 0 is returned and the certificate may be retrieved from
    the keydb using keydb_get_cert().  KEYID is the keyIdentifier from
    the AKI or NULL.  */
 static int
 find_up_external (ctrl_t ctrl, KEYDB_HANDLE kh,
                   const char *issuer, ksba_sexp_t keyid)
 {
   int rc;
   strlist_t names = NULL;
   struct find_up_store_certs_s find_up_store_certs_parm;
   char *pattern;
   const char *s;
 
   find_up_store_certs_parm.ctrl = ctrl;
   find_up_store_certs_parm.count = 0;
 
   if (opt.verbose)
     log_info (_("looking up issuer at external location\n"));
   /* The Dirmngr process is confused about unknown attributes.  As a
      quick and ugly hack we locate the CN and use the issuer string
      starting at this attribite.  Fixme: we should have far better
      parsing for external lookups in the Dirmngr. */
   s = strstr (issuer, "CN=");
   if (!s || s == issuer || s[-1] != ',')
     s = issuer;
   pattern = xtrymalloc (strlen (s)+2);
   if (!pattern)
     return gpg_error_from_syserror ();
   strcpy (stpcpy (pattern, "/"), s);
   add_to_strlist (&names, pattern);
   xfree (pattern);
 
   rc = gpgsm_dirmngr_lookup (ctrl, names, 0, find_up_store_certs_cb,
                              &find_up_store_certs_parm);
   free_strlist (names);
 
   if (opt.verbose)
     log_info (_("number of issuers matching: %d\n"),
               find_up_store_certs_parm.count);
   if (rc)
     {
       log_error ("external key lookup failed: %s\n", gpg_strerror (rc));
       rc = -1;
     }
   else if (!find_up_store_certs_parm.count)
     rc = -1;
   else
     {
       int old;
       /* The issuers are currently stored in the ephemeral key DB, so
          we temporary switch to ephemeral mode. */
       old = keydb_set_ephemeral (kh, 1);
       if (keyid)
         rc = find_up_search_by_keyid (ctrl, kh, issuer, keyid);
       else
         {
           keydb_search_reset (kh);
           rc = keydb_search_subject (ctrl, kh, issuer);
         }
       keydb_set_ephemeral (kh, old);
     }
   return rc;
 }
 
 
 /* Helper for find_up().  Ask the dirmngr for the certificate for
    ISSUER with optional SERIALNO.  KH is the keydb context we are
    currently using.  With SUBJECT_MODE set, ISSUER is searched as the
    subject.  On success 0 is returned and the certificate is available
    in the ephemeral DB.  */
 static int
 find_up_dirmngr (ctrl_t ctrl, KEYDB_HANDLE kh,
                  ksba_sexp_t serialno, const char *issuer, int subject_mode)
 {
   int rc;
   strlist_t names = NULL;
   struct find_up_store_certs_s find_up_store_certs_parm;
   char *pattern;
 
   (void)kh;
 
   find_up_store_certs_parm.ctrl = ctrl;
   find_up_store_certs_parm.count = 0;
 
   if (opt.verbose)
     log_info (_("looking up issuer from the Dirmngr cache\n"));
   if (subject_mode)
     {
       pattern = xtrymalloc (strlen (issuer)+2);
       if (pattern)
         strcpy (stpcpy (pattern, "/"), issuer);
     }
   else if (serialno)
     pattern = gpgsm_format_sn_issuer (serialno, issuer);
   else
     {
       pattern = xtrymalloc (strlen (issuer)+3);
       if (pattern)
         strcpy (stpcpy (pattern, "#/"), issuer);
     }
   if (!pattern)
     return gpg_error_from_syserror ();
   add_to_strlist (&names, pattern);
   xfree (pattern);
 
   rc = gpgsm_dirmngr_lookup (ctrl, names, 1, find_up_store_certs_cb,
                              &find_up_store_certs_parm);
   free_strlist (names);
 
   if (opt.verbose)
     log_info (_("number of matching certificates: %d\n"),
               find_up_store_certs_parm.count);
   if (rc && !opt.quiet)
     log_info (_("dirmngr cache-only key lookup failed: %s\n"),
               gpg_strerror (rc));
   return (!rc && find_up_store_certs_parm.count)? 0 : -1;
 }
 
 
 
 /* Locate issuing certificate for CERT. ISSUER is the name of the
    issuer used as a fallback if the other methods don't work.  If
    FIND_NEXT is true, the function shall return the next possible
    issuer.  The certificate itself is not directly returned but a
    keydb_get_cert on the keyDb context KH will return it.  Returns 0
    on success, -1 if not found or an error code.  */
 static int
 find_up (ctrl_t ctrl, KEYDB_HANDLE kh,
          ksba_cert_t cert, const char *issuer, int find_next)
 {
   ksba_name_t authid;
   ksba_sexp_t authidno;
   ksba_sexp_t keyid;
   int rc = -1;
 
   if (DBG_X509)
     log_debug ("looking for parent certificate\n");
   if (!ksba_cert_get_auth_key_id (cert, &keyid, &authid, &authidno))
     {
       const char *s = ksba_name_enum (authid, 0);
       if (s && *authidno)
         {
           rc = keydb_search_issuer_sn (ctrl, kh, s, authidno);
           if (rc)
             keydb_search_reset (kh);
 
           if (!rc && DBG_X509)
             log_debug ("  found via authid and sn+issuer\n");
 
           /* In case of an error, try to get the certificate from the
              dirmngr.  That is done by trying to put that certificate
              into the ephemeral DB and let the code below do the
              actual retrieve.  Thus there is no error checking.
              Skipped in find_next mode as usual. */
           if (rc == -1 && !find_next)
             find_up_dirmngr (ctrl, kh, authidno, s, 0);
 
           /* In case of an error try the ephemeral DB.  We can't do
              that in find_next mode because we can't keep the search
              state then. */
           if (rc == -1 && !find_next)
             {
               int old = keydb_set_ephemeral (kh, 1);
               if (!old)
                 {
                   rc = keydb_search_issuer_sn (ctrl, kh, s, authidno);
                   if (rc)
                     keydb_search_reset (kh);
 
                   if (!rc && DBG_X509)
                     log_debug ("  found via authid and sn+issuer (ephem)\n");
                 }
               keydb_set_ephemeral (kh, old);
             }
           if (rc)
             rc = -1; /* Need to make sure to have this error code. */
         }
 
       if (rc == -1 && keyid && !find_next)
         {
           /* Not found by AIK.issuer_sn.  Lets try the AIK.ki
              instead. Loop over all certificates with that issuer as
              subject and stop for the one with a matching
              subjectKeyIdentifier. */
           /* Fixme: Should we also search in the dirmngr?  */
           rc = find_up_search_by_keyid (ctrl, kh, issuer, keyid);
           if (!rc && DBG_X509)
             log_debug ("  found via authid and keyid\n");
           if (rc)
             {
               int old = keydb_set_ephemeral (kh, 1);
               if (!old)
                 rc = find_up_search_by_keyid (ctrl, kh, issuer, keyid);
               if (!rc && DBG_X509)
                 log_debug ("  found via authid and keyid (ephem)\n");
               keydb_set_ephemeral (kh, old);
             }
           if (rc)
             rc = -1; /* Need to make sure to have this error code. */
         }
 
       /* If we still didn't found it, try to find it via the subject
          from the dirmngr-cache.  */
       if (rc == -1 && !find_next)
         {
           if (!find_up_dirmngr (ctrl, kh, NULL, issuer, 1))
             {
               int old = keydb_set_ephemeral (kh, 1);
               if (keyid)
                 rc = find_up_search_by_keyid (ctrl, kh, issuer, keyid);
               else
                 {
                   keydb_search_reset (kh);
                   rc = keydb_search_subject (ctrl, kh, issuer);
                 }
               keydb_set_ephemeral (kh, old);
             }
           if (rc)
             rc = -1; /* Need to make sure to have this error code. */
 
           if (!rc && DBG_X509)
             log_debug ("  found via authid and issuer from dirmngr cache\n");
         }
 
       /* If we still didn't found it, try an external lookup.  */
       if (rc == -1 && opt.auto_issuer_key_retrieve && !find_next)
         {
           rc = find_up_external (ctrl, kh, issuer, keyid);
           if (!rc && DBG_X509)
             log_debug ("  found via authid and external lookup\n");
         }
 
 
       /* Print a note so that the user does not feel too helpless when
          an issuer certificate was found and gpgsm prints BAD
          signature because it is not the correct one. */
       if (rc == -1 && opt.quiet)
         ;
       else if (rc == -1)
         {
           log_info ("%sissuer certificate ", find_next?"next ":"");
           if (keyid)
             {
               log_printf ("{");
               gpgsm_dump_serial (keyid);
               log_printf ("} ");
             }
           if (authidno)
             {
               log_printf ("(#");
               gpgsm_dump_serial (authidno);
               log_printf ("/");
               gpgsm_dump_string (s);
               log_printf (") ");
             }
           log_printf ("not found using authorityKeyIdentifier\n");
         }
       else if (rc)
         log_error ("failed to find authorityKeyIdentifier: rc=%d\n", rc);
       xfree (keyid);
       ksba_name_release (authid);
       xfree (authidno);
     }
 
   if (rc) /* Not found via authorithyKeyIdentifier, try regular issuer name. */
     rc = keydb_search_subject (ctrl, kh, issuer);
   if (rc == -1 && !find_next)
     {
       int old;
 
       /* Also try to get it from the Dirmngr cache.  The function
          merely puts it into the ephemeral database.  */
       find_up_dirmngr (ctrl, kh, NULL, issuer, 0);
 
       /* Not found, let us see whether we have one in the ephemeral key DB. */
       old = keydb_set_ephemeral (kh, 1);
       if (!old)
         {
           keydb_search_reset (kh);
           rc = keydb_search_subject (ctrl, kh, issuer);
         }
       keydb_set_ephemeral (kh, old);
 
       if (!rc && DBG_X509)
         log_debug ("  found via issuer\n");
     }
 
   /* Still not found.  If enabled, try an external lookup.  */
   if (rc == -1 && opt.auto_issuer_key_retrieve && !find_next)
     {
       rc = find_up_external (ctrl, kh, issuer, NULL);
       if (!rc && DBG_X509)
         log_debug ("  found via issuer and external lookup\n");
     }
 
   return rc;
 }
 
 
 /* Return the next certificate up in the chain starting at START.
    Returns -1 when there are no more certificates. */
 int
 gpgsm_walk_cert_chain (ctrl_t ctrl, ksba_cert_t start, ksba_cert_t *r_next)
 {
   int rc = 0;
   char *issuer = NULL;
   char *subject = NULL;
   KEYDB_HANDLE kh = keydb_new ();
 
   *r_next = NULL;
   if (!kh)
     {
       log_error (_("failed to allocate keyDB handle\n"));
       rc = gpg_error (GPG_ERR_GENERAL);
       goto leave;
     }
 
   issuer = ksba_cert_get_issuer (start, 0);
   subject = ksba_cert_get_subject (start, 0);
   if (!issuer)
     {
       log_error ("no issuer found in certificate\n");
       rc = gpg_error (GPG_ERR_BAD_CERT);
       goto leave;
     }
   if (!subject)
     {
       log_error ("no subject found in certificate\n");
       rc = gpg_error (GPG_ERR_BAD_CERT);
       goto leave;
     }
 
   if (is_root_cert (start, issuer, subject))
     {
       rc = -1; /* we are at the root */
       goto leave;
     }
 
   rc = find_up (ctrl, kh, start, issuer, 0);
   if (rc)
     {
       /* It is quite common not to have a certificate, so better don't
          print an error here.  */
       if (rc != -1 && opt.verbose > 1)
         log_error ("failed to find issuer's certificate: rc=%d\n", rc);
       rc = gpg_error (GPG_ERR_MISSING_ISSUER_CERT);
       goto leave;
     }
 
   rc = keydb_get_cert (kh, r_next);
   if (rc)
     {
       log_error ("keydb_get_cert() failed: rc=%d\n", rc);
       rc = gpg_error (GPG_ERR_GENERAL);
     }
 
  leave:
   xfree (issuer);
   xfree (subject);
   keydb_release (kh);
   return rc;
 }
 
 
 /* Helper for gpgsm_is_root_cert.  This one is used if the subject and
    issuer DNs are already known.  */
 static int
 is_root_cert (ksba_cert_t cert, const char *issuerdn, const char *subjectdn)
 {
   gpg_error_t err;
   int result = 0;
   ksba_sexp_t serialno;
   ksba_sexp_t ak_keyid;
   ksba_name_t ak_name;
   ksba_sexp_t ak_sn;
   const char *ak_name_str;
   ksba_sexp_t subj_keyid = NULL;
 
   if (!issuerdn || !subjectdn)
     return 0;  /* No.  */
 
   if (strcmp (issuerdn, subjectdn))
     return 0;  /* No.  */
 
   err = ksba_cert_get_auth_key_id (cert, &ak_keyid, &ak_name, &ak_sn);
   if (err)
     {
       if (gpg_err_code (err) == GPG_ERR_NO_DATA)
         return 1; /* Yes. Without a authorityKeyIdentifier this needs
                      to be the Root certificate (our trust anchor).  */
       log_error ("error getting authorityKeyIdentifier: %s\n",
                  gpg_strerror (err));
       return 0; /* Well, it is broken anyway.  Return No. */
     }
 
   serialno = ksba_cert_get_serial (cert);
   if (!serialno)
     {
       log_error ("error getting serialno: %s\n", gpg_strerror (err));
       goto leave;
     }
 
   /* Check whether the auth name's matches the issuer name+sn.  If
      that is the case this is a root certificate.  */
   ak_name_str = ksba_name_enum (ak_name, 0);
   if (ak_name_str
       && !strcmp (ak_name_str, issuerdn)
       && !cmp_simple_canon_sexp (ak_sn, serialno))
     {
       result = 1;  /* Right, CERT is self-signed.  */
       goto leave;
     }
 
   /* Similar for the ak_keyid. */
   if (ak_keyid && !ksba_cert_get_subj_key_id (cert, NULL, &subj_keyid)
       && !cmp_simple_canon_sexp (ak_keyid, subj_keyid))
     {
       result = 1;  /* Right, CERT is self-signed.  */
       goto leave;
     }
 
 
  leave:
   ksba_free (subj_keyid);
   ksba_free (ak_keyid);
   ksba_name_release (ak_name);
   ksba_free (ak_sn);
   ksba_free (serialno);
   return result;
 }
 
 
 
 /* Check whether the CERT is a root certificate.  Returns True if this
    is the case. */
 int
 gpgsm_is_root_cert (ksba_cert_t cert)
 {
   char *issuer;
   char *subject;
   int yes;
 
   issuer = ksba_cert_get_issuer (cert, 0);
   subject = ksba_cert_get_subject (cert, 0);
   yes = is_root_cert (cert, issuer, subject);
   xfree (issuer);
   xfree (subject);
   return yes;
 }
 
 
 /* This is a helper for gpgsm_validate_chain. */
 static gpg_error_t
 is_cert_still_valid (ctrl_t ctrl, int force_ocsp, int lm, estream_t fp,
                      ksba_cert_t subject_cert, ksba_cert_t issuer_cert,
                      int *any_revoked, int *any_no_crl, int *any_crl_too_old)
 {
   gpg_error_t err;
 
   if (ctrl->offline || (opt.no_crl_check && !ctrl->use_ocsp))
     {
       audit_log_ok (ctrl->audit, AUDIT_CRL_CHECK,
                     gpg_error (GPG_ERR_NOT_ENABLED));
       return 0;
     }
 
   err = gpgsm_dirmngr_isvalid (ctrl,
                                subject_cert, issuer_cert,
                                force_ocsp? 2 : !!ctrl->use_ocsp);
   audit_log_ok (ctrl->audit, AUDIT_CRL_CHECK, err);
 
   if (err)
     {
       if (!lm)
         gpgsm_cert_log_name (NULL, subject_cert);
       switch (gpg_err_code (err))
         {
         case GPG_ERR_CERT_REVOKED:
           do_list (1, lm, fp, _("certificate has been revoked"));
           *any_revoked = 1;
           /* Store that in the keybox so that key listings are able to
              return the revoked flag.  We don't care about error,
              though. */
           keydb_set_cert_flags (ctrl, subject_cert, 1, KEYBOX_FLAG_VALIDITY, 0,
                                 ~0, VALIDITY_REVOKED);
           break;
 
         case GPG_ERR_NO_CRL_KNOWN:
           do_list (1, lm, fp, _("no CRL found for certificate"));
           *any_no_crl = 1;
           break;
 
         case GPG_ERR_NO_DATA:
           do_list (1, lm, fp, _("the status of the certificate is unknown"));
           *any_no_crl = 1;
           break;
 
         case GPG_ERR_CRL_TOO_OLD:
           do_list (1, lm, fp, _("the available CRL is too old"));
           if (!lm)
             log_info (_("please make sure that the "
                         "\"dirmngr\" is properly installed\n"));
           *any_crl_too_old = 1;
           break;
 
         default:
           do_list (1, lm, fp, _("checking the CRL failed: %s"),
                    gpg_strerror (err));
           return err;
         }
     }
   return 0;
 }
 
 
 /* Helper for gpgsm_validate_chain to check the validity period of
    SUBJECT_CERT.  The caller needs to pass EXPTIME which will be
    updated to the nearest expiration time seen.  A DEPTH of 0 indicates
    the target certifciate, -1 the final root certificate and other
    values intermediate certificates. */
 static gpg_error_t
 check_validity_period (ksba_isotime_t current_time,
                        ksba_cert_t subject_cert,
                        ksba_isotime_t exptime,
                        int listmode, estream_t listfp, int depth)
 {
   gpg_error_t err;
   ksba_isotime_t not_before, not_after;
 
   err = ksba_cert_get_validity (subject_cert, 0, not_before);
   if (!err)
     err = ksba_cert_get_validity (subject_cert, 1, not_after);
   if (err)
     {
       do_list (1, listmode, listfp,
                _("certificate with invalid validity: %s"), gpg_strerror (err));
       return gpg_error (GPG_ERR_BAD_CERT);
     }
 
   if (*not_after)
     {
       if (!*exptime)
         gnupg_copy_time (exptime, not_after);
       else if (strcmp (not_after, exptime) < 0 )
         gnupg_copy_time (exptime, not_after);
     }
 
   if (*not_before && strcmp (current_time, not_before) < 0 )
     {
       do_list (1, listmode, listfp,
                depth ==  0 ? _("certificate not yet valid") :
                depth == -1 ? _("root certificate not yet valid") :
                /* other */   _("intermediate certificate not yet valid"));
       if (!listmode)
         {
           log_info ("  (valid from ");
           dump_isotime (not_before);
           log_printf (")\n");
         }
       return gpg_error (GPG_ERR_CERT_TOO_YOUNG);
     }
 
   if (*not_after && strcmp (current_time, not_after) > 0 )
     {
       do_list (opt.ignore_expiration?0:1, listmode, listfp,
                depth == 0  ? _("certificate has expired") :
                depth == -1 ? _("root certificate has expired") :
                /* other  */  _("intermediate certificate has expired"));
       if (!listmode)
         {
           log_info ("  (expired at ");
           dump_isotime (not_after);
           log_printf (")\n");
         }
       if (opt.ignore_expiration)
         log_info ("WARNING: ignoring expiration\n");
       else
         return gpg_error (GPG_ERR_CERT_EXPIRED);
     }
 
   return 0;
 }
 
 /* This is a variant of check_validity_period used with the chain
    model.  The extra constraint here is that notBefore and notAfter
    must exists and if the additional argument CHECK_TIME is given this
    time is used to check the validity period of SUBJECT_CERT.  */
 static gpg_error_t
 check_validity_period_cm (ksba_isotime_t current_time,
                           ksba_isotime_t check_time,
                           ksba_cert_t subject_cert,
                           ksba_isotime_t exptime,
                           int listmode, estream_t listfp, int depth)
 {
   gpg_error_t err;
   ksba_isotime_t not_before, not_after;
 
   err = ksba_cert_get_validity (subject_cert, 0, not_before);
   if (!err)
     err = ksba_cert_get_validity (subject_cert, 1, not_after);
   if (err)
     {
       do_list (1, listmode, listfp,
                _("certificate with invalid validity: %s"), gpg_strerror (err));
       return gpg_error (GPG_ERR_BAD_CERT);
     }
   if (!*not_before || !*not_after)
     {
       do_list (1, listmode, listfp,
                _("required certificate attributes missing: %s%s%s"),
                !*not_before? "notBefore":"",
                (!*not_before && !*not_after)? ", ":"",
                !*not_before? "notAfter":"");
       return gpg_error (GPG_ERR_BAD_CERT);
     }
   if (strcmp (not_before, not_after) > 0 )
     {
       do_list (1, listmode, listfp,
                _("certificate with invalid validity"));
       log_info ("  (valid from ");
       dump_isotime (not_before);
       log_printf (" expired at ");
       dump_isotime (not_after);
       log_printf (")\n");
       return gpg_error (GPG_ERR_BAD_CERT);
     }
 
   if (!*exptime)
     gnupg_copy_time (exptime, not_after);
   else if (strcmp (not_after, exptime) < 0 )
     gnupg_copy_time (exptime, not_after);
 
   if (strcmp (current_time, not_before) < 0 )
     {
       do_list (1, listmode, listfp,
                depth ==  0 ? _("certificate not yet valid") :
                depth == -1 ? _("root certificate not yet valid") :
                /* other */   _("intermediate certificate not yet valid"));
       if (!listmode)
         {
           log_info ("  (valid from ");
           dump_isotime (not_before);
           log_printf (")\n");
         }
       return gpg_error (GPG_ERR_CERT_TOO_YOUNG);
     }
 
   if (*check_time
       && (strcmp (check_time, not_before) < 0
           || strcmp (check_time, not_after) > 0))
     {
       /* Note that we don't need a case for the root certificate
-         because its own consitency has already been checked.  */
+         because its own consistency has already been checked.  */
       do_list(opt.ignore_expiration?0:1, listmode, listfp,
               depth == 0 ?
               _("signature not created during lifetime of certificate") :
               depth == 1 ?
               _("certificate not created during lifetime of issuer") :
               _("intermediate certificate not created during lifetime "
                 "of issuer"));
       if (!listmode)
         {
           log_info (depth== 0? _("  (  signature created at ") :
                     /* */      _("  (certificate created at ") );
           dump_isotime (check_time);
           log_printf (")\n");
           log_info (depth==0? _("  (certificate valid from ") :
                     /* */     _("  (     issuer valid from ") );
           dump_isotime (not_before);
           log_info (" to ");
           dump_isotime (not_after);
           log_printf (")\n");
         }
       if (opt.ignore_expiration)
         log_info ("WARNING: ignoring expiration\n");
       else
         return gpg_error (GPG_ERR_CERT_EXPIRED);
     }
 
   return 0;
 }
 
 
 
 /* Ask the user whether he wants to mark the certificate CERT trusted.
    Returns true if the CERT is the trusted.  We also check whether the
    agent is at all enabled to allow marktrusted and don't call it in
    this session again if it is not.  */
 static int
 ask_marktrusted (ctrl_t ctrl, ksba_cert_t cert, int listmode)
 {
   static int no_more_questions;
   int rc;
   char *fpr;
   int success = 0;
 
   fpr = gpgsm_get_fingerprint_string (cert, GCRY_MD_SHA1);
   log_info (_("fingerprint=%s\n"), fpr? fpr : "?");
   xfree (fpr);
 
   if (no_more_questions)
     rc = gpg_error (GPG_ERR_NOT_SUPPORTED);
   else
     rc = gpgsm_agent_marktrusted (ctrl, cert);
   if (!rc)
     {
       log_info (_("root certificate has now been marked as trusted\n"));
       success = 1;
     }
   else if (!listmode)
     {
       gpgsm_dump_cert ("issuer", cert);
       log_info ("after checking the fingerprint, you may want "
                 "to add it manually to the list of trusted certificates.\n");
     }
 
   if (gpg_err_code (rc) == GPG_ERR_NOT_SUPPORTED)
     {
       if (!no_more_questions)
         log_info (_("interactive marking as trusted "
                     "not enabled in gpg-agent\n"));
       no_more_questions = 1;
     }
   else if (gpg_err_code (rc) == GPG_ERR_CANCELED)
     {
       log_info (_("interactive marking as trusted "
                   "disabled for this session\n"));
       no_more_questions = 1;
     }
   else
     set_already_asked_marktrusted (cert);
 
   return success;
 }
 
 
 
 
 /* Validate a chain and optionally return the nearest expiration time
    in R_EXPTIME. With LISTMODE set to 1 a special listmode is
    activated where only information about the certificate is printed
    to LISTFP and no output is send to the usual log stream.  If
    CHECKTIME_ARG is set, it is used only in the chain model instead of the
    current time.
 
    Defined flag bits
 
    VALIDATE_FLAG_NO_DIRMNGR  - Do not do any dirmngr isvalid checks.
    VALIDATE_FLAG_CHAIN_MODEL - Check according to chain model.
    VALIDATE_FLAG_STEED       - Check according to the STEED model.
 */
 static int
 do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg,
                    ksba_isotime_t r_exptime,
                    int listmode, estream_t listfp, unsigned int flags,
                    struct rootca_flags_s *rootca_flags)
 {
   int rc = 0, depth, maxdepth;
   char *issuer = NULL;
   char *subject = NULL;
   KEYDB_HANDLE kh = NULL;
   ksba_cert_t subject_cert = NULL, issuer_cert = NULL;
   ksba_isotime_t current_time;
   ksba_isotime_t check_time;
   ksba_isotime_t exptime;
   int any_expired = 0;
   int any_revoked = 0;
   int any_no_crl = 0;
   int any_crl_too_old = 0;
   int any_no_policy_match = 0;
   int is_qualified = -1; /* Indicates whether the certificate stems
                             from a qualified root certificate.
                             -1 = unknown, 0 = no, 1 = yes. */
   chain_item_t chain = NULL; /* A list of all certificates in the chain.  */
 
 
   gnupg_get_isotime (current_time);
 
   if ( (flags & VALIDATE_FLAG_CHAIN_MODEL) )
     {
       if (!strcmp (checktime_arg, "19700101T000000"))
         {
           do_list (1, listmode, listfp,
                    _("WARNING: creation time of signature not known - "
                      "assuming current time"));
           gnupg_copy_time (check_time, current_time);
         }
       else
         gnupg_copy_time (check_time, checktime_arg);
     }
   else
     *check_time = 0;
 
   if (r_exptime)
     *r_exptime = 0;
   *exptime = 0;
 
   if (opt.no_chain_validation && !listmode)
     {
       log_info ("WARNING: bypassing certificate chain validation\n");
       return 0;
     }
 
   kh = keydb_new ();
   if (!kh)
     {
       log_error (_("failed to allocate keyDB handle\n"));
       rc = gpg_error (GPG_ERR_GENERAL);
       goto leave;
     }
 
   if (DBG_X509 && !listmode)
     gpgsm_dump_cert ("target", cert);
 
   subject_cert = cert;
   ksba_cert_ref (subject_cert);
   maxdepth = 50;
   depth = 0;
 
   for (;;)
     {
       int is_root;
       gpg_error_t istrusted_rc = -1;
 
       /* Put the certificate on our list.  */
       {
         chain_item_t ci;
 
         ci = xtrycalloc (1, sizeof *ci);
         if (!ci)
           {
             rc = gpg_error_from_syserror ();
             goto leave;
           }
         ksba_cert_ref (subject_cert);
         ci->cert = subject_cert;
         ci->next = chain;
         chain = ci;
       }
 
       xfree (issuer);
       xfree (subject);
       issuer = ksba_cert_get_issuer (subject_cert, 0);
       subject = ksba_cert_get_subject (subject_cert, 0);
 
       if (!issuer)
         {
           do_list (1, listmode, listfp,  _("no issuer found in certificate"));
           rc = gpg_error (GPG_ERR_BAD_CERT);
           goto leave;
         }
 
 
       /* Is this a self-issued certificate (i.e. the root certificate)?  */
       is_root = is_root_cert (subject_cert, issuer, subject);
       if (is_root)
         {
           chain->is_root = 1;
           /* Check early whether the certificate is listed as trusted.
              We used to do this only later but changed it to call the
              check right here so that we can access special flags
              associated with that specific root certificate.  */
           if (gpgsm_cert_has_well_known_private_key (subject_cert))
             {
               memset (rootca_flags, 0, sizeof *rootca_flags);
               istrusted_rc = ((flags & VALIDATE_FLAG_STEED)
                               ? 0 : gpg_error (GPG_ERR_NOT_TRUSTED));
             }
           else
             istrusted_rc = gpgsm_agent_istrusted (ctrl, subject_cert, NULL,
                                                   rootca_flags);
           audit_log_cert (ctrl->audit, AUDIT_ROOT_TRUSTED,
                           subject_cert, istrusted_rc);
           /* If the chain model extended attribute is used, make sure
              that our chain model flag is set. */
           if (!(flags & VALIDATE_FLAG_STEED)
               && has_validation_model_chain (subject_cert, listmode, listfp))
             rootca_flags->chain_model = 1;
         }
 
 
       /* Check the validity period. */
       if ( (flags & VALIDATE_FLAG_CHAIN_MODEL) )
         rc = check_validity_period_cm (current_time, check_time, subject_cert,
                                        exptime, listmode, listfp,
                                        (depth && is_root)? -1: depth);
       else
         rc = check_validity_period (current_time, subject_cert,
                                     exptime, listmode, listfp,
                                     (depth && is_root)? -1: depth);
       if (gpg_err_code (rc) == GPG_ERR_CERT_EXPIRED)
         any_expired = 1;
       else if (rc)
         goto leave;
 
 
       /* Assert that we understand all critical extensions. */
       rc = unknown_criticals (subject_cert, listmode, listfp);
       if (rc)
         goto leave;
 
       /* Do a policy check. */
       if (!opt.no_policy_check)
         {
           rc = check_cert_policy (subject_cert, listmode, listfp);
           if (gpg_err_code (rc) == GPG_ERR_NO_POLICY_MATCH)
             {
               any_no_policy_match = 1;
               rc = 1;  /* Be on the safe side and set RC.  */
             }
           else if (rc)
             goto leave;
         }
 
 
       /* If this is the root certificate we are at the end of the chain.  */
       if (is_root)
         {
           if (!istrusted_rc)
             ; /* No need to check the certificate for a trusted one. */
           else if (gpgsm_check_cert_sig (subject_cert, subject_cert) )
             {
               /* We only check the signature if the certificate is not
                  trusted for better diagnostics. */
               do_list (1, listmode, listfp,
                        _("self-signed certificate has a BAD signature"));
               if (DBG_X509)
                 {
                   gpgsm_dump_cert ("self-signing cert", subject_cert);
                 }
               rc = gpg_error (depth? GPG_ERR_BAD_CERT_CHAIN
                                    : GPG_ERR_BAD_CERT);
               goto leave;
             }
           if (!rootca_flags->relax)
             {
               rc = allowed_ca (ctrl, subject_cert, NULL, listmode, listfp);
               if (rc)
                 goto leave;
             }
 
 
           /* Set the flag for qualified signatures.  This flag is
              deduced from a list of root certificates allowed for
              qualified signatures. */
           if (is_qualified == -1 && !(flags & VALIDATE_FLAG_STEED))
             {
               gpg_error_t err;
               size_t buflen;
               char buf[1];
 
               if (!ksba_cert_get_user_data (cert, "is_qualified",
                                             &buf, sizeof (buf),
                                             &buflen) && buflen)
                 {
                   /* We already checked this for this certificate,
                      thus we simply take it from the user data. */
                   is_qualified = !!*buf;
                 }
               else
                 {
                   /* Need to consult the list of root certificates for
                      qualified signatures. */
                   err = gpgsm_is_in_qualified_list (ctrl, subject_cert, NULL);
                   if (!err)
                     is_qualified = 1;
                   else if ( gpg_err_code (err) == GPG_ERR_NOT_FOUND)
                     is_qualified = 0;
                   else
                     log_error ("checking the list of qualified "
                                "root certificates failed: %s\n",
                                gpg_strerror (err));
                   if ( is_qualified != -1 )
                     {
                       /* Cache the result but don't care too much
                          about an error. */
                       buf[0] = !!is_qualified;
                       err = ksba_cert_set_user_data (subject_cert,
                                                      "is_qualified", buf, 1);
                       if (err)
                         log_error ("set_user_data(is_qualified) failed: %s\n",
                                    gpg_strerror (err));
                     }
                 }
             }
 
 
           /* Act on the check for a trusted root certificates. */
           rc = istrusted_rc;
           if (!rc)
             ;
           else if (gpg_err_code (rc) == GPG_ERR_NOT_TRUSTED)
             {
               do_list (0, listmode, listfp,
                        _("root certificate is not marked trusted"));
               /* If we already figured out that the certificate is
                  expired it does not make much sense to ask the user
                  whether we wants to trust the root certificate.  We
                  should do this only if the certificate under question
                  will then be usable.  If the certificate has a well
                  known private key asking the user does not make any
                  sense.  */
               if ( !any_expired
                    && !gpgsm_cert_has_well_known_private_key (subject_cert)
                    && (!listmode || !already_asked_marktrusted (subject_cert))
                    && ask_marktrusted (ctrl, subject_cert, listmode) )
                 rc = 0;
             }
           else
             {
               log_error (_("checking the trust list failed: %s\n"),
                          gpg_strerror (rc));
             }
 
           if (rc)
             goto leave;
 
           /* Check for revocations etc. */
           if ((flags & VALIDATE_FLAG_NO_DIRMNGR))
             ;
           else if ((flags & VALIDATE_FLAG_STEED))
             ; /* Fixme: check revocations via DNS.  */
           else if (opt.no_trusted_cert_crl_check || rootca_flags->relax)
             ;
           else
             rc = is_cert_still_valid (ctrl,
                                       (flags & VALIDATE_FLAG_CHAIN_MODEL),
                                       listmode, listfp,
                                       subject_cert, subject_cert,
                                       &any_revoked, &any_no_crl,
                                       &any_crl_too_old);
           if (rc)
             goto leave;
 
           break;  /* Okay: a self-signed certificate is an end-point. */
         } /* End is_root.  */
 
 
       /* Take care that the chain does not get too long. */
       if ((depth+1) > maxdepth)
         {
           do_list (1, listmode, listfp, _("certificate chain too long\n"));
           rc = gpg_error (GPG_ERR_BAD_CERT_CHAIN);
           goto leave;
         }
 
       /* Find the next cert up the tree. */
       keydb_search_reset (kh);
       rc = find_up (ctrl, kh, subject_cert, issuer, 0);
       if (rc)
         {
           if (rc == -1)
             {
               do_list (0, listmode, listfp, _("issuer certificate not found"));
               if (!listmode)
                 {
                   log_info ("issuer certificate: #/");
                   gpgsm_dump_string (issuer);
                   log_printf ("\n");
                 }
             }
           else
             log_error ("failed to find issuer's certificate: rc=%d\n", rc);
           rc = gpg_error (GPG_ERR_MISSING_ISSUER_CERT);
           goto leave;
         }
 
       ksba_cert_release (issuer_cert); issuer_cert = NULL;
       rc = keydb_get_cert (kh, &issuer_cert);
       if (rc)
         {
           log_error ("keydb_get_cert() failed: rc=%d\n", rc);
           rc = gpg_error (GPG_ERR_GENERAL);
           goto leave;
         }
 
     try_another_cert:
       if (DBG_X509)
         {
           log_debug ("got issuer's certificate:\n");
           gpgsm_dump_cert ("issuer", issuer_cert);
         }
 
       rc = gpgsm_check_cert_sig (issuer_cert, subject_cert);
       if (rc)
         {
           do_list (0, listmode, listfp, _("certificate has a BAD signature"));
           if (DBG_X509)
             {
               gpgsm_dump_cert ("signing issuer", issuer_cert);
               gpgsm_dump_cert ("signed subject", subject_cert);
             }
           if (gpg_err_code (rc) == GPG_ERR_BAD_SIGNATURE)
             {
               /* We now try to find other issuer certificates which
                  might have been used.  This is required because some
                  CAs are reusing the issuer and subject DN for new
                  root certificates. */
               /* FIXME: Do this only if we don't have an
                  AKI.keyIdentifier */
               rc = find_up (ctrl, kh, subject_cert, issuer, 1);
               if (!rc)
                 {
                   ksba_cert_t tmp_cert;
 
                   rc = keydb_get_cert (kh, &tmp_cert);
                   if (rc || !compare_certs (issuer_cert, tmp_cert))
                     {
                       /* The find next did not work or returned an
                          identical certificate.  We better stop here
                          to avoid infinite checks. */
                       /* No need to set RC because it is not used:
                          rc = gpg_error (GPG_ERR_BAD_SIGNATURE);  */
                       ksba_cert_release (tmp_cert);
                     }
                   else
                     {
                       do_list (0, listmode, listfp,
                                _("found another possible matching "
                                  "CA certificate - trying again"));
                       ksba_cert_release (issuer_cert);
                       issuer_cert = tmp_cert;
                       goto try_another_cert;
                     }
                 }
             }
 
           /* We give a more descriptive error code than the one
              returned from the signature checking. */
           rc = gpg_error (GPG_ERR_BAD_CERT_CHAIN);
           goto leave;
         }
 
       is_root = gpgsm_is_root_cert (issuer_cert);
       istrusted_rc = -1;
 
 
       /* Check that a CA is allowed to issue certificates. */
       {
         int chainlen;
 
         rc = allowed_ca (ctrl, issuer_cert, &chainlen, listmode, listfp);
         if (rc)
           {
             /* Not allowed.  Check whether this is a trusted root
                certificate and whether we allow special exceptions.
                We could carry the result of the test over to the
                regular root check at the top of the loop but for
                clarity we won't do that.  Given that the majority of
                certificates carry proper BasicContraints our way of
                overriding an error in the way is justified for
                performance reasons. */
             if (is_root)
               {
                 if (gpgsm_cert_has_well_known_private_key (issuer_cert))
                   {
                     memset (rootca_flags, 0, sizeof *rootca_flags);
                     istrusted_rc = ((flags & VALIDATE_FLAG_STEED)
                                     ? 0 : gpg_error (GPG_ERR_NOT_TRUSTED));
                   }
                 else
                   istrusted_rc = gpgsm_agent_istrusted
                     (ctrl, issuer_cert, NULL, rootca_flags);
 
                 if (!istrusted_rc && rootca_flags->relax)
                   {
                     /* Ignore the error due to the relax flag.  */
                     rc = 0;
                     chainlen = -1;
                   }
               }
           }
         if (rc)
           goto leave;
         if (chainlen >= 0 && depth > chainlen)
           {
             do_list (1, listmode, listfp,
                      _("certificate chain longer than allowed by CA (%d)"),
                      chainlen);
             rc = gpg_error (GPG_ERR_BAD_CERT_CHAIN);
             goto leave;
           }
       }
 
       /* Is the certificate allowed to sign other certificates. */
       if (!listmode)
         {
           rc = gpgsm_cert_use_cert_p (issuer_cert);
           if (rc)
             {
               char numbuf[50];
               sprintf (numbuf, "%d", rc);
               gpgsm_status2 (ctrl, STATUS_ERROR, "certcert.issuer.keyusage",
                              numbuf, NULL);
               goto leave;
             }
         }
 
       /* Check for revocations etc.  Note that for a root certificate
          this test is done a second time later. This should eventually
          be fixed. */
       if ((flags & VALIDATE_FLAG_NO_DIRMNGR))
         rc = 0;
       else if ((flags & VALIDATE_FLAG_STEED))
         rc = 0; /* Fixme: XXX */
       else if (is_root && (opt.no_trusted_cert_crl_check
                            || (!istrusted_rc && rootca_flags->relax)))
         rc = 0;
       else
         rc = is_cert_still_valid (ctrl,
                                   (flags & VALIDATE_FLAG_CHAIN_MODEL),
                                   listmode, listfp,
                                   subject_cert, issuer_cert,
                                   &any_revoked, &any_no_crl, &any_crl_too_old);
       if (rc)
         goto leave;
 
 
       if (opt.verbose && !listmode)
         log_info (depth == 0 ? _("certificate is good\n") :
                   !is_root   ? _("intermediate certificate is good\n") :
                   /* other */  _("root certificate is good\n"));
 
       /* Under the chain model the next check time is the creation
          time of the subject certificate.  */
       if ( (flags & VALIDATE_FLAG_CHAIN_MODEL) )
         {
           rc = ksba_cert_get_validity (subject_cert, 0, check_time);
           if (rc)
             {
               /* That will never happen as we have already checked
                  this above.  */
               BUG ();
             }
         }
 
       /* For the next round the current issuer becomes the new subject.  */
       keydb_search_reset (kh);
       ksba_cert_release (subject_cert);
       subject_cert = issuer_cert;
       issuer_cert = NULL;
       depth++;
     } /* End chain traversal. */
 
   if (!listmode && !opt.quiet)
     {
       if (opt.no_policy_check)
         log_info ("policies not checked due to %s option\n",
                   "--disable-policy-checks");
       if (ctrl->offline || (opt.no_crl_check && !ctrl->use_ocsp))
         log_info ("CRLs not checked due to %s option\n",
                   ctrl->offline ? "offline" : "--disable-crl-checks");
     }
 
   if (!rc)
     { /* If we encountered an error somewhere during the checks, set
          the error code to the most critical one */
       if (any_revoked)
         rc = gpg_error (GPG_ERR_CERT_REVOKED);
       else if (any_expired)
         rc = gpg_error (GPG_ERR_CERT_EXPIRED);
       else if (any_no_crl)
         rc = gpg_error (GPG_ERR_NO_CRL_KNOWN);
       else if (any_crl_too_old)
         rc = gpg_error (GPG_ERR_CRL_TOO_OLD);
       else if (any_no_policy_match)
         rc = gpg_error (GPG_ERR_NO_POLICY_MATCH);
     }
 
  leave:
   /* If we have traversed a complete chain up to the root we will
      reset the ephemeral flag for all these certificates.  This is done
      regardless of any error because those errors may only be
      transient. */
   if (chain && chain->is_root)
     {
       gpg_error_t err;
       chain_item_t ci;
 
       for (ci = chain; ci; ci = ci->next)
         {
           /* Note that it is possible for the last certificate in the
              chain (i.e. our target certificate) that it has not yet
              been stored in the keybox and thus the flag can't be set.
              We ignore this error because it will later be stored
              anyway.  */
           err = keydb_set_cert_flags (ctrl, ci->cert, 1, KEYBOX_FLAG_BLOB, 0,
                                       KEYBOX_FLAG_BLOB_EPHEMERAL, 0);
           if (!ci->next && gpg_err_code (err) == GPG_ERR_NOT_FOUND)
             ;
           else if (err)
             log_error ("clearing ephemeral flag failed: %s\n",
                        gpg_strerror (err));
         }
     }
 
   /* If we have figured something about the qualified signature
      capability of the certificate under question, store the result as
      user data in all certificates of the chain.  We do this even if the
      validation itself failed.  */
   if (is_qualified != -1 && !(flags & VALIDATE_FLAG_STEED))
     {
       gpg_error_t err;
       chain_item_t ci;
       char buf[1];
 
       buf[0] = !!is_qualified;
 
       for (ci = chain; ci; ci = ci->next)
         {
           err = ksba_cert_set_user_data (ci->cert, "is_qualified", buf, 1);
           if (err)
             {
               log_error ("set_user_data(is_qualified) failed: %s\n",
                          gpg_strerror (err));
               if (!rc)
                 rc = err;
             }
         }
     }
 
   /* If auditing has been enabled, record what is in the chain.  */
   if (ctrl->audit)
     {
       chain_item_t ci;
 
       audit_log (ctrl->audit, AUDIT_CHAIN_BEGIN);
       for (ci = chain; ci; ci = ci->next)
         {
           audit_log_cert (ctrl->audit,
                           ci->is_root? AUDIT_CHAIN_ROOTCERT : AUDIT_CHAIN_CERT,
                           ci->cert, 0);
         }
       audit_log (ctrl->audit, AUDIT_CHAIN_END);
     }
 
   if (r_exptime)
     gnupg_copy_time (r_exptime, exptime);
   xfree (issuer);
   xfree (subject);
   keydb_release (kh);
   while (chain)
     {
       chain_item_t ci_next = chain->next;
       ksba_cert_release (chain->cert);
       xfree (chain);
       chain = ci_next;
     }
   ksba_cert_release (issuer_cert);
   ksba_cert_release (subject_cert);
   return rc;
 }
 
 
 /* Validate a certificate chain.  For a description see
    do_validate_chain.  This function is a wrapper to handle a root
    certificate with the chain_model flag set.  If RETFLAGS is not
    NULL, flags indicating now the verification was done are stored
    there.  The only defined vits for RETFLAGS are
    VALIDATE_FLAG_CHAIN_MODEL and VALIDATE_FLAG_STEED.
 
    If you are verifying a signature you should set CHECKTIME to the
    creation time of the signature.  If your are verifying a
    certificate, set it nil (i.e. the empty string).  If the creation
    date of the signature is not known use the special date
    "19700101T000000" which is treated in a special way here. */
 int
 gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime,
                       ksba_isotime_t r_exptime,
                       int listmode, estream_t listfp, unsigned int flags,
                       unsigned int *retflags)
 {
   int rc;
   struct rootca_flags_s rootca_flags;
   unsigned int dummy_retflags;
 
   if (!retflags)
     retflags = &dummy_retflags;
 
   /* If the session requested a certain validation mode make sure the
      corresponding flags are set.  */
   if (ctrl->validation_model == 1)
     flags |= VALIDATE_FLAG_CHAIN_MODEL;
   else if (ctrl->validation_model == 2)
     flags |= VALIDATE_FLAG_STEED;
 
   /* If the chain model was forced, set this immediately into
      RETFLAGS.  */
   *retflags = (flags & VALIDATE_FLAG_CHAIN_MODEL);
 
   memset (&rootca_flags, 0, sizeof rootca_flags);
 
   rc = do_validate_chain (ctrl, cert, checktime,
                           r_exptime, listmode, listfp, flags,
                           &rootca_flags);
   if (!rc && (flags & VALIDATE_FLAG_STEED))
     {
       *retflags |= VALIDATE_FLAG_STEED;
     }
   else if (gpg_err_code (rc) == GPG_ERR_CERT_EXPIRED
       && !(flags & VALIDATE_FLAG_CHAIN_MODEL)
       && (rootca_flags.valid && rootca_flags.chain_model))
     {
       do_list (0, listmode, listfp, _("switching to chain model"));
       rc = do_validate_chain (ctrl, cert, checktime,
                               r_exptime, listmode, listfp,
                               (flags |= VALIDATE_FLAG_CHAIN_MODEL),
                               &rootca_flags);
       *retflags |= VALIDATE_FLAG_CHAIN_MODEL;
     }
 
   if (opt.verbose)
     do_list (0, listmode, listfp, _("validation model used: %s"),
              (*retflags & VALIDATE_FLAG_STEED)?
              "steed" :
              (*retflags & VALIDATE_FLAG_CHAIN_MODEL)?
              _("chain"):_("shell"));
 
   return rc;
 }
 
 
 /* Check that the given certificate is valid but DO NOT check any
    constraints.  We assume that the issuers certificate is already in
    the DB and that this one is valid; which it should be because it
    has been checked using this function. */
 int
 gpgsm_basic_cert_check (ctrl_t ctrl, ksba_cert_t cert)
 {
   int rc = 0;
   char *issuer = NULL;
   char *subject = NULL;
   KEYDB_HANDLE kh;
   ksba_cert_t issuer_cert = NULL;
 
   if (opt.no_chain_validation)
     {
       log_info ("WARNING: bypassing basic certificate checks\n");
       return 0;
     }
 
   kh = keydb_new ();
   if (!kh)
     {
       log_error (_("failed to allocate keyDB handle\n"));
       rc = gpg_error (GPG_ERR_GENERAL);
       goto leave;
     }
 
   issuer = ksba_cert_get_issuer (cert, 0);
   subject = ksba_cert_get_subject (cert, 0);
   if (!issuer)
     {
       log_error ("no issuer found in certificate\n");
       rc = gpg_error (GPG_ERR_BAD_CERT);
       goto leave;
     }
 
   if (is_root_cert (cert, issuer, subject))
     {
       rc = gpgsm_check_cert_sig (cert, cert);
       if (rc)
         {
           log_error ("self-signed certificate has a BAD signature: %s\n",
                      gpg_strerror (rc));
           if (DBG_X509)
             {
               gpgsm_dump_cert ("self-signing cert", cert);
             }
           rc = gpg_error (GPG_ERR_BAD_CERT);
           goto leave;
         }
     }
   else
     {
       /* Find the next cert up the tree. */
       keydb_search_reset (kh);
       rc = find_up (ctrl, kh, cert, issuer, 0);
       if (rc)
         {
           if (rc == -1)
             {
               log_info ("issuer certificate (#/");
               gpgsm_dump_string (issuer);
               log_printf (") not found\n");
             }
           else
             log_error ("failed to find issuer's certificate: rc=%d\n", rc);
           rc = gpg_error (GPG_ERR_MISSING_ISSUER_CERT);
           goto leave;
         }
 
       ksba_cert_release (issuer_cert); issuer_cert = NULL;
       rc = keydb_get_cert (kh, &issuer_cert);
       if (rc)
         {
           log_error ("keydb_get_cert() failed: rc=%d\n", rc);
           rc = gpg_error (GPG_ERR_GENERAL);
           goto leave;
         }
 
       rc = gpgsm_check_cert_sig (issuer_cert, cert);
       if (rc)
         {
           log_error ("certificate has a BAD signature: %s\n",
                      gpg_strerror (rc));
           if (DBG_X509)
             {
               gpgsm_dump_cert ("signing issuer", issuer_cert);
               gpgsm_dump_cert ("signed subject", cert);
             }
           rc = gpg_error (GPG_ERR_BAD_CERT);
           goto leave;
         }
       if (opt.verbose)
         log_info (_("certificate is good\n"));
     }
 
  leave:
   xfree (issuer);
   xfree (subject);
   keydb_release (kh);
   ksba_cert_release (issuer_cert);
   return rc;
 }
 
 
 
 /* Check whether the certificate CERT has been issued by the German
    authority for qualified signature.  They do not set the
    basicConstraints and thus we need this workaround.  It works by
    looking up the root certificate and checking whether that one is
    listed as a qualified certificate for Germany.
 
    We also try to cache this data but as long as don't keep a
    reference to the certificate this won't be used.
 
    Returns: True if CERT is a RegTP issued CA cert (i.e. the root
    certificate itself or one of the CAs).  In that case CHAINLEN will
    receive the length of the chain which is either 0 or 1.
 */
 static int
 get_regtp_ca_info (ctrl_t ctrl, ksba_cert_t cert, int *chainlen)
 {
   gpg_error_t err;
   ksba_cert_t next;
   int rc = 0;
   int i, depth;
   char country[3];
   ksba_cert_t array[4];
   char buf[2];
   size_t buflen;
   int dummy_chainlen;
 
   if (!chainlen)
     chainlen = &dummy_chainlen;
 
   *chainlen = 0;
   err = ksba_cert_get_user_data (cert, "regtp_ca_chainlen",
                                  &buf, sizeof (buf), &buflen);
   if (!err)
     {
       /* Got info. */
       if (buflen < 2 || !*buf)
         return 0; /* Nothing found. */
       *chainlen = buf[1];
       return 1; /* This is a regtp CA. */
     }
   else if (gpg_err_code (err) != GPG_ERR_NOT_FOUND)
     {
       log_error ("ksba_cert_get_user_data(%s) failed: %s\n",
                  "regtp_ca_chainlen", gpg_strerror (err));
       return 0; /* Nothing found.  */
     }
 
   /* Need to gather the info.  This requires to walk up the chain
      until we have found the root.  Because we are only interested in
      German Bundesnetzagentur (former RegTP) derived certificates 3
      levels are enough.  (The German signature law demands a 3 tier
      hierarchy; thus there is only one CA between the EE and the Root
      CA.)  */
   memset (&array, 0, sizeof array);
 
   depth = 0;
   ksba_cert_ref (cert);
   array[depth++] = cert;
   ksba_cert_ref (cert);
   while (depth < DIM(array) && !(rc=gpgsm_walk_cert_chain (ctrl, cert, &next)))
     {
       ksba_cert_release (cert);
       ksba_cert_ref (next);
       array[depth++] = next;
       cert = next;
     }
   ksba_cert_release (cert);
   if (rc != -1 || !depth || depth == DIM(array) )
     {
       /* We did not reached the root. */
       goto leave;
     }
 
   /* If this is a German signature law issued certificate, we store
      additional information. */
   if (!gpgsm_is_in_qualified_list (NULL, array[depth-1], country)
       && !strcmp (country, "de"))
     {
       /* Setting the pathlen for the root CA and the CA flag for the
          next one is all what we need to do. */
       err = ksba_cert_set_user_data (array[depth-1], "regtp_ca_chainlen",
                                      "\x01\x01", 2);
       if (!err && depth > 1)
         err = ksba_cert_set_user_data (array[depth-2], "regtp_ca_chainlen",
                                        "\x01\x00", 2);
       if (err)
         log_error ("ksba_set_user_data(%s) failed: %s\n",
                    "regtp_ca_chainlen", gpg_strerror (err));
       for (i=0; i < depth; i++)
         ksba_cert_release (array[i]);
       *chainlen = (depth>1? 0:1);
       return 1;
     }
 
  leave:
   /* Nothing special with this certificate. Mark the target
      certificate anyway to avoid duplicate lookups. */
   err = ksba_cert_set_user_data (cert, "regtp_ca_chainlen", "", 1);
   if (err)
     log_error ("ksba_set_user_data(%s) failed: %s\n",
                "regtp_ca_chainlen", gpg_strerror (err));
   for (i=0; i < depth; i++)
     ksba_cert_release (array[i]);
   return 0;
 }
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index 1f015e9e7..dee5d5d47 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -1,494 +1,494 @@
 /* gpg-check-pattern.c - A tool to check passphrases against pattern.
  * Copyright (C) 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG 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.
  *
  * GnuPG 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 <https://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
 #ifdef HAVE_LANGINFO_CODESET
 # include <langinfo.h>
 #endif
 #ifdef HAVE_DOSISH_SYSTEM
 # include <fcntl.h> /* for setmode() */
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <ctype.h>
 
 #include "../common/util.h"
 #include "../common/i18n.h"
 #include "../common/sysutils.h"
 #include "../common/init.h"
 
 
 enum cmd_and_opt_values
 { aNull = 0,
   oVerbose	  = 'v',
   oArmor          = 'a',
   oPassphrase     = 'P',
 
   oProtect        = 'p',
   oUnprotect      = 'u',
   oNull           = '0',
 
   oNoVerbose = 500,
   oCheck,
 
   oHomedir
 };
 
 
 /* The list of commands and options.  */
 static ARGPARSE_OPTS opts[] = {
 
   { 301, NULL, 0, N_("@Options:\n ") },
 
   { oVerbose, "verbose",   0, "verbose" },
 
   { oHomedir, "homedir", 2, "@" },
   { oCheck,   "check", 0,  "run only a syntax check on the patternfile" },
   { oNull,    "null", 0,   "input is expected to be null delimited" },
 
   ARGPARSE_end ()
 };
 
 
 /* Global options are accessed through the usual OPT structure. */
 static struct
 {
   int verbose;
   const char *homedir;
   int checkonly;
   int null;
 } opt;
 
 
 enum {
   PAT_NULL,    /* Indicates end of the array.  */
   PAT_STRING,  /* The pattern is a simple string.  */
-  PAT_REGEX    /* The pattern is an extended regualar expression. */
+  PAT_REGEX    /* The pattern is an extended regular expression. */
 };
 
 
 /* An object to decibe an item of our pattern table. */
 struct pattern_s
 {
   int type;
   unsigned int lineno;     /* Line number of the pattern file.  */
   union {
     struct {
       const char *string;  /* Pointer to the actual string (nul termnated).  */
       size_t length;       /* The length of this string (strlen).  */
     } s; /*PAT_STRING*/
     struct {
       /* We allocate the regex_t because this type is larger than what
          we need for PAT_STRING and we expect only a few regex in a
          patternfile.  It would be a waste of core to have so many
          unused stuff in the table.  */
       regex_t *regex;
     } r; /*PAT_REGEX*/
   } u;
 };
 typedef struct pattern_s pattern_t;
 
 
 
 /*** Local prototypes ***/
 static char *read_file (const char *fname, size_t *r_length);
 static pattern_t *parse_pattern_file (char *data, size_t datalen);
 static void process (FILE *fp, pattern_t *patarray);
 
 
 
 
 /* Info function for usage().  */
 static const char *
 my_strusage (int level)
 {
   const char *p;
   switch (level)
     {
     case 11: p = "gpg-check-pattern (@GnuPG@)";
       break;
     case 13: p = VERSION; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
     case 1:
     case 40:
       p =  _("Usage: gpg-check-pattern [options] patternfile (-h for help)\n");
       break;
     case 41:
       p =  _("Syntax: gpg-check-pattern [options] patternfile\n"
              "Check a passphrase given on stdin against the patternfile\n");
     break;
 
     default: p = NULL;
     }
   return p;
 }
 
 
 int
 main (int argc, char **argv )
 {
   ARGPARSE_ARGS pargs;
   char *raw_pattern;
   size_t raw_pattern_length;
   pattern_t *patternarray;
 
   early_system_init ();
   set_strusage (my_strusage);
   gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
   log_set_prefix ("gpg-check-pattern", GPGRT_LOG_WITH_PREFIX);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init ();
   init_common_subsystems (&argc, &argv);
 
   setup_libgcrypt_logging ();
   gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0);
 
   pargs.argc = &argc;
   pargs.argv = &argv;
   pargs.flags=  1;  /* (do not remove the args) */
   while (arg_parse (&pargs, opts) )
     {
       switch (pargs.r_opt)
         {
         case oVerbose: opt.verbose++; break;
         case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
         case oCheck: opt.checkonly = 1; break;
         case oNull: opt.null = 1; break;
 
         default : pargs.err = 2; break;
 	}
     }
   if (log_get_errorcount(0))
     exit (2);
 
   if (argc != 1)
     usage (1);
 
   /* We read the entire pattern file into our memory and parse it
      using a separate function.  This allows us to eventual do the
      reading while running setuid so that the pattern file can be
      hidden from regular users.  I am not sure whether this makes
      sense, but lets be prepared for it.  */
   raw_pattern = read_file (*argv, &raw_pattern_length);
   if (!raw_pattern)
     exit (2);
 
   patternarray = parse_pattern_file (raw_pattern, raw_pattern_length);
   if (!patternarray)
     exit (1);
   if (opt.checkonly)
     return 0;
 
 #ifdef HAVE_DOSISH_SYSTEM
   setmode (fileno (stdin) , O_BINARY );
 #endif
   process (stdin, patternarray);
 
   return log_get_errorcount(0)? 1 : 0;
 }
 
 
 
 /* Read a file FNAME into a buffer and return that malloced buffer.
    Caller must free the buffer.  On error NULL is returned, on success
    the valid length of the buffer is stored at R_LENGTH.  The returned
    buffer is guarnteed to be nul terminated.  */
 static char *
 read_file (const char *fname, size_t *r_length)
 {
   FILE *fp;
   char *buf;
   size_t buflen;
 
   if (!strcmp (fname, "-"))
     {
       size_t nread, bufsize = 0;
 
       fp = stdin;
 #ifdef HAVE_DOSISH_SYSTEM
       setmode ( fileno(fp) , O_BINARY );
 #endif
       buf = NULL;
       buflen = 0;
 #define NCHUNK 8192
       do
         {
           bufsize += NCHUNK;
           if (!buf)
             buf = xmalloc (bufsize+1);
           else
             buf = xrealloc (buf, bufsize+1);
 
           nread = fread (buf+buflen, 1, NCHUNK, fp);
           if (nread < NCHUNK && ferror (fp))
             {
               log_error ("error reading '[stdin]': %s\n", strerror (errno));
               xfree (buf);
               return NULL;
             }
           buflen += nread;
         }
       while (nread == NCHUNK);
 #undef NCHUNK
 
     }
   else
     {
       struct stat st;
 
       fp = fopen (fname, "rb");
       if (!fp)
         {
           log_error ("can't open '%s': %s\n", fname, strerror (errno));
           return NULL;
         }
 
       if (fstat (fileno(fp), &st))
         {
           log_error ("can't stat '%s': %s\n", fname, strerror (errno));
           fclose (fp);
           return NULL;
         }
 
       buflen = st.st_size;
       buf = xmalloc (buflen+1);
       if (fread (buf, buflen, 1, fp) != 1)
         {
           log_error ("error reading '%s': %s\n", fname, strerror (errno));
           fclose (fp);
           xfree (buf);
           return NULL;
         }
       fclose (fp);
     }
   buf[buflen] = 0;
   *r_length = buflen;
   return buf;
 }
 
 
 
 static char *
 get_regerror (int errcode, regex_t *compiled)
 {
   size_t length = regerror (errcode, compiled, NULL, 0);
   char *buffer = xmalloc (length);
   regerror (errcode, compiled, buffer, length);
   return buffer;
 }
 
 /* Parse the pattern given in the memory aread DATA/DATALEN and return
    a new pattern array.  The end of the array is indicated by a NULL
    entry.  On error an error message is printed and the function
    returns NULL.  Note that the function modifies DATA and assumes
    that data is nul terminated (even if this is one byte past
    DATALEN).  */
 static pattern_t *
 parse_pattern_file (char *data, size_t datalen)
 {
   char *p, *p2;
   size_t n;
   pattern_t *array;
   size_t arraysize, arrayidx;
   unsigned int lineno = 0;
 
   /* Estimate the number of entries by counting the non-comment lines.  */
   arraysize = 0;
   p = data;
   for (n = datalen; n && (p2 = memchr (p, '\n', n)); p2++, n -= p2 - p, p = p2)
     if (*p != '#')
       arraysize++;
   arraysize += 2; /* For the terminating NULL and a last line w/o a LF.  */
 
   array = xcalloc (arraysize, sizeof *array);
   arrayidx = 0;
 
   /* Loop over all lines.  */
   while (datalen && data)
     {
       lineno++;
       p = data;
       p2 = data = memchr (p, '\n', datalen);
       if (p2)
         {
           *data++ = 0;
           datalen -= data - p;
         }
       else
         p2 = p + datalen;
       assert (!*p2);
       p2--;
       while (isascii (*p) && isspace (*p))
         p++;
       if (*p == '#')
         continue;
       while (p2 > p && isascii (*p2) && isspace (*p2))
         *p2-- = 0;
       if (!*p)
         continue;
       assert (arrayidx < arraysize);
       array[arrayidx].lineno = lineno;
       if (*p == '/')
         {
           int rerr;
 
           p++;
           array[arrayidx].type = PAT_REGEX;
           if (*p && p[strlen(p)-1] == '/')
             p[strlen(p)-1] = 0;  /* Remove optional delimiter.  */
           array[arrayidx].u.r.regex = xcalloc (1, sizeof (regex_t));
           rerr = regcomp (array[arrayidx].u.r.regex, p,
                           REG_ICASE|REG_NOSUB|REG_EXTENDED);
           if (rerr)
             {
               char *rerrbuf = get_regerror (rerr, array[arrayidx].u.r.regex);
               log_error ("invalid r.e. at line %u: %s\n", lineno, rerrbuf);
               xfree (rerrbuf);
               if (!opt.checkonly)
                 exit (1);
             }
         }
       else
         {
           array[arrayidx].type = PAT_STRING;
           array[arrayidx].u.s.string = p;
           array[arrayidx].u.s.length = strlen (p);
         }
       arrayidx++;
     }
   assert (arrayidx < arraysize);
   array[arrayidx].type = PAT_NULL;
 
   return array;
 }
 
 
 /* Check whether string macthes any of the pattern in PATARRAY and
    returns the matching pattern item or NULL.  */
 static pattern_t *
 match_p (const char *string, pattern_t *patarray)
 {
   pattern_t *pat;
 
   if (!*string)
     {
       if (opt.verbose)
         log_info ("zero length input line - ignored\n");
       return NULL;
     }
 
   for (pat = patarray; pat->type != PAT_NULL; pat++)
     {
       if (pat->type == PAT_STRING)
         {
           if (!strcasecmp (pat->u.s.string, string))
             return pat;
         }
       else if (pat->type == PAT_REGEX)
         {
           int rerr;
 
           rerr = regexec (pat->u.r.regex, string, 0, NULL, 0);
           if (!rerr)
             return pat;
           else if (rerr != REG_NOMATCH)
             {
               char *rerrbuf = get_regerror (rerr, pat->u.r.regex);
               log_error ("matching r.e. failed: %s\n", rerrbuf);
               xfree (rerrbuf);
               return pat;  /* Better indicate a match on error.  */
             }
         }
       else
         BUG ();
     }
   return NULL;
 }
 
 
 /* Actual processing of the input.  This function does not return an
    error code but exits as soon as a match has been found.  */
 static void
 process (FILE *fp, pattern_t *patarray)
 {
   char buffer[2048];
   size_t idx;
   int c;
   unsigned long lineno = 0;
   pattern_t *pat;
 
   idx = 0;
   c = 0;
   while (idx < sizeof buffer -1 && c != EOF )
     {
       if ((c = getc (fp)) != EOF)
         buffer[idx] = c;
       if ((c == '\n' && !opt.null) || (!c && opt.null) || c == EOF)
         {
           lineno++;
           if (!opt.null)
             {
               while (idx && isascii (buffer[idx-1]) && isspace (buffer[idx-1]))
                 idx--;
             }
           buffer[idx] = 0;
           pat = match_p (buffer, patarray);
           if (pat)
             {
               if (opt.verbose)
                 log_error ("input line %lu matches pattern at line %u"
                            " - rejected\n",
                            lineno, pat->lineno);
               exit (1);
             }
           idx = 0;
         }
       else
         idx++;
     }
   if (c != EOF)
     {
       log_error ("input line %lu too long - rejected\n", lineno+1);
       exit (1);
     }
   if (ferror (fp))
     {
       log_error ("input read error at line %lu: %s - rejected\n",
                  lineno+1, strerror (errno));
       exit (1);
     }
   if (opt.verbose)
     log_info ("no input line matches the pattern - accepted\n");
 }