No OneTemporary
Actions

Size

498 KB

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.

	diff --git a/Makefile.am b/Makefile.am
	index 1fc16db4b..350bf6032 100644
	--- a/Makefile.am
	+++ b/Makefile.am
	@@ -1,53 +1,53 @@
	# Copyright (C) 1998,1999,2000,2001,2003 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 2 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, write to the Free Software
	# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

	## Process this file with automake to produce Makefile.in

	ACLOCAL_AMFLAGS = -I m4
	DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support
	-AUTOMAKE_OPTIONS = dist-bzip2 std-options
	+AUTOMAKE_OPTIONS = dist-bzip2

	if CROSS_COMPILING
	checks =
	else
	checks = checks
	endif

	SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
	EXTRA_DIST = scripts/config.rpath PROJECTS BUGS config.h.in autogen.sh
	DISTCLEANFILES = g10defs.h

	# Add all the files listed in "distfiles" files to the distribution,
	# apply version numbers to some files and create a VERSION file which
	# we need for the Prereq: patch file trick.
	dist-hook:
	@set -e; \
	for file in `cd $(top_srcdir); \
	find scripts mpi include -type f -name distfiles`; do \
	dir=`dirname $$file` ; $(mkinstalldirs) $(distdir)/$$dir ; \
	for i in distfiles `cat $(top_srcdir)/$$file` ; do \
	ln $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i 2> /dev/null \
	\|\| cp -p $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i; \
	done ; \
	done
	@set -e; \
	sed -e 's/@pkg_version@/$(VERSION)/g' \
	$(top_srcdir)/scripts/gnupg.spec.in \
	> $(distdir)/gnupg.spec
	echo "$(VERSION)" > $(distdir)/VERSION

	diff --git a/configure.ac b/configure.ac
	index 8203edd9f..0e32609ee 100644
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,1285 +1,1285 @@
	dnl Configure.ac script for GnuPG
	dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
	dnl 2004 Free Software Foundation, Inc.
	dnl
	dnl This file is part of GnuPG.
	dnl
	dnl GnuPG is free software; you can redistribute it and/or modify
	dnl it under the terms of the GNU General Public License as published by
	dnl the Free Software Foundation; either version 2 of the License, or
	dnl (at your option) any later version.
	dnl
	dnl GnuPG is distributed in the hope that it will be useful,
	dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
	dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	dnl GNU General Public License for more details.
	dnl
	dnl You should have received a copy of the GNU General Public License
	dnl along with this program; if not, write to the Free Software
	dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
	dnl
	dnl (Process this file with autoconf to produce a configure script.)
	dnlAC_REVISION($Revision$)dnl

	AC_PREREQ(2.59)
	min_automake_version="1.7.9"

	# Remember to change the version number immediately after a release
	# and remove the "-cvs" or "rc" suffix immediately before a release.
	AC_INIT(gnupg, 1.3.91-cvs, bug-gnupg@gnu.org)
	# Set development_version to yes if the minor number is odd or you
	# feel that the default check for a development version is not
	# sufficient.
	development_version=yes

	AC_CONFIG_AUX_DIR(scripts)
	AC_CONFIG_SRCDIR(g10/g10.c)
	AC_CANONICAL_TARGET
	-AM_INIT_AUTOMAKE
	+AM_INIT_AUTOMAKE([std-options])
	AM_CONFIG_HEADER(config.h)

	AC_GNU_SOURCE

	dnl
	dnl Check for random module options
	dnl
	AC_MSG_CHECKING([which random module to use])
	AC_ARG_ENABLE(static-rnd,
	[ --enable-static-rnd=[egd\|unix\|linux\|auto] ],
	[use_static_rnd=$enableval], [use_static_rnd=default] )

	if test "$use_static_rnd" = no; then
	use_static_rnd=default
	fi

	case "$use_static_rnd" in
	egd \| linux \| unix \| default )
	AC_MSG_RESULT($use_static_rnd)
	;;
	auto )
	AC_MSG_RESULT(automagically selected at runtime)
	;;
	* )
	AC_MSG_RESULT(invalid argument)
	AC_MSG_ERROR(there is no random module rnd$use_static_rnd)
	;;
	esac

	AC_ARG_WITH(egd-socket,
	[ --with-egd-socket=NAME use NAME for the EGD socket],
	egd_socket_name="$withval", egd_socket_name="" )
	AC_DEFINE_UNQUOTED(EGD_SOCKET_NAME, "$egd_socket_name",
	[Define if you don't want the default EGD socket name.
	For details see cipher/rndegd.c])


	dnl
	dnl See whether the user wants to disable checking for /dev/random

	AC_MSG_CHECKING([whether use of /dev/random is requested])
	AC_ARG_ENABLE(dev-random,
	[ --disable-dev-random disable the use of dev random],
	try_dev_random=$enableval, try_dev_random=yes)
	AC_MSG_RESULT($try_dev_random)


	dnl
	dnl Check other options
	dnl

	AC_MSG_CHECKING([whether assembler modules are requested])
	AC_ARG_ENABLE(asm,
	[ --disable-asm do not use assembler modules],
	try_asm_modules=$enableval, try_asm_modules=yes)
	AC_MSG_RESULT($try_asm_modules)

	AC_MSG_CHECKING([whether memory guard is requested])
	AC_ARG_ENABLE(m-guard,
	[ --enable-m-guard enable memory guard facility],
	use_m_guard=$enableval, use_m_guard=no)
	AC_MSG_RESULT($use_m_guard)
	if test "$use_m_guard" = yes ; then
	AC_DEFINE(M_GUARD,1,[Define to use the (obsolete) malloc guarding feature])
	fi

	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 OpenPGP card support is requested])
	AC_ARG_ENABLE(card-support,
	AC_HELP_STRING([--disable-card-support],
	[disable OpenPGP card support]),
	card_support=$enableval, card_support=yes)
	AC_MSG_RESULT($card_support)

	AC_MSG_CHECKING([whether readline support is requested])
	AC_ARG_WITH(readline,
	AC_HELP_STRING([--without-readline],
	[do not support fancy command line editing]),
	[readline_support="$withval"], [readline_support=yes])
	case "$readline_support" in yes);; no);; *)readline_support=yes;; esac
	AC_MSG_RESULT($readline_support)


	dnl See if we are disabling any algorithms or features for a smaller
	dnl binary

	try_extensions=no

	use_rsa=yes
	use_idea=yes
	use_cast5=yes
	use_blowfish=yes
	use_aes=yes
	use_twofish=yes
	use_sha256=yes
	use_sha512=yes
	use_bzip2=yes
	use_exec=yes

	AC_ARG_ENABLE(minimal,
	AC_HELP_STRING([--enable-minimal],[build the smallest gpg binary possible]),
	use_rsa=no
	use_idea=no
	use_cast5=no
	use_blowfish=no
	use_aes=no
	use_twofish=no
	use_sha256=no
	use_sha512=no
	use_bzip2=no
	use_exec=no)

	AC_MSG_CHECKING([whether to enable the RSA public key algorithm])
	AC_ARG_ENABLE(rsa,
	AC_HELP_STRING([--disable-rsa],[disable the RSA public key algorithm]),
	use_rsa=$enableval)
	AC_MSG_RESULT($use_rsa)
	if test x"$use_rsa" = xyes ; then
	AC_DEFINE(USE_RSA,1,[Define to include the RSA public key algorithm])
	fi

	AC_MSG_CHECKING([whether to enable the IDEA cipher])
	AC_ARG_ENABLE(idea,
	AC_HELP_STRING([--disable-idea],[disable the IDEA cipher]),
	use_idea=$enableval)
	AC_MSG_RESULT($use_idea)
	if test x"$use_idea" = xyes ; then
	AC_DEFINE(USE_IDEA,1,[Define to include the IDEA cipher])

	# We don't need idea but some people claim that they need it for
	# research etc., so we allow to place an idea source code into the
	# cipher directory and statically link it if available, otherwise we
	# link to a stub. We don't use AC_CHECK_FILE to avoid caching.

	AC_MSG_CHECKING([for idea cipher module])
	tmp=""
	if test -f $srcdir/cipher/idea.c; then
	IDEA_O=idea.o
	tmp=idea
	else
	IDEA_O=idea-stub.o
	tmp=no
	try_extensions=yes
	fi
	AC_SUBST(IDEA_O)
	AC_MSG_RESULT($tmp)
	fi

	AC_MSG_CHECKING([whether to enable the CAST5 cipher])
	AC_ARG_ENABLE(cast5,
	AC_HELP_STRING([--disable-cast5],[disable the CAST5 cipher]),
	use_cast5=$enableval)
	AC_MSG_RESULT($use_cast5)
	if test x"$use_cast5" = xyes ; then
	AC_DEFINE(USE_CAST5,1,[Define to include the CAST5 cipher])
	fi

	AC_MSG_CHECKING([whether to enable the BLOWFISH cipher])
	AC_ARG_ENABLE(blowfish,
	AC_HELP_STRING([--disable-blowfish],[disable the BLOWFISH cipher]),
	use_blowfish=$enableval)
	AC_MSG_RESULT($use_blowfish)
	if test x"$use_blowfish" = xyes ; then
	AC_DEFINE(USE_BLOWFISH,1,[Define to include the BLOWFISH cipher])
	fi

	AC_MSG_CHECKING([whether to enable the AES ciphers])
	AC_ARG_ENABLE(aes,
	AC_HELP_STRING([--disable-aes],[disable the AES, AES192, and AES256 ciphers]),
	use_aes=$enableval)
	AC_MSG_RESULT($use_aes)
	if test x"$use_aes" = xyes ; then
	AC_DEFINE(USE_AES,1,[Define to include the AES, AES192, and AES256 ciphers])
	fi

	AC_MSG_CHECKING([whether to enable the TWOFISH cipher])
	AC_ARG_ENABLE(twofish,
	AC_HELP_STRING([--disable-twofish],[disable the TWOFISH cipher]),
	use_twofish=$enableval)
	AC_MSG_RESULT($use_twofish)
	if test x"$use_twofish" = xyes ; then
	AC_DEFINE(USE_TWOFISH,1,[Define to include the TWOFISH cipher])
	fi

	AC_MSG_CHECKING([whether to enable the SHA-256 digest])
	AC_ARG_ENABLE(sha256,
	AC_HELP_STRING([--disable-sha256],[disable the SHA-256 digest]),
	use_sha256=$enableval)
	AC_MSG_RESULT($use_sha256)
	if test x"$use_sha256" = xyes ; then
	AC_DEFINE(USE_SHA256,1,[Define to include the SHA-256 digest])
	fi

	dnl SHA512 is defined only after we confirm 64-bit support later
	AC_MSG_CHECKING([whether to enable the SHA-384 and SHA-512 digests])
	AC_ARG_ENABLE(sha512,
	AC_HELP_STRING([--disable-sha512],[disable the SHA-384 and SHA-512 digests]),
	use_sha512=$enableval)
	AC_MSG_RESULT($use_sha512)

	dnl BZLIB 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)

	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

	AC_MSG_CHECKING([whether to enable external keyserver helpers])
	AC_ARG_ENABLE(keyserver-helpers,
	[ --disable-keyserver-helpers disable all external keyserver support],
	[if test "$enableval" = no ; then
	AC_DEFINE(DISABLE_KEYSERVER_HELPERS,1,
	[define to disable keyserver helpers])
	fi],enableval=yes)
	gnupg_cv_enable_keyserver_helpers=$enableval
	AC_MSG_RESULT($enableval)

	if test "$gnupg_cv_enable_keyserver_helpers" = yes ; then
	AC_MSG_CHECKING([whether LDAP keyserver support is requested])
	AC_ARG_ENABLE(ldap,
	[ --disable-ldap disable LDAP keyserver interface],
	try_ldap=$enableval, try_ldap=yes)
	AC_MSG_RESULT($try_ldap)

	AC_MSG_CHECKING([whether HKP keyserver support is requested])
	AC_ARG_ENABLE(hkp,
	[ --disable-hkp disable HKP keyserver interface],
	try_hkp=$enableval, try_hkp=yes)
	AC_MSG_RESULT($try_hkp)

	AC_MSG_CHECKING([whether HTTP key fetching support is requested])
	AC_ARG_ENABLE(http,
	AC_HELP_STRING([--disable-http],[disable HTTP key fetching interface]),
	try_http=$enableval, try_http=yes)
	AC_MSG_RESULT($try_http)

	AC_MSG_CHECKING([whether Finger key fetching support is requested])
	AC_ARG_ENABLE(finger,
	AC_HELP_STRING([--disable-finger],
	[disable Finger key fetching interface]),
	try_finger=$enableval, try_finger=yes)
	AC_MSG_RESULT($try_finger)

	AC_MSG_CHECKING([whether email keyserver support is requested])
	AC_ARG_ENABLE(mailto,
	[ --disable-mailto disable email keyserver interface],
	try_mailto=$enableval, try_mailto=yes)
	AC_MSG_RESULT($try_mailto)
	fi

	AC_MSG_CHECKING([whether keyserver exec-path is enabled])
	AC_ARG_ENABLE(keyserver-path,
	[ --disable-keyserver-path disable the exec-path option for keyserver helpers],
	[if test "$enableval" = no ; then
	AC_DEFINE(DISABLE_KEYSERVER_PATH,1,[define to disable exec-path for keyserver helpers])
	fi],enableval=yes)
	AC_MSG_RESULT($enableval)
	fi

	AC_MSG_CHECKING([whether the included zlib is requested])
	AC_ARG_WITH(included-zlib,
	[ --with-included-zlib use the zlib code included here],
	[g10_force_zlib=yes], [g10_force_zlib=no] )
	AC_MSG_RESULT($g10_force_zlib)

	dnl
	dnl Check for the key/uid cache size. This can't be zero, but can be
	dnl pretty small on embedded systems.
	dnl
	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])

	dnl
	dnl Check whether we want to use Linux capabilities
	dnl
	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)


	AH_BOTTOM([
	#if !(defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID))
	#define EXEC_TEMPFILE_ONLY
	#endif

	/* This is the major version number of GnuPG so that
	source included files can test for this. */
	#define GNUPG_MAJOR_VERSION 1

	#include "g10defs.h"
	])


	AM_MAINTAINER_MODE

	dnl Checks 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)
	AC_PROG_CC
	AC_PROG_CPP
	AC_PROG_RANLIB
	AC_CHECK_TOOL(AR, ar, :)
	AC_PATH_PROG(PERL,"perl")
	AC_ISC_POSIX
	AC_SYS_LARGEFILE
	AC_PROG_INSTALL
	AC_PROG_LN_S
	AC_PROG_AWK
	AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no)
	AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes)
	GNUPG_CHECK_FAQPROG
	GNUPG_CHECK_DOCBOOK_TO_TEXI

	MPI_OPT_FLAGS=""


	try_gettext=yes
	have_dosish_system=no
	need_dlopen=yes
	case "${target}" 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(HAVE_DRIVE_LETTERS,1,
	[defined if we must run on a stupid file system])
	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
	need_dlopen=no
	try_gettext="no"
	LDAPLIBS="-lwldap32"
	;;
	i?86-emx-os2 \| i?86--os2emx )
	# 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"
	;;

	--freebsd*)
	# FreeBSD
	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
	LDFLAGS="$LDFLAGS -L/usr/local/lib"
	;;

	--hpux*)
	if test -z "$GCC" ; then
	CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
	fi
	;;
	-dec-osf4)
	if test -z "$GCC" ; then
	# Suppress all warnings
	# to get rid of the unsigned/signed char mismatch warnings.
	CFLAGS="$CFLAGS -w"
	fi
	;;
	-dec-osf5)
	if test -z "$GCC" ; then
	# Use the newer compiler `-msg_disable ptrmismatch' 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="$CFLAGS -msg_disable ptrmismatch"
	fi
	;;
	m68k-atari-mint)
	;;
	*)
	;;
	esac

	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])
	fi
	AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)

	AC_SUBST(MPI_OPT_FLAGS)
	GNUPG_SYS_SYMBOL_UNDERSCORE

	dnl These need to go after AC_PROG_CC so that $EXEEXT is defined
	if test x"$try_hkp" = xyes ; then
	AC_SUBST(GPGKEYS_HKP,"gpgkeys_hkp$EXEEXT")
	fi

	if test x"$try_http" = xyes ; then
	AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT")
	fi

	if test x"$try_finger" = xyes ; then
	AC_SUBST(GPGKEYS_FINGER,"gpgkeys_finger$EXEEXT")
	fi

	dnl Must check for network library requirements before doing link tests
	dnl for ldap, for example. If ldap libs are static (or dynamic and without
	dnl ELF runtime link paths), then link will fail and LDAP support won't
	dnl 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"]))

	dnl Now try for the resolver functions so we can use DNS SRV

	AC_ARG_ENABLE(dns-srv,
	AC_HELP_STRING([--disable-dns-srv],
	[disable the use of DNS SRV in HKP and HTTP]),
	use_dns_srv=$enableval,use_dns_srv=yes)

	if (test x"$try_hkp" = xyes \|\| test x"$try_http" = xyes) && test x"$use_dns_srv" = xyes ; then
	_srv_save_libs=$LIBS
	LIBS=""
	# the double underscore thing is a glibc-ism?
	AC_SEARCH_LIBS(res_query,resolv bind,,
	AC_SEARCH_LIBS(__res_query,resolv bind,,use_dns_srv=no))
	AC_SEARCH_LIBS(dn_expand,resolv bind,,
	AC_SEARCH_LIBS(__dn_expand,resolv bind,,use_dns_srv=no))
	AC_SEARCH_LIBS(dn_skipname,resolv bind,,
	AC_SEARCH_LIBS(__dn_skipname,resolv bind,,use_dns_srv=no))

	if test x"$use_dns_srv" = xyes ; then

	# Make sure that the BIND 4 resolver interface is workable before
	# enabling SRVs. At some point I'll rewrite the code to use the
	# BIND 8 resolver API.

	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);]])],,use_dns_srv=no)
	fi

	if test x"$use_dns_srv" = xyes ; then
	AC_DEFINE(USE_DNS_SRV,1,[define to use DNS SRV])
	SRVLIBS=$LIBS
	else
	AC_MSG_NOTICE([Resolver functions not found or not usable. Disabling DNS SRV.])
	fi
	LIBS=$_srv_save_libs
	fi

	AC_SUBST(SRVLIBS)

	# Try and link a LDAP test program to weed out unusable LDAP
	# libraries. -lldap [-llber [-lresolv]] is for older OpenLDAPs.
	# OpenLDAP, circa 1999, was terrible with creating weird dependencies.
	# This seems to have all been resolved, so I'm simplifying this code
	# significantly. If all else fails, the user can play
	# guess-the-dependency by using something like ./configure
	# LDAPLIBS="-Lfoo -lbar"

	if test "$try_ldap" = yes ; then
	for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv"; do
	_ldap_save_libs=$LIBS
	LIBS="$MY_LDAPLIBS $NETLIBS $LIBS"

	AC_MSG_CHECKING([whether LDAP via \"$MY_LDAPLIBS\" is present and sane])
	AC_TRY_LINK([#include <ldap.h>],[ldap_open("foobar",1234);],
	[gnupg_cv_func_ldap_init=yes],[gnupg_cv_func_ldap_init=no])
	AC_MSG_RESULT([$gnupg_cv_func_ldap_init])

	if test "$gnupg_cv_func_ldap_init" = yes ; then
	LDAPLIBS=$MY_LDAPLIBS
	GPGKEYS_LDAP="gpgkeys_ldap$EXEEXT"

	AC_CHECK_FUNCS(ldap_get_option ldap_set_option ldap_start_tls_s)

	if test "$ac_cv_func_ldap_get_option" != yes ; then
	AC_MSG_CHECKING([whether LDAP supports ld_errno])
	AC_TRY_LINK([#include <ldap.h>],[LDAP *ldap; ldap->ld_errno;],
	[gnupg_cv_func_ldap_ld_errno=yes],
	[gnupg_cv_func_ldap_ld_errno=no])
	AC_MSG_RESULT([$gnupg_cv_func_ldap_ld_errno])

	if test "$gnupg_cv_func_ldap_ld_errno" = yes ; then
	AC_DEFINE(HAVE_LDAP_LD_ERRNO,1,[Define if the LDAP library supports ld_errno])
	fi
	fi
	fi

	LIBS=$_ldap_save_libs

	if test "$GPGKEYS_LDAP" != "" ; then break; fi
	done
	fi

	AC_SUBST(GPGKEYS_LDAP)
	AC_SUBST(LDAPLIBS)
	AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "")

	dnl This isn't necessarily sendmail itself, but anything that gives a
	dnl sendmail-ish interface to the outside world. That includes qmail,
	dnl postfix, etc. Basically, anything that can handle "sendmail -t".

	if test "$try_mailto" = yes ; then
	AC_ARG_WITH(mailprog,[ --with-mailprog=NAME use "NAME -t" for mail transport],,with_mailprog=yes)

	if test "$with_mailprog" = yes ; then
	AC_PATH_PROG(SENDMAIL,sendmail,,$PATH:/usr/sbin:/usr/libexec:/usr/lib)
	if test "$ac_cv_path_SENDMAIL" ; then
	GPGKEYS_MAILTO="gpgkeys_mailto"
	fi
	elif test "$with_mailprog" != no ; then
	AC_MSG_CHECKING([for a mail transport program])
	AC_SUBST(SENDMAIL,$with_mailprog)
	AC_MSG_RESULT($with_mailprog)
	GPGKEYS_MAILTO="gpgkeys_mailto"
	fi
	fi

	AC_SUBST(GPGKEYS_MAILTO)

	case "${target}" in
	--mingw32*)
	PRINTABLE_OS_NAME="MingW32"
	;;
	--cygwin*)
	PRINTABLE_OS_NAME="Cygwin"
	;;
	i?86-emx-os2 \| i?86--os2emx )
	PRINTABLE_OS_NAME="OS/2"
	;;
	i?86--msdosdjgpp)
	PRINTABLE_OS_NAME="MSDOS/DJGPP"
	try_extensions=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])


	#
	# 1. Set names of random devices
	#
	NAME_OF_DEV_RANDOM="/dev/random"
	NAME_OF_DEV_URANDOM="/dev/urandom"
	case "${target}" in
	-openbsd)
	NAME_OF_DEV_RANDOM="/dev/srandom"
	NAME_OF_DEV_URANDOM="/dev/urandom"
	;;
	esac
	AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM",
	[defined to the name of the strong random device])
	AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, "$NAME_OF_DEV_URANDOM",
	[defined to the name of the weaker random device])
	AC_SUBST(MPI_OPT_FLAGS)


	dnl Checks for libraries.

	AM_GNU_GETTEXT_VERSION(0.14.1)
	if test "$try_gettext" = yes; then
	AM_GNU_GETTEXT(,[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
	AC_SUBST(USE_NLS)
	AC_SUBST(USE_INCLUDED_LIBINTL)
	AC_SUBST(BUILD_INCLUDED_LIBINTL)
	fi

	if test "$try_extensions" = yes \|\| test x"$card_support" = xyes ; then
	if test "$need_dlopen" = yes; then
	_dl_save_libs=$LIBS
	LIBS=""
	AC_SEARCH_LIBS(dlopen,dl,found_dlopen=yes)
	if test x"$found_dlopen" = "xyes" ; then
	AC_DEFINE(HAVE_DL_DLOPEN,1,
	[Defined when the dlopen function family is available])
	DLLIBS=$LIBS
	else
	if test "$try_extensions" = yes ; then
	AC_MSG_NOTICE([dlopen not found. Disabling extensions.])
	try_extensions=no
	fi

	if test "$card_support" = yes ; then
	AC_MSG_WARN([dlopen not found. Disabling OpenPGP card support.])
	card_support=no
	fi
	fi
	LIBS=$_dl_save_libs
	fi
	fi

	AC_SUBST(DLLIBS)

	if test "$card_support" = yes ; then
	AC_DEFINE(ENABLE_CARD_SUPPORT,1,[Define to include OpenPGP card support])
	fi

	if test "$try_extensions" = yes ; then
	AC_DEFINE(USE_DYNAMIC_LINKING,1,[Define to enable the use of extensions])
	fi

	if test "$selinux_support" = yes ; then
	AC_DEFINE(ENABLE_SELINUX_HACKS,1,[Define to enable SELinux support])
	fi

	AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)

	dnl Checks for header files.
	AC_HEADER_STDC
	AC_CHECK_HEADERS(unistd.h langinfo.h termio.h locale.h getopt.h)


	dnl Checks for typedefs, structures, and compiler 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

	GNUPG_CHECK_ENDIAN

	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)

	# Ensure that we have UINT64_C before we bother to check for uint64_t
	AC_CACHE_CHECK([for UINT64_C],[gnupg_cv_uint64_c_works],
	AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <inttypes.h>
	uint64_t foo=UINT64_C(42);]),gnupg_cv_uint64_c_works=yes,gnupg_cv_uint64_c_works=no))

	if test "$gnupg_cv_uint64_c_works" = "yes" ; then
	AC_CHECK_SIZEOF(uint64_t)
	fi

	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

	dnl Do we have any 64-bit data types?
	if test "$ac_cv_sizeof_unsigned_int" != "8" \
	&& test "$ac_cv_sizeof_unsigned_long" != "8" \
	&& test "$ac_cv_sizeof_unsigned_long_long" != "8" \
	&& test x"$ac_cv_sizeof_uint64_t" != "x8"; then
	AC_MSG_NOTICE([No 64-bit types. Disabling SHA-384 and SHA-512.])
	else
	if test x"$use_sha512" = xyes ; then
	AC_SUBST(SHA512_O,sha512.o)
	AC_DEFINE(USE_SHA512,1,[Define to include the SHA-384 and SHA-512 digests])
	fi
	fi

	dnl Checks for library functions.
	AC_FUNC_FSEEKO
	AC_FUNC_VPRINTF
	AC_FUNC_FORK
	AC_CHECK_FUNCS(strerror stpcpy strsep strlwr tcgetattr strtoul mmap)
	AC_CHECK_FUNCS(strcasecmp strncasecmp ctermid times unsetenv)
	AC_CHECK_FUNCS(memmove gettimeofday getrusage setrlimit clock_gettime)
	AC_CHECK_FUNCS(atexit raise getpagesize strftime nl_langinfo setlocale)
	AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe stat getaddrinfo)
	AC_REPLACE_FUNCS(mkdtemp timegm)
	AC_REPLACE_FUNCS(vasprintf)
	AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>])

	# See if getopt is in libiberty. This is of course not optimal since
	# it might be somewhere other than libiberty, but does cover the
	# mingw32 case.

	AC_CHECK_FUNC(getopt,,AC_CHECK_LIB(iberty,getopt,AC_SUBST(GETOPT,"-liberty")))

	#
	# check for gethrtime and run a testprogram to see whether
	# it is broken. It has been reported that some Solaris and HP UX systems
	# raise an SIGILL
	#
	AC_CACHE_CHECK([for gethrtime],
	[gnupg_cv_func_gethrtime],
	[AC_TRY_LINK([#include <sys/times.h>],[
	hrtime_t tv;
	tv = gethrtime();
	],
	[gnupg_cv_func_gethrtime=yes],
	[gnupg_cv_func_gethrtime=no])
	])
	if test $gnupg_cv_func_gethrtime = yes; then
	AC_DEFINE([HAVE_GETHRTIME], 1,
	[Define if you have the `gethrtime(2)' function.])
	AC_CACHE_CHECK([whether gethrtime is broken],
	[gnupg_cv_func_broken_gethrtime],
	[AC_TRY_RUN([
	#include <sys/times.h>
	int main () {
	hrtime_t tv;
	tv = gethrtime();
	}
	],
	[gnupg_cv_func_broken_gethrtime=no],
	[gnupg_cv_func_broken_gethrtime=yes],
	[gnupg_cv_func_broken_gethrtime=assume-no])
	])
	if test $gnupg_cv_func_broken_gethrtime = yes; then
	AC_DEFINE([HAVE_BROKEN_GETHRTIME], 1,
	[Define if `gethrtime(2)' does not work correctly i.e. issues a SIGILL.])
	fi
	fi


	GNUPG_CHECK_MLOCK
	GNUPG_FUNC_MKDIR_TAKES_ONE_ARG

	dnl
	dnl Check whether we can use Linux capabilities as requested
	dnl
	if test "$use_capabilities" = "yes" ; then

	AC_MSG_WARN([[
	***
	*** WARNING: using capabilities with GnuPG is experimental code!
	***]])

	use_capabilities=no
	AC_CHECK_HEADERS(sys/capability.h)
	if test "$ac_cv_header_sys_capability_h" = "yes" ; then
	AC_CHECK_LIB(cap, cap_init, ac_need_libcap=1)
	if test "$ac_cv_lib_cap_cap_init" = "yes"; then
	AC_DEFINE(USE_CAPABILITIES,1,
	[define if capabilities should be used])
	AC_SUBST(CAPLIBS,"-lcap")
	use_capabilities=yes
	fi
	fi
	if test "$use_capabilities" = "no" ; then
	AC_MSG_WARN([[
	***
	*** The use of capabilities on this system is not possible.
	*** You need a recent Linux kernel and some patches:
	*** fcaps-2.2.9-990610.patch (kernel patch for 2.2.9)
	*** fcap-module-990613.tar.gz (kernel module)
	*** libcap-1.92.tar.gz (user mode library and utilities)
	*** And you have to configure the kernel with CONFIG_VFS_CAP_PLUGIN
	*** set (filesystems menu). Be warned: This code is really ALPHA.
	***]])
	fi
	fi


	GNUPG_CHECK_IPC
	if test "$ac_cv_header_sys_shm_h" = "yes"; then
	AC_DEFINE(USE_SHM_COPROCESSING,1,
	[define if the shared memory interface should be made available])
	fi

	dnl
	dnl check whether we have a random device
	dnl
	if test "$try_dev_random" = yes ; then
	AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
	[if test -r "$NAME_OF_DEV_RANDOM" && test -r "$NAME_OF_DEV_URANDOM" ; then
	ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
	if test "$ac_cv_have_dev_random" = yes; then
	AC_DEFINE(HAVE_DEV_RANDOM,1,
	[defined if the system supports a random device] )
	fi
	else
	AC_MSG_CHECKING(for random device)
	ac_cv_have_dev_random=no
	AC_MSG_RESULT(has been disabled)
	fi


	dnl
	dnl Figure out the default random module.
	dnl
	random_modules=""
	if test "$use_static_rnd" = default; then
	if test "$ac_cv_have_dev_random" = yes; then
	random_modules="rndlinux"
	else
	case "${target}" in
	--mingw32\|--cygwin)
	random_modules="rndw32"
	;;
	i?86-emx-os2\|i?86--os2emx)
	random_modules="rndos2"
	;;
	m68k-atari-mint)
	random_modules="rndatari"
	;;
	i?86--msdosdjgpp)
	:
	;;
	*)
	random_modules="rndlinux rndegd rndunix"
	AC_DEFINE(USE_ALL_RANDOM_MODULES, 1,
	[Allow to select random modules at runtime.])
	;;
	esac
	fi
	else
	if test "$use_static_rnd" = auto; then
	random_modules="rndlinux rndegd rndunix"
	AC_DEFINE(USE_ALL_RANDOM_MODULES, 1)
	else
	random_modules="rnd$use_static_rnd";
	fi
	fi

	if test -z "$random_modules"; then
	AC_MSG_ERROR(no random module available)
	fi
	print_egd_warning=no
	for rndmod in $random_modules "" ; do
	case "$rndmod" in
	rndlinux)
	AC_DEFINE(USE_RNDLINUX,1,
	[Defined if the /dev/random based RNG should be used.])
	;;
	rndunix)
	AC_DEFINE(USE_RNDUNIX,1,
	[Defined if the default Unix RNG should be used.])
	print_egd_warning=yes
	;;
	rndegd)
	AC_DEFINE(USE_RNDEGD,1,
	[Defined if the EGD based RNG should be used.])
	;;
	rndw32)
	AC_DEFINE(USE_RNDW32,1,
	[Defined if the Windows specific RNG should be used.])
	;;
	esac
	done

	dnl setup assembler stuff
	AC_MSG_CHECKING(for mpi assembler functions)
	if test -f $srcdir/mpi/config.links ; then
	. $srcdir/mpi/config.links
	AC_CONFIG_LINKS("$mpi_ln_list")
	ac_cv_mpi_extra_asm_modules="$mpi_extra_modules"
	ac_cv_mpi_sflags="$mpi_sflags"
	ac_cv_mpi_config_done="yes"
	AC_MSG_RESULT(done)
	else
	AC_MSG_RESULT(failed)
	AC_MSG_ERROR([mpi/config.links missing!])
	fi
	MPI_EXTRA_ASM_OBJS=""
	show_extraasm=""
	if test "$ac_cv_mpi_extra_asm_modules" != ""; then
	for i in $ac_cv_mpi_extra_asm_modules; do
	show_extraasm="$show_extraasm $i"
	MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o"
	done
	fi
	AC_SUBST(MPI_EXTRA_ASM_OBJS)
	MPI_SFLAGS="$ac_cv_mpi_sflags"
	AC_SUBST(MPI_SFLAGS)

	# Sanity check regex. Tests adapted from mutt.

	AC_MSG_CHECKING([whether regular expression support is requested])
	AC_ARG_ENABLE(regex,
	[ --disable-regex do not handle regular expressions in trust sigs],
	use_regex=$enableval, use_regex=yes)
	AC_MSG_RESULT($use_regex)

	if test "$use_regex" = yes ; then
	AC_MSG_CHECKING([whether the included regex lib is requested])
	AC_ARG_WITH(included-regex,
	[ --with-included-regex use the included GNU regex library],
	[gnupg_cv_included_regex=yes],[gnupg_cv_included_regex=no])
	AC_MSG_RESULT($gnupg_cv_included_regex)

	if test $gnupg_cv_included_regex = no ; then
	# Does the system have regex functions at all?
	AC_CHECK_FUNC(regcomp,gnupg_cv_included_regex=no,
	gnupg_cv_included_regex=yes)
	fi

	if test $gnupg_cv_included_regex = no ; then
	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 - using the included GNU regex instead.)
	gnupg_cv_included_regex=yes
	fi
	fi

	if test $gnupg_cv_included_regex = yes; then
	AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex lib ])
	AC_SUBST(REGEX_O,regex.o)
	fi
	else

	AC_DEFINE(DISABLE_REGEX,1,[ Define to disable regular expression support ])
	fi

	dnl Do we have zlib? Must do it here because Solaris failed
	dnl when compiling a conftest (due to the "-lz" from LIBS).
	use_local_zlib=yes
	if test "$g10_force_zlib" = "yes"; then
	:
	else
	_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_,
	use_local_zlib=no
	ZLIBS="-lz",
	CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
	CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
	fi

	if test "$use_local_zlib" = yes ; then
	AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true)
	AC_CONFIG_LINKS(zlib.h:zlib/zlib.h zconf.h:zlib/zconf.h )
	ZLIBS="../zlib/libzlib.a"
	else
	AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false)
	fi

	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)


	#
	# libusb allows us to use the integrated CCID smartcard reader driver.
	#
	LIBUSB_LIBS=""
	if test "$card_support" = yes; then
	AC_CHECK_LIB(usb, usb_bulk_write,
	[ LIBUSB_LIBS="$LIBUSB_LIBS -lusb"
	AC_DEFINE(HAVE_LIBUSB,1,
	[defined if libusb is available])
	])
	fi
	AC_SUBST(LIBUSB_LIBS)
	AC_CHECK_FUNCS(usb_get_busses)

	#
	# Check for readline support
	#
	if test "$readline_support" = yes ; then
	AC_CHECK_LIB(readline, add_history)
	AC_CHECK_HEADERS([readline/readline.h])
	fi


	# Allow users to append something to the version string without
	# flagging it as development version. The user version parts is
	# considered everything after a dash.
	if test "$development_version" != yes; then
	changequote(,)dnl
	tmp_pat='[a-zA-Z]'
	changequote([,])dnl
	if echo "$VERSION" \| sed 's/-.*//' \| grep "$tmp_pat" >/dev/null ; then
	development_version=yes
	fi
	fi
	if test "$development_version" = yes; then
	AC_DEFINE(IS_DEVELOPMENT_VERSION,1,
	[Defined if this is not a regular release])
	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.
	case "${target}" in
	--mingw32*)
	dnl NETLIBS="$NETLIBS -lwsock32"
	W32LIBS="-lwsock32"
	;;
	*)
	;;
	esac

	AC_SUBST(NETLIBS)
	AC_SUBST(W32LIBS)

	if test "$GCC" = yes; then
	if test "$USE_MAINTAINER_MODE" = "yes"; then
	CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
	CFLAGS="$CFLAGS -Wformat-nonliteral"
	else
	CFLAGS="$CFLAGS -Wall"
	fi
	fi


	if test "$print_egd_warning" = yes; then
	AC_MSG_WARN([[
	***
	*** The performance of the UNIX random gatherer module is not very good
	*** and it does not keep the entropy pool over multiple invocations of
	*** GnuPG. The suggested way to overcome this problem is to use the
	***
	*** Entropy Gathering Daemon (EGD)
	***
	*** which provides a entropy source for the whole system. It is written
	*** in Perl and available at the GnuPG FTP servers. For more information
	*** consult the GnuPG webpages:
	***
	*** http://www.gnupg.org/download/#EGD
	***
	*** You may want to run ./configure with --enable-static-rnd=egd or
	*** --enable-static-rnd=auto to use it.
	***]])
	fi

	# Note the \\\\ for backslashes. Autoconf eats one layer, leaving \\

	AC_CONFIG_COMMANDS(g10defs.h,[[
	cat >g10defs.tmp <<G10EOF
	/* Generated automatically by configure */
	#ifdef HAVE_DRIVE_LETTERS
	#define G10_LOCALEDIR "c:\\\\lib\\\\gnupg\\\\locale"
	#define GNUPG_LIBDIR "c:\\\\lib\\\\gnupg"
	#define GNUPG_LIBEXECDIR "c:\\\\lib\\\\gnupg"
	#define GNUPG_DATADIR "c:\\\\lib\\\\gnupg"
	#define GNUPG_HOMEDIR "c:\\\\gnupg"
	#else
	#define G10_LOCALEDIR "${datadir}/locale"
	#define GNUPG_LIBDIR "${libdir}/gnupg"
	#define GNUPG_DATADIR "${datadir}/gnupg"
	#ifdef __VMS
	#define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg"
	#else
	#define GNUPG_HOMEDIR "~/.gnupg"
	#endif
	#endif
	/* those are here to be redefined by handcrafted g10defs.h.
	Please note that the string version must not contain more
	than one character because the using code assumes strlen()==1 */
	#ifdef HAVE_DOSISH_SYSTEM
	#define DIRSEP_C '\\\\'
	#define EXTSEP_C '.'
	#define DIRSEP_S "\\\\"
	#define EXTSEP_S "."
	#else
	#define DIRSEP_C '/'
	#define EXTSEP_C '.'
	#define DIRSEP_S "/"
	#define EXTSEP_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 '-'
	G10EOF
	cat mpi/mpi-asm-defs.h >>g10defs.tmp
	if cmp -s g10defs.h g10defs.tmp 2>/dev/null; then
	echo "g10defs.h is unchanged"
	rm -f g10defs.tmp
	else
	rm -f g10defs.h
	mv g10defs.tmp g10defs.h
	echo "g10defs.h created"
	fi
	]],[[
	prefix=$prefix
	exec_prefix=$exec_prefix
	libdir=$libdir
	libexecdir=$libexecdir
	datadir=$datadir
	DATADIRNAME=$DATADIRNAME
	]])


	AC_CONFIG_FILES([
	Makefile
	m4/Makefile
	intl/Makefile
	po/Makefile.in
	util/Makefile
	mpi/Makefile
	cipher/Makefile
	g10/Makefile
	keyserver/Makefile
	keyserver/gpgkeys_mailto
	keyserver/gpgkeys_test
	doc/Makefile
	tools/Makefile
	zlib/Makefile
	checks/Makefile
	])
	AC_OUTPUT

	# Give some feedback
	echo
	echo " Configured for: $PRINTABLE_OS_NAME ($target)"
	if test -n "$show_extraasm"; then
	echo " Extra cpu specific functions:$show_extraasm"
	fi
	echo
	diff --git a/g10/ChangeLog b/g10/ChangeLog
	index 09c9ecb10..96d1c6929 100644
	--- a/g10/ChangeLog
	+++ b/g10/ChangeLog
	@@ -1,10615 +1,10619 @@
	2004-10-15 Werner Koch <wk@g10code.com>

	+ * app-openpgp.c (parse_login_data): New.
	+ (app_select_openpgp): Call it.
	+ (do_setattr): Reparse it after change.
	+
	* pkclist.c (do_edit_ownertrust): Add a note to translators.
	* keygen.c (ask_user_id): Ditto.

	* helptext.c: Typo fix.

	2004-10-14 David Shaw <dshaw@jabberwocky.com>

	* keylist.c (list_keyblock_print): Show the fingerprint after the
	key, not after the first user ID.

	* keyedit.c (show_key_with_all_names): Don't show validity if
	we're just printing user IDs for signing.

	* armor.c (fake_packet): Properly handle the case where the line
	is dash-space (i.e. a blank line that was quoted). Give a warning
	for bad dash escaping.

	2004-10-14 Werner Koch <wk@g10code.com>

	* export.c (do_export_stream) [ENABLE_SELINUX_HACKS]: Don't allow
	secret key export.
	* import.c (import_secret_one) [ENABLE_SELINUX_HACKS]: Likewise

	* misc.c (is_secured_filename): New.
	* keydb.c (maybe_create_keyring)
	* tdbio.c (tdbio_set_dbname)
	* plaintext.c (handle_plaintext)
	* openfile.c (copy_options_file, open_outfile)
	* exec.c (exec_write)
	* keygen.c (do_generate_keypair, gen_card_key_with_backup)

	* sign.c (sign_file, clearsign_file)
	* keyring.c (create_tmp_file, do_copy): Check for secured files
	before creating them.

	* keygen.c (print_status_key_created, read_parameter_file):
	s/unsigned char/byte/ due to a strange typedef for RISC OS. Noted
	by Stefan.

	2004-10-13 David Shaw <dshaw@jabberwocky.com>

	* armor.c (fake_packet): Allow arbitrary dash-escaped lines as per
	2440bis-10. This is bug #158.

	* keyserver.c (keyserver_work): Handle keyserver timeouts.

	* pkclist.c (do_edit_ownertrust): Different prompt when we're
	using direct trust since the meaning is different.

	* keyedit.c (trustsig_prompt): Change the strings to match the
	ones in pkclist.c:do_edit_ownertrust to make translation easier.

	* trustdb.c (trust_model_string, get_validity): Add direct trust
	model which applies to the key as a whole and not per-uid.

	* options.h, g10.c (parse_trust_model): New.
	(main): Call it from here to do string-to-trust-model.

	2004-10-13 Werner Koch <wk@g10code.com>

	* tdbdump.c (import_ownertrust): Removed all log_error_f and
	reworded the messages.

	* dermor.c: Include i18n.h. Made 2 strings translatable.

	* misc.c (register_secured_file, is_secured_file)
	(unregister_secured_file): New.
	* keyring.c (do_copy, rename_tmp_file): Implement the SELinux hacks.
	(keyring_register_filename): Ditto.
	* tdbio.c (open_db): Ditto.
	* openfile.c (copy_options_file, open_sigfile): Ditto.
	* verify.c (verify_signatures, verify_one_file): Ditto.
	* photoid.c (generate_photo_id): Ditto.
	* keygen.c (read_parameter_file): Ditto.
	* import.c (import_keys_internal): Ditto.
	* decrypt.c (decrypt_message, decrypt_messages): Ditto.
	* dearmor.c (dearmor_file, enarmor_file): Ditto.
	* g10.c (main, print_mds): Ditto.
	* exec.c (exec_write, exec_read): Ditto.
	* card-util.c (change_login): Ditto.
	* encode.c (encode_simple, encode_crypt): Ditto.

	* openfile.c (overwrite_filep, make_outfile_name, open_outfile)
	(open_sigfile): Use iobuf_is_pipe_filename to check for pipes so
	that special filesnames are taken into account. This is bug 327.

	* tdbdump.c (import_ownertrust): Ditto.

	* sign.c (write_plaintext_packet): Ditto.
	(sign_file, clearsign_file, sign_symencrypt_file):

	* progress.c (handle_progress): Ditto.
	* plaintext.c (handle_plaintext): Ditto.
	(ask_for_detached_datafile, hash_datafiles):

	* encode.c (encode_simple, encode_crypt): Ditto.

	2004-10-12 Werner Koch <wk@g10code.com>

	* keygen.c (read_parameter_file): Changed to use iobuf based file
	reading to allow the special file name feature to work.

	* keygen.c (read_parameter_file): New keyword "Handle". This is
	bug 287.
	(print_status_key_not_created): New.
	(print_status_key_created): Add new arg HANDLE.
	(do_generate_keypair): Print not created status.
	* status.c, tatus.h (STATUS_KEY_NOT_CREATED): New.

	2004-10-11 David Shaw <dshaw@jabberwocky.com>

	* pkclist.c (do_edit_ownertrust): Use the same translated string
	for showing the user ID as mainproc.c:print_pkenc_list.

	* mainproc.c (print_pkenc_list): Allow translating the quotes
	around the user ID.

	* card-util.c, g10.c, photoid.c, trustdb.c: The last of the \"%s\"
	-> `%s' quoting for things that aren't user IDs.

	* keyserver.c (keyserver_spawn): If there is no keyserver host,
	print the whole URI since it is self-contained.

	2004-10-11 Werner Koch <wk@g10code.com>

	* keyserver.c (keyserver_spawn): Print an empty string in log_info
	if the host is not set (e.g. finger).

	2004-10-10 David Shaw <dshaw@jabberwocky.com>

	* card-util.c, keyedit.c, openfile.c, pkclist.c, delkey.c,
	keygen.c, photoid.c, revoke.c: Some yes-or-no prompts end in
	"(y/n)". Some don't. Consistently use y/n everywhere.

	* keygen.c (ask_key_flags): New.
	(ask_algo): Call it here in --expert mode so we don't need to
	specify each possible variation of RSA capabilities.

	* keygen.c (do_add_key_flags): The spec says that all primary keys
	MUST be able to certify. Force the certify flag on for primaries
	(and off for subkeys).

	* keygen.c (generate_keypair): Fix generating keys with the auth
	flag.

	2004-10-08 David Shaw <dshaw@jabberwocky.com>

	* encr-data.c (decrypt_data): Give a warning with a weak key, but
	still allow to decrypt the message.

	2004-10-07 David Shaw <dshaw@jabberwocky.com>

	* pkclist.c (build_pk_list): Keystrify.

	* mainproc.c (check_sig_and_print), pkclist.c
	(do_edit_ownertrust): Improve translatability of user ID prompts.

	2004-10-06 David Shaw <dshaw@jabberwocky.com>

	* helptext.c, pkclist.c (do_we_trust): It is not possible to get
	here with a revoked or expired key, so BUG() that case. Remove
	question about overriding revoked/expired. Also
	--keyid-format-ify.
	(do_we_trust_pre): Use print_pubkey_info() instead of printing the
	info ourselves.

	* passphrase.c (passphrase_to_dek): Improve translatability of
	user ID prompts.

	* keylist.c (print_pubkey_info): Use the user ID the pk was
	selected by, if any.

	* keyedit.c (sign_uids, ask_revoke_sig): Improve translatability
	of user ID prompts.
	(ask_revoke_sig, menu_revsig): Try and use common strings for
	these two functions so they don't need to be translated twice.

	* keyedit.c, keylist.c, keyserver.c, mainproc.c: The
	revoked/expired/expires string change of 2004-09-29 was too
	simple. Use two styles for each tag.

	2004-10-06 Werner Koch <wk@g10code.com>

	* ccid-driver.c (ccid_open_reader): Store the vendor ID.
	(ccid_transceive_secure): New.
	(parse_ccid_descriptor): Workaround for an SCM reader problem.
	(send_escape_cmd): New.

	2004-10-05 David Shaw <dshaw@jabberwocky.com>

	* passphrase.c (agent_get_passphrase): Use keystrs for agent
	strings, and fix sprintf warnings.

	* keyserver.c (keyserver_spawn): Fix BUG() with certain sets of
	mixed regular and preferred keyserver refreshes. Noted by
	Sebastian Wiesinger.

	* keyedit.c (show_key_with_all_names): Show uid validity in menu.

	2004-10-03 Timo Schulz <twoaday@g10code.de>

	* apdu.c (apdu_open_remote_reader) [_WIN32]: Do not set ENOSYS.

	2004-10-03 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (print_and_check_one_sig_colon): Fix bad keyids in
	colon delsig output. Noted by Peter Palfrader.
	(show_prefs): Do not reference missing selfsig. Noted by Alex
	Moroz.

	2004-10-01 Werner Koch <wk@g10code.com>

	* gpgv.c (i18n_init): Always use LC_ALL.

	2004-09-30 Werner Koch <wk@g10code.com>

	* app-openpgp.c (verify_chv3) [GNUPG_MAJOR_VERSION!=1]: Typo fix.

	2004-09-30 David Shaw <dshaw@jabberwocky.com>

	* gpgv.c, keydb.c (keydb_add_resource): Factored keyring creation
	out to ..
	(maybe_create_keyring): .. new. Make sure that we do the checks
	in a locked state. Problem reported by Stefan Haller. Try to
	create the home directory before acquiring a lock for the keyring.
	From Werner on stable branch.

	* g10.c (main): Blow up if we didn't lose setuid. From Werner on
	stable branch.

	2004-09-29 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c, keylist.c, keyserver.c, mainproc.c: Reduce the many
	variations of "revoked" ("revoked", "[revoked]", " [revoked]",
	"[revoked] ") "and" expired down to two to simplify translation.

	2004-09-28 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (print_and_check_one_sig): Account for the extra space
	that show-sig-expire takes up so we do not wrap lines.
	(show_key_with_all_names): No need to show subkey revocations as a
	seperate line since we now show revocation date in the main subkey
	line.

	* signal.c (got_fatal_signal): HAVE_DECL_SYS_SIGLIST is defined,
	but zero if not found. Noted by John Clizbe.

	* keyserver.c (parse_keyrec): Fix problem with non-expiring keys
	appearing expired in --search-keys results.

	2004-09-27 Werner Koch <wk@g10code.com>

	* card-util.c (card_edit): Take admin only status from the table.

	* app-openpgp.c: Made all strings translatable.
	(verify_chv3) [GNUPG_MAJOR_VERSION]: Make opt.allow_admin
	available for use in gnupg 2.
	(verify_chv3): Reimplemented countdown showing to use only
	functions from this module. Flush the CVH status cache on a
	successful read.
	(get_one_do): Hack to bypass the cache for cards versions > 1.0.
	(store_fpr): Store the creation date for card version > 1.0.

	2004-09-25 David Shaw <dshaw@jabberwocky.com>

	* main.h, g10.c (main), card-util.c (change_pin): If "admin" has
	not been issued, skip right to the CHV1/CHV2 PIN change. No need
	to show the unblock or admin PIN change option.
	(card_edit): Add "admin" command to add admin commands to the
	menu. Do not allow admin commands until "admin" is given.

	* app-openpgp.c (verify_chv3): Show a countdown of how many wrong
	admin PINs can be entered before the card is locked.

	* options.h, g10.c (main), app-openpgp.c (verify_chv3): Remove
	--allow-admin.

	2004-09-24 David Shaw <dshaw@jabberwocky.com>

	* main.h: Create S2K_DIGEST_ALGO macro so we do not need to always
	set opt.s2k_digest_algo. This helps fix a problem with PGP 2.x
	encrypted symmetric messages. Change all callers (encode.c,
	g10.c, keyedit.c, keygen.c, passphrase.c, sign.c).

	* armor.c, cardglue.c, getkey.c, import.c, keygen.c: Be consistent
	in some more quoted strings. Always use 'user ID', not 'user id',
	"quotes" for user IDs, etc.

	* keyedit.c (keyedit_menu), gpgv.c (agent_scd_getattr (stub)),
	keygen.c (copy_mpi, generate_raw_key): Fix a compile problem and a
	few warnings when building without card support.

	2004-09-23 Werner Koch <wk@g10code.com>

	* card_util.c (generate_card_keys): ask whether backup should be
	created.
	(card_store_subkey): Factored some code out to ..
	* keygen.c (save_unprotected_key_to_card): .. new function.
	(gen_card_key_with_backup): New.
	(generate_raw_key): New.
	(generate_keypair): New arg BACKUP_ENCRYPTION_DIR. Changed all
	callers.
	(do_generate_keypair): Divert to gen_card_key_with_backup when
	desired.

	* apdu.c (open_pcsc_reader): Do not print empty reader string.

	* keygen.c (ask_algo): Allow creation of AUTH keys.

	* keyid.c (usagestr_from_pk): New.

	* app-openpgp.c (app_openpgp_storekey): Call flush_cache.
	(get_cached_data): Move local data initialization to ..
	(app_select_openpgp): .. here. Read some flags for later use.
	(do_getattr): New read-only attribute EXTCAP.

	* keyedit.c (keyedit_menu): New command "keytocard"
	(keyedit_menu): Bad hack for the not_with_sk element.
	(show_key_with_all_names): Print the usage.
	(find_pk_from_sknode): New.

	* card-util.c (card_store_subkey): New.
	(copy_mpi): New.

	* cardglue.c (agent_openpgp_storekey): New.

	2004-09-22 Werner Koch <wk@g10code.com>

	* card-util.c (card_generate_subkey, generate_card_keys): Factored
	common code out to ...
	(get_info_for_key_operation, check_pin_for_key_operation)
	(restore_forced_chv1, replace_existing_key_p)
	(show_card_key_info): ... new functions.

	2004-09-21 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (check_sig_and_print), keyedit.c (show_prefs,
	menu_set_keyserver_url): Make sure that keyserver URLs with
	control characters inside are printed properly. In fact, handle
	them as UTF8.

	* keyedit.c (keyedit_menu): Don't show "addcardkey" in the menu if
	we do not have card support.

	* keydb.h, keyserver.c (print_keyrec, keyserver_spawn): fpr is an
	array of unsigned bytes.

	2004-09-20 Werner Koch <wk@g10code.com>

	* g10.c: Make -K an alias for --list-secret-keys.

	* keylist.c (print_card_serialno): New. Taken from gnupg 1.9.11.
	(list_keyblock_print): Make use of it.
	* keyedit.c (show_key_with_all_names): Print the card S/N.

	* keyedit.c (keyedit_menu): New command ADDCARDKEY.
	* card-util.c (card_generate_subkey): New.
	* keygen.c (generate_card_subkeypair): New.
	(gen_card_key): New arg IS_PRIMARY; changed all callers.

	* cardglue.c (open_card): Use shutdown code if possible.
	(check_card_serialno): Ditto.

	* ccid-driver.c (do_close_reader): Factored some code out from ...
	(ccid_close_reader): ..here.
	(ccid_shutdown_reader): New.

	* apdu.c (apdu_shutdown_reader): New.
	(shutdown_ccid_reader): New.

	2004-09-17 Werner Koch <wk@g10code.com>

	* g10.c (list_config): New config option ccid-reader-id.
	(gpgconf_list): Add "reader-port".

	* apdu.c (open_ccid_reader): New arg PORTSTR. Pass it to
	ccid_open_reader.
	(apdu_open_reader): Pass portstr to open_ccid_reader.
	(apdu_open_reader): No fallback if a full CCID reader id has been
	given.

	* ccid-driver.c (ccid_get_reader_list): New.
	(ccid_open_reader): Changed API to take a string for the reader.
	Removed al the cruft for the libusb development vesion which seems
	not to be maintained anymore and there are no packages anyway.
	The stable library works just fine.
	(struct ccid_reader_id_s): Deleted and replaced everywhere by a
	simple string.
	(usb_get_string_simple): Removed.
	(bulk_in): Do valgrind hack here and not just everywhere.

	2004-09-16 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names, show_prefs): Show preferred
	keyserver(s) in "showpref" output.

	* keygen.c (keygen_add_keyserver_url), keyedit.c
	(menu_set_keyserver_url): Allow setting a keyserver URL of "none"
	to remove an existing keyserver URL.

	* keyedit.c (menu_set_keyserver_url): Confirm replacement of a
	keyserver URL before overwriting the old one.

	2004-09-15 David Shaw <dshaw@jabberwocky.com>

	* gpgv.c (agent_scd_getattr): Stub.

	* misc.c (get_signature_count): New. Get the signature count from
	a smartcard.
	(pct_expando): Call it here so the %c expando becomes the number
	of signatures issued. This allows for notations or the like with
	an automatic signature count.

	* ccid-driver.c (usb_get_string_simple): Replacement function to
	work with older libusb.

	2004-09-15 Werner Koch <wk@g10code.com>

	* g10.c [HAVE_LIBUSB]: New option --debug-ccid-driver.

	* ccid-driver.c (read_device_info): Removed.
	(make_reader_id, scan_or_find_devices): New.
	(ccid_open_reader): Simplified by make use of the new functions.
	(ccid_set_debug_level): New. Changed the macros to make use of
	it. It has turned out that it is often useful to enable debugging
	at runtime so I added this option.

	2004-09-13 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (premerge_public_with_secret): Fix subkey<->binding sig
	mismatch when some secret subkeys are missing. Discovered by
	Michael Roth.

	* main.h, keylist.c (print_subpackets_colon): Make a public
	function.

	* keyedit.c (print_and_check_one_sig_colon): New. Print a
	with-colons version of the sig record.
	(menu_delsig): Call it here for a with-colons delsig.

	2004-09-12 David Shaw <dshaw@jabberwocky.com>

	* options.h, keylist.c (print_one_subpacket,
	print_subpackets_colon): Print a spk record for each request
	subpacket.
	(list_keyblock_colon): Call them here.

	* g10.c (parse_subpacket_list, parse_list_options): New. Make the
	list of subpackets we are going to print.
	(main): Call them here.

	2004-09-11 David Shaw <dshaw@jabberwocky.com>

	* card-util.c (fetch_url, card_edit): Use the pubkey URL stored on
	the card to fetch an updated copy. Works with either straight
	URLs or HKP or LDAP keyservers.

	* keyserver-internal.h, keyserver.c (keyserver_import_fprint),
	import.c (revocation_present): Use a keyserver_spec so the caller
	can pass in whatever keyserver they like.

	2004-09-10 David Shaw <dshaw@jabberwocky.com>

	* app-openpgp.c (get_cached_data): Avoid mallocing zero since it
	breaks us when using --enable-m-guard.

	* ccid-driver.c (read_device_info): Fix segfault when usb device
	is not accessible.
	(ccid_open_reader): Allow working with an even older version of
	libusb (usb_busses global instead of usb_get_busses()).

	2004-09-09 Werner Koch <wk@g10code.com>

	* cardglue.h: Add members for CA fingerprints.
	* cardglue.c (agent_release_card_info): Invalid them.
	(learn_status_cb): Store them.

	* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
	* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
	* card-util.c: Updated from current gnupg-1.9.

	Changes are:

	* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
	* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
	of libusb.
	(ccid_get_atr): Handle short messages.
	* apdu.c (my_rapdu_get_status): Implemented.
	* apdu.c: Include <signal.h>.
	* apdu.c (reader_table_s): Add function pointers for the backends.
	(apdu_close_reader, apdu_get_status, apdu_activate)
	(send_apdu): Make use of them.
	(new_reader_slot): Intialize them to NULL.
	(dump_ccid_reader_status, ct_dump_reader_status): New.
	(dump_pcsc_reader_status): New.
	(open_ct_reader, open_pcsc_reader, open_ccid_reader)
	(open_osc_reader, open_rapdu_reader): Intialize function pointers.
	(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
	(error_string): Removed. Replaced by apdu_strerror.
	(get_ccid_error_string): Removed.
	(ct_activate_card): Remove the unused loop.
	(reset_ct_reader): Implemented.
	(ct_send_apdu): Activate the card if not yet done.
	(pcsc_send_apdu): Ditto.
	* ccid-driver.h: Add error codes.
	* ccid-driver.c: Implement more or less proper error codes all
	over the place.
	* apdu.c (apdu_send_direct): New.
	(get_ccid_error_string): Add some error code mappings.
	(send_apdu): Pass error codes along for drivers already supporting
	them.
	(host_sw_string): New.
	(get_ccid_error_string): Use above.
	(send_apdu_ccid): Reset the reader if it has not yet been done.
	(open_ccid_reader): Don't care if the ATR can't be read.
	(apdu_activate_card): New.
	(apdu_strerror): New.
	(dump_reader_status): Only enable it with opt.VERBOSE.
	* iso7816.c (map_sw): Add mappings for the new error codes.
	* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
	(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
	in verbose mode.
	* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
	* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
	exponent.
	* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
	* card-util.c (change_login): Kludge to allow reading data from a
	file.
	(card_edit): Pass ARG_STRING to change_login.
	(card_status): Print CA fingerprints.
	(change_cafpr): New.
	(card_edit): New command CAFPR.

	2004-04-30 Werner Koch <wk@gnupg.org>

	* g10.c (main) <gpgconf>: Use gpg.conf and not /dev/null as
	default filename.

	2004-04-28 Werner Koch <wk@gnupg.org>

	* card-util.c (card_edit): Remove PIN verification.
	(generate_card_keys): New arg SERIALNO. Do PIN verification here
	after resetting forced_chv1.


	2004-09-09 Werner Koch <wk@g10code.com>

	* signal.c (got_fatal_signal): Do readline cleanup. Print signal
	number if we can't print the name. Use new autoconf macro
	HAVE_DECL_SYS_SIGLIST.
	(get_signal_name): Removed.

	* photoid.c: Include ttyio.h.

	* parse-packet.c (skip_rest): Removed. Changed all callers to use
	the new iobuf_skip_reset. Orginal patch by Florian Weimer.

	2004-09-07 Werner Koch <wk@g10code.de>

	* photoid.c (generate_photo_id): Use tty_printf and not just
	printf. Put _() around one string.

	2004-09-03 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (parse_keyrec): Force the 'e'xpired flag on as soon
	as we know the key is definitely expired. Some translatable
	string cleanup.

	2004-08-27 David Shaw <dshaw@jabberwocky.com>

	* encode.c, exec.c, g10.c, sign.c: Some translatable string
	cleanup. Change some "this" to `this'.

	2004-08-23 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_spawn): Show log line for what keyserver
	action we are taking.

	* keyid.c (keystr): If printing a keyid that lacks the high 4
	bytes, print the low 4 alone.
	(keystr_from_desc): Handle short keyids and warn on v3
	fingerprints.

	* keydb.h, getkey.c (get_user_id_printable): Rename to
	get_user_id_native and remove the printable stuff since we're
	print-ifying valid utf8 characters. Change all callers in
	import.c, sign.c, keylist.c, and encode.c.

	* keyserver.c (keyserver_search_prompt): Make sure the search
	string is converted from UTF-8 before display.

	2004-08-19 Werner Koch <wk@g10code.de>

	* seskey.c (encode_session_key): Changed the zero random byte
	substituting code to actually do clever things. Thanks to
	Matthias Urlichs for noting the implementation problem.

	2004-08-18 Marcus Brinkmann <marcus@g10code.de>

	* passphrase.c (agent_get_passphrase): Fix detection of gpg-agent
	cancellation.

	2004-08-08 David Shaw <dshaw@jabberwocky.com>

	* plaintext.c (handle_plaintext): Bigger buffer for extra safety.

	* g10.c (main): New alias --throw-keyid for --throw-keyids, so
	that it continues to work in old configuration files. Noted by
	Jens Adam.

	* pkclist.c (algo_available): --pgp8 now allows blowfish, zlib,
	and bzip2.

	* status.c (do_get_from_fd): Flush stdout if status isn't flushing
	it for us. This guarantees that any menus that were displayed
	before the prompt don't get stuck in a buffer. Noted by Peter
	Palfrader. This is Debian bug #254072.

	* sign.c (update_keysig_packet): Revert change of 2004-05-18. It
	is not appropriate to strip policy and notations when remaking a
	sig. That should only happen when specifically requested by the
	user.

	2004-08-05 David Shaw <dshaw@jabberwocky.com>

	* armor.c (radix64_read): No armor CRC is legal according to the
	spec (the CRC is a MAY).

	2004-07-28 David Shaw <dshaw@jabberwocky.com>

	* misc.c (argsplit): Properly split quoted args from the keyword
	and trim whitespace afterwards.

	2004-07-27 David Shaw <dshaw@jabberwocky.com>

	* misc.c (optsep): Add the ability to understand keyword="quoted
	arg with spaces" type options.

	2004-07-16 David Shaw <dshaw@jabberwocky.com>

	* keylist.c (list_keyblock_print): Always use the new listing
	format where uids are always on a line for themselves. Mark
	expired secret keys as expired.

	* options.h, g10.c (main): Rename list show-validity to
	show-uid-validity as it only shows for uids.

	* armor.c (armor_filter): Do not use padding to get us to 8 bytes
	of header. Rather, use 2+4 as two different chunks. This avoids
	a fake filename of "is".

	2004-07-15 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (sign_uids): Properly handle remaking a self-sig on
	revoked or expired user IDs. Also, once we've established that a
	given uid cannot or will not be signed, don't continue to ask
	about each sig.

	* mainproc.c (proc_symkey_enc), seckey-cert.c (do_check): Check
	the S2K hash algorithm before we try to generate a passphrase
	using it. This prevents hitting BUG() when generating a
	passphrase using a hash that we don't have.

	* sign.c (sign_symencrypt_file): Allow using --force-mdc in --sign
	--symmetric messages.

	* g10.c (main): Alias --charset as --display-charset to help avoid
	the continuing confusion and make room for possible changes in
	devel.

	* parse-packet.c (parse_plaintext): Show the hex value for the
	literal packet mode since it may not be printable.

	* keygen.c (make_backsig): Make sure that the backsig was built
	successfully before we try and use it.

	* status.h, status.c (get_status_string), plaintext.c
	(handle_plaintext): New status tags PLAINTEXT and
	PLAINTEXT_LENGTH.

	2004-06-16 Werner Koch <wk@gnupg.org>

	* free-packet.c (copy_secret_key): Get last fix right.

	2004-06-16 Werner Koch <wk@gnupg.org>

	* free-packet.c (copy_secret_key): Fixed memory leak when D is not
	NULL.

	* passphrase.c (passphrase_to_dek): Added a few comments to the
	code.

	2004-05-26 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_refresh): Keep track of keys already
	fetched so we don't do a regular keyserver fetch if the preferred
	keyserver fetch has exhausted the list.

	2004-05-23 David Shaw <dshaw@jabberwocky.com>

	* verify.c (verify_signatures): Verify multiple files in the same
	order in which we hashed them when issuing the signature. Noted
	by Nicholas Cole.

	* pkclist.c (do_edit_ownertrust): Fix a kbnode leak and do another
	keyid-format conversion.

	2004-05-22 Werner Koch <wk@gnupg.org>

	* trustdb.c (check_regexp): s/EXP/EXPR/.

	* keyedit.c (trustsig_prompt): Remoev useless range check.

	* options.h: Renamed ctrl to glo_ctrl. Changed all users.

	* ccid-driver.c (ccid_open_reader): Print a warning when CCID
	can't be used.

	2004-05-21 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (check_sig_and_print): If we're honoring preferred
	keyservers, and auto-key-retrieve is set, try and get a missing
	key from the preferred keyserver subpacket when we verify the sig.

	* gpgv.c (parse_preferred_keyserver, free_keyserver_spec): Stubs.

	* keyserver.c (keyidlist): Use new parse_preferred_keyserver
	function.
	(keyserver_work): Use the passed-in keyserver spec rather than the
	options global one.

	* keyserver-internal.h, keyserver.c (parse_preferred_keyserver):
	New function to take a sig and return a split out keyserver_spec.
	(keyserver_import_keyid): Now takes a keyserver_spec.

	* keyserver.c (keyidlist): Go back to the old fast keyid lister.
	Only merge selfsigs if we have to for honor-keyserver-url.
	(keyserver_refresh): Keyserver URL handler moved here.
	(calculate_keyid_fpr): Removed.

	* keydb.h, keyid.c (keystr_from_desc): Calculate a key string from
	a KEYDB_SEARCH_DESC.

	* keyserver.c (keyserver_spawn): Fix keyserver options on tempfile
	only platforms. Noted by Roger Sondermann.

	2004-05-20 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_work): Allow --refresh-keys with a
	preferred keyserver to happen even if there is no global keyserver
	set.

	* sig-check.c (do_check_messages): No need to check for Elgamal
	signatures any longer.
	(do_check_messages, do_check, check_key_signature2):
	--keyid-format conversion.

	* pkclist.c (show_paths, edit_ownertrust): Remove some unused
	code.

	* options.h (ctrl): New for member IN_AUTO_KEY_RETRIEVE.

	* mainproc.c (check_sig_and_print): track whether we are
	retrieving a key.

	* status.c (status_currently_allowed): New.
	(write_status_text, write_status_text_and_buffer): Use it here.

	* g10.c: New command --gpgconf-list.
	(gpgconf_list): New. From Werner on stable branch.

	2004-05-19 David Shaw <dshaw@jabberwocky.com>

	* pubkey-enc.c (get_session_key, get_it), keyedit.c
	(show_key_with_all_names, show_basic_key_info): --keyid-format
	conversion.

	2004-05-18 David Shaw <dshaw@jabberwocky.com>

	* sign.c (update_keysig_packet): Policies and notations should be
	stripped out when remaking a self-signature. Noted by Atom
	Smasher.

	* keyserver.c (parse_keyserver_uri): Fix compiler warnings.

	2004-05-11 David Shaw <dshaw@jabberwocky.com>

	* options.h, keyserver-internal.h, keyserver.c
	(parse_keyserver_uri): Improved URI parser that keeps track of the
	path information and doesn't modify the input string.
	(keyserver_spawn): Tell keyserver plugins about the path.

	2004-05-11 Werner Koch <wk@gnupg.org>

	* keylist.c (show_policy_url, show_keyserver_url, show_notation)
	(list_one): Use const char* for i18n string helpers.

	* keygen.c (do_generate_keypair, read_parameter_file): Really
	close the files.
	(do_generate_keypair): Create the secret key file using safe
	permissions. Noted by Atom Smasher.

	2004-05-10 David Shaw <dshaw@jabberwocky.com>

	* options.h, mainproc.c (symkey_decrypt_seskey), keyserver.c
	(struct keyrec, parse_keyrec, keyserver_search_prompt), keyedit.c
	(keyedit_menu), g10.c (add_keyserver_url, add_policy_url): Fix
	some compiler warnings.

	2004-05-08 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (keyedit_menu, menu_set_keyserver_url): Allow passing
	preferred keyserver on "keyserver" command line. Sanity check
	keyserver URL before accepting it.

	* keyserver-internal.h, g10.c (main), keyserver.c
	(parse_keyserver_uri): Add an option to require the scheme:// and
	change all callers.
	(free_keyserver_spec): Make public.

	2004-05-07 Werner Koch <wk@gnupg.org>

	* sign.c (write_plaintext_packet): Fixed the detection of too
	large files in the same way as in encode.c.

	2004-05-04 David Shaw <dshaw@jabberwocky.com>

	* keylist.c (show_notation): Use bits to select which sort of
	notation to show. Don't allow a not-shown notation to prevent us
	from issuing the proper --status-fd message.

	* options.h, g10.c (main): Add show-std/standard-notations and
	show-user-notations. show-notations is both. Default is to show
	standard notations only during verify. Change all callers.

	2004-04-28 David Shaw <dshaw@jabberwocky.com>

	* main.h, keylist.c (show_notation): Add argument to show only
	user notations, only standard notations, or both. Change all
	callers.

	* keyserver.c (keyserver_spawn): We still need EXEC_TEMPFILE_ONLY.

	2004-04-28 Werner Koch <wk@gnupg.org>

	* card-util.c (card_edit): Require PIN only for generate.

	* app-openpgp.c (do_setattr): Sync FORCE_CHV1.

	2004-04-27 Werner Koch <wk@gnupg.org>

	* keyserver.c (keyserver_spawn) [EXEC_TEMPFILE_ONLY]: Removed
	setting use_temp_file because this option has been removed.

	* g10.c: New commands --allow-admin and --deny-admin.
	* options.h (opt): Add member ALLOW_ADMIN.

	* tlv.h, tlv.c: New. Copied from gnupg-1.9.
	* cardglue.c (open_card): The serialno is now set internally by
	app_select_openpgp; changed invocation.
	* cardglue.h (app_t, ctrl_t): New.
	(GPG_ERR_EBUSY, GPG_ERR_ENOENT, GPG_ERR_NOT_FOUND, GPG_ERR_BUG)
	(GPG_ERR_NOT_IMPLEMENTED, GPG_ERR_EACCESS): New.
	(gpg_err_code_from_errno): New.

	* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
	* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
	* card-util.c: Updated from current gnupg-1.9.

	Changes are:

	* app-common.h: New members FNC.DEINIT and APP_LOCAL.
	* app-openpgp.c (do_deinit): New.
	(get_cached_data, flush_cache_item, flush_cache_after_error)
	(flush_cache): New.
	(get_one_do): Replaced arg SLOT by APP. Make used of cached data.
	(verify_chv2, verify_chv3): Flush some cache item after error.
	(do_change_pin): Ditto.
	(do_sign): Ditto.
	(do_setattr): Flush cache item.
	(do_genkey): Flush the entire cache.
	(compare_fingerprint): Use cached data.

	* apdu.c (apdu_send_le): Reinitialize RESULTLEN. Handle
	SW_EOF_REACHED like SW_SUCCESS.

	* ccid-driver.c (parse_ccid_descriptor): Store some of the reader
	features away. New arg HANDLE
	(read_device_info): New arg HANDLE. Changed caller.
	(bulk_in): Handle time extension requests.
	(ccid_get_atr): Setup parameters and the IFSD.
	(compute_edc): New. Factored out code.
	(ccid_transceive): Use default NADs when required.

	* apdu.h: New pseudo stati SW_HOST_NOT_SUPPORTED,
	SW_HOST_LOCKING_FAILED and SW_HOST_BUSY.
	* iso7816.c (map_sw): Map it.

	* ccid-driver.c (ccid_slot_status): Add arg STATUSBITS.
	* apdu.c (apdu_get_status): New.
	(ct_get_status, pcsc_get_status, ocsc_get_status): New stubs.
	(get_status_ccid): New.
	(apdu_reset): New.
	(reset_ct_reader, reset_pcsc_reader, reset_osc_reader): New stubs.
	(reset_ccid_reader): New.
	(apdu_enum_reader): New.

	* apdu.c (lock_slot, trylock_slot, unlock_slot): New helpers.
	(new_reader_slot) [USE_GNU_PTH]: Init mutex.
	(apdu_reset, apdu_get_status, apdu_send_le): Run functions
	in locked mode.

	2004-04-25 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (get_seckey_byname2): Significantly simplify this
	function by using key_byname to do the heavy lifting. Note that
	this also fixes an old problem when the first key on the secret
	keyring has an unusable stub primary, but is still chosen.

	* getkey.c (key_byname): If namelist is NULL, return the first key
	in the keyring.

	2004-04-22 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (make_backsig): If DO_BACKSIGS is not defined, do not
	create backsigs.

	* getkey.c (merge_selfsigs_subkey): Find 0x19 backsigs on subkey
	selfsigs and verify they are valid. If DO_BACKSIGS is not
	defined, fake this as always valid.

	* packet.h, parse-packet.c (parse_signature): Make parse_signature
	non-static so we can parse 0x19s in self-sigs.

	* main.h, sig-check.c (check_backsig): Check a 0x19 signature.
	(signature_check2): Give a backsig warning if there is no or a bad
	0x19 with signatures from a subkey.

	2004-04-21 David Shaw <dshaw@jabberwocky.com>

	* parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt,
	can_handle_critical): Parse and display 0x19 signatures.

	2004-04-20 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (parse_keyserver_uri): Do not accept "http" as an
	alias for "hkp". They are not the same thing.

	2004-04-19 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main): Add keyserver-option
	honor-keyserver-url. parse_keyserver_options now returns a
	success code.

	* keyserver.c (parse_keyserver_options): Return error on failure
	to parse. Currently there is no way to fail as any unrecognized
	options get saved to be sent to the keyserver plugins later.
	Check length of keyserver option tokens since with =arguments we
	must only match the prefix.
	(free_keyserver_spec): Moved code from parse_keyserver_url.
	(keyserver_work, keyserver_spawn): Pass in a struct keyserver_spec
	rather than using the global keyserver option.
	(calculate_keyid_fpr): New. Fills in a KEYDB_SEARCH_DESC for a
	key.
	(keyidlist): New implementation using get_pubkey_bynames rather
	than searching the keydb directly. If honor-keyserver-url is set,
	make up a keyserver_spec and try and fetch that key directly. Do
	not include it in the returned keyidlist in that case.

	2004-04-16 David Shaw <dshaw@jabberwocky.com>

	* plaintext.c (handle_plaintext): Accept 'u' as a plaintext mode
	that requires end of line conversion. This is being considered
	for a UTF8 text packet. If this doesn't take place, no major harm
	done. If it does take place, we'll get a jump on starting the
	changeover.

	* g10.c (main): --no-use-embedded-filename.

	* build-packet.c (calc_plaintext, do_plaintext): Do not create
	illegal (packet header indicates a size larger than the actual
	packet) encrypted data packets when not compressing and using a
	filename longer than 255 characters.

	* keyedit.c (no_primary_warning): Cleanup. (menu_expire): Don't
	give primary warning for subkey expiration changes. These cannot
	reorder primaries.

	* keygen.c (gen_elg, gen_dsa, gen_rsa, do_create,
	do_generate_keypair, generate_subkeypair): New is_subkey argument
	to set whether a generated key is a subkey. Do not overload the
	ret_sk. This is some early cleanup to do backsigs for signing
	subkeys.

	* keygen.c (write_keybinding, do_generate_keypair,
	generate_subkeypair): Keep track of the unprotected subkey secret
	key so we can make a backsig with it.

	* keygen.c (make_backsig): New function to add a backsig to a
	binding sig of signing subkeys. Currently disabled.
	(write_keybinding): Call it here, for signing subkeys only.

	* sign.c (make_keysig_packet): Allow generating 0x19 signatures
	(same as 0x18 or 0x28, but used for backsigs).

	* packet.h, build-packet.c (build_sig_subpkt): Add new
	SIGSUBPKT_SIGNATURE type for embedded signatures.

	* main.h, misc.c (optsep, argsplit, optlen, parse_options):
	Simplify code and properly handle a partial match against an
	option with an argument.

	* keyserver-internal.h, keyserver.c (parse_keyserver_options): Use
	new optsep and argsplit functions.

	2004-04-15 David Shaw <dshaw@jabberwocky.com>

	* main.h, misc.c (argsplit): Refactor argsep into argsplit and
	argsep so they can be called separately.

	* options.h, keyserver.c (parse_keyserver_options): Remove
	duplicate code from parse_keyserver_options by calling the generic
	parse_options.

	* keyserver.c (keyserver_spawn, keyserver_refresh), g10.c (main),
	gpgv.c (main), mainproc.c (check_sig_and_print), import.c
	(revocation_present): Change all callers.

	2004-04-14 David Shaw <dshaw@jabberwocky.com>

	* packet.h, getkey.c (fixup_uidnode, merge_selfsigs_subkey): Keep
	track of which self-sig we actually chose.

	* keyedit.c (menu_expire, menu_set_primary_uid,
	menu_set_preferences): Use it here to avoid updating non-used
	self-sigs and possibly promoting an old self-sig into
	consideration again.

	* options.h, import.c, keyserver-internal.h, g10.c, mainproc.c,
	keyserver.c (parse_keyserver_uri): Parse keyserver URI into a
	structure. Cleanup for new "guess my keyserver" functionality, as
	well as refreshing via a preferred keyserver subpacket.

	* options.h: Encapsulate keyserver details. Change all callers.

	2004-04-05 Werner Koch <wk@gnupg.org>

	* status.h (STATUS_NEWSIG): New.
	* status.c (get_status_string): Add it.

	2004-03-27 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (keyedit_menu): Request a trustdb update when adding a
	new user ID so the new ID gets validity set. Reported by Owen
	Taylor.

	2004-03-25 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), compress-bz2.c (init_uncompress):
	Rename --bzip2-compress-lowmem to --bzip2-decompress-lowmem since
	it applies to decompression, not compression.

	2004-03-24 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (sign_uids, show_key_and_fingerprint, ask_revoke_sig,
	menu_revsig, menu_showphoto): --keyid-format conversion.
	(menu_addrevoker): Use print_pubkey_info() rather than duplicating
	code.

	2004-03-19 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (update_min_ownertrust, validate_keys): Do not use
	keystr functions in log_debug.

	* import.c (import_one): Try and collapse user IDs when importing
	a key for the first time.

	* keyedit.c (menu_addrevoker): Allow appointing a subkey as a
	designated revoker if the user forces it via keyid!, so long as
	the subkey can certify. Also use the proper date string when
	prompting for confirmation.

	* g10.c (main): Maintain ordering of multiple Comment lines.
	Requested by Peter Hyman.

	2004-03-17 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (proc_pubkey_enc, print_pkenc_list, list_node):
	--keyid-format conversion.

	2004-03-16 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (skip_unusable, merge_selfsigs_main,
	premerge_public_with_secret, lookup, get_user_id_string):
	--keyid-format conversion.

	2004-03-15 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (add_utk, verify_own_keys, update_min_ownertrust,
	get_validity, ask_ownertrust, validate_keys): --keyid-format
	conversion.

	* import.c (check_prefs_warning, check_prefs): --keyid-format
	conversion and a little better text.
	(import_one, import_secret_one, import_revoke_cert, chk_self_sigs,
	delete_inv_parts, merge_blocks): Still more --keyid-format
	conversions.

	2004-03-06 David Shaw <dshaw@jabberwocky.com>

	* keylist.c (print_seckey_info, print_pubkey_info): --keyid-format
	conversion.
	(list_keyblock_print): 0xshort should not push us into the new
	list format since it is not much longer than regular 8-character
	short keyids.

	* keydb.h, keyid.c (keystr_from_pk, keystr_from_sk): New functions
	to pull a key string from a key in one step. This isn't faster
	than before, but makes for neater code.

	* keylist.c (list_keyblock_print): Use keystr_from_xx here.
	(print_key_data): No need to pass a keyid in.

	2004-03-05 David Shaw <dshaw@jabberwocky.com>

	* keyid.c (keyid_from_sk): Minor performance boost by caching
	secret key keyids so we don't have to calculate them each time.

	* getkey.c (merge_selfsigs_subkey): Do not mark subkeys valid if
	we do not support their pk algorithm. This allows for early
	(during get_*) rejection of a subkey, and selection of another.

	* passphrase.c (passphrase_to_dek): Give a little more information
	when we have room to do so.

	2004-03-04 David Shaw <dshaw@jabberwocky.com>

	* revoke.c (export_minimal_pk), export.c (do_export_stream),
	passphrase.c (passphrase_to_dek), keyserver.c (print_keyrec): A
	few more places to use --keyid-format.

	* options.h, g10.c (main), export.c (parse_export_options,
	do_export_stream): Remove --export-all and the "include-non-rfc"
	export-option as they are no longer meaningful with the removal of
	v3 Elgamal keys.

	* armor.c (fake_packet, armor_filter): Use the 2440 partial length
	encoding for the faked plaintext packet.

	2004-03-03 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), mainproc.c (check_sig_and_print):
	Remove verify-option show-long-keyids and replace with
	the more general keyid-format.

	* build-packet.c (write_header2): Remove call to start old gpg
	partial length mode and change all callers.
	(do_plaintext): Turn off partial length encoding now that we're
	done writing the packet.
	(do_comment, do_user_id): Try for a headerlen of 2 since that's
	the smallest and most likely encoding for these packets.

	* parse-packet.c (parse): Remove call to start old gpg partial
	length mode.

	2004-03-02 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main): Add a more flexible --keyid-format
	option to replace the list-option (and eventually verify-option)
	show-long-keyids. The format can be short, long, 0xshort, and
	0xlong.

	* keydb.h, keyid.c (keystr, keystrlen): New functions to generate
	a printable keyid.

	* keyedit.c (print_and_check_one_sig, show_key_with_all_names),
	keylist.c (list_keyblock_print): Use new keystr() function here to
	print keyids.

	* packet.h, free-packet.c (free_encrypted, free_plaintext),
	parse-packet.c (copy_packet, skip_packet, skip_rest, read_rest,
	parse_plaintext, parse_encrypted, parse_gpg_control): Use a flag
	to indicate partial or indeterminate encoding. This is the first
	step in some minor surgery to remove the old gpg partial length
	encoding.

	2004-03-01 David Shaw <dshaw@jabberwocky.com>

	* parse-packet.c (parse): Only data-type packets are allowed to
	use OpenPGP partial length encoding.

	2004-02-25 David Shaw <dshaw@jabberwocky.com>

	* delkey.c (do_delete_key): Allow deleting a public key with a
	secret present if --expert is set.

	* plaintext.c (handle_plaintext): Make bytecount static so it
	works with multiple literal packets inside a message.

	* encode.c, helptext.c (keygen.algo, keygen.algo.elg_se), keygen.c
	(ask_algo), sig-check.c (do_check_messages), skclist.c
	(build_sk_list): Rename "ElGamal" to "Elgamal" as that is the
	proper spelling nowadays. Suggested by Jon Callas.

	2004-02-24 David Shaw <dshaw@jabberwocky.com>

	* plaintext.c: Copyright.

	* encode.c (encode_simple): Show cipher with --verbose.

	* options.h, g10.c (main), keyedit.c (sign_keys): Add
	--ask-cert-level option to enable cert level prompts during
	sigs. Defaults to on. Simplify --default-cert-check-level to
	--default-cert-level. If ask-cert-level is off, or batch is on,
	use the default-cert-level as the cert level.

	* options.h, g10.c (main), trustdb.c (mark_usable_uid_certs):
	Simplify --min-cert-check-level to --min-cert-level.

	2004-02-22 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Add
	--min-cert-check-level option to specify minimum cert check level.
	Defaults to 2 (so 0x11 sigs are ignored). 0x10 sigs cannot be
	ignored.

	2004-02-21 David Shaw <dshaw@jabberwocky.com>

	* plaintext.c (handle_plaintext): Properly handle a --max-output
	of zero (do not limit output at all).

	* keyserver.c (keyserver_spawn): Use the full 64-bit keyid in the
	INFO header lines, and include "sig:" records for the benefit of
	people who store their keys in LDAP servers. It makes it easy to
	do queries for things like "all keys signed by Isabella".

	* main.h, misc.c (hextobyte): Removed. It's in libutil.a now.

	2004-02-20 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_export): Disallow user strings that
	aren't key IDs.
	(keyserver_import): Clarify error message.
	(keyserver_spawn): Properly handle 8 bit characters in user IDs in
	the info lines during SEND.

	* mkdtemp.c: Removed.

	* Makefile.am: We get mkdtemp.c from libutil.a now, so don't link
	with @LIBOBJS@.

	* keyserver.c (keyserver_spawn): Pass the scheme to the keyserver
	helper.

	2004-02-18 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), plaintext.c (handle_plaintext): Add
	--max-output option to help people deal with decompression bombs.

	2004-02-15 David Shaw <dshaw@jabberwocky.com>

	* build-packet.c (do_user_id): Do not force a header for attribute
	packets as they require a new CTB, and we don't support forced
	headers for new CTBs yet.

	2004-02-14 David Shaw <dshaw@jabberwocky.com>

	* build-packet.c (write_header2): If a suggested header length is
	provided along with a zero length, interpret this as an actual
	zero length packet and not as an indeterminate length packet.
	(do_comment, do_user_id): Use it here as these packets might be
	naturally zero length.

	* parse-packet.c (parse): Show packet type when failing due to an
	indeterminate length packet.

	* misc.c (parse_options): Only provide args for the true (i.e. not
	"no-xxx") form of options.

	2004-02-13 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (argsep): Move to misc.c.

	* main.h, misc.c (parse_options), export.c (parse_export_options),
	import.c (parse_import_options), g10.c (main): Use it here to
	allow for options with optional arguments. Change all callers.

	* import.c (check_prefs): Some language fixes.
	(sec_to_pub_keyblock, import_secret_one): Without knowing the
	number of MPIs there are, we cannot try and sk-to-pk-ize a key.

	2004-02-12 David Shaw <dshaw@jabberwocky.com>

	* import.c (check_prefs): New function to check preferences on a
	public key to ensure that it does not advertise any that we cannot
	fulfill. Use the keyedit command list function to optionally
	rewrite the prefs.
	(import_one, import_secret_one): Use it here when importing a
	public key that we have the secret half of, or when importing a
	secret key that we have the public half of.

	* main.h, keyedit.c (keyedit_menu): Remove sign_mode and enhance
	the more general command list functionality to replace it.

	* g10.c (main): Use the general command functionality to implement
	--sign-key, --lsign-key, --nrsign-key, and --nrlsign-key.

	* import.c (import_one): Do the revocation check even in the case
	when a key, a revocation key set in a direct key signature, and a
	revocation from that revocation key, all arrive piecemeal.
	Needless to say, this is pretty obscure.

	2004-02-11 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), keylist.c (list_keyblock_print): Add
	"show-unusable-subkeys" list-option to show revoked and/or expired
	subkeys.

	2004-02-10 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (keyedit_menu): Prompt for subkey removal for both
	secret and public subkeys.

	* keylist.c (list_keyblock_print), keyedit.c
	(show_key_with_all_names): Show the revocation date of a
	key/subkey, and general formatting work.

	* packet.h, getkey.c (merge_selfsigs_main, merge_selfsigs_subkey,
	merge_selfsigs): Keep track of the revocation date of a key.

	* keydb.h, keyid.c (revokestr_from_pk): New function to print the
	revocation date of a key.

	* keygen.c (keygen_set_std_prefs): Build the default preferences
	list at runtime as it properly handles algorithms disabled at
	build or run time.

	* getkey.c (merge_selfsigs_main): Properly handle expired user IDs
	when the expired self-sig is not the only self-sig.

	* misc.c (compress_algo_to_string): Return NULL on failure like
	all of the other xxxx_algo_to_string() functions.

	* mainproc.c (list_node): Minor spacing tweak to match --list-keys
	output.

	* keylist.c (list_keyblock_print), mainproc.c (list_node): Mark
	revoked subkeys as revoked. Requested by Matthew Wilcox. Revoked
	overrides expiration when both apply.

	* keyedit.c (show_prefs): Use compress algo constants.
	(show_basic_key_info): Make revoked and expired tags translatable.

	* g10.c (rm_group): Properly ungroup from a list of groups.

	2004-01-30 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main, rm_group): Add --ungroup command to remove a
	particular group.
	(add_group): When adding a group with the same name as an already
	existing group, merge the two groups.
	(list_config): Show an error message when listing a config item
	that doesn't exist.
	(main): Replace -z0 trick for no compression.

	* packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c
	(list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor
	cleanup to remove local_id, which is no longer used.

	2004-01-27 David Shaw <dshaw@jabberwocky.com>

	* getkey.c: Set MAX_PK_CACHE_ENTRIES and MAX_UID_CACHE_ENTRIES to
	PK_UID_CACHE_SIZE (set in ./configure).

	* getkey.c (get_pubkey): When reading key data into the cache,
	properly handle keys that are partially (pk, no UIDs) cached
	already. This is Debian bug #176425 and #229549.

	* compress.c (init_compress, push_compress_filter2): Do the right
	thing (i.e. nothing) with compress algo 0.

	* main.h, decrypt.c (decrypt_messages): Accept filenames to
	decrypt on stdin. This is bug #253.

	2004-01-23 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (list_node): Show sigs with --verbose.

	* options.h, g10.c (set_screen_dimensions): New function to look
	at COLUMNS and LINES.

	* keyserver.c (parse_keyrec, keyserver_search_prompt), keyedit.c
	(print_and_check_one_sig): Use new screen dimension variables.

	2004-01-21 David Shaw <dshaw@jabberwocky.com>

	* g10.c (list_config): New function to dump config options to
	stdout. Currently requires --with-colons.
	(collapse_args): New function to turn argc/argv into a single
	string.
	(main): Use it here to pass list_config() more than one argument
	as a single string.
	(print_algo_numbers): Helper to print algorithm number for
	--list-config "pubkey", "cipher", "hash"/"digest", and "compress"
	config options.

	* packet.h, getkey.c (merge_selfsigs, merge_selfsigs_main),
	pkclist.c (check_signatures_trust): Indicate who has revoked a key
	(the owner or a designated revoker). If a key was revoked by
	both, prefer the owner. If a subkey is already revoked by the
	owner, don't allow a designated revokation of the whole key to
	override this. We're still revoked either way, of course.

	* keyedit.c (print_and_check_one_sig, keyedit_menu): Use the
	COLUMNS environment variable (if any) to hint how wide the
	terminal is. Disabled on _WIN32. Suggested by Janusz
	A. Urbanowicz.

	2004-01-20 David Shaw <dshaw@jabberwocky.com>

	* keylist.c (set_attrib_fd): Open attribute fd in binary
	mode. This isn't meaningful on POSIX systems, but the Mingw builds
	aren't exactly POSIX.

	* trustdb.c (reset_trust_records): New, faster, implementation
	that doesn't involve a keyring scan.
	(clear_validity): Removed.

	* g10.c (main), keydb.h, keydb.c (keydb_rebuild_caches),
	keyring.h, keyring.c (keyring_rebuild_cache): Add "noisy" flag so
	cache rebuilds can remain noisy when called for itself, and quiet
	when called as part of the trustdb rebuild.

	* trustdb.c (validate_keys): Rebuild the sig caches before
	building the trustdb. Note that this is going to require some
	architectual re-thinking, as it is agonizingly slow.

	2004-01-19 David Shaw <dshaw@jabberwocky.com>

	* sig-check.c (check_key_signature2): Comments.

	* keyring.c (keyring_rebuild_cache): Clear sig cache for any
	signatures that we can no longer process (say, if the user removed
	support for a necessary pubkey or digest algorithm).

	2004-01-16 David Shaw <dshaw@jabberwocky.com>

	* misc.c (print_cipher_algo_note): May as well call Rijndael AES
	at this point.

	* keygen.c (do_create), misc.c (openpgp_pk_algo_usage): Remove the
	last bits of Elgamal type 20 support.

	2004-01-03 Stefan Bellon <sbellon@sbellon.de>

	* compress.c [__riscos__]: Only use RISC OS' own ZLib module if
	configured to use it.

	2003-12-30 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), import.c (parse_import_options,
	import_one, import_secret_one), keyserver.c (keyserver_refresh):
	Change --merge-only to --import-option merge-only. Deprecate
	--merge-only.

	2003-12-29 David Shaw <dshaw@jabberwocky.com>

	* misc.c (pull_in_libs): Dead code. Removed.

	* sig-check.c (check_revocation_keys): Comments.

	* getkey.c (merge_selfsigs_main): Don't bother to check designated
	revoker sigs if the key is already revoked.

	* packet.h, getkey.c (merge_selfsigs_main): New "maybe_revoked"
	flag on PKs. It is set when there is a revocation signature from
	a valid revocation key, but the revocation key is not present to
	verify the signature.

	* pkclist.c (check_signatures_trust): Use it here to give a
	warning when showing key trust.

	* compress-bz2.c: Include stdio.h. Solaris 9 has a very old bzip2
	library and we can at least guarantee that it won't fail because
	of the lack of stdio.h.

	* tdbio.c: Fixed format string bugs related to the use of DB_NAME.
	Reported by Florian Weimer.

	2003-12-28 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), keyserver.c (keyserver_opts,
	parse_keyserver_uri): honor-http-proxy is no longer an option
	since we can do the same thing with http-proxy with no arguments.
	Also remove broken-http-proxy since it can be better handled in
	the HTTP helper.

	* keyserver.c (argsep): New variation on strsep that knows about
	optional arguments.
	(parse_keyserver_options): Use it here for optional arguments.

	2003-12-28 Stefan Bellon <sbellon@sbellon.de>

	* plaintext.c (handle_plaintext) [__riscos__]: Don't mangle
	filename if the user specified it.

	* g10.c, gpgv.c [__riscos__]: Removal of unnecessary #ifdef
	__riscos__ sections.

	2003-12-27 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (strip_leading_space, get_arg): New.
	(parse_keyserver_options): Use them here to allow arguments to
	keyserver-options. Since none of our options need arguments yet,
	just pass them through whole to the keyserver helper.

	* main.h, misc.c (parse_options): Add a "noisy" flag to enable and
	disable the messages about which option didn't match or matched
	ambiguously. Change all callers (g10.c, keyserver.c).

	* main.h, import.c (import_options), export.c (export_options):
	Pass the noisy flag through.

	2003-12-17 David Shaw <dshaw@jabberwocky.com>

	* build-packet.c (write_fake_data, do_secret_key), seckey-cert.c
	(do_check): Use an unsigned length for mpi_get_opaque.

	* options.h: It's impolite to assign -1 to an unsigned
	opt.force_ownertrust.

	* sig-check.c (cmp_help, do_check), sign.c (do_sign): Remove old
	unused code.

	* keyid.c (keyid_from_sk): Make sure lowbits is initialized.

	2003-12-12 David Shaw <dshaw@jabberwocky.com>

	* sig-check.c (do_check): Move the signing algo and hash checks
	from here...
	(signature_check2): ... to here.
	(check_key_signature2): ... and here. This is a minor
	optimization to avoid fetching a key (which can be expensive,
	especially if it is not self-signed, and there are many key
	signatures on it which need to be checked for ultimate trust) if
	the signature would have failed anyway because of algorithm or
	hash problems.

	2003-12-10 David Shaw <dshaw@jabberwocky.com>

	* packet.h, build-packet.c (hash_public_key): Remove function ...

	* keydb.h, keyid.c (hash_public_key, do_fingerprint_md): ... and
	make a new one here that shares code with the fingerprint
	calculations. This removes some duplicated functionality, and is
	also around 14% faster. (Every bit helps).

	* import.c (import_one): No longer need the Elgamal import
	warning.

	* getkey.c (get_pubkey_fast): This one is sort of obscure.
	get_pubkey_fast returns the primary key when requesting a subkey,
	so if a user has a key signed by a subkey (we don't do this, but
	used to), AND that key is not self-signed, AND the algorithm of
	the subkey in question is not present in GnuPG, AND the algorithm
	of the primary key that owns the subkey in question is present in
	GnuPG, then we will try and verify the subkey signature using the
	primary key algorithm and hit a BUG(). The fix is to not return a
	hit if the keyid is not the primary. All other users of
	get_pubkey_fast already expect a primary only.

	2003-12-09 David Shaw <dshaw@jabberwocky.com>

	* keyid.c (do_fingerprint_md): Remove the rules to hash the old v3
	Elgamal keys. They are no longer needed.

	* keyid.c (keyid_from_sk, keyid_from_pk, fingerprint_from_pk,
	fingerprint_from_sk): Enforce the v3-is-only-RSA rule. Anything
	that isn't RSA gets a zero keyid and fingerprint.

	* keyid.c (do_fingerprint_md): Properly handle hashing of keys
	that we don't know the structure of by using the opaque MPI.
	(do_fingerprint_md_sk): We cannot calculate the fingerprint from a
	secret key unless we know the structure (since we can't leave off
	the secret key parts), so fail early.....
	(keyid_from_sk, fingerprint_from_sk): .... and return all zeroes.

	2003-12-03 David Shaw <dshaw@jabberwocky.com>

	* g10.c (strusage, main): Show development version warning in
	--version output.
	(main): Set --bzip2-compress-level to the default value at
	startup. Remove --emulate-checksum-bug noop.

	* options.h, g10.c (main), main.h, seskey.c (do_encode_md,
	encode_md_value), sig-check.c (do_check), sign.c (do_sign): Remove
	--emulate-md-encode-bug as it only applied to Elgamal signatures,
	which are going away.

	2003-11-30 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (proc_symkey_enc, proc_encrypted): Add ability to use
	--override-session-key on --symmetric messages (new-style or
	old-style).
	(proc_pubkey_enc): Move code to show session key from here to
	proc_encrypted() so it can work with any type of message.
	Suggested by Michael Young.

	2003-11-29 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (validate_keys): Reset the trustdb before checking if
	we have any ultimately trusted keys. This ensures that if we lose
	all our ultimately trusted keys, we don't leave behind the old
	validity calculations. Noted by Peter Palfrader.

	* revoke.c (gen_desig_revoke): Specify in the comment when a
	designated revocation is generated.

	* getkey.c (merge_selfsigs_main, merge_selfsigs_subkey,
	get_seckey_byname2): Remove Elgamal check since we are removing
	type 20 keys altogether.

	2003-11-27 David Shaw <dshaw@jabberwocky.com>

	* pkclist.c (build_pk_list): Do not allow an empty PK list in
	interactive mode.

	* keygen.c (ask_algo): Remove ability to generate Elgamal
	sign+encrypt keys.

	* getkey.c (merge_selfsigs_main, merge_selfsigs_subkey,
	get_seckey_byname2): Disallow use of sign+encrypt Elgamal keys.

	2003-11-20 David Shaw <dshaw@jabberwocky.com>

	* seskey.c (do_encode_md): Comment about earlier (pre-PGP 2.3)
	encodings.

	* misc.c (compress_algo_to_string): Translate "Uncompressed".
	Requested by Tommi Vainikainen.
	(string_to_compress_algo): Include multi-string for
	"uncompressed\|none".

	2003-11-17 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), compress-bz2.c (init_uncompress): Add
	--bz2-compress-lowmem to set bzlib "small" flag for low memory
	(but slow) decompression.

	2003-11-15 David Shaw <dshaw@jabberwocky.com>

	* compress.c (init_compress): Remove compress level 10 trick,
	since it is no longer needed.

	* g10.c: Fix typoed option name.

	* compress-bz2.c (init_compress): Compression level 0 is not
	meaningful for bzip2.

	* options.h, g10.c (main), compress.c (init_compress),
	compress-bz2.c (init_compress): Add --compress-level and
	--bzip2-compress-level. -z sets them both. Change various
	callers.

	* encode.c (encode_simple), sign.c (sign_symencrypt_file):
	Properly use default_compress_algo (--compress-algo, followed by
	the highest --personal-compress-preference, followed by ZIP) to
	get the algorithm.

	2003-11-14 David Shaw <dshaw@jabberwocky.com>

	* options.h, trustdb.c (trust_model_string, init_trustdb): Add
	support for "external" trust model, where the user can provide a
	pregenerated trustdb.

	* keyedit.c (keyedit_menu): Do not allow editing ownertrust with
	an external trust model trustdb.

	2003-11-13 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the
	plurarility (or not) of various list and verify options.

	2003-11-12 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Add --symmetric --sign --encrypt.

	* main.h, encode.c (setup_symkey): New. Prompt for a passphrase
	and create a DEK for symmetric encryption.
	(write_symkey_enc): New. Write out symmetrically encrypted
	session keys.
	(encode_crypt, encrypt_filter): Use them here here when creating a
	message that can be decrypted with a passphrase or a pk.

	* sign.c (sign_file): Call setup_symkey if we are doing a
	--symmetric --sign --encrypt.

	2003-11-09 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (proc_symkey_enc): Don't show algorithm information
	when --quiet is set. Suggested by Duncan Harris. Also don't fail
	with BUG() when processing a --symmetric message with a cipher we
	don't have.

	* g10.c: Alias --personal-xxx-prefs to --personal-xxx-preferences.

	* pkclist.c (build_pk_list): When adding recipients interactively,
	allow the user to stop at any point.

	2003-10-31 David Shaw <dshaw@jabberwocky.com>

	* trustdb.h, trustdb.c (register_trusted_keyid): New. Adds a
	keyid to the list of ultimately trusted keys.

	* keygen.c (do_generate_keypair): Use it here so that the ultimate
	ownertrust happens before the trustdb (might be) rebuilt. Also
	fix an error where the newly generated pk is thought to be a
	subkey by the trustdb.

	* g10.c (main): Fix --export-all do actually do something
	different than --export.

	* pkclist.c (build_pk_list): Show all recipients rather than
	showing each recipient as they are added.

	* mainproc.c (proc_symkey_enc, proc_encrypted): Keep a count of
	the number of passphrases that can decrypt a symmetric or mixed
	symmetric/pk message and include it in the list of keys shown to
	the user.

	2003-10-30 David Shaw <dshaw@jabberwocky.com>

	* misc.c (compress_algo_to_string, string_to_compress_algo,
	check_compress_algo): Add bzip2.

	* compress.c (compress_filter): Make static to help force the use
	of push_compress_filter. Remove default algorithm setting since
	that is done in push_compress_filter now.

	* main.h: Use named algorithm.

	* filter.h, compress.c (push_compress_filter,
	push_compress_filter2): New. Figure out which is the appropriate
	compression filter to use, and push it into place.

	* compress.c (handle_compressed), encode.c (encode_simple,
	encode_crypt), sign.c (sign_file, sign_symencrypt_file), import.c
	(read_block), export.c (do_export): Use push_compress_filter
	instead of pushing the compression filter ourselves.

	* compress-bz2.c: New. Bzlib versions of the compression filter
	routines.

	* Makefile.am: Include compress-bz2.c if bz2lib is available.

	2003-10-30 Werner Koch <wk@gnupg.org>

	* apdu.c (close_ct_reader, close_pcsc_reader): Implemented.
	(get_ccid_error_string): New. Not very useful messages, though.

	2003-10-29 Werner Koch <wk@gnupg.org>

	* cardglue.c (open_card): Ask for card insertion.
	(check_card_serialno): New.
	(agent_scd_pksign, agent_scd_pkdecrypt): Use it here.
	* cardglue.c (open_card): Issue insertion status message.
	* status.h, status.c (STATUS_CARDCTRL): New.

	* status.c (cpr_get_answer_okay_cancel): New.

	2003-10-28 Werner Koch <wk@gnupg.org>

	* keylist.c (list_keyblock_print): Denote secrets keys stored on a
	card with an '>'. Print the '#' also for subkeys.
	(list_keyblock_colon): Introduce new field 15 for sec/ssb to print
	the serial number.

	2003-10-26 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Enhance the version-specific config file code to
	try for more specific matches before giving up (e.g. 1.3.3-cvs,
	1.3.3, 1.3, 1).

	2003-10-25 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Add --symmetric --encrypt command. This generates
	a message that can be decrypted via a passphrase or public key
	system.

	* main.h, encode.c (encode_seskey): Allow passing in an
	already-created session key dek.
	(encode_simple): Use the actual symmetric cipher when encrypting a
	session key for a symmetric message.
	(encode_crypt): Add a flag to trigger a hybrid mode that can be
	decrypted via a passphrase or a pk. Change all callers.

	* mainproc.c (symkey_decrypt_sesskey): There is no way to tell the
	difference here between a bad passphrase and a cipher algorithm
	that we don't have, so use a error message that makes that clear.
	Use the actual list of ciphers when checking whether a cipher is
	invalid. Return error if the decrypted cipher algorithm is
	invalid.
	(proc_symkey_enc): In a mixed passphrase/pk message, if a valid
	dek already exists from decrypting via pk, do not try to process
	the passphrase.
	(proc_symkey_enc): Indicate when we're decrypting a session key as
	opposed to decrypting data. If a passphrase is invalid, discard
	the dek so we'll keep trying.

	2003-10-25 Werner Koch <wk@gnupg.org>

	* ccid-driver.c (ccid_open_reader): Return an error if no USB
	devices are found.

	* Makefile.am: Replaced INTLLIBS by LIBINTL.

	* g10.c (main) [ENABLE_CARD_SUPPORT]: Add a default for
	--pcsc-driver.

	* cardglue.c (learn_status_cb): Fixed faulty use of !space.

	2003-10-24 Werner Koch <wk@gnupg.org>

	* apdu.c (apdu_open_reader): Hacks for PC/SC under Windows.

	2003-10-21 Werner Koch <wk@gnupg.org>

	* passphrase.c (ask_passphrase): Add optional promptid arg.
	Changed all callers.
	* cardglue.c (pin_cb): Use it here, so the machine interface can
	tell whether the Admin PIN is requested.

	* cardglue.c (agent_scd_checkpin): New.

	* misc.c (openpgp_pk_algo_usage): Added AUTH usage.

	* app-openpgp.c (check_against_given_fingerprint): New. Factored
	out that code elsewhere.
	(do_check_pin): New.
	* card-util.c (card_edit): New command "passwd". Add logic to
	check the PIN in advance.
	(card_status): Add new args to return the serial number. Changed
	all callers.

	2003-10-14 David Shaw <dshaw@jabberwocky.com>

	* import.c (import_one): Show the keyid when giving the Elgamal
	slow import warning.

	* g10.c (main): Older versions used --comment "" to indicate no
	comment. Don't add an empty comment.

	2003-10-13 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names): Ownertrust is only
	meaningful for the PGP or classic trust models. Both validity and
	ownertrust are not meaningful for the always trust model.

	2003-10-11 Werner Koch <wk@gnupg.org>

	* keygen.c: Always enable the gen_card_key prototype.

	2003-10-10 Werner Koch <wk@gnupg.org>

	* cardglue.c (card_close): New.
	(agent_scd_change_pin): Implemented.

	* ccid-driver.c (ccid_close_reader): New.
	* apdu.c (close_ccid_reader, close_ct_reader, close_csc_reader)
	(close_osc_reader, apdu_close_reader): New. Not all are properly
	implemented yet.
	* g10.c (g10_exit): Use close_card.

	2003-10-09 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Give a deprecated option warning for
	--show-keyring, --show-photos, --show-policy-url, --show-notation,
	and their respective no- forms.

	* options.skel: Remove show-photos and replace with
	list/verify-options show-photos. Remove no-mangle-dos-filenames.

	* misc.c (parse_options): Allow for incomplete (but unambiguous)
	options.

	2003-10-09 Werner Koch <wk@gnupg.org>

	* ccid-driver.c (ccid_transceive): Add T=1 chaining for sending.

	* sign.c (do_sign) [!ENABLE_CARD_SUPPORT]: Return an error for
	card keys.

	* cardglue.c (agent_scd_pkdecrypt): Implemented.
	* pubkey-enc.c (get_it) [ENABLE_CARD_SUPPORT]: Divert decryption
	to card

	2003-10-08 Werner Koch <wk@gnupg.org>

	* cardglue.c (pin_cb): Detect whether an admin or regular PIN is
	requested.
	(genkey_status_cb): New.
	(agent_scd_genkey): Implemented.

	* keygen.c (generate_keypair): New arg CARD_SERIALNO and prepare
	parameters for on card key generation. Changed all callers.
	(do_generate_keypair): Add new arg card and merged casrd specific
	changes from 1.9.
	(proc_parameter_file): New arg card, apss it down to
	do_generate_keypair and changed all callers.
	(gen_card_key): New.

	* g10.c: Include cardclue.h.
	(main): s/app_set_default_reader_port/card_set_reader_port/.
	* cardglue.c (card_set_reader_port): New to address include file
	issues.

	2003-10-02 Werner Koch <wk@gnupg.org>

	* cardglue.c (learn_status_cb): Release values before assignment
	so that it can be used by getattr to update the structure.
	(agent_scd_getattr): New.

	* keylist.c (print_pubkey_info): Add FP arg for optional printing
	to a stream. Changed all callers.

	2003-10-01 Werner Koch <wk@gnupg.org>

	* app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c
	* apdu.h, ccid-driver.c, ccid-driver.h, card-util.c: Updated
	from current GnuPG 1.9. Changes over there are:
	* card-util.c: Tweaked to use this source also under 1.3.
	(card_edit): New command "forcesig".
	* card-util.c (print_name, print_isoname): Use 0 and not LF fro
	the max_n arg of tty_print_utf8_string2.
	* card-util.c (change_pin): Simplified. We now have only a PIN
	and an Admin PIN.
	* ccid-driver.c: Detect GnuPG 1.3 and include appropriate files.
	* apdu.c: Ditto.
	* app-openpgp.c: Ditto.
	* iso7816.c: Ditto.
	(generate_keypair): Renamed to ..
	(do_generate_keypair): .. this.
	* app-common.h [GNUPG_MAJOR_VERSION]: New.
	* iso7816.h [GNUPG_MAJOR_VERSION]: Include cardglue.h
	* app-openpgp.c (do_change_pin): Make sure CVH1 and CHV2 are
	always synced.
	(verify_chv2, verify_chv3): New. Factored out common code.
	(do_setattr, do_sign, do_auth, do_decipher): Change the names of
	the prompts to match that we have only 2 different PINs.
	(app_select_openpgp): Check whether the card enforced CHV1.
	(convert_sig_counter_value): New. Factor out code from
	get_sig_counter.

	* Makefile.am (card_support_source): Depend on new AM conditional
	to get the ifdef ENABLE_CARD_SUPPORT off the way from source
	copied files.
	(update-source-from-gnupg-2): Maintainer helper.

	2003-10-01 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Add --no-groups to zero --group list.

	* encode.c (encode_simple): Allow for 32 bytes (256 bits) of
	symmetrically encrypted session key. Use --s2k-cipher-algo to
	choose cipher, rather than the default cipher.

	* parse-packet.c (parse_subkeyenc): Give a warning if an
	symmetrically encrypted session key is seen without salt. Show in
	--list-packets if a symetrically encrypted session key is present.

	* pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning
	unless --quiet is set. Use text name of cipher in warning.

	2003-09-30 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), mainproc.c (check_sig_and_print): Add
	--verify-option show-unusable-uids.

	* gpgv.c (check_trustdb_stale): Stub.

	* trustdb.c (get_validity): Move the up-to-date check to
	check_trustdb_stale (new), so that it can be called before
	validity is checked.

	* keylist.c (list_keyblock_print): Disable the overall key
	validity display until it can be thought about more. Use
	check_trustdb_stale here to avoid putting the check warning in the
	middle of a listed key.

	* trustdb.c (init_trustdb): Only verify_own_keys() for those trust
	models that it applies to (i.e. classic and OpenPGP).

	2003-09-29 Werner Koch <wk@gnupg.org>

	* keygen.c (do_add_key_flags, parse_parameter_usage): Add support
	the proposed AUTH key flag.
	* getkey.c (fixup_uidnode, merge_selfsigs_main)
	(merge_selfsigs_subkey, premerge_public_with_secret): Ditto.
	* keylist.c (print_capabilities): Ditto.

	* parse-packet.c (parse_key): Allow to parse the divert-to-card
	S2K mode.
	* build-packet.c (do_secret_key): Handle divert-to-card S2K
	* seckey-cert.c (is_secret_key_protected): Ditto.
	(check_secret_key): Ditto.

	* keygen.c (do_ask_passphrase): Renamed from ask_passphrase.
	* passphrase.c (ask_passphrase): New.

	2003-09-28 Werner Koch <wk@gnupg.org>

	* g10.c (main): New commands --card-edit, --card-status and
	--change-pin. New options --ctapi-driver, --pcsc-driver and
	--disable-ccid
	* options.h (DBG_CARD_IO): New.
	* cardglue.c, cardclue.h: Enhanced.
	* card-util.c: New. Taken from current the gnupg 1.9 branch.
	* app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c
	* apdu.h, ccid-driver.c, ccid-driver.h: New. Takem from the current
	gnupg 1.9 branch withy minor changes to include directives.
	* Makefile.am: Added these files.

	2003-09-27 Werner Koch <wk@gnupg.org>

	* sign.c (do_sign) [ENABLE_CARD_SUPPORT]: Divert to card.
	* cardglue.c, cardglue.h: New.
	* Makefile.am (gpg_LDADD): Added.
	(card_support_sources): New.

	2003-09-25 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), keylist.c (list_keyblock_print): Add
	"show-unusable-uids" list-option to show revoked and/or expired
	user IDs.

	2003-09-24 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names): Show names a little neater
	by putting the [revoked] or [expired] in the space used for the
	[validity]. There is also no point in showing "[unknown]
	[revoked]".

	2003-09-23 David Shaw <dshaw@jabberwocky.com>

	* sign.c (mk_notation_policy_etc): Capitalize "URL".

	* trustdb.c (validate_keys): Give a little more information while
	rebuilding trustdb.

	* pkclist.c (do_edit_ownertrust): Clarify "don't know".

	* g10.c (main): Default to --no-mangle-dos-filenames.

	* keydb.h, keyring.c (keyring_search), trustdb.c (search_skipfnc):
	Expand the skipfnc to include a pointer to the user ID that
	matched.

	* getkey.c (skip_disabled): Rename to skip_unusable, and add
	checks for expired or revoked user IDs.

	2003-09-22 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Deprecate --default-comment in favor of
	--no-comments.

	* options.h, g10.c (main), armor.c (armor_filter): Allow using
	--comment multiple times to get multiple Comment: header lines.
	--no-comments resets list.

	2003-09-11 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Trim --help to commonly used options. Remove -f.

	2003-09-08 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Error out if --multifile is used with the commands
	that don't support it yet (--sign, --clearsign, --detach-sign,
	--symmetric, and --store).

	* g10.c (main): Add --multifile as an alias to turn --encrypt into
	--encrypt-files (plus --verify-files, --decrypt-files).

	* encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440
	directly to check for MDC usability. Do not set the force_mdc or
	disable_mdc flags since there is no point any longer.

	2003-09-04 David Shaw <dshaw@jabberwocky.com>

	* armor.c (parse_hash_header, armor_filter), g10.c (print_hex,
	print_mds), pkclist.c (algo_available): Drop TIGER/192 support.

	2003-09-03 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names): Fix assertion failure when
	using toggle to see a secret key. Reported by Maxim Britov.

	2003-08-31 David Shaw <dshaw@jabberwocky.com>

	* g10.c (add_keyserver_url), keyedit.c (keyedit_menu), sign.c
	(mk_notation_policy_etc): Clarify a few strings. It's a
	"preferred keyserver URL".

	* g10.c (main): Use "keyserver-url" instead of
	"preferred-keyserver" for the sake of short and simple commands.

	2003-08-30 David Shaw <dshaw@jabberwocky.com>

	* main.h, keygen.c (keygen_add_keyserver_url): Signature callback
	for adding a keyserver URL.

	* keyedit.c (keyedit_menu, menu_set_keyserver_url): New command to
	set preferred keyserver to specified (or all) user IDs.

	* build-packet.c (build_sig_subpkt): Set preferred keyserver flag
	while building a preferred keyserver subpacket.

	* keylist.c (show_policy_url, show_keyserver_url): URLs might be
	UTF8.

	* keyedit.c (menu_addrevoker): Fix leaking a few bytes.

	2003-08-29 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names): Use list-option
	show-long-keyid in main --edit-key display.

	* keyedit.c (print_and_check_one_sig): Use list-option
	show-long-keyid in --edit-key "check" function.

	2003-08-28 David Shaw <dshaw@jabberwocky.com>

	* passphrase.c (agent_send_all_options): Make use of $GPG_TTY.

	* g10.c (main): Disable use-agent if passphrase-fd is given
	later. Suggested by Kurt Garloff.

	* exec.c, g10.c, gpgv.c, passphrase.c, photoid.c:
	s/__MINGW32__/_WIN32/ to help building on native Windows
	compilers. Requested by Brian Gladman. From Werner on stable
	branch.

	2003-08-25 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main): Add list-option
	list-preferred-keyserver.

	* keyedit.c (change_passphrase): When responding 'no' to the blank
	passphrase question, re-prompt for a new passphrase. This is bug
	#202.

	* mainproc.c (check_sig_and_print): Use two different preferred
	keyserver displays - one if the key is not present (to tell the
	user where to get the key), the other if it is present (to tell
	the user where the key can be refreshed).

	* packet.h, parse-packet.c (parse_signature): Set flag if a
	preferred keyserver is present.

	* keylist.c (list_keyblock_print): Show keyserver url in listings
	with list-option show-keyserver-url.

	2003-08-24 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: Use NETLIBS instead of EGDLIBS.

	* mainproc.c (check_sig_and_print): Get the uid validity before
	printing any sig results to avoid munging the output with trustdb
	warnings.

	* g10.c (main): Don't include --show-keyring in --help as it is
	deprecated.

	2003-08-21 David Shaw <dshaw@jabberwocky.com>

	* gpgv.c: Remove extra semicolon (typo).

	* options.skel: Note that keyserver.pgp.com isn't synchronized,
	and explain the roundrobin a bit better.

	* sig-check.c (check_key_signature2), import.c (import_one,
	import_revoke_cert, chk_self_sigs, delete_inv_parts,
	collapse_uids, merge_blocks): Make much quieter during import of
	slightly munged, but recoverable, keys. Use log_error for
	unrecoverable import failures.

	* keyring.c (keyring_rebuild_cache): Comment.

	* sign.c (mk_notation_and_policy): Making a v3 signature with
	notations or policy urls is an error, not an info (i.e. increment
	the errorcount). Don't print the notation or policy url to stdout
	since it can be mixed into the output stream when piping and munge
	the stream.

	2003-08-12 David Shaw <dshaw@jabberwocky.com>

	* packet.h, sig-check.c (signature_check2, do_check,
	do_check_messages): Provide a signing-key-is-revoked flag. Change
	all callers.

	* status.h, status.c (get_status_string): New REVKEYSIG status tag
	for a good signature from a revoked key.

	* mainproc.c (do_check_sig, check_sig_and_print): Use it here.

	* import.c (import_revoke_cert, merge_blocks, merge_sigs): Compare
	actual signatures on import rather than using keyid or class
	matching. This does not change actual behavior with a key, but
	does mean that all sigs are imported whether they will be used or
	not.

	* parse-packet.c (parse_signature): Don't give "signature packet
	without xxxx" warnings for experimental pk algorithms. An
	experimental algorithm may not have a notion of (for example) a
	keyid (i.e. PGP's x.509 stuff).

	2003-08-02 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), keylist.c (list_keyblock_print),
	keyedit.c (print_and_check_one_sig): New "show-sig-expire"
	list-option to show signature expiration dates (if any).

	2003-07-24 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main, add_keyserver_url): Add
	--sig-preferred-keyserver to implant a "where to get my key"
	subpacket into a signature.

	* sign.c (mk_notation_and_policy): Rename to
	mk_notation_policy_etc and add preferred keyserver support for
	signatures.

	2003-07-21 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (do_add_key_flags): Don't set the certify flag for
	subkeys.
	(ask_algo): Provide key flags for DSA, Elgamal_e, and Elgamal
	subkeys.
	(generate_keypair): Provide key flags for the default DSA/Elgamal
	keys.

	* sig-check.c (signature_check, signature_check2,
	check_key_signature, check_key_signature2): Allow passing NULLs
	for unused parameters in the x2 form of each function to avoid the
	need for dummy variables. getkey.c, mainproc.c: Change all
	callers.

	* trustdb.h, trustdb.c (read_trust_options): New. Returns items
	from the trustdb version record.

	* keylist.c (public_key_list): Use it here for the new "tru"
	record.

	* gpgv.c (read_trust_options): Stub.

	2003-07-20 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names): Use list-option
	show-validity in --edit-key interface as well.

	2003-07-19 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), mainproc.c (check_sig_and_print): Add
	verify-options "show-validity" and "show-long-keyid" to show
	trustdb validity and long keyids during (file) signature
	verification.

	* packet.h, main.h, sig-check.c (signature_check2,
	check_key_signature2, do_check): If ret_pk is set, fill in the pk
	used to verify the signature. Change all callers in getkey.c,
	mainproc.c, and sig-check.c.

	* keylist.c (list_keyblock_colon): Use the ret_pk from above to
	put the fingerprint of the signing key in "sig" records during a
	--with-colons --check-sigs. This requires --no-sig-cache as well
	since we don't cache fingerprints.

	2003-07-10 David Shaw <dshaw@jabberwocky.com>

	* parse-packet.c (parse_signature): No need to reserve 8 bytes for
	the unhashed signature cache any longer.

	* misc.c (pct_expando): Add two new expandos - signer's
	fingerprint (%g), and signer's primary fingerprint (%p).

	* Makefile.am: Include W32LIBS where appropriate.

	* g10.c (main): Add --rfc2440 alias for --openpgp since in a few
	months, they won't be the same thing.

	* keyserver.c (parse_keyserver_uri): Accept "http" as an alias for
	"hkp", since it is occasionally written that way.
	(keyserver_spawn): Use ascii_isspace to avoid locale issues.

	* keygen.c (ask_user_id): Make --allow-freeform-uid apply to the
	email field as well as the name field, and allow mixing fields
	when it is set.

	* options.skel: Use subkeys.pgp.net as the default keyserver.

	* trustdb.c (validate_one_keyblock): Certifications on revoked or
	expired uids do not count in the web of trust.

	* signal.c (init_one_signal, pause_on_sigusr, do_block): Only use
	sigprocmask() if we have sigset_t, and only use sigaction() if we
	have struct sigaction. This is for Forte c89 on Solaris which
	seems to define only the function call half of the two pairs by
	default.
	(pause_on_sigusr): Typo.
	(do_block): If we can't use sigprocmask() and sigset_t, try to get
	the number of signals from NSIG as well as MAXSIG, and if we
	can't, fail with an explanation.

	* signal.c, tdbio.c: Comment out the transaction code. It was not
	used in this version, and was causing some build problems on
	quasi-posix platforms (Solaris and Forte c89).

	* keylist.c (list_keyblock_colon): Don't include validity values
	when listing secret keys since they can be incorrect and/or
	misleading. This is a temporary kludge, and will be handled
	properly in 1.9/2.0.

	* mainproc.c (check_sig_and_print): Only show the "key available
	from" preferred keyserver line if the key is not currently
	present.

	* keyedit.c (sign_uids): Do not sign expired uids without --expert
	(same behavior as revoked uids). Do not allow signing a user ID
	without a self-signature. --expert overrides. Add additional
	prompt to the signature level question.
	(menu_expire): When changing expiration dates, don't replace
	selfsigs on revoked uids since this would effectively unrevoke
	them. There is also no point in replacing expired selfsigs. This
	is bug #181

	2003-07-10 David Shaw <dshaw@jabberwocky.com> (from Werner on stable branch)

	* g10.c (add_notation_data): Make sure that only ascii is passed
	to iscntrl. Noted by Christian Biere.
	* getkey.c (classify_user_id2): Replaced isspace by spacep
	* keygen.c (ask_user_id): Ditto.
	(get_parameter_algo): Ditto.
	* keyedit.c (keyedit_menu): Ditto.
	* tdbdump.c (import_ownertrust): Ditto. s/isxdigit/hexdigitp/.
	* revoke.c (ask_revocation_reason):
	* keyserver.c (keyserver_spawn): Dito.

	2003-06-10 Werner Koch <wk@gnupg.org>

	* parse-packet.c (parse): Disallow old style partial length for
	all key material packets to avoid possible corruption of keyrings.

	2003-06-08 Werner Koch <wk@gnupg.org>

	* import.c (import_keys_internal): Invalidate the cache so that
	the file descriptor gets closed. Fixes bug reported by Juan
	F. Codagnone.

	2003-06-04 David Shaw <dshaw@jabberwocky.com>

	* options.skel: Use new hkp://subkeys.pgp.net as sample keyserver
	since they at least handle subkeys correctly.

	* options.h, g10.c (main), main.h, keylist.c (show_keyserver_url),
	mainproc.c (check_sig_and_print), parse-packet.c (dump_sig_subpkt,
	parse_one_sig_subpkt, can_handle_critical): Add read-only support
	for preferred keyserver subpackets. They're basically policy URLs
	with a different name. Add a verify-option
	"show-preferred-keyserver" to turn them on and off (on by default,
	as per stable branch).

	* g10.c (main): Add "--set-notation" as alias to "--notation-data"
	this is to make things consistent with --set-policy-url meaning
	both sigs and certs.

	2003-06-03 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), keylist.c (list_keyblock_print): Add
	"show-validity" and "show-long-keyid" list-options.

	* gpgv.c (get_validity, trust_value_to_string): Stubs.

	* g10.c (main): Use SAFE_VERSION instead of VERSION in the
	version-specific gpg.conf file so it can be overridden on RISCOS.

	2003-06-01 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main), keylist.c (show_policy_url, show_notation),
	mainproc.c (check_sig_and_print): Emulate the old policy and
	notation behavior (display by default). Send to status-fd whether
	it is displayed on the screen or not.

	* g10.c (main): Since we now have some options in devel that won't
	work in a stable branch gpg.conf file, try for a version-specific
	gpg.conf-VERSION file before falling back to gpg.conf.

	* main.h, options.h: Move various option flags to options.h.

	2003-05-31 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (check_sig_and_print), main.h, keylist.c
	(show_policy, show_notation): Collapse the old print_notation_data
	into show_policy() and show_notation() so there is only one
	function to print notations and policy URLs.

	* options.h, main.h, g10.c (main), keyedit.c
	(print_and_check_one_sig), keylist.c (list_one,
	list_keyblock_print), pkclist.c (do_edit_ownertrust), sign.c
	(mk_notation_and_policy): New "list-options" and "verify-options"
	commands. These replace the existing
	--show-photos/--no-show-photos,
	--show-notation/--no-show-notation,
	--show-policy-url/--no-show-policy-url, and --show-keyring
	options. The new method is more flexible since a user can specify
	(for example) showing photos during sig verification, but not in
	key listings. The old options are emulated.

	* main.h, misc.c (parse_options): New general option line
	parser. Fix the bug in the old version that did not handle report
	syntax errors after a valid entry.

	* import.c (parse_import_options), export.c
	(parse_export_options): Call it here instead of duplicating the
	code.

	2003-05-30 David Shaw <dshaw@jabberwocky.com>

	* keylist.c (list_one): Don't show the keyring filename when in
	--with-colons mode. Actually translate "Keyring" string.

	* mainproc.c (proc_tree): We can't currently handle multiple
	signatures of different classes or digests (we'd pretty much have
	to run a different hash context for each), but if they are all the
	same, make an exception. This is Debian bug #194292.

	* sig-check.c (check_key_signature2): Make string translatable.

	* packet.h, getkey.c (fixup_uidnode): Mark real primary uids
	differently than assumed primaries.

	* keyedit.c (no_primary_warning): Use the differently marked
	primaries here in a new function to warn when an --edit-key
	command might rearrange the self-sig dates enough to change which
	uid is primary.
	(menu_expire, menu_set_preferences): Use no_primary_warning()
	here.

	* Makefile.am: Use @DLLIBS@ for -ldl.

	2003-05-26 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (premerge_public_with_secret): Made "no secret subkey
	for" warning a verbose item and translatable. (From wk on stable
	branch)

	* sig-check.c (check_key_signature2): Made "no subkey for subkey
	binding packet" a verbose item instead of a !quiet one. There are
	too many garbled keys out in the wild. (From wk on stable branch)

	* filter.h: Remove const from WHAT. (From wk on stable branch)

	* progress.c (handle_progress): Store a copy of
	NAME. (progress_filter): Release WHAT, make sure not to print a
	NULL WHAT. (From wk on stable branch)

	* openfile.c (open_sigfile): Adjust free for new progress
	semantics. (From wk on stable branch)

	* plaintext.c (ask_for_detached_datafile): Don't dealloc
	pfx->WHAT. (From wk on stable branch)

	* seckey-cert.c (do_check): Issue the RSA_OR_IDEA status when the
	cipher algo is IDEA to make it easier to track down the
	problem. (From twoaday on stable branch)

	2003-05-24 David Shaw <dshaw@jabberwocky.com>

	* armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c,
	build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c,
	status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h,
	encode.c, mainproc.c, parse-packet.c, signal.c, textfilter.c: Edit
	all preprocessor instructions to remove whitespace before the '#'.
	This is not required by C89, but there are some compilers out
	there that don't like it.

	2003-05-21 David Shaw <dshaw@jabberwocky.com>

	* trustdb.h, trustdb.c (is_disabled), gpgv.c (is_disabled): Rename
	is_disabled to cache_disabled_value, which now takes a pk and not
	just the keyid. This is for speed since there is no need to
	re-fetch a key when we already have that key handy. Cache the
	result of the check so we don't need to hit the trustdb more than
	once.

	* getkey.c (skip_disabled): New function to get a pk and call
	is_disabled on it. (key_byname): Use it here.

	* packet.h, getkey.c (skip_disabled), keylist.c
	(print_capabilities): New "pk_is_disabled" macro to retrieve the
	cached disabled value if available, and fill it in via
	cache_disabled_value if not available.

	* trustdb.c (get_validity): Cache the disabled value since we have
	it handy and it might be useful later.

	* parse-packet.c (parse_key): Clear disabled flag when parsing a
	new key. Just in case someone forgets to clear the whole key.

	* getkey.c (merge_selfsigs_main): Add an "if all else fails" path
	for setting a single user ID primary when there are multiple set
	primaries all at the same second, or no primaries set and the most
	recent user IDs are at the same second, or no signed user IDs at
	all. This is arbitrary, but deterministic.

	* exec.h, photoid.h: Add copyright message.

	* keylist.c (list_keyblock_print): Don't dump attribs for
	revoked/expired/etc uids for non-colon key listings. This is for
	consistency with --show-photos.

	* main.h, keylist.c (dump_attribs), mainproc.c
	(check_sig_and_print): Dump attribs if --attrib-fd is set when
	verifying signatures.

	* g10.c (main): New --gnupg option to disable the various
	--openpgp, --pgpX, etc. options. This is the same as --no-XXXX
	for those options.

	* revoke.c (ask_revocation_reason): Clear old reason if user
	elects to repeat question. This is bug 153.

	* keyedit.c (sign_uids): Show keyid of the key making the
	signature.

	2003-05-21 Werner Koch <wk@gnupg.org>

	* progress.c (handle_progress)
	* sign.c (write_plaintext_packet)
	* encode.c (encode_simple,encode_crypt): Make sure that a filename
	of "-" is considered to be stdin so that iobuf_get_filelength
	won't get called. This fixes bug 156 reported by Gregery Barton.

	2003-05-02 David Shaw <dshaw@jabberwocky.com>

	* packet.h, build-packet.c (build_sig_subpkt), export.c
	(do_export_stream), import.c (remove_bad_stuff, import),
	parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove
	vestigal code for the old sig cache subpacket. This wasn't
	completely harmless as it caused subpacket 101 to disappear on
	import and export.

	* options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c,
	sign.c, encode.c, getkey.c, revoke.c: The current flags for
	different levels of PGP-ness are massively complex. This is step
	one in simplifying them. No functional change yet, just use a
	macro to check for compliance level.

	* sign.c (sign_file): Fix bug that causes spurious compression
	preference warning.

	* sign.c (clearsign_file): Fix bug that prevents proper warning
	message from appearing when clearsigning in --pgp2 mode with a
	non-v3 RSA key.

	* main.h, misc.c (compliance_option_string, compliance_string,
	compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file,
	clearsign_file), encode.c (encode_crypt,
	write_pubkey_enc_from_list): New functions to put the "this
	message may not be usable...." warning in one place.

	* options.h, g10.c (main): Part two of the simplification. Use a
	single enum to indicate what we are compliant to (1991, 2440,
	PGPx, etc.)

	* g10.c (main): Show errors for failure in export, send-keys,
	recv-keys, and refresh-keys.

	* options.h, g10.c (main): Give algorithm warnings for algorithms
	chosen against the --pgpX and --openpgp rules.

	* keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in
	--openpgp mode.

	* sign.c (sign_file), pkclist.c (algo_available): Allow passing a
	hint of 0.

	2003-05-01 David Shaw <dshaw@jabberwocky.com>

	* tdbio.c (create_version_record): Only create new trustdbs with
	TM_CLASSIC or TM_PGP.

	* trustdb.h, trustdb.c (trust_string, get_ownertrust_string,
	get_validity_string, ask_ownertrust, validate_keys), pkclist.c
	(do_edit_ownertrust): Rename trust_string to trust_value_to_string
	for naming consistency.

	* trustdb.h, trustdb.c (string_to_trust_value): New function to
	translate a string to a trust value.

	* g10.c (main): Use string_to_trust_value here for
	--force-ownertrust.

	* options.h, g10.c (main), trustdb.c (trust_model_string,
	init_trustdb, check_trustdb, update_trustdb, get_validity,
	validate_one_keyblock): An "OpenPGP" trust model is misleading
	since there is no official OpenPGP trust model. Use "PGP"
	instead.

	2003-04-30 David Shaw <dshaw@jabberwocky.com>

	* build-packet.c (build_sig_subpkt): Comments.

	* exec.c (exec_write): Cast NULL to void* to properly terminate
	varargs list.

	* keyedit.c (show_key_with_all_names): Just for safety, catch an
	invalid pk algorithm.

	* sign.c (make_keysig_packet): Crucial that the call to mksubpkt
	comes LAST before the calls to finalize the sig as that makes it
	possible for the mksubpkt function to get a reliable pointer to
	the subpacket area.

	* pkclist.c (do_we_trust_pre): If an untrusted key was chosen by a
	particular user ID, use that ID as the one to ask about when
	prompting whether to use the key anyway.
	(build_pk_list): Similar change here when adding keys to the
	recipient list.

	* trustdb.c (update_validity): Fix bug that prevented more than
	one validity record per trust record.
	(get_validity): When retrieving validity for a (user) supplied
	user ID, return the validity for that user ID only, and do not
	fall back to the general key validity.
	(validate_one_keyblock): Some commentary on whether
	non-self-signed user IDs belong in the web of trust (arguably,
	they do).

	2003-04-27 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Add --no-textmode.

	* export.c (do_export_stream), keyedit.c (show_key_with_all_names,
	menu_addrevoker), mainproc.c (check_sig_and_print), photoid.c
	(show_photos), sign.c (mk_notation_and_policy), trustdb.c
	(get_validity, reset_trust_records, validate_keys): Make some
	strings translatable.

	* mainproc.c (check_sig_and_print): Show digest algorithm and sig
	class when verifying a sig with --verbose on, and add version, pk
	and hash algorithms and sig class to VALIDSIG.

	* parse-packet.c (enum_sig_subpkt): Make a warning message a
	--verbose warning message since we don't need to warn every time
	we see an unknown critical (we only need to invalidate the
	signature).

	* trustdb.c (init_trustdb): Check the trustdb options even with
	TM_AUTO since the auto may become TM_CLASSIC or TM_OPENPGP.

	2003-04-26 David Shaw <dshaw@jabberwocky.com>

	* sign.c (do_sign): Show the hash used when making a signature in
	verbose mode.

	* tdbio.h, tdbio.c (tdbio_read_model): New function to return the
	trust model used in a given trustdb.

	* options.h, g10.c (main), trustdb.c (init_trustdb, check_trustdb,
	update_trustdb): Use tdbio_read_model to implement an "auto" trust
	model which is set via the trustdb.

	2003-04-23 David Shaw <dshaw@jabberwocky.com>

	* import.c (import_revoke_cert): Remove ultimate trust when
	revoking an ultimately trusted key.

	* keyedit.c (sign_uids): Allow replacing expired signatures.
	Allow duplicate signatures with --expert.

	* pkclist.c (check_signatures_trust): Don't display a null
	fingerprint when checking a signature with --always-trust enabled.

	* filter.h (progress_filter_context_t), progress.c
	(handle_progress), plaintext.c (ask_for_detached_datafile,
	hash_datafiles): Fix compiler warnings. Make "what" constant.

	* build-packet.c (do_plaintext): Do not create invalid literal
	packets with >255-byte names.

	2003-04-15 Werner Koch <wk@gnupg.org>

	* Makefile.am (AM_CFLAGS): Make use of AM_CFLAGS and AM_LDFLAGS.

	* g10.c, options.h: New option --enable-progress-filter.
	* progress.c (handle_progress): Make use of it.

	2003-04-15 Marcus Brinkmann <marcus@g10code.de>

	* progress.c: New file.
	* Makefile.am (common_source): Add progress.c.
	* filter.h (progress_filter_context_t): New type.
	(progress_filter, handle_progress): New prototypes.
	* main.h (open_sigfile): New argument for prototype.
	* openfile.c (open_sigfile): New argument to install progress
	filter.
	* encode.c (encode_simple): New variable PFX. Register
	progress filter. Install text_filter after that.
	(encode_crypt): Likewise.
	* sign.c (sign_file): Likewise.
	(clearsign_file): Likewise.
	* decrypt.c (decrypt_message): Likewise.
	(decrypt_messages): Likewise.
	* verify.c (verify_signatures): Likewise.
	(verify_one_file): Likewise.
	* plaintext.c (hash_datafiles): Likewise.
	(ask_for_detached_datafile): Likewise.

	2003-04-10 Werner Koch <wk@gnupg.org>

	* passphrase.c (read_passphrase_from_fd): Do a dummy read if the
	agent is to be used. Noted by Ingo Klöcker.
	(agent_get_passphrase): Inhibit caching when we have no
	fingerprint. This is required for key generation as well as for
	symmetric only encryption.

	* passphrase .c (agent_get_passphrase): New arg CANCELED.
	(passphrase_to_dek): Ditto. Passed to above. Changed all
	callers to pass NULL.
	* seckey-cert.c (do_check): New arg CANCELED.
	(check_secret_key): Terminate loop when canceled.

	* keyedit.c (change_passphrase): Pass ERRTEXT untranslated to
	passphrase_to_dek and translate where appropriate.
	* seckey-cert.c (check_secret_key): Ditto.
	* keygen.c (ask_passphrase): Ditto.
	* passphrase.c (agent_get_passphrase): Translate the TRYAGAIN_TEXT.
	Switch the codeset to utf-8.

	2003-04-09 Werner Koch <wk@gnupg.org>

	* decrypt.c (decrypt_messages): Fixed error handling; the function
	used to re-loop with same file after an error. Reported by Joseph
	Walton.

	2003-04-08 David Shaw <dshaw@jabberwocky.com>

	* main.h, g10.c (main), import.c (parse_import_options,
	fix_pks_corruption): It's really PKS corruption, not HKP
	corruption. Keep the old repair-hkp-subkey-bug command as an
	alias.

	* g10.c (main): Rename --no-version to --no-emit-version for
	consistency. Keep --no-version as an alias.

	2003-04-04 David Shaw <dshaw@jabberwocky.com>

	* pkclist.c (algo_available): PGP 8 can use the SHA-256 hash.

	* sign.c (sign_file, clearsign_file, sign_symencrypt_file): Remove
	unused code.

	2003-04-01 Werner Koch <wk@gnupg.org>

	* mainproc.c (check_sig_and_print): Add primary key fpr to VALIDSIG
	status.

	2003-03-24 David Shaw <dshaw@jabberwocky.com>

	* keydb.h: Err on the side of making an unknown signature a SIG
	rather than a CERT.

	* import.c (delete_inv_parts): Discard any key signatures that
	aren't key types (i.e. 0x00, 0x01, etc.)

	* g10.c (main): Add deprecated option warning for
	--list-ownertrust. Add --compression-algo alias for
	--compress-algo. Change --version output strings to match
	"showpref" strings, and make translatable.

	* status.c (do_get_from_fd): Accept 'y' as well as 'Y' for
	--command-fd boolean input.

	* trustdb.c: Fix typo (DISABLE_REGEXP -> DISABLE_REGEX)

	* keyedit.c (show_key_with_all_names_colon): Show no-ks-modify
	flag.

	2003-03-11 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), keyserver.c (kopts): Add "try-dns-srv"
	keyserver option. Defaults to on.

	* passphrase.c (agent_get_passphrase): Fix memory leak with
	symmetric messages. Fix segfault with symmetric messages. Fix
	incorrect prompt with symmetric messages.

	2003-03-10 Werner Koch <wk@gnupg.org>

	* compress.c (init_uncompress): Use a 15 bit window size so that
	the output of implementations which don't run for PGP 2
	compatibility won't get garbled.

	2003-03-04 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (validate_keys): Mask the ownertrust when building the
	list of fully valid keys so that disabled keys are still counted
	in the web of trust.
	(get_ownertrust_with_min): Do the same for the minimum ownertrust
	calculation.

	* parse-packet.c (dump_sig_subpkt): Show the notation names for
	not-human-readable notations. Fix cosmetic off-by-one length
	counter.

	* options.skel: Add explantion and commented-out
	"no-mangle-dos-filenames".

	* mainproc.c (proc_encrypted): Make string translatable.

	* keyserver.c (keyserver_spawn): Quote ':', '%', and any 8-bit
	characters in the uid strings sent to the keyserver helper.

	* keyring.c (keyring_rebuild_cache): Lock the keyring while
	rebuilding the signature caches to prevent another gpg from
	tampering with the temporary copy.

	* keygen.c (keygen_set_std_prefs): Include AES192 and AES256 in
	default prefs.

	* keyedit.c (show_prefs): Make strings translatable.

	* keydb.c: Double the maximum number of keyrings to 40.

	* gpgv.c (main): Fix bug #113 - gpgv should accept the
	--ignore-time-conflict option.

	* g10.c (main): --openpgp disables --pgpX. Double the amount of
	secure memory to 32k (keys are getting bigger these days).

	* Makefile.am: Makefile.am: Use @CAPLIBS@ to link in -lcap if we
	are using capabilities.

	2003-02-26 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_spawn): Include various pieces of
	information about the key in the data sent to the keyserver
	helper. This allows the helper to use it in instructing a remote
	server which may not have any actual OpenPGP smarts in parsing
	keys.

	* main.h, export.c (export_pubkeys_stream, do_export_stream): Add
	ability to return only the first match in an exported keyblock for
	keyserver usage. This should be replaced at some point with a
	more flexible solution where each key can be armored seperately.

	2003-02-22 David Shaw <dshaw@jabberwocky.com>

	* sign.c (sign_file): Do not push textmode filter onto an unopened
	IOBUF (segfault). Noted by Marcus Brinkmann. Push and
	reinitialize textmode filter for each file in a multiple file
	list.

	* packet.h, getkey.c (fixup_uidnode), keyedit.c (show_prefs): Set
	and show the keyserver no-modify flag.

	* keygen.c (add_keyserver_modify): New.
	(keygen_upd_std_prefs): Call it here.
	(keygen_set_std_prefs): Accept "ks-modify" and "no-ks-modify" as
	prefs to set and unset keyserver modify flag.

	* g10.c (main): Accept "s1" in addition to "idea" to match the
	other ciphers.

	* main.h, misc.c (idea_cipher_warn): We don't need this if IDEA
	has been disabled.

	2003-02-21 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (keygen_set_std_prefs): Don't put AES or CAST5 in
	default prefs if they are disabled.

	* g10.c (main): Use 3DES instead of CAST5 if we don't have CAST5
	support. Use 3DES for the s2k cipher in --openpgp mode.
	(print_mds): #ifdef all of the optional digest algorithms.

	2003-02-12 David Shaw <dshaw@jabberwocky.com>

	* keydb.h, getkey.c (classify_user_id, classify_user_id2): Make
	'exact' a per-desc item. Merge into one function since
	'force_exact' is no longer needed.
	(key_byname): Use new classify_user_id function, and new exact
	flag in KEYDB_SEARCH_DESC.

	* keyring.h, keyring.c (keyring_search): Return an optional index
	to show which KEYDB_SEARCH_DESC was the matching one.

	* keydb.h, keydb.c (keydb_search): Rename to keydb_search2, and
	pass the optional index to keyring_search. Add a macro version of
	keydb_search that calls this new function.

	* export.c (do_export_stream): If the keyid! syntax is used,
	export only that specified key. If the key in question is a
	subkey, export the primary plus that subkey only.

	2003-02-11 David Shaw <dshaw@jabberwocky.com>

	* exec.c (set_exec_path): Add debugging line.

	* g10.c (print_hex, print_mds): Print long hash strings a lot
	neater. This assumes at least an 80-character display, as there
	are a few other similar assumptions here and there. Users who
	need unformatted hashes can still use with-colons. Check that
	SHA384 and 512 are available before using them as they are no
	longer always available.

	* Makefile.am: Use a local copy of libexecdir along with @PACKAGE@
	as GNUPG_LIBEXECDIR so it can be easily overridden at make time.

	2003-02-04 David Shaw <dshaw@jabberwocky.com>

	* armor.c (parse_hash_header, armor_filter): Accept the new SHAs
	in the armor Hash: header.

	* g10.c (print_hex): Print long hash strings a little neater.
	(print_mds): Add the new SHAs to the hash list.

	2003-02-02 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (menu_revuid): Properly handle a nonselfsigned uid on
	a v4 key (treat as a v4 revocation).

	* import.c (print_import_check): Do not re-utf8 convert user IDs.

	2003-01-27 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (list_node): Show signature expiration date in
	with-colons sig records.

	* keylist.c (list_keyblock_colon), mainproc.c (list_node): Show
	trust sig information in with-colons sig records.

	2003-01-16 David Shaw <dshaw@jabberwocky.com>

	* g10.c (add_group): Trim whitespace after a group name so it does
	not matter where the user puts the = sign.

	* options.skel: Comment out the first three lines in case someone
	manually copies the skel file to their homedir.

	* sign.c (clearsign_file): Only use pgp2mode with v3 keys and
	MD5. This matches what we do when decoding such messages and
	prevents creating a message (v3+RIPEMD/160) that we can't verify.

	* sig-check.c (signature_check2): Use G10ERR_GENERAL as the error
	for signature digest conflict. BAD_SIGN implies that a signature
	was checked and we may try and print out a user ID for a key that
	doesn't exist.

	2003-01-15 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (init_trustdb, get_validity): Don't use a changed
	trust model to indicate a dirty trustdb, and never auto-rebuild a
	dirty trustdb with the "always" trust model.

	* g10.c (add_group): Last commit missed the \t ;)

	2003-01-14 David Shaw <dshaw@jabberwocky.com>

	* packet.h, parse-packet.c (setup_user_id), free-packet.c
	(free_user_id), keydb.h, keyid.c (namehash_from_uid): New function
	to rmd160-hash the contents of a user ID packet and cache it in
	the uid object.

	* keylist.c (list_keyblock_colon): Use namehash in field 8 of
	uids. Show dates for creation (selfsig date), and expiration in
	fields 6 and 7.

	* trustdb.c (get_validity, get_validity_counts, update_validity):
	Use new namehash function rather than hashing it locally.

	2003-01-14 Werner Koch <wk@gnupg.org>

	* g10.c (add_group): Fixed group parsing to allow more than one
	delimiter in a row and also allow tab as delimiter.

	2003-01-12 David Shaw <dshaw@jabberwocky.com>

	* tdbio.c (tdbio_set_dbname): Fix assertion failure with
	non-fully-qualified trustdb names.

	2003-01-11 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (get_validity_info, get_ownertrust_info,
	trust_letter): Simplify by returning a ? for error directly.

	* keyedit.c (show_key_with_all_names): Use get_validity_string and
	get_ownertrust_string to show full word versions of trust
	(i.e. "full" instead of 'f').

	* trustdb.h, trustdb.c (get_ownertrust_string,
	get_validity_string): Same as get_ownertrust_info, and
	get_validity_info, except returns a full string.

	* trustdb.c (get_ownertrust_with_min): New. Same as
	'get_ownertrust' but takes the min_ownertrust value into account.

	2003-01-10 David Shaw <dshaw@jabberwocky.com>

	* armor.c (armor_filter): Comment about PGP's end of line tab
	problem.

	* trustdb.h, trustdb.c (trust_letter): Make
	static. (get_ownertrust_info, get_validity_info): Don't mask the
	trust level twice.

	* trustdb.h, gpgv.c, trustdb.c (get_validity, get_validity_info),
	keylist.c (list_keyblock_colon), keyedit.c
	(show_key_with_all_names_colon, menu_revuid): Pass a user ID in
	rather than a namehash, so we only have to do the hashing in one
	place.

	* packet.h, pkclist.c (build_pk_list), free-packet.c
	(release_public_key_parts): Remove unused namehash element for
	public keys.

	2003-01-07 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (keygen_set_std_prefs): Warn when setting an IDEA
	preference when IDEA is not available.

	2003-01-06 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (get_validity_info): 'd' for disabled is not a
	validity value any more.

	* packet.h, tdbio.h, tdbio.c (tdbio_read_record,
	tdbio_write_record), trustdb.c (update_validity): Store temporary
	full & marginal counts in the trustdb.
	(clear_validity, get_validity_counts): Return and clear temp
	counts.
	(store_validation_status): Keep track of which keyids have been
	stored.
	(validate_one_keyblock, validate_key_list): Use per-uid copies of
	the full & marginal counts so they can be recalled for multiple
	levels.
	(validate_keys): Only use unused keys for each new round.
	(reset_unconnected_keys): Rename to reset_trust_records, and only
	skip specifically excluded records.

	* keylist.c (print_capabilities): Show 'D' for disabled keys in
	capabilities section.

	* trustdb.c (is_disabled): Remove incorrect comment.

	2003-01-03 David Shaw <dshaw@jabberwocky.com>

	* import.c (import_one): Only do the work to create the status
	display for interactive import if status is enabled.

	* keyring.c (keyring_search): skipfnc didn't work properly with
	non-keyid searches. Noted by Stefan Bellon.

	* getkey.c (merge_selfsigs_main): Remove some unused code and make
	sure that the pk selfsigversion member accounts for 1F direct
	sigs.

	2003-01-02 Werner Koch <wk@gnupg.org>

	* keydb.c (keydb_add_resource): Don't assume that try_make_homedir
	terminates but check again for the existence of the directory and
	continue then.
	* openfile.c (copy_options_file): Print a warning if the skeleton
	file has active options.

	2002-12-29 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (merge_selfsigs_main), main.h, sig-check.c
	(check_key_signature2): Pass the ultimately trusted pk directly to
	check_key_signature2 to avoid going through the key selection
	mechanism. This prevents a deadly embrace when two keys without
	selfsigs each sign the other.

	2002-12-27 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_refresh): Don't print the "refreshing..."
	line if there are no keys to refresh or if there is no keyserver
	set.

	* getkey.c (merge_selfsigs_main): Any valid user ID should make a
	key valid, not just the last one. This also fixes Debian bug
	#174276.

	2002-12-27 Stefan Bellon <sbellon@sbellon.de>

	* import.c (print_import_check): Changed int to size_t.

	2002-12-27 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (keyedit_menu, menu_revuid): Add "revuid" feature to
	revoke a user ID. This is the same as issuing a revocation for
	the self-signature, but a much simpler interface to do it.

	2002-12-26 David Shaw <dshaw@jabberwocky.com>

	* keydb.h, getkey.c (key_byname): Flag to enable or disable
	including disabled keys. Keys specified via keyid (i.e. 0x...)
	are always included.

	* getkey.c (get_pubkey_byname, get_seckey_byname2,
	get_seckey_bynames), keyedit.c (keyedit_menu, menu_addrevoker):
	Include disabled keys in these functions.

	* pkclist.c (build_pk_list): Do not include disabled keys for -r
	or the key prompt. Do include disabled keys for the default key
	and --encrypt-to.

	* trustdb.h, trustdb.c (is_disabled): New skipfnc for skipping
	disabled keys.

	* gpgv.c (is_disabled): Stub.

	* keygen.c (keygen_add_key_expire): Properly handle updating a key
	expiration to a no-expiration value.

	* keyedit.c (enable_disable_key): Comment.

	* import.c (import_one): When in interactive mode and --verbose,
	don't repeat some key information twice.

	2002-12-22 Timo Schulz <ts@winpt.org>

	* import.c (print_import_check): New.
	(import_one): Use it here.
	Use merge_keys_and_selfsig in the interactive mode to avoid
	wrong key information.
	* status.h: Add new status code.
	* status.c: Ditto.

	2002-12-13 David Shaw <dshaw@jabberwocky.com>

	* pkclist.c (do_we_trust): Tweak language to refer to the "named
	user" rather than "owner". Noted by Stefan Bellon.

	* trustdb.h, trustdb.c (trustdb_pending_check): New function to
	check if the trustdb needs a check.

	* import.c (import_keys_internal): Used here so we don't rebuild
	the trustdb if it is still clean.
	(import_one, chk_self_sigs): Only mark trustdb dirty if the key
	that is being imported has any sigs other than self-sigs.
	Suggested by Adrian von Bidder.

	* options.skel: Include the required '=' sign in the sample
	'group' option. Noted by Stefan Bellon.

	* import.c (chk_self_sigs): Don't try and check a subkey as if it
	was a signature.

	2002-12-11 David Shaw <dshaw@jabberwocky.com>

	* tdbio.c (tdbio_read_record, tdbio_write_record): Compact the
	RECTYPE_TRUST records a bit.

	* g10.c (main): Comment out --list-trust-path until it can be
	implemented.

	* import.c (import_one): Warn when importing an Elgamal primary
	that this may take some time (to verify self-sigs).
	(chk_self_sigs): Try and cache all self-sigs so the keyblock is
	written to the keyring with a good rich cache.

	* keygen.c (ask_algo): Make the Elgamal sign+encrypt warning
	stronger, and remove the RSA sign+encrypt warning.

	2002-12-06 Stefan Bellon <sbellon@sbellon.de>

	* options.h: Fixed typo (mangle_dos_names instead of
	mangle_dos_filenames).

	2002-12-05 Werner Koch <wk@gnupg.org>

	* g10.c: New options --[no-]mangle-dos-filenames.
	* options.h (opt): Added mangle-dos-filenames.
	* openfile.c (open_outfile) [USE_ONLY_8DOT3]: Truncate the
	filename only when this option is set; this is the default.

	2002-12-04 David Shaw <dshaw@jabberwocky.com>

	* main.h, keyedit.c, keygen.c: Back out previous (2002-12-01)
	change. Minimal isn't always best.

	* sign.c (update_keysig_packet): Use the current time rather then
	a modification of the original signature time. Make sure that
	this doesn't cause a time warp.

	* keygen.c (keygen_add_key_expire): Properly handle a key
	expiration date in the past (use a duration of 0).

	* keyedit.c (menu_expire): Use update_keysig_packet so any sig
	subpackets are maintained during the update.

	* build-packet.c (build_sig_subpkt): Mark sig expired or unexpired
	when the sig expiration subpacket is added.
	(build_sig_subpkt_from_sig): Handle making an expiration subpacket
	from a sig that has already expired (use a duration of 0).

	* packet.h, sign.c (update_keysig_packet), keyedit.c
	(menu_set_primary_uid, menu_set_preferences): Add ability to issue
	0x18 subkey binding sigs to update_keysig_packet and change all
	callers.

	* trustdb.c (validate_keys): Show trust parameters when building
	the trustdb, and make sure that the version record update was
	successful.
	(init_trustdb): If the current parameters aren't what was used for
	building the trustdb, the trustdb is invalid.

	* tbio.c (tdbio_db_matches_options): Update to work with new
	trustdbs.

	2002-12-03 David Shaw <dshaw@jabberwocky.com>

	* tdbio.h, tdbio.c (tdbio_read_record, tdbio_write_record): Store
	trust model in the trustdb version record.
	(tdbio_update_version_record): New function to update version
	record values during a trustdb check or update.
	(tdbio_dump_record): Show trust model in dump.

	* trustdb.c (validate_keys): Call tdbio_update_version_record on
	success so that the correct options are stored in the trustdb.

	* options.h: rearrange trust models so that CLASSIC is 0 and
	OPENPGP is 1.

	* options.h, g10.c (main), encode.c (write_pubkey_enc_from_list),
	pkclist.c (algo_available), revoke.c (gen_revoke): Add --pgp8
	mode. This is basically identical to --pgp7 in all ways except
	that signing subkeys, v4 data sigs (including expiration), and SK
	comments are allowed.

	* getkey.c (finish_lookup): Comment.

	* main.h, keylist.c (reorder_keyblock), keyedit.c (keyedit_menu):
	Reorder user ID display in the --edit-key menu to match that of
	the --list-keys display.

	* g10.c (add_notation_data): Fix initialization.

	2002-12-01 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (menu_expire): Don't lose key flags when changing the
	expiration date of a subkey. This is not the most optimal
	solution, but it is minimal change on the stable branch.

	* main.h, keygen.c (do_copy_key_flags): New function to copy key
	flags, if any, from one sig to another.
	(do_add_key_expire): New function to add key expiration to a sig.
	(keygen_copy_flags_add_expire): New version of
	keygen_add_key_expire that also copies key flags.
	(keygen_add_key_flags_and_expire): Use do_add_key_expire.

	* import.c (fix_hkp_corruption): Comment.

	2002-11-25 Stefan Bellon <sbellon@sbellon.de>

	* plaintext.c (handle_plaintext) [__riscos__]: If nooutput is set,
	no filetype is needed obviously.

	2002-11-24 David Shaw <dshaw@jabberwocky.com>

	* main.h, misc.c (default_cipher_algo, default_compress_algo):
	New. Return the default algorithm by trying
	--cipher-algo/--compress-algo, then the first item in the pref
	list, then s2k-cipher-algo or ZIP.

	* sign.c (sign_file, sign_symencrypt_file), encode.c
	(encode_simple, encode_crypt): Call default_cipher_algo and
	default_compress_algo to get algorithms.

	* g10.c (main): Allow pref selection for compress algo with
	--openpgp.

	* mainproc.c (proc_encrypted): Use --s2k-digest-algo for
	passphrase mangling rather than --digest-algo.

	* sign.c (hash_for): If --digest-algo is not set, but
	--personal-digest-preferences is, then use the first hash
	algorithm in the personal list. If the signing algorithm is DSA,
	then use the first 160-bit hash algorithm in the personal list.
	If --pgp2 is set and it's a v3 RSA key, use MD5.

	* g10.c (main), keydb.c (keydb_add_resource,
	keydb_locate_writable): Rename --default-keyring as
	--primary-keyring. Stefan wins the naming contest.

	2002-11-23 David Shaw <dshaw@jabberwocky.com>

	* g10.c (add_notation_data): Disallow notation names that do not
	contain a '@', unless --expert is set. This is to help prevent
	people from polluting the (as yet unused) IETF namespace.

	* main.h: Comments about default algorithms.

	* photoid.c (image_type_to_string): Comments about 3-letter file
	extensions.

	* encode.c (encode_simple), passphrase.c (passphrase_to_dek),
	sign.c (sign_symencrypt_file): Use --s2k-digest-algo for
	passphrase mangling rather than --digest-algo.

	2002-11-21 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (keygen_set_std_prefs): Properly handle an empty
	preference string.

	* misc.c (string_to_compress_algo): "none" is a bad choice since
	it conflicts with the "none" in setpref.

	2002-11-14 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Allow compression algorithm names as the argument
	to --compress-algo. The old algorithm names still work for
	backwards compatibility.

	* misc.c (string_to_compress_algo): Allow "none" as an alias for
	"uncompressed".

	2002-11-13 Stefan Bellon <sbellon@sbellon.de>

	* getkey.c (get_pubkey_byfprint_fast): Fixed type incompatibility,
	was unsigned char instead of byte.

	2002-11-13 David Shaw <dshaw@jabberwocky.com>

	* encode.c (encode_simple): Make sure that files larger than about
	4G use partial length encoding. This is required because OpenPGP
	allows only for 32 bit length fields. From Werner on stable
	branch.

	* getkey.c (get_pubkey_direct): Renamed to...
	(get_pubkey_fast): this and made extern.
	(get_pubkey_byfprint_fast): New. From Werner on stable branch.

	* keydb.h, import.c (import_one): Use get_pubkey_fast instead of
	get_pubkey. We don't need a merged key and actually this might
	lead to recursions.
	(revocation_present): Likewise for search by fingerprint. From
	Werner on stable branch.

	* g10.c (main): Try to create the trustdb even for non-colon-mode
	list-key operations. This is required because getkey needs to
	know whether a a key is ultimately trusted. From Werner on stable
	branch.

	* exec.c [__CYGWIN32__]: Keep cygwin separate from Mingw32;
	we don't need it here as it behaves more like a Posix system.
	From Werner on stable branch.

	* passphrase.c (agent_get_passphrase): Ditto. From Werner on
	stable branch.

	* tdbio.c (MY_O_BINARY): Need binary mode with Cygwin. From
	Werner on stable branch.

	* g10.c, gpgv.c (main) [__CYGWIN32__]: Don't get the homedir from
	the registry. From Werner on stable branch.

	* keyedit.c (show_key_with_all_names_colon): Make --with-colons
	--edit display match the validity and trust of --with-colons
	--list-keys.

	* passphrase.c (agent_send_all_options): Fix compile warning.

	* keylist.c (list_keyblock_colon): Validity for subkeys should
	match that of the primary key, and not that of the last user ID.

	* getkey.c (merge_selfsigs): Revoked/expired/invalid primary keys
	carry these facts onto all their subkeys, but only after the
	subkey has a chance to be marked valid. This is to fix an
	incorrect "invalid public key" error verifying a signature made by
	a revoked signing subkey, with a valid unrevoked primary key.

	2002-11-09 Werner Koch <wk@gnupg.org>

	* passphrase.c (agent_send_all_options): Use tty_get_ttyname to
	get the default ttyname.

	2002-11-07 David Shaw <dshaw@jabberwocky.com>

	* keyring.h, keyring.c (keyring_register_filename): Return the
	pointer if a given keyring is registered twice.

	* keydb.h, keydb.c (keydb_add_resource): Use flags to indicate a
	default keyring.
	(keydb_locate_writable): Prefer the default keyring if possible.

	* g10.c (main): Add --default-keyring option.

	2002-11-06 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), trustdb.c (ask_ownertrust): Add
	--force-ownertrust option for debugging purposes. This allows
	setting a whole keyring to a given trust during an
	--update-trustdb. Not for normal use - it's just easier than
	hitting "4" all the time to test a large trustdb.

	* pubkey-enc.c (get_session_key): With hidden recipients or try a
	given passphrase against all secret keys rather than trying all
	secret keys in turn. Don't if --try-all-secrets or --status-fd is
	enabled.

	* passphrase.c (passphrase_to_dek): Mode 1 means do a regular
	passphrase query, but don't prompt with the key info.

	* seckey-cert.c (do_check, check_secret_key): A negative ask count
	means to enable passphrase mode 1.

	* keydb.h, getkey.c (enum_secret_keys): Add flag to include
	secret-parts-missing keys (or not) in the list.

	2002-11-05 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_search_prompt): When --with-colons is
	enabled, don't try and fit the search output to the screen size -
	just dump the whole list.

	2002-11-04 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_search_prompt): When --with-colons is
	enabled, just dump the raw keyserver protocol to stdout and don't
	print the menu.

	* keyserver.c (show_prompt): Don't show a prompt when command-fd
	is being used.

	* trustdb.c (trust_model_string, check_trustdb, update_trustdb,
	validate_one_keyblock): It's not clear what a trustdb rebuild or
	check means with a trust model other than "classic" or "openpgp",
	so disallow this.

	2002-11-03 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main): Add --trust-model option. Current
	models are "openpgp" which is classic+trustsigs, "classic" which
	is classic only, and "always" which is the same as the current
	option --always-trust (which still works). Default is "openpgp".

	* trustdb.c (validate_one_keyblock): Use "openpgp" trust model to
	enable trust sigs.

	* gpgv.c (main), mainproc.c (check_sig_and_print), pkclist.c
	(do_we_trust, do_we_trust_pre, check_signatures_trust): Use new
	--trust-model option in place of --always-trust.

	* keyedit.c (sign_mk_attrib, trustsig_prompt, sign_uids,
	keyedit_menu): Prompt for and create a trust signature with
	"tsign". This is functional, but needs better UI text.

	* build-packet.c (build_sig_subpkt): Able to build trust and
	regexp subpackets.

	* pkclist.c (do_edit_ownertrust): Comment.

	2002-11-02 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (set_one_pref, keygen_set_std_prefs): Allow using the
	full algorithm name (CAST5, SHA1) rather than the short form (S3,
	H2).

	* main.h, keygen.c (keygen_get_std_prefs), keyedit.c
	(keyedit_menu): Return and use a fake uid packet rather than a
	string since we already have a nice parser/printer in
	keyedit.c:show_prefs.

	* main.h, misc.c (string_to_compress_algo): New.

	2002-11-01 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Add --no-throw-keyid.

	* keydb.h, encode.c (write_pubkey_enc_from_list), g10.c (main),
	pkclist.c (build_pk_list): Add --hidden-recipient (-R) and
	--hidden-encrypt-to, which do a single-user variation on
	--throw-keyid. The "hide this key" flag is carried in bit 0 of
	the pk_list flags field.

	* keyserver.c (parse_keyrec): Fix shadowing warning.

	2002-10-31 Stefan Bellon <sbellon@sbellon.de>

	* compress.c (init_compress) [__riscos__]: Use
	riscos_load_module() to load ZLib module.

	* g10.c (main) [__riscos__]: Renames due to changes in riscos.c
	(e.g. prefixes all RISC OS specific functions with riscos_*).
	* photoid.c (show_photos) [__riscos__]: Likewise.
	* signal.c (got_fatal_signal) [__riscos__]: Likewise.

	* trustdb.c (check_regexp) [__riscos__]: Branch to RISC OS RegEx
	handling.

	2002-10-31 David Shaw <dshaw@jabberwocky.com>

	* build-packet.c (do_plaintext), encode.c (encode_sesskey,
	encode_simple, encode_crypt), sign.c (write_plaintext_packet): Use
	wipememory() instead of memset() to wipe sensitive memory as the
	memset() might be optimized away.

	2002-10-30 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (check_regexp): Modern regexps require REG_EXTENDED.

	2002-10-29 David Shaw <dshaw@jabberwocky.com>

	* packet.h, trustdb.h, trustdb.c (trust_string): New. Return a
	string like "fully trusted", "marginally trusted", etc.
	(get_min_ownertrust): New. Return minimum ownertrust.
	(update_min_ownertrust): New. Set minimum ownertrust.
	(check_regexp): New. Check a regular epression against a user ID.
	(ask_ownertrust): Allow specifying a minimum value.
	(get_ownertrust_info): Follow the minimum ownertrust when
	returning a letter.
	(clear_validity): Remove minimum ownertrust when a key becomes
	invalid.
	(release_key_items): Release regexp along with the rest of the
	info.
	(validate_one_keyblock, validate_keys): Build a trust sig chain
	while validating. Call check_regexp for regexps. Use the minimum
	ownertrust if the user does not specify a genuine ownertrust.

	* pkclist.c (do_edit_ownertrust): Only allow user to select a
	trust level greater than the minimum value.

	* parse-packet.c (can_handle_critical): Can handle critical trust
	and regexp subpackets.

	* trustdb.h, trustdb.c (clear_ownertrusts), delkey.c
	(do_delete_key), import.c (import_one): Rename clear_ownertrust to
	clear_ownertrusts and have it clear the min_ownertrust value as
	well.

	* keylist.c (list_keyblock_print): Indent uid to match pub and
	sig.

	* keyedit.c (print_and_check_one_sig, show_key_and_fingerprint,
	menu_addrevoker), keylist.c (list_keyblock_print,
	print_fingerprint): Show "T" or the trust depth for trust
	signatures, and add spaces to some strings to make room for it.

	* packet.h, parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt,
	parse_signature): Parse trust signature values.

	* tdbio.h, tdbio.c (tdbio_read_record, tdbio_write_record):
	Reserve a byte for the minimum ownertrust value (for use with
	trust signatures).

	2002-10-29 Stefan Bellon <sbellon@sbellon.de>

	* build-packet.c (calc_plaintext, do_plaintext): Removed RISC OS
	specific filetype parts (it's now done in make_basename()).

	* plaintext.c (handle_plaintext): Tidied up RISC OS specific
	filetype parts.

	* encode.c (encode_simple, encode_crypt): Added argument to
	make_basename() call.

	* sign.c (write_plaintext_packet): Added argument to
	make_basename() call.

	2002-10-28 Stefan Bellon <sbellon@sbellon.de>

	* build-packet.c (calc_plaintext, do_plaintext): Added filetype
	handling for RISC OS' file types.

	* plaintext.c (handle_plaintext) [__riscos__]: Added filetype
	handling for RISC OS' file types.

	2002-10-23 David Shaw <dshaw@jabberwocky.com>

	* main.h, import.c (sec_to_pub_keyblock, import_secret_one,
	parse_import_options), g10.c (main): New import-option
	"convert-sk-to-pk" to convert a secret key into a public key
	during import. It is on by default.

	2002-10-23 Werner Koch <wk@gnupg.org>

	* pubkey-enc.c (get_it): Fix segv, test for revoked only when PK
	has been assigned.

	2002-10-18 Timo Schulz <ts@winpt.org>

	* keylist.c: (print_pubkey_info): New.
	(print_seckey_info): New.
	* main.h: Prototypes for the new functions.
	* delkey.c (do_delete_key): Use it here.
	* revoke.c (gen_desig_revoke): Ditto.

	2002-10-17 Werner Koch <wk@gnupg.org>

	* pkclist.c (do_edit_ownertrust): Show all user IDs. This should
	be enhanced to also show the current trust level. Suggested by
	Florian Weimer.

	2002-10-17 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Handle --strict and --no-strict from the command
	line before the options file is loaded.

	2002-10-15 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Disable --textmode when encrypting (symmetric or
	pk) in --pgp2 mode as PGP 2 can't handle the unknown length
	literal packet. Reported by Michael Richardson.

	2002-10-14 David Shaw <dshaw@jabberwocky.com>

	* keyserver-internal.h, keyserver.c (print_keyrec, parse_keyrec,
	show_prompt, keyserver_search_prompt, keyserver_spawn): Go to
	version 1 of the keyserver protocol. This is a better design,
	similar to --with-colons, that allows for keys with multiple user
	IDs rather than using multiple keys. It also matches the machine
	readable pksd format. Also use a prettier --search-keys listing
	format that can fill different size windows (currently set at 24
	lines).

	2002-10-12 Werner Koch <wk@gnupg.org>

	* keygen.c (print_status_key_created): New.
	(do_generate_keypair): Use it to print the fingerprint.
	(generate_subkeypair): Likewise.

	2002-10-11 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (menu_addrevoker): Properly back out if the signature
	fails. Also, do not allow appointing the same revoker twice, and
	report ALREADY_SIGNED if the user tries it.

	2002-10-07 David Shaw <dshaw@jabberwocky.com>

	* import.c (import_keys_internal): Missed one s/inp/inp2/.

	* keylist.c (print_capabilities): Properly indicate per-key
	capabilities of sign&encrypt primary keys that have
	secret-parts-missing (i.e. no capabilities at all)

	* mainproc.c (symkey_decrypt_sesskey): Fix compiler warning.

	2002-10-04 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (get_pubkey_direct): Don't cache keys retrieved via
	this function as they may not have all their fields filled in.

	* sig-check.c (signature_check2): Use new is_primary flag to check
	rather than comparing main_keyid with keyid as this still works in
	the case of a not fully filled in pk.

	2002-10-04 Werner Koch <wk@gnupg.org>

	* import.c (import_keys_internal): s/inp/inp2/ to avoid shadowing
	warning.

	* passphrase.c (agent_get_passphrase): Fixed signed/unsigned char
	problem in %-escaping. Noted by Ingo Klöcker.

	2002-10-03 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main): Add --strict and --no-strict to switch
	the log_warning severity level from info to error.

	* keylist.c (print_capabilities): Secret-parts-missing keys should
	show that fact in the capabilities, and only primary signing keys
	can certify other keys.

	* packet.h, parse_packet.c (parse_key): Add is_primary flag for
	public keys (it already exists for secret keys).

	2002-10-02 David Shaw <dshaw@jabberwocky.com>

	* import.c (import_secret_one): Check for an illegal (>110)
	protection cipher when importing a secret key.

	* keylist.c (list_keyblock_print): Show a '#' for a
	secret-parts-missing key.

	* parse_packet.c (parse_key): Some comments.

	* revoke.c (gen_revoke): Remove some debugging code.

	* trustdb.c (verify_own_keys): Make trusted-key a non-deprecated
	option again.

	* seckey-cert.c (do_check): Don't give the IDEA warning unless the
	cipher in question is in fact IDEA.

	2002-10-01 David Shaw <dshaw@jabberwocky.com>

	* import.c (import_one): Make sure that a newly imported key
	starts with a clean ownertrust.

	2002-10-01 Werner Koch <wk@gnupg.org>

	* getkey.c (get_pubkey_direct): New.
	(merge_selfsigs_main): Use it here to look for an ultimately
	trusted key. Using the full get_pubkey might lead to an
	infinitive recursion.

	2002-09-29 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (parse_keyserver_uri): Force the keyserver URI
	scheme to lowercase to be case-insensitive.

	2002-09-28 David Shaw <dshaw@jabberwocky.com>

	* export.c (do_export_stream): Comment.

	* sig-check.c (check_key_signature2): Properly handle a
	non-designated revocation import.

	2002-09-26 Werner Koch <wk@gnupg.org>

	* g10.c (set_homedir): New. Changed all direct assignments to use
	this.
	* gpgv.c (set_homedir): Ditto.

	2002-09-25 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: Link gpg with EGDLIBS (i.e. NETLIBS) as EGD uses
	sockets. Remove the old NETLIBS variable since the keyserver
	stuff is no longer internal.

	2002-09-24 David Shaw <dshaw@jabberwocky.com>

	* import.c (import_keys_stream): Fix compiler type warning.

	* keyring.c (keyring_rebuild_cache), sig-check.c
	(check_key_signature2), import.c (import, chk_self_sigs): Minor
	language cleanups.

	2002-09-23 Stefan Bellon <sbellon@sbellon.de>

	* main.h: Introduced fast-import as import option. Removed
	fast as separate option from prototypes.
	* import.c (parse_import_options): Added fast-import option.
	(import_*): Removed fast as separate option.
	* g10.c (main): Added option fast-import, removed old fast
	as separate argument.
	* keyserver.c (keyserver_spawn): Removed old fast as separate
	argument.

	2002-09-22 Stefan Bellon <sbellon@sbellon.de>

	* import.c (import_keys, import_keys_stream,
	import_keys_internal): Added trustdb update/check to key import if
	not fast-import and interactive set/no-auto-check-trustdb unset.
	Avoided function clone by introducing import_keys_internal.

	2002-09-19 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_spawn): Properly handle line truncation.
	Don't leak memory (~10-20 bytes) on searches.
	(keyserver_search_prompt): Cleanup.

	* keylist.c (list_keyblock_colon): Show 1F direct key signatures
	in --with-colons listing.

	2002-09-16 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (menu_addrevoker): The direct key signature for
	revocation keys must be at least v4 to carry the revocation key
	subpacket. Add a PGP 2.x warning for revocation keys.

	2002-09-14 David Shaw <dshaw@jabberwocky.com>

	* g10.c (check_permissions): Rearrange strings to make translating
	easier (don't incorporate string parts).

	* keyedit.c (sign_uids): Make strings translatable.

	* sig-check.c (check_key_signature2): Make string translatable.

	2002-09-13 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (check_revocation_keys): Move....
	* main.h, sig-check.c (check_revocation_keys): to here. Also
	return the signature_check error code rather than 0/1 and cache
	the sig result.

	* sig-check.c (check_key_signature2): Divert to
	check_revocation_keys if a revocation sig is made by someone other
	than the pk owner.

	* getkey.c (merge_selfsigs_main): Tidy.

	2002-09-13 Werner Koch <wk@gnupg.org>

	* g10.c (main) [__MINGW32__]: Activate oLoadExtension.

	2002-09-12 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am, hkp.c, hkp.h, keyserver.c (keyserver_work): Remove
	internal HKP support.

	* keyserver.c (keyserver_spawn): Remove whitespace after keyserver
	commands.

	2002-09-10 David Shaw <dshaw@jabberwocky.com>

	* exec.c (expand_args): Remove loop left over from earlier
	implementation.
	(exec_write): Missed one tick.

	2002-09-10 Werner Koch <wk@gnupg.org>

	* g10.c, options.h: Removed option --emulate-checksum-bug.
	* misc.c (checksum_u16_nobug): Removed.
	(checksum_u16): Removed the bug emulation.
	(checksum_mpi): Ditto.
	(checksum_mpi_counted_nbits): Removed and replaced all calls
	with checksum_mpi.

	* parse-packet.c (read_protected_v3_mpi): New.
	(parse_key): Use it here to store it as an opaque MPI.
	* seckey-cert.c (do_check): Changed the v3 unprotection to the new
	why to store these keys.
	(protect_secret_key): Likewise.
	* build-packet.c (do_secret_key): And changed the writing.

	* tdbio.c (tdbio_set_dbname, open_db): Use new macro MY_O_BINARY
	to avoid silly ifdefs.
	(open_db): Fallback to RDONLY so that gpg may be used from a
	RO-medium.

	* encode.c (encode_simple): Make sure we don't use an ESK packet
	when we don't have a salt in the S2K.

	* misc.c (pct_expando) <case f>: Make sure that LEN is initialized.

	* exec.c (exec_finish): Use ticks to denote filenames in messages.
	(make_tempdir, exec_write): Changed format of messages.

	* keyserver.c (print_keyinfo): Release USERID in on error.
	(keyserver_work) [!DISABLE_KEYSERVER_HELPERS]: Exclude the unused
	code.

	2002-09-09 Werner Koch <wk@gnupg.org>

	* parse-packet.c (make_attribute_uidname): Add new ar MAX_NAMELEN
	for sanity checks. Changed both callers. Limit the size of an %s.

	* options.skel: Comment lock-once out, so that this file does not
	change anything when copied to a new home directory.
	* openfile.c (try_make_homedir): Don't exit after copying the
	option skeleton.

	* options.h: Don't use a comma when declaring variables over more
	than one line.

	* mainproc.c (symkey_decrypt_sesskey): Check length of the session
	key.

	* hkp.c (dehtmlize): Use ascii_tolower to protect against weird
	locales. Cast the argument for isspace for the sake of broken
	HP/UXes.
	(parse_hkp_index): s/ascii_memcasecmp/ascii_strncasecmp/.

	* g10.c: Removed option --emulate-3des-s2k-bug.

	* passphrase.c (hash_passphrase): Was used here.

	* export.c (parse_export_options)
	* keyserver.c (parse_keyserver_options)
	* import.c (parse_import_options)
	* g10.c (check_permissions): s/ascii_memcasecmp/ascii_strncasecmp/.

	2002-09-09 David Shaw <dshaw@jabberwocky.com>

	* g10.c (add_group): Use '=' to separate group name from group
	members. Use a better error message for when no = is found.

	* hkp.c (hkp_export): Use CRLF in headers.

	2002-09-03 David Shaw <dshaw@jabberwocky.com>

	* mainproc.c (print_pkenc_list): Don't increment the error counter
	when printing the list of keys a message was encrypted to. This
	would make gpg give a non-zero exit code even for completely valid
	messages if the message was encrypted to more than one key that
	the user owned.

	2002-09-02 Werner Koch <wk@gnupg.org>

	* g10.c (main): Try to set a default character set. Print the
	used one in verbosity level 3.
	* gpgv.c (main): Try to set a default character set.

	* status.c, status.h (STATUS_IMPORT_OK): New.
	* import.c (import_one,import_secret_one): Print new status.

	2002-08-30 David Shaw <dshaw@jabberwocky.com>

	* pkclist.c (build_pk_list): Add new status code to indicate an
	untrusted user. This (or a disabled key) fail with "unavailable
	pubkey" (G10ERR_UNU_PUBKEY).

	* pkclist.c (build_pk_list): Fail if any recipient keys are
	unusable.

	* options.skel: The PGP LDAP keyserver is back. Use MIT keyserver
	as a sample rather than cryptnet as cryptnet does not support
	searching yet.

	* keyedit.c (show_key_with_all_names): Fix error message
	(preferences are userid/selfsig and not key specific).

	2002-08-30 Werner Koch <wk@gnupg.org>

	* pkclist.c (do_we_trust_pre): Changed the wording of a warning.

	* encode.c (encode_simple,encode_crypt): Use new style CTB for
	compressssed packets when using MDC. We need to do this so that
	concatenated messages are properly decrypted. Old style
	compression assumes that it is the last packet; given that we
	can't determine the length in advance, the uncompressor does not
	know where to start. Actually we should use the new CTB always
	but this would break PGP 2 compatibility.

	* parse-packet.c (parse): Special treatment for new style CTB
	compressed packets.

	* build-packet.c (do_mdc): Removed. Was not used.
	(do_encrypted_mdc): Count in the version number and the MDC packet.

	2002-08-28 David Shaw <dshaw@jabberwocky.com>

	* sig-check.c (do_check_messages, do_check): Show keyid in error
	messages.

	* keyserver.c (print_keyinfo): More readable key listings for
	--search-keys responses.

	2002-08-26 David Shaw <dshaw@jabberwocky.com>

	* hkp.c (parse_hkp_index, dehtmlize): Move HTML functionality into
	new "dehtmlize" function. Remove HTML before trying to parse each
	line from the keyserver. If the keyserver provides key type
	information in the listing, use it.

	2002-08-23 David Shaw <dshaw@jabberwocky.com>

	* sig-check.c (do_check, do_check_messages): Emit the usual sig
	warnings even for cached sigs. This also serves to protect
	against missing a sig expiring while cached.

	* getkey.c (merge_selfsigs_main): Don't check UID self-sigs twice.

	2002-08-22 David Shaw <dshaw@jabberwocky.com>

	* import.c (clean_subkeys, chk_self_sigs): Merge clean_subkeys
	into chk_self_sigs. This improves efficiency as the same
	signatures are not checked multiple times. Clarify when a subkey
	is revoked (any revocation signature, even if it is dated before
	the binding signature).

	* getkey.c (merge_selfsigs_subkey): Subkey revocation comments.

	* keylist.c (list_one): Stats are only for public key listings.

	* g10.c (main), options.skel: Default should be include-revoked
	for keyserver operations.

	2002-08-21 Werner Koch <wk@gnupg.org>

	* import.c (import_print_stats): Print new non_imported counter
	which is currently not used because we terminate on errors.

	2002-08-20 David Shaw <dshaw@jabberwocky.com>

	* options.skel: Document no-include-attributes for
	keyserver-options.

	* keylist.c, keyedit.c, keyserver.c, sign.c: Some TODOs and
	comments.

	* export.c (do_export_stream): Fix noop bug in exporting sensitive
	revocation keys.

	* pkclist.c (do_edit_ownertrust): Comment out the option for
	showing trust paths until it can be implemented.

	2002-08-19 Werner Koch <wk@gnupg.org>

	* getkey.c (get_user_id_native): Renamed to ..
	(get_user_id_printable): this. Filter out all dangerous
	characters. Checked all usages.
	(get_user_id_string_native): Renamed to..
	(get_user_id_string_printable): this. Filter out all dangerous
	characters. Checked all usages.
	* keyedit.c (show_basic_key_info): New.
	* keylist.c (print_fingerprint): New mode 3.
	* import.c (import_one): Use new function to display the user ID.

	2002-08-16 Timo Schulz <ts@winpt.org>

	* g10.c (main): Enable opt.interactive.

	* import.c (import_one): Ask the user if the key shall be
	imported when the interactive mode is used. Useful to extract
	selected keys from a file.

	2002-08-16 Werner Koch <wk@gnupg.org>

	* seckey-cert.c: Workaround to allow decryption of v3 keys created
	with a bug in the mpi_get_secure_buffer.

	2002-08-14 David Shaw <dshaw@jabberwocky.com>

	* hkp.c (parse_hkp_index): Properly handle really large keys
	(5 digit key length) in HKP searches.

	2002-08-13 David Shaw <dshaw@jabberwocky.com>

	* encode.c (encode_simple): Fix problem with using compression
	algo 2 and symmetric compressed files.

	* encode.c (encode_simple, encode_crypt): If we are not using a
	MDC, compress even if a file is already compressed. This is to
	help against the chosen ciphertext attack.

	* pkclist.c (select_algo_from_prefs): Fix requested algorithm bug
	so the request succeeds even if the requested algorithm is not the
	first found.

	* cipher.c (write_header), encode.c (use_mdc, encode_simple,
	encode_crypt, encrypt_filter), g10.c (main): Be more eager to use
	a MDC. We use a MDC if the keys directly support it, if the keys
	list AES (any) or TWOFISH anywhere in the prefs, or if the cipher
	chosen does not have a 64 bit blocksize.

	2002-08-08 David Shaw <dshaw@jabberwocky.com>

	* options.skel: Some language tweaks, and remove the
	load-extension section for random gatherers.

	* keyring.c (create_tmp_file, rename_tmp_file): Create tmp files
	with user-only permissions, but restore the original permissions
	if the user has something special set.

	* openfile.c (copy_options_file): Create new options file
	(gpg.conf) with user-only permissions.

	* keydb.c (keydb_add_resource): Create new keyrings with user-only
	permissions.

	* tdbio.c (tdbio_set_dbname): Create new trustdbs with user-only
	permissions.

	2002-08-07 David Shaw <dshaw@jabberwocky.com>

	* sig-check.c (signature_check2): Sanity check that the md has a
	context for the hash that the sig is expecting. This can happen
	if a onepass sig header does not match the actual sig, and also if
	the clearsign "Hash:" header is missing or does not match the
	actual sig.

	* keyedit.c (menu_revsig): Properly show a uid is revoked without
	restarting gpg. This is Debian bug 124219, though their supplied
	patch will not do the right thing.

	* main.h, tdbio.c (tdbio_set_dbname), misc.c (removed
	check_permissions), keydb.c (keydb_add_resource), g10.c (main,
	check_permissions): Significant reworking of the permission check
	mechanism. The new behavior is to check everything in the homedir
	by checking the homedir itself. If the user wants to put
	(possibly shared) keyrings outside the homedir, they are not
	checked. The options file and any extension files are checked
	wherever they are, as well as their enclosing directories. This
	is Debian bug 147760.

	2002-08-06 Stefan Bellon <sbellon@sbellon.de>

	* g10.c (main): Use of EXTSEP_S in new gpg.conf string.
	* openfile.c (copy_options_file): Ditto.

	2002-08-06 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), mainproc.c (proc_encrypted):
	--ignore-mdc-error option to turn a MDC check error into a
	warning.

	* encode.c (encode_crypt), g10.c (main), sign.c (sign_file,
	clearsign_file): Use the same --pgpX warning string everywhere to
	ease translations.

	* encode.c (write_pubkey_enc_from_list): Warn when using
	--throw-keyid with --pgpX. Noted by Vedaal Nistar.

	* revoke.c (export_minimal_pk, gen_desig_revoke, gen_revoke):
	Export a minimal pk along with the revocation cert when in --pgpX
	mode so that PGP can import it.

	2002-08-06 Werner Koch <wk@gnupg.org>

	* options.skel: Changed comments.

	* g10.c (main): Try to use "gpg.conf" as default option file.
	* openfile.c (copy_options_file): Changed name of created file.

	2002-08-02 Werner Koch <wk@gnupg.org>

	* Makefile.am (LDFLAGS): Removed DYNLINK_LDFLAGS.

	2002-07-30 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), mainproc.c (proc_encrypted): Return a
	decryption failed error if a MDC does not verify. Warn if a MDC
	is not present (can disable via --no-mdc-warning).

	* exec.c (exec_write), g10.c (main), keyserver.c
	(keyserver_spawn): Use new DISABLE_KEYSERVER_PATH rather than
	FIXED_EXEC_PATH.

	2002-07-28 David Shaw <dshaw@jabberwocky.com>

	* sig-check.c (do_check): Properly validate v4 sigs with no hashed
	section at all.

	2002-07-25 Werner Koch <wk@gnupg.org>

	* delkey.c (do_delete_key): Always allow to delete a key in batch mode
	when specified by fingerprint. Suggested by Enzo Michelangeli.

	2002-07-25 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (menu_revsig): Change "revsig" to honor selected uids
	so the user can revoke sigs from particular uids only.

	* keylist.c (list_keyblock_print): Don't display expired uids in
	--list-keys unless -v and not --list-sigs (just like revoked
	uids).

	* exec.c, export.c, import.c, keyedit.c, keyserver.c, misc.c:
	"Warning" -> "WARNING"

	2002-07-24 David Shaw <dshaw@jabberwocky.com>

	* main.h, import.c (parse_import_options, fix_hkp_corruption,
	import_one, delete_inv_parts), g10.c (main): New import-option
	"repair-hkp-subkey-bug", which repairs as much as possible the HKP
	mangling multiple subkeys bug. It is on by default for keyserver
	receives, and off by default for regular --import.

	* main.h, import.c (import, import_one, delete_inv_parts), hkp.c
	(hkp_ask_import), keyserver.c (keyserver_spawn): Use keyserver
	import options when doing keyserver receives.

	* options.h, exec.h, exec.c (set_exec_path, exec_write), g10.c
	(main), keyserver.c (keyserver_spawn): If the user does not use
	"exec-path", completely replace $PATH with GNUPG_LIBEXECDIR before
	calling the keyserver helper. If the user does use "exec-path",
	append GNUPG_LIBEXECDIR after the specified path.

	2002-07-23 David Shaw <dshaw@jabberwocky.com>

	* import.c (parse_import_options), export.c
	(parse_export_options): Fix offset problem with reversed ("no-")
	meanings.

	* import.c (delete_inv_parts): Discard subkey signatures (0x18 and
	0x28) if found in the userid section of the key.

	* sig-check.c (signature_check2): Signatures made by invalid
	subkeys (bad/missing binding sig) are also invalid.

	* keylist.c (print_fingerprint): Show the primary as well as the
	secondary key fingerprint in modes 1 & 2.

	2002-07-22 David Shaw <dshaw@jabberwocky.com>

	* options.h, main.h, g10.c (main), import.c
	(parse_import_options, delete_inv_parts), keyserver.c
	(parse_keyserver_options): add new --import-options option. The
	only current flag is "allow-local-sigs".

	* g10.c (main): Don't disable MDC in pgp7 mode.

	* options.h, g10.c (main), keyserver.c (parse_keyserver_options):
	Remove old keyserver-option include-attributes now that there is
	an export-option for the same thing.

	* options.h, main.h, export.c (parse_export_options,
	do_export_stream), g10.c (main): add new --export-options option.
	Current flags are "include-non-rfc", "include-local-sigs",
	"include-attributes", and "include-sensitive-revkeys".

	* options.h, hkp.c (hkp_export), keyserver.c
	(parse_keyserver_options, keyserver_spawn): try passing unknown
	keyserver options to export options, and if successful, use them
	when doing a keyserver --send-key.

	* build-packet.c (build_sig_subpkt): We do not generate
	SIGSUBPKT_PRIV_VERIFY_CACHE anymore.

	* revoke.c (gen_desig_revoke): Lots more comments about including
	sensitive revkeys along with the revocation sig itself.

	* keyserver.c (parse_keyserver_options): Simpler implementation
	that can skip one pass over the options.

	2002-07-18 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (keyedit_menu, menu_addrevoker): Allow specifying
	"sensitive" as an argument to an addrevoker command. This sets
	the 0x40 sensitive revoker flag.

	* revoke.c (gen_desig_revoke): When generating a designated
	revocation, include the direct key sig that contains the
	designated revoker subpacket. This allows sensitive designated
	revocation subpackets to be exported. Also indicate which
	revokers are sensitive in the first place.

	2002-07-17 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names_colon): The 0x40 class bit in
	a designated revoker means "sensitive", not "local". It's
	exportable under the right circumstances.

	* main.h, options.h, export.c (do_export_stream), g10.c (main),
	hkp.c (hkp_export), keyserver.c (keyserver_spawn: Add a flag to
	skip attribute packets and their signatures while exporting. This
	is to accomodate keyservers (pksd again) that choke on attributes.
	Use keyserver-option "include-attributes" to control it. This
	defaults to ON (i.e. don't skip).

	2002-07-09 David Shaw <dshaw@jabberwocky.com>

	* options.h, keyserver.c (parse_keyserver_uri, keyserver_spawn,
	keyserver_work), hkp.c (hkp_ask_import, hkp_export, hkp_search):
	Use a much more strict reading of RFC-2396 for the keyserver URIs.
	Specifically, don't try and be smart about checking the value of
	":port" so long as it is all digits, and properly handle opaque
	data (those scheme specific parts that do not start with "//").

	2002-07-04 David Shaw <dshaw@jabberwocky.com>

	* photoid.c (get_default_photo_command, show_photos): Honor
	FIXED_PHOTO_VIEWER and DISABLE_PHOTO_VIEWER.

	* mainproc.c (check_sig_and_print): Use --show-photos to show
	photos when verifying a sig made by a key with a photo.

	* keyserver.c (parse_keyserver_uri): Properly parse a URI with no
	:port section and an empty file path, but with a terminating '/'.
	(keyserver_work): Honor DISABLE_KEYSERVER_HELPERS.

	* hkp.c (hkp_ask_import): Display keyserver URI as a URI, but only
	if verbose.

	* exec.c, g10.c: USE_EXEC_PATH -> FIXED_EXEC_PATH

	2002-07-03 David Shaw <dshaw@jabberwocky.com>

	* exec.h, exec.c (set_exec_path, exec_write), g10.c (main): If
	USE_EXEC_PATH is defined at compile time, use it to lock the
	exec-path and not allow the user to change it.

	2002-07-02 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), keyserver.c (keyserver_refresh):
	Maintain and use the original keyserver URI for cosmetics rather
	than trying to recreate it when needed.

	* mainproc.c (check_sig_and_print): Properly disregard expired
	uids. Make sure that the first uid listed is a real uid and not
	an attribute (attributes should only be listed in the "aka"
	section). When there are no valid textual userids, try for an
	invalid textual userid before using any attribute uid.

	2002-07-01 David Shaw <dshaw@jabberwocky.com>

	* options.skel: Fix a few typos, clarify "group", and remove
	sample photo viewers for Win32 since they are the defaults now.

	* parse-packet.c (make_attribute_uidname), keylist.c
	(dump_attribs): Fix two typecast warnings.

	* packet.h, build-packet.c (build_attribute_subpkt), exec.c
	(expand_args), mkdtemp.c (mkdtemp), photoid.c
	(parse_image_header): Fix some signedness compiler warnings.

	2002-07-01 Werner Koch <wk@gnupg.org>

	* photoid.c (get_default_photo_command): Also use __MINGW32__
	instead of HAVE_DOSISH_SYSTEM.

	* encode.c (encode_symmetric): Do not use the new encryption code.

	2002-06-30 Werner Koch <wk@gnupg.org>

	* photoid.c: Use __MINGW32__ to include windows because
	HAVE_DOSISH_SYSTEM is also set for OS/2 and plain DOS. Provide
	constant missing in older mingw installations.

	2002-06-21 Stefan Bellon <sbellon@sbellon.de>

	* g10.c [__riscos__]: Moved RISC OS specific stuff to util/riscos.c
	and include/util.h.

	* gpgv.c [__riscos__]: Likewise.

	2002-06-20 David Shaw <dshaw@jabberwocky.com>

	* keydb.h, pkclist.c (select_algo_from_prefs): Allow passing a
	suggested algorithm which will be used if available.

	* encode.c (encode_crypt, encrypt_filter), sign.c (sign_file): Use
	new select_algo_from_prefs feature to check if forcing an
	algorithm would violate the recipient preferences.

	* photoid.c (get_default_photo_command, show_photos): Use
	different default viewers on different platforms. Currently we
	have Win 9x, Win NT (2k, xp), Mac OSX, RISC OS, and "everybody
	else". These are #ifdefs as much as possible to avoid clutter.

	* g10.c (strusage, build_list), keyedit.c (show_prefs), main.h,
	misc.c (compress_algo_to_string, check_compress_algo), pkclist.c
	(algo_available), keygen.c (keygen_set_std_prefs): New
	algo_to_string and check functions for compress algorithms.

	2002-06-20 Werner Koch <wk@gnupg.org>

	* misc.c (setsysinfo): Removed a #warning for Alpha's uniligedn
	trap disabling - it is quite possible that this is a debug relict.

	2002-06-20 Stefan Bellon <sbellon@sbellon.de>

	* g10.c [__riscos__]: Added image file system feature.

	* gpgv.c [__riscos__]: Added image file system feature.

	* photoid.c (show_photos) [__riscos__]: Set RISC OS filetype of
	photo id according to MIME type.

	2002-06-19 David Shaw <dshaw@jabberwocky.com>

	* hkp.c (parse_hkp_index): Don't leak memory when failing out of a
	bad HKP keyserver.

	* g10.c (add_notation_data): Relax slightly the rules as to what
	can go into a notation name - 2440 allows "@", for example.

	2002-06-17 David Shaw <dshaw@jabberwocky.com>

	* import.c (clean_subkeys, import_one): Only allow at most 1
	binding sig and at most 1 revocation sig on a subkey, as per
	2440:11.1.

	* hkp.c (parse_hkp_index, hkp_search): Error if the keyserver
	returns an unparseable HKP response.

	2002-06-15 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names), keylist.c
	(list_keyblock_print): Show "[expired]" before expired uids.

	* keyedit.c (show_key_with_all_names_colon), mainproc.c
	(list_node), keylist.c (list_keyblock_colon): Show flag 'e' for
	expired user ids. Use "uat" for user attribute packets instead of
	"uid". Also use '<count> <length>' rather than the fake user id
	string on attributes.

	* keygen.c (keygen_add_revkey): Remove unused code.

	* misc.c (check_permissions): Check directory permissions
	properly - they are not special files.

	* pkclist.c (expand_id, expand_group, build_pk_list): When
	expanding groups before building a pk list, inherit flags from the
	original pre-expanded string.

	* pubkey-enc.c (is_algo_in_prefs): Don't use prefs from expired
	uids.

	2002-06-14 David Shaw <dshaw@jabberwocky.com>

	* free-packet.c (copy_signature): Properly copy a signature that
	carries a revocation key on it.

	* pkclist.c (expand_id, expand_group, build_pk_list): Groups now
	work properly when used in the "Enter the user ID" prompt.

	2002-06-14 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (show_key_with_all_names): Display warning if a user
	tries to show prefs on a v3 key with a v3 selfsig.

	* kbnode.c (dump_kbnode): Show if a uid is expired.

	* import.c (merge_blocks, import_revoke_cert): Show user ID
	receiving a revocation certificate.

	* free-packet.c (cmp_user_ids): Properly compare attribute ids.

	* pkclist.c (expand_groups): Maintain the strlist flags while
	expanding. Members of an expansion inherit their flags from the
	expansion key.

	* options.h, cipher.c (write_header), g10.c (main), keygen.c
	(keygen_set_std_prefs): remove the personal_mdc flag. It no
	longer serves a purpose now that the personal preference lists are
	split into cipher/digest/zip.

	2002-06-14 Timo Schulz <ts@winpt.org>

	* skclist.c (is_insecure): Implemented.

	2002-06-12 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_spawn): Properly handle PROGRAM responses
	when they have a CRLF ending. Noted by Keith Ray.

	* keyserver.c (keyserver_spawn): Handle CRLF endings from
	keyserver helpers. Also don't leak the last line worth of memory
	from the keyserver response.

	* main.h, misc.c (deprecated_warning): New function to warn about
	deprecated options and commands.

	* g10.c (main), keyserver-internal.h, keyserver.c
	(parse_keyserver_uri): Use new deprecated function to warn about
	honor-http-proxy, auto-key-retrieve, and x-broken-hkp.

	2002-06-11 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: link gpg with NETLIBS for the built-in HKP access.

	2002-06-10 David Shaw <dshaw@jabberwocky.com>

	* options.h, keyserver.c (keyserver_opts), g10.c (main): New
	keyserver option "include-subkeys". This feature already existed,
	but now can be turned off. It defaults to on.

	* options.h, keyserver.c (parse_keyserver_options,
	keyserver_spawn): There are now enough options to justify making a
	structure for the keyserver options rather than a page of
	if-then-else-if-then-etc.

	* getkey.c (merge_keys_and_selfsig, merge_selfsigs_main): Fix bug
	in calculating key expiration dates.

	2002-06-09 David Shaw <dshaw@jabberwocky.com>

	* keydb.h, getkey.c (get_user_id_native), import.c (import_one):
	Display user ID while importing a key. Note this applies to both
	--import and keyserver --recv-keys.

	* exec.c (exec_finish): Log unnatural exit (core dump, killed
	manually, etc) for fork/exec/pipe child processes.

	2002-06-08 Timo Schulz <ts@winpt.org>

	* encode.c (encode_symmetric): Disable the compat flag
	when the expert mode is enabled.

	2002-06-07 David Shaw <dshaw@jabberwocky.com>

	* options.skel, options.h, main.h, keydb.h, pkclist.c
	(build_pk_list, expand_groups), g10.c (main, add_group): Add new
	"group" command to allow one name to expand into multiple keys.
	For simplicity, and to avoid potential loops, we only expand once
	- you can't make an alias that points to an alias.

	* main.h, g10.c (main), keygen.c (build_personal_digest_list):
	Simplify the default digest list - there is really no need for the
	other hashes since they will never be used after SHA-1 in the
	list.

	* options.skel, options.h, g10.c (main), hkp.c (hkp_ask_import,
	hkp_export, hkp_search), keyserver.c (parse_keyserver_options,
	parse_keyserver_uri, keyserver_work, keyserver_refresh): Make the
	"x-broken-hkp" keyserver scheme into keyserver-option
	"broken-http-proxy". Move honor_http_proxy into
	keyserver_options. Canonicalize the three variations of "hkp",
	"x-hkp", and "x-broken-hkp" into "hkp".

	2002-06-07 Stefan Bellon <sbellon@sbellon.de>

	* g10.c [__riscos__]: Added --attribute-file to do the same as
	--attribute-fd, but with a filename not a fd as argument.
	Added magic symbol for RISC OS to use different memory management.

	* gpgv.c [__riscos__]: Added magic symbol for RISC OS to use
	different memory management.

	2002-06-06 David Shaw <dshaw@jabberwocky.com>

	* main.h, g10.c (main), keygen.c (build_personal_digest_list): Put
	in a default digest preference list consisting of SHA-1, followed
	by every other installed digest except MD5. Note this is the same
	as having no digest preference at all except for SHA-1 being
	favored.

	* options.h, g10.c (main), keygen.c (keygen_set_std_prefs),
	pkclist.c (select_algo_from_prefs): Split
	--personal-preference-list into three:
	--personal-{cipher\|digest\|compress}-preferences. This allows a
	user to set one without affecting another (i.e. setting only a
	digest pref doesn't imply an empty cipher pref).

	* exec.c (exec_read): This is a safer way of guessing the return
	value of system(). Noted by Stefan Bellon.

	2002-06-05 David Shaw <dshaw@jabberwocky.com>

	* hkp.c (parse_hkp_index): Be more robust with keyservers
	returning very unparseable responses.

	* exec.c (exec_read): Catch and display an error when the remote
	process exits unnaturally (i.e. segfault) so the user knows what
	happened. Also fix exec_write stub which has a different number
	of arguments now.

	2002-06-05 Timo Schulz <ts@winpt.org>

	* encode.c (encode_simple): Ignore the new mode for RFC1991.
	* mainproc.c (symkey_decrypt_sesskey): Better check for weird
	keysizes.

	2002-06-05 Timo Schulz <ts@winpt.org>

	* encode.c (encode_sesskey): New.
	(encode_simple): Use it here. But by default we use the compat
	mode which supress to generate encrypted session keys.

	2002-06-05 Timo Schulz <ts@winpt.org>

	* mainproc.c (symkey_decrypt_sesskey): New.
	(proc_symkey_enc): Support for encrypted session keys.

	2002-06-04 David Shaw <dshaw@jabberwocky.com>

	* sign.c (hash_for, sign_file): When encrypting and signing at the
	same time, consult the various hash prefs to pick a hash algorithm
	to use. Pass in a 160-bit hint if any of the signing keys are
	DSA.

	* keydb.h, pkclist.c (select_algo_from_prefs, algo_available):
	Pass a "hints" opaque pointer in to let the caller give hints as
	to what algorithms would be acceptable. The only current hint is
	for PREFTYPE_HASH to require a 160-bit hash for DSA. Change all
	callers in encode.c (encode_crypt, encrypt_filter) and sign.c
	(sign_file). If we settle on MD5 as the best algorithm based
	solely on recepient keys and SHA1 is also a possibility, use SHA1
	unless the user intentionally chose MD5. This is as per 2440:13.

	* exec.c (make_tempdir): Fix duplicated filename problem.

	2002-06-03 David Shaw <dshaw@jabberwocky.com>

	* packet.h, parse-packet.c (enum_sig_subpkt): Report back from
	enum_sig_subpkt when a subpacket is critical and change all
	callers in keylist.c (show_policy_url, show_notation), mainproc.c
	(print_notation_data), and pkclist.c (do_show_revocation_reason).

	* keylist.c (show_policy_url, show_notation): Display if the
	policy or notation is critical.

	2002-06-03 David Shaw <dshaw@jabberwocky.com>

	* main.h, g10.c (main), keylist.c (dump_attribs, set_attrib_fd,
	list_keyblock_print, list_keyblock_colon), status.h, status.c
	(get_status_string): New --attribute-fd feature to dump the
	contents of attribute subpackets for frontends. If --status-fd is
	also used, then a new status tag ATTRIBUTE is provided for each
	subpacket.

	* packet.h, getkey.c (fixup_uidnode, merge_selfsigs_main,
	merge_selfsigs_subkey), parse-packet.c (setup_user_id): Keep track
	of the expiration time of a user ID, and while we're at it, use
	the expired flag from the selfsig rather than reparsing the
	SIG_EXPIRE subpacket.

	* photoid.c (generate_photo_id): When adding a new photo ID,
	showing the photo for confirmation is not safe when noninteractive
	since the "user" may not be able to dismiss a viewer window.
	Noted by Timo Schulz.

	2002-06-03 David Shaw <dshaw@jabberwocky.com>

	* options.skel: Sample photo viewers for Win32.

	* misc.c (pct_expando): Use the seckey for %k/%K if the pubkey is
	not available.

	* photoid.h, photoid.c (show_photos): Include the seckey in case a
	user tries to view a photo on a secret key, and change all callers
	in keyedit.c (menu_showphoto), keylist.c (list_keyblock_print),
	and photoid.c (generate_photo_id).

	2002-06-02 David Shaw <dshaw@jabberwocky.com>

	* photoid.c (show_photos): Work properly when not called with a
	public key.

	2002-05-31 David Shaw <dshaw@jabberwocky.com>

	* sign.c (mk_notation_and_policy): Free unneeded buffer.

	* hkp.c (parse_hkp_index): Properly handle the '&' character
	(i.e. "&") in HKP responses.

	* getkey.c (merge_selfsigs_main): Fix reversed expiration time
	check with self-sigs.

	* keyedit.c (sign_uids): When making a new self-sig on a v3 key,
	make a v3 self-sig unless it is currently a v3 self-sig being
	promoted to v4.

	2002-05-31 Timo Schulz <ts@winpt.org>

	* pkclist.c (do_show_revocation_reason): Don't use capital
	letters for non-interactive output.
	(show_revocation_reason): Now it is global.
	* pubkey-enc.c (get_it): Show if the key has been revoked.

	2002-05-30 David Shaw <dshaw@jabberwocky.com>

	* sign.c (write_signature_packets, sign_file, clearsign_file,
	sign_symencrypt_file): Make a v4 signature if a policy URL or
	notation is set, unless v3 sigs are forced via rfc1991 or
	force-v3-sigs. Also remove some doubled code and clarify an error
	message (we don't sign in PGP2 mode - just detach-sign).

	* parse-packet.c (parse_one_sig_subpkt): Add KS_FLAGS to the "any
	size" section.

	2002-05-29 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (keygen_set_std_prefs, add_feature_mdc): Use "mdc" and
	"no-mdc" in the prefs string to allow switching on and off the MDC
	feature. This is needed to properly export a key from GnuPG for
	use on PGP which does not support MDC - without this, MDC-capable
	implementations will still try and generate MDCs which will break
	PGP.

	* keygen.c (keygen_get_std_prefs): Show "[mdc]" in prefs string if
	it is enabled.

	* options.h, g10.c (main), cipher.c (write_header), keygen.c
	(keygen_set_std_prefs): For consistency, allow the user to specify
	mdc/no-mdc in the --personal-preference-list. If disabled, it
	acts just like --disable-mdc.

	2002-05-29 David Shaw <dshaw@jabberwocky.com>

	* options.h, exec.c: Add some debugging info, using the 1024 debug
	flag.

	* exec.c (win_system): New system()-like function for win32 that
	does not return until the child process terminates. Of course,
	this doesn't help if the process itself exits before it is
	finished.

	2002-05-29 Werner Koch <wk@gnupg.org>

	* encode.c (encode_simple): Intialize PKT when --no-literal is used.

	* keyedit.c (show_key_with_all_names_colon): Renamed the record
	for revocation keys to "rvk".

	2002-05-27 Werner Koch <wk@gnupg.org>

	* keyedit.c (show_key_with_all_names_colon): New.
	(show_key_with_all_names): Divert to new function when required.
	Sanitize printing of revoker name.

	2002-05-27 David Shaw <dshaw@jabberwocky.com>

	* build-packet.c (build_sig_subpkt): Handle setting sig flags for
	certain subpacket types (notation, policy url, exportable,
	revocable). keyedit.c (sign_mk_attrib): Flags no longer need to
	be set here.

	* packet.h, parse-packet.c (parse_one_sig_subpkt), build-packet.c
	(build_sig_subpkt): Call parse_one_sig_subpkt to sanity check
	buffer lengths before building a sig subpacket.

	2002-05-26 David Shaw <dshaw@jabberwocky.com>

	* sign.c (mk_notation_and_policy): Include secret key to enable %s
	expandos, and pass notations through pct_expando as well.

	* main.h, misc.c (pct_expando): Add %s and %S expandos for
	signer's keyid.

	2002-05-25 David Shaw <dshaw@jabberwocky.com>

	* g10.c (strusage, build_list): Add compress algorithms to
	--version list. Show algorithm numbers when --verbose --version
	is done.

	2002-05-22 David Shaw <dshaw@jabberwocky.com>

	* options.h, main.h, keygen.c (keygen_set_set_prefs,
	keygen_get_std_prefs, keygen_upd_std_prefs), keyedit.c
	(keyedit_menu), g10.c (main), pkclist.c (select_algo_from_prefs):
	Add --personal-preference-list which allows the user to factor in
	their own preferred algorithms when the preference lists are
	consulted. Obviously, this does not let the user violate a
	recepient's preferences (and the RFC) - this only influences the
	ranking of the agreed-on (and available) algorithms from the
	recepients. Suggested by David Hollenberg.

	* options.h, keygen.c (keygen_set_std_prefs), g10.c (main): Rename
	--preference-list to --default-preference-list (as that is what it
	really is), and make it a true default in that if the user selects
	"default" they get this list and not the compiled-in list.

	2002-05-22 Werner Koch <wk@gnupg.org>

	* g10.c (main): Add missing LF in a info printout and made it
	translatable. Noted by Michael Tokarev.

	2002-05-21 Werner Koch <wk@gnupg.org>

	* g10.c (main): Removed the undef of USE_SHM_COPROCESSING which
	was erroneously introduced on 2002-01-09.

	* signal.c (got_fatal_signal): Don't write the Nul to stderr.
	Reported by David Hollenberg.

	2002-05-18 David Shaw <dshaw@jabberwocky.com>

	* main.h, g10.c (main), revoke.c (gen_desig_revoke): Generate a
	designated revocation via --desig-revoke

	* keyedit.c (keyedit_menu, menu_addrevoker): New "addrevoker"
	command to add a designated revoker to a key.

	2002-05-17 David Shaw <dshaw@jabberwocky.com>

	* gpgv.c: Add stub for get_ownertrust().

	* g10.c (main): --allow-freeform-uid should be implied by
	OpenPGP. Add --no-allow-freeform-uid.

	* keyedit.c (sign_uids): Issue a warning when signing a
	non-selfsigned uid.

	* getkey.c (merge_selfsigs_main): If a key has no selfsigs, and
	allow-non-selfsigned-uid is not set, still try and make the key
	valid by checking all uids for a signature from an ultimately
	trusted key.

	2002-05-16 David Shaw <dshaw@jabberwocky.com>

	* main.h, keygen.c (keygen_add_revkey): Add revocation key
	subpackets to a signature (callable by
	make_keysig_packet). (write_direct_sig): Write a 1F direct key
	signature. (parse_revocation_key): Parse a string in
	algo:fpr:sensitive format into a revocation
	key. (get_parameter_revkey, do_generate_keypair): Call above
	functions when prompted from a batch key generation file.

	* build-packet.c (build_sig_subpkt): Allow multiple revocation key
	subpackets in a single sig.

	* keydb.h, getkey.c (get_seckey_byfprint): Same as
	get_pubkey_byfprint, except for secret keys. We only know the
	fingerprint of a revocation key, so this is needed to retrieve the
	secret key needed to issue a revokation.

	* packet.h, parse-packet.c (parse_signature, parse_revkeys): Split
	revkey parsing off into a new function that can be used to reparse
	after manipulating the revkey list.

	* sign.c (make_keysig_packet): Ability to make 1F direct key
	signatures.

	2002-05-15 David Shaw <dshaw@jabberwocky.com>

	* options.skel: keyserver.pgp.com is gone, so list pgp.surfnet.nl
	as a sample LDAP server instead.

	* getkey.c (merge_selfsigs_main): Properly handle multiple
	revocation keys in a single packet. Properly handle revocation
	keys that are in out-of-order packets. Remove duplicates in
	revocation key list.

	2002-05-14 Timo Schulz <ts@winpt.org>

	* exec.c (make_tempdir) [MINGW32]: Added missing '\'.

	2002-05-14 Stefan Bellon <sbellon@sbellon.de>

	* exec.c (make_tempdir): Make use of EXTSEP_S instead of hardcoded
	dot as extension separator.

	2002-05-13 David Shaw <dshaw@jabberwocky.com>

	* photoid.c (show_photos): Use the long keyid as the filename for
	the photo. Use the short keyid as the filename on 8.3 systems.

	* exec.h, exec.c (make_tempdir, exec_write, exec_finish): Allow
	caller to specify filename. This should make things easier on
	windows and macs where the file extension is required, but a whole
	filename is even better.

	* keyedit.c (show_key_with_all_names, show_prefs): Show proper
	prefs for a v4 key uid with no selfsig at all.

	* misc.c (check_permissions): Don't check permissions on
	non-normal files (pipes, character devices, etc.)

	2002-05-11 Werner Koch <wk@gnupg.org>

	* mainproc.c (proc_symkey_enc): Avoid segv in case the parser
	encountered an invalid packet.

	* keyserver.c (keyserver_export): Get confirmation before sending
	all keys.

	2002-05-10 Stefan Bellon <sbellon@sbellon.de>

	* g10.c, hkp.c, keyedit.c, keyserver.c: Replaced all occurrances
	of strcasecmp with ascii_strcasecmp and all occurrances of
	strncasecmp with ascii_memcasecmp.

	2002-05-10 David Shaw <dshaw@jabberwocky.com>

	* packet.h, getkey.c (fixup_uidnode), keyedit.c (show_prefs): Show
	assumed prefs for hash and compression as well as the cipher pref.
	Show assumed prefs if there are no prefs at all on a v4
	self-signed key.

	* options.h, g10.c (main), sign.c (make_keysig_packet): New
	--cert-digest-algo function to override the default key signing
	hash algorithm.

	2002-05-09 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (merge_selfsigs_main): Make sure the revocation key
	list starts clean as this function may be called more than once
	(e.g. from functions in --edit).

	* g10.c, encode.c (encode_crypt), sign.c (sign_file,
	sign_symencrypt_file): Make --compress-algo work like the
	documentation says. It should be like --cipher-algo and
	--digest-algo in that it can override the preferences calculation
	and impose the setting the user wants. No --compress-algo setting
	allows the usual preferences calculation to take place.

	* main.h, compress.c (compress_filter): use new
	DEFAULT_COMPRESS_ALGO define, and add a sanity check for compress
	algo value.

	2002-05-08 David Shaw <dshaw@jabberwocky.com>

	* pkclist.c (select_algo_from_prefs): There is an assumed
	compression preference for uncompressed data.

	2002-05-07 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), getkey.c (finish_lookup), pkclist.c
	(algo_available): --pgp7, identical to --pgp6 except that it
	permits a few algorithms that PGP 7 added: AES128, AES192, AES256,
	and TWOFISH. Any more of these --pgpX flags, and it'll be time to
	start looking at a generic --emulate-pgp X option.

	* export.c (do_export_stream): Warn the user when exporting a
	secret key if it or any of its secret subkeys are protected with
	SHA1 while simple_sk_checksum is set.

	* parse-packet.c (parse_key): Show when the SHA1 protection is
	used in --list-packets.

	* options.h, build-packet.c (do_comment), g10.c (main): Rename
	--no-comment as --sk-comments/--no-sk-comments (--no-comment still
	works) and make the default be --no-sk-comments.

	2002-05-07 Werner Koch <wk@gnupg.org>

	* keygen.c (get_parameter_algo): Never allow generation of the
	deprecated RSA-E or RSA-S flavors of PGP RSA.
	(ask_algo): Allow generation of RSA sign and encrypt in expert
	mode. Don't allow ElGamal S+E unless in expert mode.
	* helptext.c: Added entry keygen.algo.rsa_se.

	2002-05-07 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (sign_uids): If --expert is set, allow re-signing a
	uid to promote a v3 self-sig to a v4 one. This essentially
	deletes the old v3 self-sig and replaces it with a v4 one.

	* packet.h, parse-packet.c (parse_key), getkey.c
	(merge_keys_and_selfsig, merge_selfsigs_main): a v3 key with a v4
	self-sig must never let the v4 self-sig express a key expiration
	time that extends beyond the original v3 expiration time.

	2002-05-06 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (sign_uids): When making a self-signature via "sign"
	don't ask about sig level or expiration, and include the usual
	preferences and such for v4 self-sigs. (menu_set_preferences):
	Convert uids from UTF8 to native before printing.

	* keyedit.c (sign_uids): Convert uids from UTF8 to native before
	printing. (menu_set_primary_uid): Show error if the user tries to
	make a uid with a v3 self-sig primary.

	2002-05-05 David Shaw <dshaw@jabberwocky.com>

	* import.c (import_one): When merging with a key we already have,
	don't let a key conflict (same keyid but different key) stop the
	import: just skip the bad key and continue.

	* exec.c (make_tempdir): Under Win32, don't try environment
	variables for temp directories - GetTempDir tries environment
	variables internally, and it's better not to second-guess it in
	case MS adds some sort of temp dir handling to Windows at some
	point.

	2002-05-05 Timo Schulz <ts@winpt.org>

	* mainproc.c (proc_symkey_enc): Don't ask for a passphrase
	in the list only mode.

	2002-05-05 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_refresh): --refresh-keys implies
	--merge-only so as not to import keys with keyids that match the
	ones being refreshed. Noted by Florian Weimer.

	2002-05-04 Stefan Bellon <sbellon@sbellon.de>

	* free-packet.c (copy_public_key): Don't call m_alloc(0), therefore
	added consistency check for revkey and numrefkeys.

	* getkey.c (check_revocation_keys): Added consistency check for
	revkey and numrefkeys.

	* keyedit.c (show_key_with_all_names): Likewise.

	2002-05-03 David Shaw <dshaw@jabberwocky.com>

	* photoid.c: Provide default image viewer for Win32.

	* misc.c (pct_expando): %t means extension, not name ("jpg", not
	"jpeg").

	* keyserver.c (keyserver_spawn), photoid.c (show_photos), exec.h,
	exec.c: Allow the caller to determine the temp file extension when
	starting an exec_write and change all callers.

	* keyedit.c (sign_uids): Nonrevocable key signatures cause an
	automatic promotion to v4.

	* exec.c: Provide stubs for exec_ functions when NO_EXEC is
	defined.

	2002-05-02 David Shaw <dshaw@jabberwocky.com>

	* photoid.h, photoid.c (parse_image_header, image_type_to_string):
	Useful functions to return data about an image.

	* packet.h, parse-packet.c (make_attribute_uidname,
	parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
	(show_photos): Handle multiple images in a single attribute
	packet.

	* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy),
	photoid.c (show_photos): Simpler expando code that does not
	require using compile-time string sizes. Call
	image_type_to_string to get image strings (i.e. "jpg",
	"image/jpeg"). Change all callers.

	* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print):
	Allow viewing multiple images within a single attribute packet.

	* gpgv.c: Various stubs for link happiness.

	2002-05-02 David Shaw <dshaw@jabberwocky.com>

	* build-packet.c (build_sig_subpkt), keyedit.c (sign_uids),
	options.h, sign.c (mk_notation_and_policy), g10.c (main,
	add_notation_data, add_policy_url (new), check_policy_url
	(removed)): Allow multiple policy URLs on a given signature.
	Split "--notation-data" into "--cert-notation" and
	"--sig-notation" so the user can set different policies for key
	and data signing. For backwards compatibility, "--notation-data"
	sets both, as before.

	2002-05-02 Werner Koch <wk@gnupg.org>

	* options.skel: Removed the comment on trusted-keys because this
	option is now deprecated.

	2002-05-01 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (menu_adduid): 2440bis04 says that multiple attribute
	packets on a given key are legal.

	* keyserver.c (keyserver_refresh): the fake v3 keyid hack applies
	to "mailto" URLs as well since they are also served by pksd.

	2002-04-29 Werner Koch <wk@gnupg.org>

	Added a copyright year for files changed this year.

	2002-04-25 Werner Koch <wk@gnupg.org>

	* g10.c, options.h: New options --display, --ttyname, --ttytype,
	--lc-ctype, --lc-messages to be used with future versions of the
	gpg-agent.
	* passphrase.c (agent_send_option,agent_send_all_options): New.
	(agent_open): Send options to the agent.

	* trustdb.c (update_ownertrust, clear_ownertrust): Do an explicit
	do_sync because revalidation_mark does it only if when the
	timestamp actually changes.

	2002-04-23 David Shaw <dshaw@jabberwocky.com>

	* main.h, keygen.c (do_generate_keypair), keylist.c
	(print_signature_stats, list_all, list_one, list_keyblock,
	list_keyblock_print, list_keyblock_colon): After generating a new
	key, show the key information (name, keyid, fingerprint, etc.)
	Also do not print uncheckable signatures (missing key..) in
	--check-sigs. Print statistics (N missing keys, etc.) after
	--check-sigs.

	* keyedit.c (sign_uids): When signing a key with an expiration
	date on it, the "Do you want your signature to expire at the same
	time?" question should default to YES.

	2002-04-22 David Shaw <dshaw@jabberwocky.com>

	* parse-packet.c (parse_plaintext), packet.h, plaintext.c
	(handle_plaintext): Fix bug in handling literal packets with
	zero-length data (no data was being confused with partial body
	length).

	* misc.c (pct_expando), options.skel: %t means extension ("jpg").
	%T means MIME type ("image/jpeg").

	* import.c (import_one): Only trigger trust update if the keyring
	is actually changed.

	* export.c (do_export_stream): Missing a m_free.

	2002-04-22 Stefan Bellon <sbellon@sbellon.de>

	* keyid.c (expirestr_from_sk, expirestr_from_sig): Added _() to
	string constant.

	* exec.c (make_tempdir) [__riscos__]: Better placement of
	temporary file.

	2002-04-20 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (generate_subkeypair): 2440bis04 adds that creating
	subkeys on v3 keys is a MUST NOT.

	* getkey.c (finish_lookup): The --pgp6 "use the primary key"
	behavior should only apply while data signing and not encryption.
	Noted by Roger Sondermann.

	2002-04-19 Werner Koch <wk@gnupg.org>

	* keygen.c (keygen_set_std_prefs): Put back 3DES because the RFC
	says it is good form to do so.

	2002-04-19 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (menu_deluid): Only cause a trust update if we delete
	a non-revoked user id.

	* hkp.c (hkp_ask_import), keyserver.c (parse_keyserver_options,
	keyserver_spawn), options.h: Remove fast-import keyserver option
	(no longer meaningful).

	* g10.c (main), keyedit.c (sign_uids), options.h: Change
	--default-check-level to --default-cert-check-level as it makes
	clear what it operates on.

	* g10.c (main): --pgp6 also implies --no-ask-sig-expire.

	* delkey.c (do_delete_key): Comment.

	* keyedit.c (sign_uids, keyedit_menu, menu_deluid, menu_delsig,
	menu_expire, menu_revsig, menu_revkey): Only force a trustdb check
	if we did something that changes it.

	* g10.c: add "--auto-check-trustdb" to override a
	"--no-auto-check-trustdb"

	2002-04-19 Werner Koch <wk@gnupg.org>

	* tdbio.c (tdbio_write_nextcheck): Return a status whether the
	stamp was actually changed.
	* trustdb.c (revalidation_mark): Sync the changes. Removed the
	sync operation done by its callers.
	(get_validity): Add logic for maintaining a pending_check flag.
	(clear_ownertrust): New.

	* keyedit.c (sign_uids): Don't call revalidation_mark depending on
	primary_pk.
	(keyedit_menu): Call revalidation_mark after "trust".
	(show_key_with_all_names): Print a warning on the wrong listed key
	validity.

	* delkey.c (do_delete_key): Clear the owenertrust information when
	deleting a public key.

	2002-04-18 Werner Koch <wk@gnupg.org>

	* seskey.c (encode_md_value): Print an error message if a wrong
	digest algorithm is used with DSA. Changed all callers to cope
	with a NULL return. Problem noted by Imad R. Faiad.

	2002-04-18 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (mark_usable_uid_certs): Properly handle nonrevocable
	signatures that can expire. In short, the only thing that can
	override an unexpired nonrevocable signature is another unexpired
	nonrevocable signature.

	* getkey.c (finish_lookup): Always use primary signing key for
	signatures when --pgp6 is on since pgp6 and 7 do not understand
	signatures made by signing subkeys.

	2002-04-18 Werner Koch <wk@gnupg.org>

	* trustdb.c (validate_keys): Never schedule a nextcheck into the
	past.
	(validate_key_list): New arg curtime use it to set next_expire.
	(validate_one_keyblock): Take the current time from the caller.
	(clear_validity, reset_unconnected_keys): New.
	(validate_keys): Reset all unconnected keys.

	* getkey.c (premerge_public_with_secret): Fixed 0x12345678! syntax
	for use with secret keys.
	(lookup): Advance the searchmode after a search FIRST.

	* seckey-cert.c (do_check): Always calculate the old checksum for
	use after unprotection.

	* g10.c, options.skel: New option --no-escape-from. Made
	--escape-from and --force-v3-sigs the default and removed them
	from the options skeleton.

	2002-04-16 Werner Koch <wk@gnupg.org>

	* parse-packet.c (parse_key): Support a SHA1 checksum as per
	draft-rfc2440-bis04.
	* packet.h (PKT_secret_key): Add field sha1chk.
	* seckey-cert.c (do_check): Check the SHA1 checksum
	(protect_secret_key): And create it.
	* build-packet.c (do_secret_key): Mark it as sha-1 protected.
	* g10.c, options.h: New option --simple-sk-checksum.

	2002-04-13 David Shaw <dshaw@jabberwocky.com>

	* parse-packet.c (parse_signature): Minor fix - signatures should
	expire at their expiration time and not one second later.

	* keygen.c (proc_parameter_file): Allow specifying preferences
	string (i.e. "s5 s2 z1 z2", etc) in a batchmode key generation
	file.

	* keyedit.c (keyedit_menu): Print standard error message when
	signing a revoked key (no new translation).

	* getkey.c (merge_selfsigs): Get the default set of key prefs from
	the real (not attribute) primary uid.

	2002-04-12 David Shaw <dshaw@jabberwocky.com>

	* pkclist.c (build_pk_list): Fix bug that allowed a key to be
	selected twice in batch mode if one instance was the default
	recipient and the other was an encrypt-to. Noted by Stefan
	Bellon.

	* parse-packet.c (dump_sig_subpkt): Show data in trust and regexp
	sig subpackets.

	* keyedit.c (keyedit_menu): Use new function real_uids_left to
	prevent deleting the last real (i.e. non-attribute) uid. Again,
	according to the attribute draft. (menu_showphoto): Make another
	string translatable.

	2002-04-11 David Shaw <dshaw@jabberwocky.com>

	* build-packet.c (build_sig_subpkt): Delete subpackets from both
	hashed and unhashed area on update. (find_subpkt): No longer
	needed.

	* keyedit.c (sign_uids): With --pgp2 on, refuse to sign a v3 key
	with a v4 signature. As usual, --expert overrides. Try to tweak
	some strings to a closer match so they can all be translated in
	one place. Use different helptext keys to allow different help
	text for different questions.

	* keygen.c (keygen_upd_std_prefs): Remove preferences from both
	hashed and unhashed areas if they are not going to be used.

	2002-04-10 David Shaw <dshaw@jabberwocky.com>

	* misc.c (pct_expando), options.skel: Use %t to indicate type of a
	photo ID (in this version, it's always "jpeg"). Also tweak string
	expansion loop to minimize reallocs.

	* mainproc.c (do_check_sig): Variable type fix.

	* keyedit.c (menu_set_primary_uid): Differentiate between true
	user IDs and attribute user IDs when making one of them primary.
	That is, if we are making a user ID primary, we alter user IDs.
	If we are making an attribute packet primary, we alter attribute
	packets. This matches the language in the latest attribute packet
	draft.

	* keyedit.c (sign_uids): No need for the empty string hack.

	* getkey.c (fixup_uidnode): Only accept preferences from the
	hashed segment of the self-sig.

	2002-04-10 Werner Koch <wk@gnupg.org>

	* tdbio.c (migrate_from_v2): Fixed the offset to read the old
	ownertrust value and only add entries to the table if we really
	have a value.

	2002-04-08 David Shaw <dshaw@jabberwocky.com>

	* status.h, status.c (get_status_string): Add KEYEXPIRED, EXPSIG,
	and EXPKEYSIG. Add "deprecated-use-keyexpired-instead" to
	SIGEXPIRED.

	* sig-check.c (do_check): Start transition from SIGEXPIRED to
	KEYEXPIRED, since the actual event is signature verification by an
	expired key and not an expired signature. (do_signature_check,
	packet.h): Rename as signature_check2, make public, and change all
	callers.

	* mainproc.c (check_sig_and_print, do_check_sig): Use status
	EXPSIG for an expired, but good, signature. Add the expiration
	time (or 0) to the VALIDSIG status line. Use status KEYEXPSIG for
	a good signature from an expired key.

	* g10.c (main): remove checks for no arguments now that argparse
	does it.

	2002-04-06 Werner Koch <wk@gnupg.org>

	* keyring.c (keyring_get_keyblock): Disable the keylist mode here.

	* encode.c (encode_simple, encode_crypt): Only test on compressed
	files if a compress level was not explicity set.

	* keygen.c (keygen_set_std_prefs): Removed Blowfish and Twofish
	from the list of default preferences, swapped the preferences of
	RMD160 and SHA1. Don't include a preference to 3DES unless the
	IDEA kludge gets used.

	* free-packet.c (free_packet): call free_encrypted also for
	PKT_ENCRYPTED_MDC.

	* compress.c (release_context): New.
	(handle_compressed): Allocate the context and setup a closure to
	release the context. This is required because there is no
	guarabntee that the filter gets popped from the chain at the end
	of the function. Problem noted by Timo and probably also the
	cause for a couple of other reports.
	(compress_filter): Use the release function if set.

	* tdbio.c [__CYGWIN32__]: Don't rename ftruncate. Noted by
	Disastry.

	* parse-packet.c (parse_signature): Put parens around a bit test.

	* exec.c (make_tempdir): Double backslash for TMP directory
	creation under Windows. Better strlen the DIRSEP_S constants for
	allocation measurements.

	* decrypt.c (decrypt_messages): Release the passphrase aquired
	by get_last_passphrase.

	2002-04-02 Werner Koch <wk@gnupg.org>

	* Makefile.am (EXTRA_DIST): Removed OPTIONS an pubring.asc - they
	are no longer of any use.

	2002-04-03 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (parse_keyserver_options): fix auto-key-retrieve to
	actually work as a keyserver-option (noted by Roger Sondermann).

	* keylist.c (reorder_keyblock): do not reorder the primary
	attribute packet - the first user ID must be a genuine one.

	2002-03-31 David Shaw <dshaw@jabberwocky.com>

	* keylist.c (list_keyblock_colon): Fix ownertrust display with
	--with-colons.

	* keygen.c (generate_user_id), photoid.c (generate_photo_id):
	Properly initialize the user ID refcount. A few more "y/n" ->
	"y/N" in photoid.c.

	* keyedit.c (ask_revoke_sig): Warn the user if they are about to
	revoke an expired sig (not a problem, but they should know). Also
	tweak a few prompts to change "y/n" to "y/N", which is how most
	other prompts are written.

	* keyserver.c (keyserver_search_prompt): Control-d escapes the
	keyserver search prompt.

	* pkclist.c (show_revocation_reason & callers): If a subkey is
	considered revoked solely because the parent key is revoked, print
	the revocation reason from the parent key.

	* trustdb.c (get_validity): Allow revocation/expiration to apply
	to a uid/key with no entry in the trustdb.

	2002-03-29 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (printunquoted): unquote backslashes from keyserver
	searches

	* hkp.c (write_quoted): quote backslashes from keyserver searches

	2002-03-26 Werner Koch <wk@gnupg.org>

	* keygen.c (ask_keysize): Removed the warning for key sizes > 1536.

	2002-03-25 Werner Koch <wk@gnupg.org>

	* keyedit.c (sign_uids): Use 2 strings and not a %s so that
	translations can be done the right way.
	* helptext.c: Fixed small typo.

	2002-03-23 David Shaw <dshaw@jabberwocky.com>

	* import.c (append_uid, merge_sigs): it is okay to import
	completely non-signed uids now (with --allow-non-selfsigned-uid).

	* getkey.c (get_primary_uid, merge_selfsigs_main): do not choose
	an attribute packet (i.e. photo) as primary uid. This prevents
	oddities like "Good signature from [image of size 2671]". This is
	still not perfect (one can still select an attribute packet as
	primary in --edit), but is closer to the way the draft is going.

	* g10.c (build_list): algorithms should include 110.

	* g10.c (main): --pgp2 implies --no-ask-sig-expire and
	--no-ask-cert-expire as those would cause a v4 sig/cert.

	* armor.c (is_armor_header): be more lenient in what constitutes a
	valid armor header (i.e. -----BEGIN blah blah-----) as some
	Windows programs seem to add spaces at the end. --openpgp makes
	it strict again.

	2002-03-18 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_search_prompt): Properly handle a "no
	keys found" case from the internal HKP code (external HKP is ok).
	Also, make a COUNT -1 (i.e. streamed) keyserver response a little
	more efficient.

	* g10.c (main): Add --no-allow-non-selfsigned-uid

	2002-03-17 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): --openpgp implies --allow-non-selfsigned-uid.

	* getkey.c (merge_selfsigs_main): If none of the uids are primary
	(because none are valid) then pick the first to be primary (but
	still invalid). This is for cosmetics in case some display needs
	to print a user ID from a non-selfsigned key. Also use
	--allow-non-selfsigned-uid to make such a key valid and not
	--always-trust. The key is not automatically trusted via
	--allow-non-selfsigned-uid.

	* mainproc.c (check_sig_and_print): Make sure non-selfsigned uids
	print [uncertain] on verification even though one is primary now.

	* getkey.c (merge_selfsigs): If the main key is not valid, then
	neither are the subkeys.

	* import.c (import_one): Allow --allow-non-selfsigned-uid to work
	on completely unsigned keys. Print the uids in UTF8. Remove
	mark_non_selfsigned_uids_valid().

	* keyedit.c (show_key_with_all_names): Show revocation key as
	UTF8.

	* sign.c (clearsign_file): Allow --not-dash-escaped to work with
	v3 keys.

	2002-03-14 Werner Koch <wk@gnupg.org>

	* main.h: Changed the default algorithms to CAST5 and SHA1.

	2002-03-13 David Shaw <dshaw@jabberwocky.com>

	* import.c (chk_self_sigs): Show which user ID a bad self-sig
	(invald sig or unsupported public key algorithm) resides on.

	* import.c (chk_self_sigs): any valid self-sig should mark a user
	ID or subkey as valid - otherwise, an attacker could DoS the user
	by inventing a bogus invalid self-signature.

	2002-03-07 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): make a few more strings translatable.

	* options.h, options.skel, g10.c (main), gpgv.c, mainproc.c
	(check_sig_and_print), keyserver.c (parse_keyserver_options):
	--auto-key-retrieve should really be a keyserver-option variable.

	* import.c (revocation_present): new function to print a warning
	if a key is imported that has been revoked by designated revoker,
	but the designated revoker is not present to verify the
	revocation. If keyserver-options auto-key-retrieve is set, try
	and fetch the designated revoker from the keyserver.

	* import.c (import_one): call revocation_present after importing a
	new key. Note that this applies to --import, --recv-keys, and
	--search-keys.

	* keyserver-internal.h, keyserver.c (keyserver_import_fprint):
	import via fingerprint (for revocation keys).

	* keyserver.c (keyserver_import_keyid): much simpler
	implementation now that we're using KEYDB_SEARCH_DESC internally.

	2002-03-04 David Shaw <dshaw@jabberwocky.com>

	* revoke.c (gen_revoke): do not prompt for revocation reason for
	v3 revocations (unless force-v4-certs is on) since they wouldn't
	be used anyway.

	* keyedit.c (menu_revsig): show the status of the sigs
	(exportable? revocable?) to the user before prompting for which
	sig to revoke. Also, make sure that local signatures get local
	revocations.

	* keyedit.c (ask_revoke_sig): remind the user which sigs are
	local.

	* g10.c (main): Add "exec-path" variable to override PATH for
	execing programs.

	* export.c (do_export_stream): properly check return code from
	classify_user_id to catch unclassifiable keys.

	2002-03-03 David Shaw <dshaw@jabberwocky.com>

	* parse-packet.c (parse_signature): variable type tweak for RISC
	OS (from Stefan)

	2002-02-28 David Shaw <dshaw@jabberwocky.com>

	* getkey.c (check_revocation_keys): New function to check a
	revocation against a list of potential revocation keys. Note the
	loop-breaking code here. This is to prevent blowing up if A is
	B's revocation key, while B is also A's. Note also that this is
	written so that a revoked revoker can still issue revocations:
	i.e. If A revokes B, but A is revoked, B is still revoked. I'm
	not completely convinced this is the proper behavior, but it
	matches how PGP does it. It does at least have the advantage of
	much simpler code - my first version of this had lots of loop
	maintaining code so you could chain revokers many levels deep and
	if D was revoked, C was not, which meant that B was, and so on.
	It was sort of scary, actually.

	* getkey.c (merge_selfsigs_main): Add any revocation keys onto the
	pk. This is particularly interesting since we normally only get
	data from the most recent 1F signature, but you need multiple 1F
	sigs to properly handle revocation keys (PGP does it this way, and
	a revocation key could be marked "sensitive" and hence in a
	different signature). Also, if a pk has a revocation key set,
	check for revocation sigs that were not made by us - if made by a
	valid revocation key, mark the pk revoked.

	* packet.h, getkey.c (cache_public_key): do not cache key if
	"dont_cache" is set. This allows the revocation key code to look
	up a key and return information that may be inaccurate to prevent
	loops without caching the fake data.

	* packet.h, sig-check.c (do_signature_check): Record if a
	signature was made by a revoked pk.

	* packet.h, parse-packet.c (parse_one_sig_subpkt,
	can_handle_critical, parse_signature): Get revocation key
	information out of direct sigs.

	* keylist.c (list_keyblock_print): don't assume that the presence
	of a 0x20 signature means the key is revoked. With revocation
	keys, this may not be true if the revocation key is not around to
	verify it or if verification failed. Also, 0x1F should get listed
	as "sig", and not "unexpected signature class".

	* keyedit.c (show_key_with_all_names): Add a flag for printing
	revoker information and change all callers.

	* import.c (merge_blocks): merge in any new direct key (0x1F)
	sigs.

	* import.c (import_revoke_cert): don't keep processing after a
	revocation is rejected.

	* import.c (delete_inv_parts): Allow importing a revocation
	signature even if it was not issued by the key. This allows a
	revocation key to issue it. Of course, the sig still needs to be
	checked before we trust it.

	* free-packet.c (copy_public_key): Include a new copy of the
	revocation keys when duping a pk.

	* free-packet.c (free_seckey_enc, release_public_key_parts): Free
	any revocation keys that are attached to a sig or pk.

	* export.c (do_export_stream): Do not export signatures with
	"sensitive" revocation keys in them.

	2002-02-27 David Shaw <dshaw@jabberwocky.com>

	* export.c (do_export_stream): Do not include v3 keys in a
	--export-secret-subkeys export.

	* getkey.c (merge_selfsigs_main): If a key isn't valid (say,
	because of no self-signature), allow --always-trust to force it
	valid so it can be trusted.

	2002-02-25 David Shaw <dshaw@jabberwocky.com>

	* hkp.c (hkp_ask_import), hkp.h, keyserver.c (all): treat key
	lists internally as fingerprints when possible. All this is via
	KEYDB_SEARCH_DESC - no point in reinventing the wheel. This allows
	the helper program to search the keyserver by fingerprint if
	desired (and the keyserver supports it). Note that automatic
	fingerprint promotion during refresh only applies to v4 keys as a
	v4 fingerprint can be easily changed into a long or short key id,
	and a v3 cannot.

	* pubkey-enc.c, getkey.c, misc.c, main.h: Take two copies of
	hextobyte() from pubkey-enc.c and getkey.c and make them into one
	copy in misc.c.

	2002-02-22 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_search_prompt): Detect a "no keys found"
	case even if the helper program does not explicitly say how many
	keys were found.

	* hkp.c (parse_hkp_index): Bug fix - don't report non-revoked keys
	as revoked in HKP key searches.

	2002-02-19 Werner Koch <wk@gnupg.org>

	* parse-packet.c (parse_trust): Made parsing more robust.

	2002-02-19 David Shaw <dshaw@jabberwocky.com>

	* hkp.c (parse_hkp_index): Catch corruption in HKP index lines
	(can be caused by broken or malicious keyservers).

	* keyserver.c (keyserver_work): Add KEYSERVER_NOT_SUPPORTED for
	unsupported actions (say, a keyserver that has no way to search,
	or a readonly keyserver that has no way to add). Also add a
	USE_EXTERNAL_HKP define to disable the internal HKP keyserver
	code.

	2002-02-14 Werner Koch <wk@gnupg.org>

	* g10.c: New option --no-use-agent.

	* pkclist.c (check_signatures_trust): Always print the warning for
	unknown and undefined trust. Removed the did_add cruft. Reported
	by Janusz A. Urbanowicz.

	2002-02-11 David Shaw <dshaw@jabberwocky.com>

	* hkp.c (parse_hkp_index): Bug fix - properly handle user IDs with
	colons (":") in them while HKP searching.

	2002-02-09 David Shaw <dshaw@jabberwocky.com>

	* misc.c (pct_expando): More comments.

	* keydb.h, sign.c (mk_notation_and_policy): Clarify what is a sig
	and what is a cert. A sig has sigclass 0x00, 0x01, 0x02, or 0x40,
	and everything else is a cert.

	* g10.c (main), keyedit.c (keyedit_menu): Add a "nrlsign" for
	nonrevocable and local key signatures.

	* g10.c (main): Add a --no-force-mdc to undo --force-mdc.

	* options.h, g10.c (main), cipher.c (write_header): Add a knob to
	--disable-mdc/--no-disable-mdc. Off by default, of course, but is
	used in --pgp2 and --pgp6 modes.

	* pkclist.c (build_pk_list): Allow specifying multiple users in
	the "Enter the user ID" loop. Enter a blank line to stop. Show
	each key+id as it is added.

	* keylist.c (show_policy_url), mainproc.c (print_notation_data):
	It is not illegal (though possibly silly) to have multiple policy
	URLs in a given signature, so print all that are present.

	* hkp.c (hkp_search): More efficient implementation of URL-ifying
	code.

	2002-02-04 David Shaw <dshaw@jabberwocky.com>

	* main.h, misc.c (pct_expando): New function to generalize
	%-expando processing in any arbitrary string.

	* photoid.c (show_photo): Call the new pct_expando function rather
	than expand strings internally.

	* sign.c (mk_notation_and_policy): Show policy URLs and notations
	when making a signature if show-policy/show-notation is on.
	%-expand policy URLs during generation. This lets the user have
	policy URLs of the form "http://notary.jabberwocky.com/keysign/%K"
	which will generate a per-signature policy URL.

	* main.h, keylist.c (show_policy_url, show_notation): Add amount
	to indent so the same function can be used in key listings as well
	as during sig generation. Change all callers.

	2002-02-04 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c, options.h (parse_keyserver_options, keyidlist):
	Workaround for the pksd and OKS keyserver bug that calculates v4
	RSA keyids as if they were v3. The workaround/hack is to fetch
	both the v4 (e.g. 99242560) and v3 (e.g. 68FDDBC7) keyids. This
	only happens for key refresh while using the HKP scheme and the
	refresh-add-fake-v3-keyids keyserver option must be set. This
	should stay off by default.

	2002-02-03 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_spawn): Bug fix - do not append keys to
	each other when --sending more than one.

	2002-02-02 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c (main), keyedit.c (sign_uids), sign.c
	(mk_notation_and_policy): Split "--set-policy-url" into
	"--cert-policy-url" and "--sig-policy-url" so the user can set
	different policies for key and data signing. For backwards
	compatibility, "--set-policy-url" sets both, as before.

	2002-01-30 Werner Koch <wk@gnupg.org>

	* g10.c (main): --gen-random --armor does now output a base64
	encoded string.

	2002-01-28 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main), options.h, pkclist.c (algo_available): --pgp6
	flag. This is not nearly as involved as --pgp2. In short, it
	turns off force_mdc, turns on no_comment, escape_from, and
	force_v3_sigs, and sets compression to 1. It also restricts the
	user to IDEA (if present), 3DES, CAST5, MD5, SHA1, and RIPEMD160.
	See the comments above algo_available() for lots of discussion on
	why you would want to do this.

	2002-01-27 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (keygen_set_std_prefs): Comment

	* keyedit.c (sign_uids): Bug fix - when signing with multiple
	secret keys at the same time, make sure each key gets the sigclass
	prompt.

	* exec.c (exec_finish): Close the iobuf and FILE before trying to
	waitpid, so the remote process will get a SIGPIPE and exit. This
	is only a factor when using a pipe to communicate.

	* exec.c (exec_write): Disable cache-on-close of the fd iobuf (is
	this right? Why is a fd iobuf cached at all?)

	2002-01-26 Werner Koch <wk@gnupg.org>

	* g10.c, options.h: New option --gpg-agent-info
	* passphrase.c (agent_open): Let it override the environment info.
	* seckey-cert.c (check_secret_key): Always try 3 times when the
	agent is enabled.
	* options.skel: Describe --use-agent.

	2002-01-24 David Shaw <dshaw@jabberwocky.com>

	* pubkey-enc.c (is_algo_in_prefs, get_it): Only check preferences
	against keys with v4 self sigs - there is really little point in
	warning for every single non-IDEA message encrypted to an old key.

	* pkclist.c (select_algo_from_prefs): Only put in the fake IDEA
	preference if --pgp2 is on.

	* mainproc.c (check_sig_and_print): Print "Expired" for expired
	but good signatures (this still prints "BAD" for expired but bad
	signatures).

	2002-01-23 David Shaw <dshaw@jabberwocky.com>

	* keygen.c (ask_keysize): Cosmetic: don't present a RSA signing
	key as a "keypair" which can be 768 bits long (as RSA minimum is
	1024).

	* pubkey-enc.c (is_algo_in_prefs): Allow IDEA as a fake preference
	for v3 keys with v3 selfsigs.

	2002-01-22 David Shaw <dshaw@jabberwocky.com>

	* packet.h, getkey.c (merge_selfsigs_main), pkclist.c
	(select_algo_from_prefs): Implement the fake IDEA preference as
	per RFC2440:12.1. This doesn't mean that IDEA will be used (the
	plugin may not be present), but it does mean that a v3 key with a
	v3 selfsig has an implicit IDEA preference instead of 3DES. v3
	keys with v4 selfsigs use preferences as normal.

	* encode.c (encode_crypt): if select_algo_from_prefs fails, this
	means that we could not find a cipher that both keys like. Since
	all v4 keys have an implicit 3DES preference, this means there is
	a v3 key with a v3 selfsig in the list. Use 3DES in this case as
	it is the safest option (we know the v4 key can handle it, and
	we'll just hope the v3 key is being used in an implementation that
	can handle it). If --pgp2 is on, warn the user what we're doing
	since it'll probably break PGP2 compatibility.

	* g10.c (main): Do not force using IDEA for encrypted files in
	--pgp2 mode - let the fake IDEA preference choose this for us for
	better compatibility when encrypting to multiple keys, only some
	of which are v3.

	* keygen.c (keygen_set_std_prefs): Put 3DES on the end of the
	default cipher pref list (RFC2440: "...it is good form to place it
	there explicitly."). If the user has the IDEA plugin installed,
	put a preference for IDEA after 3DES to effectively disable its
	use for everything except encrypting along with v3 keys.

	* encode.c, g10.c, sign.c: Change the PGP2 warning line from
	"... will not be usable ..." to "... may not be usable ..." as the
	user could be using one of the enhanced PGP2 variations.

	* helptext.c: Revise the sign_uid.class help text as suggested by
	Stefan.

	2002-01-20 Werner Koch <wk@gnupg.org>

	* passphrase.c (passphrase_to_dek): Add tryagain_text arg to be
	used with the agent. Changed all callers.
	(agent_get_passphrase): Likewise and send it to the agent
	* seckey-cert.c (do_check): New arg tryagain_text.
	(check_secret_key): Pass the string to do_check.
	* keygen.c (ask_passphrase): Set the error text is required.
	* keyedit.c (change_passphrase): Ditto.

	* passphrase.c (agent_open): Disable opt.use_agent in case of a
	problem with the agent.
	(agent_get_passphrase): Ditto.
	(passphrase_clear_cache): Ditto.

	2002-01-19 Werner Koch <wk@gnupg.org>

	* passphrase.c (agent_open): Add support for the new Assuan based
	gpg-agent. New arg to return the used protocol version.
	(agent_get_passphrase): Implemented new protocol here.
	(passphrase_clear_cache): Ditto.
	(readline): New.

	2002-01-15 Timo Schulz <ts@winpt.org>

	* encode.c (encode_crypt_files): Fail if --output is used.

	* g10.c: New command --decrypt-files.

	* decrypt.c (decrypt_messages): New.

	2002-01-09 David Shaw <dshaw@jabberwocky.com>

	* g10.c, misc.c, gpgv.c: move idea_cipher_warn to misc.c so gpgv.c
	doesn't need a stub for it any longer.

	* g10.c (get_temp_dir), main.h: no longer used (it's in exec.c now)

	* g10.c (main), delkey.c (delete_keys), main.h : Allow
	--delete-key (now --delete-keys, though --delete-key still works,
	of course) to delete multiple keys in one go. This applies to
	--delete-secret-key(s) and --delete-secret-and-public-key(s) as
	well.

	2002-01-09 Timo Schulz <ts@winpt.org>

	* encode.c (encode_crypt_files): Now it behaves like verify_files.

	* g10.c (main): We don't need to check argc for encode_crypt_files
	any longer.

	2002-01-09 Timo Schulz <ts@winpt.org>

	* exec.c: Include windows.h for dosish systems.

	2002-01-08 Timo Schulz <ts@winpt.org>

	* g10.c (main): New description for --encrypt-files.

	2002-01-08 Werner Koch <wk@gnupg.org>

	* g10.c (main): Must register the secring for encryption because
	it is needed to figure out the default recipient. Reported by
	Roger Sondermann.

	2002-01-05 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (menu_adduid): Require --expert before adding a photo
	ID to a v3 key, and before adding a second photo ID to any key.

	* keyedit.c (keyedit_menu): Don't allow adding photo IDs in
	rfc1991 or pgp2 mode.

	* getkey.c (merge_selfsigs_subkey): Permit v3 subkeys. Believe it
	or not, this is allowed by rfc 2440, and both PGP 6 and PGP 7 work
	fine with them.

	* g10.c, options.h, keyedit.c, sign.c: Move the "ask for
	expiration" switch off of --expert, which was getting quite
	overloaded, and onto ask-sig-expire and ask-cert-expire. Both
	default to off.

	* g10.c (main): Change the default compression algo to 1, to be
	more OpenPGP compliant (PGP also uses this, so it'll help with
	interoperability problems as well).

	* encode.c (encode_crypt): Handle compression algo 2, since the
	default is now 1.

	* build-packet.c (build_attribute_subpkt): Fix off-by-one error.

	2002-01-05 Werner Koch <wk@gnupg.org>

	* g10.c (main): Do not register the secret keyrings for certain
	commands.

	* keydb.c (keydb_add_resource): Use access to test for keyring
	existence. This avoids cached opened files which are bad under
	RISC OS.

	2002-01-04 David Shaw <dshaw@jabberwocky.com>

	* sign.c (sign_file, sign_symencrypt_file): always use one-pass
	packets unless rfc1991 is enabled. This allows a signature made
	with a v3 key to work in PGP 6 and 7. Signatures made with v4
	keys are unchanged.

	* g10.c (main): Disallow non-detached signatures in PGP2 mode.
	Move the "you must use files and not pipes" PGP2 warning up so all
	the PGP2 stuff is together.

	* encode.c (encode_simple): Use the actual filesize instead of
	partial length packets in the internal literal packet from a
	symmetric message. This breaks PGP5(?), but fixes PGP2, 6, and 7.
	It's a decent tradeoff. Note there was only an issue with
	old-style RFC1991 symmetric messages. 2440-style messages in 6
	and 7 work with or without partial length packets.

	2002-01-03 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Removed --no-default-check-level option, as it is
	not consistent with other "default" options. Plus, it is the same
	as saying --default-check-level 0.

	* exec.c (exec_read): Disallow caching tempfile from child
	process, as this keeps the file handle open and can cause unlink
	problems on some platforms.

	* keyserver.c (keyserver_search_prompt): Minor tweak - don't
	bother to transform keyids into textual form if they're just going
	to be transformed back to numbers.

	2002-01-03 Timo Schulz <ts@winpt.org>

	* g10.c: New command --encrypt-files.

	* verify.c (print_file_status): Removed the static because
	encode_crypt_files also uses this function.

	* main.h (print_files_status): New.
	(encode_crypt_files): New.

	* encode.c (encode_crypt_files): New.

	2002-01-02 Stefan Bellon <sbellon@sbellon.de>

	* keyserver.c: Moved util.h include down in order to avoid
	redefinition problems on RISC OS.

	* keyring.c (keyring_lock): Only lock keyrings that are writable.

	* keyring.c (keyring_update_keyblock): Close unused iobuf.

	* hkp.c (parse_hkp_index, hkp_search) [__riscos__]: Changed
	unsigned char* to char* because of compiler issues.

	* exec.c (exec_finish) [__riscos__]: Invalidate close cache so
	that file can be unlinked.

	2001-12-28 David Shaw <dshaw@jabberwocky.com>

	* g10.c (main): Use a different strlist to check extensions since
	they need to be handled seperately now.

	* misc.c,main.h (check_permissions): Properly handle permission
	and ownership checks on files in the lib directory
	(e.g. /usr/local/lib/gnupg), which are owned by root and are
	world-readable, and change all callers to specify extension or
	per-user file.

	* photoid.c (show_photo), keyserver.c (keyserver_spawn): Bug fix -
	don't call exec_finish if exec_write fails.

	* keyserver.c (keyserver_spawn): Look for OPTIONS from the
	keyserver helper - specifically, a "OUTOFBAND" option for the
	email keyserver.

	* mainproc.c (list_node), keylist.c (list_keyblock_colon),
	import.c (delete_inv_parts), export.c (do_export_stream): Use
	signature flags for exportability check rather than re-parsing the
	subpacket.

	* keyid.c, keydb.h (get_lsign_letter): No longer needed.

	2001-12-27 David Shaw <dshaw@jabberwocky.com>

	* exec.c (exec_finish): Show errors when temp files cannot be
	deleted for whatever reason.

	* exec.c (exec_read): Don't rely on WEXITSTATUS being present.

	* exec.c (make_tempdir): Add temp file creator for win32. Don't
	create an incoming temp file if the exec is write-only.

	* keyserver.c (keyserver_spawn): Clean up error handling, for when
	the spawn fails.

	* photoid.c (show_photo): Clean up error handling.

	* misc.c (check_permissions): Neaten.

	2001-12-25 David Shaw <dshaw@jabberwocky.com>

	* mkdtemp.c (mkdtemp): Add copyleft info and tweak the 'X' counter
	to be a bit simpler.

	* keyserver.c, photoid.c: Remove unused headers left over from
	when the exec functions lived there.

	2001-12-23 Timo Schulz <ts@winpt.org>

	* misc.c (check_permissions): Do not use it for W32 systems.

	* tdbio.c (migrate_from_v2): Define ftruncate as chsize() for W32.

	* mkdtemp.c: W32 support.

	* photoid.c: Ditto.

	* exec.c: Ditto.

	2001-12-22 David Shaw <dshaw@jabberwocky.com>

	* exec.c (make_tempdir): avoid compiler warning with const

	* mkdtemp.c (mkdtemp): catch the empty ("") string case in case
	someone repurposes mkdtemp at some point.

	* photoid.c (generate_photo_id, show_photo): some type changes
	from Stefan Bellon.

	* exec.c (make_tempdir): handle Win32 systems, suggested by Timo
	Schulz.

	2001-12-22 Werner Koch <wk@gnupg.org>

	* encode.c (encode_simple, encode_crypt): i18n 2 strings.

	2001-12-22 Timo Schulz <ts@winpt.org>

	* encode.c (encode_simple, encode_crypt): Use is_file_compressed
	to avoid to compress compressed files.

	2001-12-22 Werner Koch <wk@gnupg.org>

	* keyserver.c (keyserver_spawn): Removed some variables
	declaration due to shadowing warnings.

	* build-packet.c (build_attribute_subpkt): s/index/idx/ to avoid
	compiler warnig due to index(3).

	* getkey.c (get_ctx_handle): Use KEYDB_HANDLE as return value.
	* keylist.c (list_one): Made resname const.

	* keyedit.c (keyedit_menu): Allow "addphoto" only when --openpgp is
	not used.

	* options.skel: Changed one example photo viewer to qiv.

	2001-12-21 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: add exec.c, exec.h, photoid.c, and photoid.h

	* build-packet.c (build_attribute_subpkt): new function to build
	the raw attribute subpacket. Note that attribute subpackets have
	the same format as signature subpackets.

	* exec.c: new file with generic exec-a-program functionality.
	Used by both photo IDs and keyserver helpers. This is pretty much
	the same code that used to be keyserver specific, with some
	changes to be usable generically.

	* free-packet.c (free_attributes (new)): function to free an
	attribute packet.

	* gpgv.c: added stub show_photo

	* keyedit.c (keyedit_menu, menu_adduid, menu_showphoto): can add a
	photo (calls generate_photo_id), or display a photo (calls
	show_photo) from the --edit menu. New commands are "addphoto",
	and "delphoto" (same as "deluid").

	* keylist.c (list_keyblock_print): show photos during key list if
	--show-photos enabled.

	* keyserver.c (keyserver_spawn): use the generic exec_xxx
	functions to call keyserver helper.

	* g10.c, options.h: three new options - --{no-}show-photos, and
	--photo-viewer to give the command line to display a picture.

	* options.skel: instructions for the photo viewer

	* parse-packet.c (parse_user_id, setup_user_id (new)): common code
	for both user IDs and attribute IDs moved to setup_user_id.

	* parse-packet.c (make_attribute_uidname (new)): constructs a fake
	"name" for attribute packets (e.g. "[image of size ...]")

	* parse-packet.c (parse_attribute (replaces parse_photo_id),
	parse_attribute_subpkts): Builds an array of individual
	attributes. Currently only handles attribute image / type jpeg
	subpackets.

	* sign.c (hash_uid): Fix bug in signing attribute (formerly
	photo_id) packets.

	* packet.h, and callers: globally change "photo_id" to "attribute"
	and add structures for attributes. The packet format is generic
	attributes, even though the only attribute type thus far defined
	is jpeg.

	2001-12-21 David Shaw <dshaw@jabberwocky.com>

	* parse-packet.c (can_handle_critical): Can handle critical
	revocation subpackets now.

	* trustdb.c (mark_usable_uid_certs): Disregard revocations for
	nonrevocable sigs. Note that this allows a newer revocable
	signature to override an older nonrevocable signature.

	* sign.c (make_keysig_packet): add a duration field and change all
	callers. This makes make_keysig_packet closer to
	write_signature_packets and removes some duplicated expiration
	code.

	* keyedit.c (keyedit_menu, menu_revsig, sign_uids,
	sign_mk_attrib): Add nrsign command, don't allow revoking a
	nonrevocable signature,

	* g10.c (main): Add --nrsign option to nonrevocably sign a key
	from the command line.

	* build-packet.c (build_sig_subpkt_from_sig): Comment to explain
	the use of CRITICAL.

	2001-12-21 Werner Koch <wk@gnupg.org>

	* g10.c. options.h : New option --show-keyring
	* getkey.c (get_ctx_handle): New.
	* keylist.c (list_one): Implement option here. By David Champion.

	2001-12-20 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (keyserver_spawn): Use mkdtemp() to make temp
	directory.

	* mkdtemp.c: replacement function for those platforms that don't
	have mkdtemp (make a temp directory securely).

	2001-12-19 David Shaw <dshaw@jabberwocky.com>

	* misc.c (check_permissions): New function to stat() and ensure
	the permissions of GNUPGHOME and the files have safe permissions.

	* keydb.c (keydb_add_resource): Check keyring permissions.

	* tdbio.c (tdbio_set_dbname): Check permissions of trustdb.gpg

	* keyserver.c (keyserver_spawn): Disable keyserver schemes that
	involve running external programs if the options file has unsafe
	permissions or ownership.

	* g10.c, options.h: New option --no-permission-warning to disable
	the permission warning message(s). This also permits use of the
	keyserver if it had been disabled (see above). Also check the
	permissions/ownership of random_seed.

	* keyserver.c (keyserver_spawn): The new glibc prints a warning
	when using mktemp() (the code was already secure, but the warning
	was bound to cause confusion). Use a different implementation
	based on get_random_bits() instead. Also try a few times to get
	the temp dir before giving up.

	2001-12-19 Werner Koch <wk@gnupg.org>

	* g10.c, passphrase.c [CYGWIN32]: Allow this as an alias for MINGW32.

	2001-12-18 David Shaw <dshaw@jabberwocky.com>

	* g10.c (idea_cipher_warn): Add a flag to show the warning always
	or once per session and change all callers (show always except for
	the secret key protection and unknown cipher from an encrypted
	message errors). Also make the strings translatable.

	* pubkey-enc.c (get_it): Add the IDEA cipher warning if the user
	tries to decrypt an IDEA encrypted message without the IDEA
	plugin.

	* keyserver.c (parse_keyserver_uri): More strict checking of the
	keyserver URI. Specifically, fail if the ":port" section is
	anything except a number between 1 and 65535.

	2001-12-17 David Shaw <dshaw@jabberwocky.com>

	* keyserver.c (print_keyinfo): No need to check for
	control/illegal characters, as utf8_to_native does this for us.

	* mainproc.c (proc_encrypted): Use generic IDEA warning.

	* gpgv.c: add stub for idea_cipher_warn

	* g10.c, hkp.c, keyserver.c: Fix capitalization and plural issues.

	* encode.c (encode_crypt), sign.c (sign_file, clearsign_file):
	disable pgp2 mode after the message is no longer pgp2 compatible.

	* g10.c (main): Tweak the PGP2.x IDEA warning to use the generic
	warning, and not merely fail if the IDEA plugin isn't there.

	* g10.c (main, idea_cipher_warn), keygen.c (set_one_pref),
	seckey-cert.c (do_check): Add a generic IDEA warning for when the
	IDEA plugin is not present. This pops up when the user uses
	"--cipher-algo idea", when setpref is used to set a "S1"
	preference, and when a secret key protected with IDEA is used.

	2001-12-15 Werner Koch <wk@gnupg.org>

	* keyserver.c (keyserver_spawn): Assert that we have dropped privs.

	2001-12-13 Werner Koch <wk@gnupg.org>

	* pubkey-enc.c (get_session_key): Check that the public key
	algorithm is indeed usable for en/decryption. This avoid a
	strange error message from pubkey_decrypt if for some reasons a
	bad algorithm indentifier is passed.

	2001-12-12 David Shaw <dshaw@jabberwocky.com>

	* Fixed some types for portability. Noted by Stefan Bellon.

	2001-12-11 Werner Koch <wk@gnupg.org>

	* hkp.c (hkp_export): Do not print possible control characters
	from a keyserver response.
	(parse_hkp_index): Made uid an unsigned char* because it is passed to
	isspace().
	(hkp_search): Ditto for the char* vars.

	* g10.c (main): Print the IDEA warning also for -c and -se.

	* g10.c (get_temp_dir): Assert that we have dropped privs

	* encode.c (encode_crypt): Include the first key into the --pgp2
	check.

	2001-12-07 David Shaw <dshaw@jabberwocky.com>

	* g10.c, options.h: New option --pgp2. This is identical to
	"--rfc1991 --cipher-algo idea --compress-algo 1 --digest-algo md5
	--force_v3_sigs" with the addition of an warning to advise the
	user not to use a pipe (which would break pgp2 compatibility).

	* encode.c (encode_crypt): warn if the user tries to encrypt to
	any key that is not RSA and <= 2048 bits when the --pgp2 option is
	used.

	* sign.c (sign_file, clearsign_file): When using --pgp2, make a v3
	sig, and warn if the signature is made with a non-v3 key.

	2001-12-05 David Shaw <dshaw@jabberwocky.com>

	* sign.c (sign_file, clearsign_file, sign_symencrypt_file): Prompt
	for sig expiration if --expert is set and --force-v3-sigs is not
	set (v3 sigs cannot expire).

	* mainproc.c (check_sig_and_print): After checking a sig, print
	expiration status. This causes a error return if the sig is
	expired.

	* build-packet.c (build_sig_subpkt_from_sig): Include a critical
	sig expiration subpacket if the sig is to expire.

	* keyedit.c (sign_uids): Do not sign an expired key unless
	--expert is set, in which case prompt. Also, offer to expire a
	signature when the key the user is signing expires.

	* keygen.c (ask_expire_interval): Add a value to determine whether
	to prompt for a key or sig expiration and change all callers.

	* keyid.c: New functions: expirestr_from_sig and
	colon_expirestr_from_sig.

	* keylist.c (list_keyblock_colon): Show sig expiration date in the
	--with-colons listing.

	* sign.c (make_keysig_packet, write_signature_packets): Pass in an
	optional timestamp for the signature packet, and change all
	callers.

	* keyedit.c (sign_mk_attrib): Include a critical expiration
	subpacket in the signature if an expiration date is given.

	2001-12-04 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (sign_uids): If the user tries to sign a
	locally-signed key, allow the cert to be promoted to a full
	exportable signature. This essentially deletes the old
	non-exportable sig, and replaces it with a new exportable one.

	2001-12-04 David Shaw <dshaw@jabberwocky.com>

	* keyedit.c (keyedit_menu): Do not allow signing a revoked key
	unless --expert is set, and ask even then.

	* keyedit.c (sign_uids): Do not allow signing a revoked UID unless
	--expert is set, and ask even then.

	* g10.c, options.h : New option --expert

	2001-11-16 David Shaw <dshaw@jabberwocky.com>

	* Allow the user to select no compression via "--compress-algo 0"
	on the command line.

	* keyedit.c (show_prefs): Show compression preferences in the
	long-form "showpref" style.

	* keygen.c (set_one_pref): Permit setting a no-compression ("Z0")
	preference.

	* getkey.c (fixup_uidnode): Fix compression preference corruption
	bug.

	2001-12-02 David Shaw <dshaw@jabberwocky.com>

	* g10.c: Add advisory --for-your-eyes-only option as per section
	5.9 of 2440.

	2001-12-05 David Shaw <dshaw@jabberwocky.com>

	* Force a V4 sig if the user has a notation or policy URL set.

	2001-12-04 David Shaw <dshaw@jabberwocky.com>

	* g10.c: Add options --keyserver-options, --temp-directory, and
	auto-key-retrieve (the opposite of no-auto-key-retrieve).

	* hkp.c (hkp_search): New function to handle searching a HKP
	keyserver for a key

	* hkp.c (hkp_ask_import, hkp_export): Pretty large changes to make
	them communicate via the generic functions in keyserver.c

	* keyserver.c: new file with generic keyserver routines for
	getting keys from a keyserver, sending keys to a keyserver, and
	searching for keys on a keyserver. Calls the internal HKP stuff
	in hkp.c for HKP keyserver functions. Other calls are handled by
	an external program which is spawned and written to and read from
	via pipes. Platforms that don't have pipes use temp files.

	2001-11-20 David Shaw <dshaw@jabberwocky.com>

	* options.h, g10.c: New options show-notation, no-show-notation,
	default-check-level, no-default-check-level, show-policy-url,
	no-show-policy-url.

	* packet.h, sign.c (make_keysig_packet), parse-packet.c
	(parse_signature), free-packet.c (free_seckey_enc): Fill in
	structures for notation, policy, sig class, exportability, etc.

	* keyedit.c, keylist.c (print_and_check_one_sig,
	list_keyblock_print): Show flags in signature display for cert
	details (class, local, notation, policy, revocable). If selected,
	show the notation and policy url.

	* keyedit.c (sign_uids): Prompt for and use different key sig
	classes.

	* helptext.c (helptexts): Add help text to explain different
	key signature classes

	2001-11-26 David Shaw <dshaw@jabberwocky.com>

	* trustdb.c (mark_usable_uid_certs): Fix segfault from bad
	initialization and fix reversed key signature expiration check.

	2001-11-09 Werner Koch <wk@gnupg.org>

	* export.c (do_export_stream): Put all given names into a search
	description and change the loop so that all matching names are
	returned.

	2001-11-08 Werner Koch <wk@gnupg.org>

	* pubkey-enc.c (get_it): To reduce the number of questions on the
	MLs print the the name of cipher algorithm 1 with the error message.

	* mainproc.c: Changed the way old rfc1991 encryption cipher is
	selected. Based on a patch by W Lewis.

	* pkclist.c (do_edit_ownertrust): Allow to skip over keys, the non
	working "show info" is now assigned to "i"
	* trustdb.c (ask_ownertrust, validate_keys): Implement a real quit
	here. Both are by David Shaw.

	* trustdb.c (validate_keys): Make sure next_exipire is initialized.

	* sign.c (make_keysig_packet): Use SHA-1 with v4 RSA keys.

	* g10.c, options.h : New option --[no-]froce-v4-certs.
	* sign.c (make_keysig_packet): Create v4 sigs on v4 keys even with
	a v3 key. Use that new option. By David Shaw

	* revoke.c (ask_revocation_reason): Allow to select "no reason".
	By David Shaw.

	* keyid.c (fingerprint_from_sk): Calculation of an v3 fpr was
	plain wrong - nearly the same code in fingerprint_from_pk is correct.

	* build-packet.c (do_secret_key): Added a few comments to the code.

	2001-11-07 Werner Koch <wk@gnupg.org>

	* g10.c (main): Print a warning when -r is used w/o encryption.
	Suggested by Pascal Scheffers.

	2001-10-23 Werner Koch <wk@gnupg.org>

	* keyedit.c (keyedit_menu): Changed helptext for showpref
	command. Suggested by Reinhard Wobst.

	* keyring.c (keyring_search): When marking the offtbl ready, take
	into account that we may have more than one keyring.

	2001-10-22 Werner Koch <wk@gnupg.org>

	* Makefile.am: Do not use OMIT_DEPENDENCIES

	* build-packet.c (build_sig_subpkt): Default is now to put all
	types of subpackets into the hashed area and only list those which
	should go into the unhashed area.

	2001-10-18 Werner Koch <wk@gnupg.org>

	* keydb.c (keydb_add_resource): Rearranged the way we keep track
	of the resource. There will now be an entry for each keyring here
	and not in keyring.c itself. Store a token to allow creation of a
	keyring handle. Changed all functions to utilize this new design.
	(keydb_locate_writable): Make a real implementation.
	* keyring.c (next_kr): Removed and changed all callers to set the
	resource directly from the one given with the handle.
	(keyring_is_writable): New.
	(keyring_rebuild_cache): Add an arg to pass the token from keydb.

	2001-10-17 Werner Koch <wk@gnupg.org>

	* keyring.c (keyring_search): Enabled word search mode but print a
	warning that it is buggy.

	2001-10-11 Werner Koch <wk@gnupg.org>

	* hkp.c (hkp_ask_import): No more need to set the port number for
	the x-hkp scheme.
	(hkp_export): Ditto.

	2001-10-06 Stefan Bellon <sbellon@sbellon.de>

	* passphrase.c [__riscos__]: Disabled agent specific stuff.
	* g10.c: New option --no-force-v3-sigs.

	2001-10-04 Werner Koch <wk@gnupg.org>

	* export.c (do_export_stream): Do not push the compress filter
	here because the context would run out of scope due to the
	iobuf_close done by the caller.
	(do_export): Do it here instead.

	2001-09-28 Werner Koch <wk@gnupg.org>

	* keyedit.c (sign_uids): Always use the primary key to sign keys.
	* getkey.c (finish_lookup): Hack to return only the primary key if
	a certification key has been requested.

	* trustdb.c (cmp_kid_for_make_key_array): Renamed to
	(validate_one_keyblock): this and changed arg for direct calling.
	(make_key_array): Renamed to
	(validate_one_keyblock): this and changed args for direct calling.
	(mark_usable_uid_certs, validate_one_keyblock)
	(validate_key_list): Add next_expire arg to keep track of
	expiration times.
	(validate_keys): Ditto for UTKs and write the stamp.

	* tdbio.c (migrate_from_v2): Check return code of tbdio_sync.

	* tdbdump.c (import_ownertrust): Do a tdbio_sync().

	* keyring.c: Made the offtbl an global object.

	2001-09-27 Werner Koch <wk@gnupg.org>

	* pkclist.c (do_edit_ownertrust): Allow settin of ultimate trust.

	* trustdb.c (mark_keyblock_seen): New.
	(make_key_array): Use it to mark the subkeys too.
	(validate_keys): Store validity for ultimatly trusted keys.

	2001-09-26 Werner Koch <wk@gnupg.org>

	* pkclist.c (check_signatures_trust, do_we_trust): Removed the
	invocation of add_ownertrust. Minor changes to the wording.
	(add_ownertrust, add_ownertrust_cb): Removed.

	* trustdb.c (get_validity): Allow to lookup the validity using a
	subkey.

	* trustdb.c (new_key_hash_table): Increased the table size to 1024
	and changed the masks accordingly.
	(validate): Changed stats printing.
	(mark_usable_uid_certs): New.
	(cmp_kid_for_make_key_array): Does now check the signatures and
	figures out a usable one.

	2001-09-25 Werner Koch <wk@gnupg.org>

	* keyring.c (new_offset_item,release_offset_items)
	(new_offset_hash_table, lookup_offset_hash_table)
	(update_offset_hash_table, update_offset_hash_table_from_kb): New.
	(keyring_search): Use a offset table to optimize search for
	unknown keys.
	(keyring_update_keyblock, keyring_insert_keyblock): Insert new
	offsets.
	* getkey.c (MAX_UNK_CACHE_ENTRIES): Removed the unknown keys
	caching code.

	* g10.c, options.h, import.c: Removed the entire
	allow-secret-key-import stuff because the validity is now
	controlled by other means.

	* g10.c: New command --rebuild-keydb-caches.
	* keydb.c (keydb_rebuild_caches): New.
	* keyring.c (do_copy): Moved some code to
	(create_tmp_file, rename_tmp_file, write_keyblock): new functions.
	(keyring_rebuild_cache): New.

	* packet.h (PKT_ring_trust): Add sigcache field.
	* parse-packet.c (parse_trust): Parse sigcache.
	* keyring.c (do_copy): Always insert a sigcache packet.
	(keyring_get_keyblock): Copy the sigcache packet to the signature.
	* sig-check.c (cache_sig_result): Renamed from
	cache_selfsig_result. Changed implementation to use the flag bits
	and changed all callers.
	(mdc_kludge_check): Removed this unused code.
	(do_check): Do not set the sig flags here.

	* import.c (read_block): Make sure that ring_trust packets are
	never imported.
	* export.c (do_export_stream): and never export them.

	* trustdb.c (make_key_array): Skip revoked and expired keys.

	2001-09-24 Werner Koch <wk@gnupg.org>

	* g10.c, options.h: New option --no-auto-check-trustdb.

	* keygen.c (do_generate_keypair): Set newly created keys to
	ultimately trusted.

	* tdbio.h, tdbio.c: Removed all support for records DIR, KEY, UID,
	PREF, SIG, SDIR and CACH. Changed migration function to work
	direct on the file.
	(tdbio_read_nextcheck): New.
	(tdbio_write_nextcheck): New.

	2001-09-21 Werner Koch <wk@gnupg.org>

	Revamped the entire key validation system.
	* trustdb.c: Complete rewrite. No more validation on demand,
	removed some functions, adjusted to all callers to use the new
	and much simpler interface. Does not use the LID anymore.
	* tdbio.c, tdbio.h: Add new record types trust and valid. Wrote a
	migration function to convert to the new trustdb layout.
	* getkey.c (classify_user_id2): Do not allow the use of the "#"
	prefix.
	* keydb.h: Removed the TDBIDX mode add a skipfnc to the
	descriptor.
	* keyring.c (keyring_search): Implemented skipfnc.

	* passphrase.c (agent_open): Add missing bracket. Include windows.h.

	2001-09-19 Werner Koch <wk@gnupg.org>

	* keylist.c (print_fingerprint): Renamed from fingerprint, made
	global available. Added new arg to control the print style.
	* mainproc.c (print_fingerprint): Removed.
	* pkclist.c (print_fpr, fpr_info): Removed and changed callers to
	use print_fingerprint.
	* keyedit.c (show_fingerprint): Ditto.

	* passphrase.c (writen, readn)
	(agent_open, agent_close)
	(agent_get_passphrase)
	(passphrase_clear_cache): Support for W32. Contributed by Timo.

	* import.c (import_one): Release keydb handles at 2 more places.

	* keyring.c (keyring_release): Close the iobuf.
	(keyring_get_keyblock): Init ret_kb to NULL and store error contidion.

	* import.c (import_new_stats_handle): New.
	(import_release_stats_handle): New.
	(import_print_stats): Renamed from static fnc print_stats.
	(import_keys, import_keys_stream): Add an optional status handle
	arg and changed all callers.
	* hkp.c (hkp_ask_import): Add an stats_handle arg and changed all
	callers.

	* mainproc.c (print_pkenc_list): Use print_utf8_string2().

	2001-09-18 Werner Koch <wk@gnupg.org>

	* g10.c: New command --refresh-keys.
	* hkp.c (hkp_refresh_keys): New. Contributed by Timo Schulz.

	* parse-packet.c (parse): Stop on impossible packet lengths.

	2001-09-17 Werner Koch <wk@gnupg.org>

	* mainproc.c (print_notation_data): Wrap notation data status lines
	after 50 chars.

	* mainproc.c (proc_pubkey_enc): Make option try-all-secrets work.
	By disastry@saiknes.lv.

	2001-09-14 Werner Koch <wk@gnupg.org>

	* parse-packet.c (dump_sig_subpkt): List key server preferences
	and show the revocable flag correctly. Contributed by David Shaw.

	2001-09-09 Werner Koch <wk@gnupg.org>

	* keyedit.c (keyedit_menu): No need to define another p.

	* keylist.c (print_capabilities): s/used/use/ so that it
	does not shadow a global.
	* sign.c (sign_file): Renamed arg encrypt to encryptflag
	* keygen.c: Replaced all "usage" by "use".
	* misc.c (openpgp_pk_algo_usage): Ditto.

	* pubkey-enc.c (get_it): Renamed arg k to enc so that the later
	defined k does not shadow it.

	* parse-packet.c (parse_gpg_control): No need to define another i.

	* getkey.c (get_pubkey_byfprint): Must use the enum values and not
	the fprint_len.
	* keyring.c (keyring_search): Removed a non-sense break. Both
	bugs pointed out by Stefan.

	2001-09-07 Werner Koch <wk@gnupg.org>

	* status.c, status.h: Added NO_RECP and ALREADY_SIGNED.
	* pkclist.c (build_pk_list): Issue NO_RECP.
	* keyedit.c (sign_uids): Added experimental ALREADY_SIGNED

	* hkp.c (hkp_import): Use log_error. Bug reported by Neal H
	Walfield.

	* getkey.c (classify_user_id2): Change args to take the desc union
	direct. It was a stupid idea to pass the individual fields of an
	union to this function. Changed all callers.
	(classify_user_id): Ditto and allow to pass NULL as the description.

	2001-09-06 Werner Koch <wk@gnupg.org>

	* getkey.c (fixup_uidnode): Features flag is now a bit vector.
	* keygen.c (add_feature_mdc): Ditto.

	Revamped the entire key I/O code to be prepared for other ways of
	key storages and to get rid of the existing shit. GDBM support has
	gone.
	* keydb.c: New
	* keyring.c, keyring.h: New.
	* ringedit.c: Removed. Moved some stuff to keyring.c
	* getkey.c: Changed everything related to the key retrieving
	functions which are now using the keydb_ functions.
	(prepare_search, word_match_chars, word_match)
	(prepare_word_match, compare_name): Moved to keyring.c
	(get_pubkey_byname): Removed ctx arg and add ret_kdbhd
	arg. Changed all callers.
	(key_byname): Use get_pubkey_end to release the context and take
	new ret_kbdhd arg. Changed all callers.
	(classify_user_id2): Fill the 16 byte fingerprint up with 4 null
	bytes not with zero bytes of value 4, tsss.
	* import.c (import_one): Updated to use the new keydb interface.
	(import_secret_one): Ditto.
	(import_revoke_cert): Ditto.
	* delkey.c (do_delete_key): Ditto.
	* keyedit.c (keyedit_menu): Ditto.
	(get_keyblock_byname): Removed.
	* revoke.c (gen_revoke): Ditto.
	* export.c (do_export_stream): Ditto.
	* trustdb.c (update_trustdb): Ditto.
	* g10.c, gpgv.c (main): Renamed add_keyblock_resource to
	keydb_add_resource.
	* Makefile.am: Added and removed files.

	* keydb.h: Moved KBNODE typedef and MAX_FINGERPRINT_LEN to
	* global.h: this new header.

	2001-09-03 Werner Koch <wk@gnupg.org>

	* passphrase.c (agent_get_passphrase): Changed nread to size_t.
	(passphrase_clear_cache): Ditto.

	* keyid.c (mk_datestr): Avoid trigraphs.
	(fingerprint_from_pk): Cache the keyid in the pk.

	* options.h: Add opt.with_fingerprint so that we know whether the
	corresponding options was used.
	* g10.c (main): Set it here.
	* pkclist.c (check_signatures_trust): Always print fingerprint
	when this option is used. Mixed a minor memory leak.

	* status.c, status.h: New status INV_RECP.
	* pkclist.c (build_pk_list): Issue this status.

	2001-08-31 Werner Koch <wk@gnupg.org>

	* parse-packet.c (parse_key,parse_pubkeyenc)
	(parse_signature): Return error on reading bad MPIs.

	* mainproc.c (check_sig_and_print): Always print the user ID even
	if it is not bound by a signature. Use the primary UID in the
	status messages and encode them in UTF-8
	* status.c (write_status_text_and_buffer): New.

	2001-08-30 Werner Koch <wk@gnupg.org>

	* packet.h (sigsubpkttype_t): Add SIGSUBPKT_FEATURES.
	(PKT_public_key, PKT_user_id): Add a flag for it.
	* parse-packet.c, build-packet.c: Add support for them.
	* getkey.c (fixup_uidnode, merge_selfsigs): Set the MDC flags.
	* keygen.c (add_feature_mdc): New.
	(keygen_upd_std_prefs): Always set the MDC feature.
	* keyedit.c (show_prefs): List the MDC flag
	* pkclist.c (select_mdc_from_pklist): New.
	* encode.c (encode_crypt, encrypt_filter): Test whether MDC
	should be used.
	* cipher.c (write_header): Set MDC use depending on the above test.
	Print more status info.

	* delkey.c (do_delete_key): Kludge to delete a secret key with no
	public key available.

	* ringedit.c (find_secret_keyblock_direct): New.
	* getkey.c (seckey_available): Simplified.

	* ringedit.c (cmp_seckey): Now compares the secret key against the
	public key while ignoring all secret parts.
	(keyring_search): Use a public key packet as arg. Allow to search
	for subnkeys
	(search): Likewise. Changed all callers.
	(find_secret_keyblock_bypk): New.
	(find_secret_keyblock_byname): First locate the pubkey and then
	find the correponding secret key.
	* parse-packet.c (parse): Renamed pkttype arg to onlykeypkts and
	changed code accordingly. Changed all callers.
	(search_packet): Removed pkttype arg.
	* keyedit.c (keyedit_menu): First locate the public key and then
	try to locate a secret key.

	* ringedit.c (locate_keyblock_by_fpr): Removed.
	(locate_keyblock_by_keyid): Removed.
	(find_keyblock_bysk): Removed.

	* sig-check.c (check_key_signature2): Print the keyid along with
	the wrong sig class errors.

	2001-08-24 Werner Koch <wk@gnupg.org>

	* sign.c (sign_file): Stripped the disabled comment packet code.
	(sign_file, sign_symencrypt_file): Moved common code to ..
	(write_onepass_sig_packets): .. this new function.
	(sign_file, clearsign_file, sign_symencrypt_file): Moved common
	code to
	(write_signature_packets): this new function.
	(write_signature_packets, make_keysig_packet)
	(update_keysig_packet): Moved common code to
	(hash_uid, hash_sigclass_to_magic): these new functions
	(sign_file, sign_symencrypt_file): Moved common code to
	(write_plaintext_packet): this new function.

	2001-08-21 Stefan Bellon <sbellon@sbellon.de>

	* trustdb.c (query_trust_info): Changed trustlevel to signed int.
	* g10.c [__riscos__]: Fixed handling of --use-agent --lock-multiple.

	2001-08-20 Werner Koch <wk@gnupg.org>

	* encr-data.c (decrypt_data): Keep track on whether we already
	printed information about the used algorithm.
	* mainproc.c (proc_encrypted): Removed the non-working IDEA hack
	and print a message about the assumed algorithm.
	* passphrase.c (passphrase_to_dek): Use the same algorithm as above.
	(proc_symkey_enc): Print the algorithm, so that the user knows it
	before entering the passphrase.
	(proc_pubkey_enc, proc_pubkey_enc): Zero the DEK out.
	* encode.c (encode_crypt, encrypt_filter): Ditto.

	* g10.c: Allow for --sign --symmetric.
	* sign.c (sign_and_symencrypt): New.

	Applied patches from Stefan Bellon <sbellon@sbellon.de> to support
	RISC OS. Nearly all of these patches are identified by the
	__riscos__ macro.
	* compress.c: Added a couple of casts.
	* g10.c [__riscos__]: Some patches and new options foo-file similar
	to all foo-fd options.
	* gpgv.c, openfile.c, ringedit.c, tdbio.c: Minor fixes. Mainly
	replaced hardcoded path separators with EXTSEP_S like macros.
	* passprase.c [__riscos__]: Disabled agent stuff
	* trustdb.c (check_trust): Changed r_trustlevel to signed int to
	avoid mismatch problems in pkclist.c
	* pkclist.c (add_ownertrust): Ditto.
	* plaintext.c (handle_plaintext) [__riscos__]: Print a note when
	file can't be created.
	* options.h [__riscos__]: Use an extern unless included from the
	main module.
	* signal.c (got_fatal_signal) [__riscos__]: Close all files.

	2001-08-14 Werner Koch <wk@gnupg.org>

	* keygen.c (ask_algo): New arg r_usage. Allow for RSA keys.
	(gen_rsa): Enabled the code.
	(do_create): Enabled RSA branch.
	(parse_parameter_usage): New.
	(proc_parameter_file): Handle usage parameter.
	(read_parameter_file): Ditto.
	(generate_keypair): Ditto.
	(generate_subkeypair): Ditto.
	(do_generate_keypair): Ditto.
	(do_add_key_flags): New.
	(keygen_add_std_prefs): Use the new function.
	(keygen_add_key_flags_and_expire): New.
	(write_selfsig, write_keybinding): Handle new usage arg.
	* build-packet.c (build_sig_subpkt): Make sure that key flags go
	into the hashed area.

	* keygen.c (write_uid): Initialize the reference cunter.

	* keyedit.c (keyedit_menu): No more need to update the trustdb for
	preferences. Added calls to merge keblock.

	* kbnode.c (dump_kbnode): Print some more flags.

	2001-08-10 Werner Koch <wk@gnupg.org>

	Revamped the preference handling.

	* packet.h (prefitem_t, preftype_t): New.
	(PKT_public_key): Added a uid field.
	(PKT_user_id): Added field to store preferences and a reference
	counter.
	* parse-packet.c (parse_user_id,parse_photo_id): Initialize them
	* free-packet.c (free_user_id): Free them.
	(copy_user_id): Removed.
	(scopy_user_id): New.
	(cmp_user_ids): Optimized for identical pointers.
	(release_public_key_parts): Release the uid.
	(copy_public_key_with_new_namehash): Removed.
	(copy_prefs): New.
	* keyedit.c (menu_adduid): Use the new shallow copy user id.
	(show_prefs): Adjusted implementation.
	(keyedit_menu): No more need to update the trustdb after changing
	preferences.
	* getkey.c (fixup_uidnode): Store preferences.
	(find_by_name): Return a user id packet and remove namehash stuff.
	(lookup): Removed the unused namehash stuff.
	(finish_lookup): Added foundu arg.
	(pk_from_block): Removed the namehash arg and changed all callers.
	(merge_selfsigs): Copy prefs to all keys.
	* trustdb.c (get_pref_data): Removed.
	(is_algo_in_prefs): Removed.
	(make_pref_record): Deleted and removed all class.
	* pkclist.c (select_algo_from_prefs): Adjusted for the new
	preference implementation.
	* pubkey-enc.c (is_algo_in_prefs): New.
	(get_it): Use that new function.

	2001-08-09 Werner Koch <wk@gnupg.org>

	* build-packet.c (build_sig_subpkt): Fixed calculation of
	newarea->size.

	* g10.c (main): New option "--preference-list"
	* keyedit.c (keyedit_menu): New commands "setpref" and "updpref".
	(menu_set_preferences): New.
	* keygen.c (keygen_set_std_prefs): New.
	(set_one_pref): New.
	(check_zip_algo): New.
	(keygen_get_std_prefs): New.
	(keygen_upd_std_prefs): New
	(keygen_add_std_prefs): Move the pref setting code into the above fnc.
	* build-packet.c (build_sig_subpkt): Updated the list of allowed
	to update subpackets.

	2001-08-08 Werner Koch <wk@gnupg.org>

	* packet.h (subpktarea_t): New.
	(PKT_signature): Use that type for hashed_data and unhashed_data and
	removed the _data prefix from those fields. Changed all users.
	* parse-packet.c (parse_signature): Changed allocation for that.
	(parse_sig_subpkt): Changed declaration
	(enum_sig_subpkt): Ditto and changed implementation accordingly.
	* free-packet.c (cp_subpktarea): Renamed from cp_data_block and
	adjusted implementation. Changed caller.
	* sig-check.c (mdc_kludge_check): Adjusted the hashing.
	(do_check): Ditto.
	* sign.c (sign_file, clearsign_file, make_keysig_packet,
	update_keysig_packet): Ditto.
	* build-packet.c (build_sig_subpkt): Partial rewrite.
	(find_subpkt): Adjusted and made static.
	(delete_sig_subpkt): Adjusted.
	(do_signature): Ditto.

	* keygen.c (ask_keysize): Do not print the notes about suggested
	key sizes if just a DSA key is generated.

	* trustdb.c (add_ultimate_key): s/log_error/log_info/ for
	duplicated inserted trusted keys.

	2001-08-07 Werner Koch <wk@gnupg.org>

	* sign.c (sleep): Redefine for W32.

	* g10.c, options.h: Set new flag opt.no_homedir_creation when
	--no-options is given.
	* openfile.c (try_make_homedir): Don't create the homedir in that case.

	2001-08-03 Werner Koch <wk@gnupg.org>

	* armor.c (armor_filter): Removed the default comment string
	because it could get us in trouble due to translations using non
	ascii characters.

	2001-08-01 Werner Koch <wk@gnupg.org>

	* keylist.c (list_keyblock_print): Do not list revoked UIDs unless
	in verbose mode and we do no signature listing.

	* getkey.c (finish_lookup): Skip subkeys which are not yet valid.
	* g10.c, options.h: New option --ignore-valid-from.

	* sign.c (make_keysig_packet): Added new sigversion argument to
	allow the caller to force generation of required signature
	version. Changed all callers. Suggested by Thomas Roessler.

	* keyedit.c (sign_uids): Force v4 signature generation for local
	sigs. Removed the check for local signature and pre-v4 keys.

	2001-07-27 Werner Koch <wk@gnupg.org>

	* keyedit.c (sign_uids): Check that we are not trying to to a
	lsign with a pre-v4 key. Bug noticed by Thomas Roessler.

	2001-07-26 Werner Koch <wk@gnupg.org>

	* parse-packet.c (parse_photo_id): Reset all variables.
	* getkey.c (merge_selfsigs_main): Removed checks on PHOTO_ID
	because this is handled identically to a user ID.

	2001-07-06 Werner Koch <wk@gnupg.org>

	* cipher.c (write_header): Don't use MDC with --rfc1991. Suggested
	by disastry@saiknes.lv.

	2001-07-05 Werner Koch <wk@gnupg.org>

	* g10.c, options.h: New option --preserve-permissions.
	* ringedit.c (add_keyblock_resource): Use it here
	(keyring_copy): and here.

	* trustdb.c (verify_own_keys): Be more silent on --quiet.
	Suggested by Thomas Roessler.
	* sig-check.c (check_key_signature2): Ditto.
	* mainproc.c (proc_encrypted, proc_tree): Ditto
	* getkey.c (lookup): Ditto.

	2001-07-04 Werner Koch <wk@gnupg.org>

	* ringedit.c (add_keyblock_resource): Restore filename in case of error.

	2001-06-25 Werner Koch <wk@gnupg.org>

	* kbnode.c (dump_kbnode): Print the signature timestamp.

	* keyedit.c (keyedit_menu): New menu point "primary".
	(change_primary_uid_cb): New.
	(menu_set_primary_uid): New.
	* sign.c (update_keysig_packet): New.
	* build-packet.c (build_sig_subpkt): Put the primary UID flag into
	the hashed area. Allow update of some more packets.

	2001-06-15 Werner Koch <wk@gnupg.org>

	* getkey.c (merge_selfsigs): Exit gracefully when a secret key is
	encountered. May happen if a secret key is in public keyring.
	Reported by Francesco Potorti.

	2001-06-12 Werner Koch <wk@gnupg.org>

	* getkey.c (compare_name): Use ascii_memistr(), ascii_memcasecmp()
	* keyedit.c (keyedit_menu): Use ascii_strcasecmp().
	* armor.c (radix64_read): Use ascii_toupper().
	* ringedit.c (do_bm_search): Ditto.
	* keygen.c (read_parameter_file): Ditto.
	* openfile.c (CMP_FILENAME): Ditto.
	* g10.c (i18n_init): We can now use just LC_ALL.

	2001-05-29 Werner Koch <wk@gnupg.org>

	* keygen.c (generate_subkeypair): Print a warning if a subkey is
	created on a v3 key. Suggested by Brian M. Carlson.

	2001-05-27 Werner Koch <wk@gnupg.org>

	* keyid.c (get_lsign_letter): New.
	* keylist.c (list_keyblock_colon): Use it here.
	* mainproc.c (list_node): and here.

	* getkey.c, packet.h, free-packet.c: Removed that useless key
	created field; I dunno why I introducded this at all - the
	creation time is always bound to the key packet and subject to
	fingerprint calculation etc.

	* getkey.c (fixup_uidnode): Add keycreated arg and use this
	instead of the signature timestamp to calculate the
	help_key_expire. Bug reported by David R. Bergstein.
	(merge_selfsigs_main): Correct key expiration time calculation.
	(merge_selfsigs_subkey): Ditto.

	2001-05-25 Werner Koch <wk@gnupg.org>

	* revoke.c (gen_revoke): Add a cast to a tty_printf arg.
	* delkey.c (do_delete_key): Ditto.
	* keyedit.c (print_and_check_one_sig): Ditto.
	(ask_revoke_sig): Ditto.
	(menu_revsig): Ditto.
	(check_all_keysigs): Removed unused arg.

	2001-05-23 Werner Koch <wk@gnupg.org>

	* g10.c (opts): Typo fix by Robert C. Ames.

	2001-05-06 Werner Koch <wk@gnupg.org>

	* revoke.c: Small typo fix

	2001-05-04 Werner Koch <wk@gnupg.org>

	* passphrase.c (passphrase_clear_cache): Shortcut if agent usage
	is not enabled.

	2001-05-01 Werner Koch <wk@gnupg.org>

	* passphrase.c (writen): Replaced ssize_t by int. Thanks to
	to Robert Joop for reporting that SunOS 4.1.4 does not have it.

	2001-04-28 Werner Koch <wk@gnupg.org>

	* getkey.c (merge_public_with_secret): pkttype was not set to subkey.

	2001-04-27 Werner Koch <wk@gnupg.org>

	* skclist.c (build_sk_list): Changed one log_debug to log_info.

	2001-04-25 Werner Koch <wk@gnupg.org>

	* keyedit.c (show_prefs): Add a verbose mode.
	(show_key_with_all_names): Pass verbose flag for special value of
	with_pref.
	(keyedit_menu): New command "showpref"
	(show_key_with_all_names): Mark revoked uids and the primary key.

	2001-04-24 Werner Koch <wk@gnupg.org>

	* getkey.c (get_primary_uid): Return a different string in case of
	error and made it translatable.

	* build-packet.c (do_secret_key): Ugly, we wrote a zero
	instead of the computed ndays. Thanks to M Taylor for complaining
	about a secret key import problem.

	2001-04-23 Werner Koch <wk@gnupg.org>

	* hkp.c (hkp_ask_import): Allow to specify a port number for the
	keyserver. Add a kudge to set the no_shutdown flag.
	(hkp_export): Ditto.
	* options.skel: Document the changes

	2001-04-20 Werner Koch <wk@gnupg.org>

	* options.skel: Add some more comments.

	2001-04-19 Werner Koch <wk@gnupg.org>

	* keyid.c (mk_datestr): New. Handles negative times. We must do
	this because Windoze segvs on negative times passed to gmtime().
	Changed all datestr_from function to use this one.

	* keyid.c, keyid.h (colon_strtime): New. To implement the
	fixed-list-mode.
	(colon_datestr_from_pk): New.
	(colon_datestr_from_sk): New.
	(colon_datestr_from_sig): New.
	* keylist.c (list_keyblock_colon): Use these functions here.
	* mainproc.c (list_node): Ditto.

	2001-04-18 Werner Koch <wk@gnupg.org>

	* openfile.c (open_sigfile): Fixed the handling of ".sign".
	* mainproc.c (proc_tree): Use iobuf_get_real_fname.
	Both are by Vincent Broman.

	2001-04-14 Werner Koch <wk@gnupg.org>

	* getkey.c (fixup_uidnode): Removed check for !sig which is
	pointless here. Thanks to Jan Niehusmann.

	2001-04-10 Werner Koch <wk@gnupg.org>

	* sig-check.c (check_key_signature2): Use log_info instead of
	log_error so that messed up keys do not let gpg return an error.
	Suggested by Christian Kurz.

	* getkey.c (merge_selfsigs_main): Do a fixup_uidnode only if we
	have both, uid and sig. Thanks to M Taylor.

	2001-04-05 Werner Koch <wk@gnupg.org>

	* armor.c (unarmor_pump_new,unarmor_pump_release): New.
	(unarmor_pump): New.
	* pipemode.c (pipemode_filter): Use the unarmor_pump to handle
	armored or non-armored detached signatures. We can't use the
	regular armor_filter becuase this does only chack for armored
	signatures the very first time. In pipemode we may have a mix of
	armored and binary detached signatures.
	* mainproc.c (proc_tree): Do not print the "old style" notice when
	this is a pipemode processes detached signature.
	(proc_plaintext): Special handling of pipemode detached sigs.

	* packet.h (CTRLPKT_PLAINTEXT_MARK): New.
	* parse-packet.c (create_gpg_control): New.
	* kbnode.c (dump_kbnode): Support it here.
	* mainproc.c (check_sig_and_print): Fixed the check for bad
	sequences of multiple signatures.
	(proc_plaintext): Add the marker packet.
	(proc_tree): We can now check multiple detached signatures.

	2001-04-02 Werner Koch <wk@gnupg.org>

	The length of encrypted packets for blocksizes != 8 was not
	correct encoded. I think this is a minor problem, because we
	usually use partial length packets. Kudos to Kahil D. Jallad for
	pointing this out.
	* packet.h: Add extralen to PKT_encrypted.
	* cipher.c (write_header): Set extralen.
	* build-packet.c (do_encrypted): Use extralen instead of const 10.
	(do_encrypted_mdc): Ditto.
	* parse-packet.c (parse_encrypted): Set extralen to 0 because we
	don't know it here.

	2001-03-30 Werner Koch <wk@gnupg.org>

	* getkey.c (premerge_public_with_secret): Changed wording an add
	the keyID to the info message.

	2001-03-29 Werner Koch <wk@gnupg.org>

	* getkey.c (premerge_public_with_secret): Use log_info instead of
	log_error when no secret key was found for a public one.
	Fix the usage if the secret parts of a key are not available.

	* openfile.c (ask_outfile_name): Trim spaces.
	(open_outfile): Allow to enter an alternate filename. Thanks to
	Stefan Bellon.
	* plaintext.c (handle_plaintext): Ditto.

	2001-03-28 Werner Koch <wk@gnupg.org>

	* mainproc.c (do_check_sig): Allow direct key and subkey
	revocation signature.
	* sig-check.c (check_key_signature2): Check direct key signatures.
	Print the signature class along with an error.

	2001-03-27 Werner Koch <wk@gnupg.org>

	* packet.h: Add a missing typedef to an enum. Thanks to Stefan Bellon.

	* g10.c: New option --no-sig-create-check.
	* sign.c (do_sign): Implement it here.
	* g10.c: New option --no-sig-cache.
	* sig-check.c (check_key_signature2): Implement it here.
	(cache_selfsig_result): and here.

	* keylist.c (list_keyblock): Removed debugging stuff.

	* getkey.c (cache_public_key): Made global.
	* keygen.c (write_selfsig, write_keybinding): Cache the new key.

	* getkey.c (key_byname): Add new arg secmode and changed all
	callers to request explicitly the mode. Deriving this information
	from the other supplied parameters does not work if neither pk nor
	sk are supplied.

	2001-03-25 Werner Koch <wk@gnupg.org>

	* packet.h (ctrlpkttype_t): New.
	* mainproc.c (add_gpg_control,proc_plaintext,proc_tree): Use the
	new enum values.
	* pipemode.c (make_control): Ditto.
	* armor.c (armor_filter): Ditto.

	2001-03-24 Werner Koch <wk@gnupg.org>

	* sign.c (do_sign): Verify the signature right after creation.

	2001-03-23 Werner Koch <wk@gnupg.org>

	* status.c, status.h (STATUS_UNEXPECTED): New.
	* mainproc.c (do_proc_packets): And emit it here.

	2001-03-21 Werner Koch <wk@gnupg.org>

	* status.c: Add sys/types.h so that it runs on Ultrix. Reported
	by Georg Schwarz.x

	* build-packet.c (build_sig_subpkt): Fixed generaton of packet
	length header in case where 2 bytes headers are needed. Thanks to
	Piotr Krukowiecki.

	2001-03-19 Werner Koch <wk@gnupg.org>

	* g10.c (main): the default keyring is no always used unless
	--no-default-keyring is given.

	* ringedit.c (add_keyblock_resource): invalidate cache after file
	creation.

	2001-03-15 Werner Koch <wk@gnupg.org>

	* keygen.c (ask_algo): Changed the warning of the ElGamal S+E Algo.

	* keylist.c (print_capabilities): New.
	(list_keyblock_colon): and use it here.

	2001-03-13 Werner Koch <wk@gnupg.org>

	* main.c, options.h: New option --fixed_list_mode.
	* keylist.c (list_keyblock_colon): use it here.

	* getkey.c (merge_keys_and_selfsig): Divert merging of public keys
	to the function used in key selection..
	* keylist.c (is_uid_valid): Removed.
	(list_keyblock): Splitted into ..
	(list_keyblock_print, list_keyblock_colon): .. these.
	functions. Changed them to use the flags set in the key lookup code.
	(reorder_keyblock): New, so that primary user IDs are listed first.

	* ringedit.c (keyring_copy): flush the new iobuf chaces before
	rename or remove operations. This is mainly needed for W32.

	* hkp.c [HAVE_DOSISH_SYSTEM]: Removed the disabled code because we
	have now W32 socket support in ../util/http.c

	* skclist.c (key_present_in_sk_list): New.
	(is_duplicated_entry): New.
	(build_sk_list): Check for duplicates and do that before unlocking.

	2001-03-12 Werner Koch <wk@gnupg.org>

	* armor.c (parse_header_line): Removed double empty line check.
	(parse_header_line): Replaced trim_trailing_ws with a counting
	function so that we can adjust for the next read.

	* options.skel: Fixed 3 typos. By Thomas Klausner. Replaced the
	keyserver example by a better working server.

	* parse-packet.c (parse_symkeyenc): Return Invalid_Packet on error.
	(parse_pubkeyenc): Ditto.
	(parse_onepass_sig): Ditto.
	(parse_plaintext): Ditto.
	(parse_encrypted): Ditto.
	(parse_signature): Return error at other places too.
	(parse_key): Ditto.
	* g10.c (main): Set opt.list_packets to another value when invoked
	with the --list-packets command.
	* mainproc.c (do_proc_packets): Don's stop processing when running
	under --list-packets command.

	* signal.c (do_sigaction): Removed.
	(init_one_signal): New to replace the above. Needed to support
	systems without sigactions. Suggested by Dave Dykstra.
	(got_fatal_signal,init_signals): Use the above here.
	(do_block): Use sigset() if sigprocmask() is not available.

	* armor.c (parse_hash_header): Test on TIGER192, which is the
	correct value as per rfc2440. By Edwin Woudt.

	2001-03-08 Werner Koch <wk@gnupg.org>

	* misc.c: Include time.h. By James Troup.

	* getkey.c: Re-enabled the unknown user Id and PK caches and
	increased their sizes.

	* getkey.c (merge_selfsigs_main): Set expire date and continue
	processing even if we found a revoked key.
	(merge_selfsigs_subkeys): Ditto.

	* packet.h: Add an is_revoked flag to the user_id packet.
	* getkey.c (fixup_uidnode): Set that flag here.
	(merge_selfsigs_main): Fix so that the latest signature is used to
	find the self-signature for an UID.
	* parse-packet.c (parse_user_id): Zero out all fields.
	* mainproc.c (check_sig_and_print): Print the primary user ID
	according the the node flag and then all other non-revoked user IDs.
	(is_uid_revoked): Removed; it is now handled by the key selection code.

	Changed the year list of all copyright notices.

	2001-03-07 Werner Koch <wk@gnupg.org>

	* getkey.c (finish_lookup): Print an info message only in verbose mode.

	2001-03-05 Werner Koch <wk@gnupg.org>

	* packet.h: Replaced sigsubpkt_t value 101 by PRIV_VERIFY_CACHE.
	We have never used the old value, so we can do this without any harm.
	* parse-packet.c (dump_sig_subpkt): Ditto.
	(parse_one_sig_subpkt): Parse that new sub packet.
	* build-packet.c (build_sig_subpkt): Removed the old one from the
	hashed area.
	(delete_sig_subpkt): New.
	(build_sig_subpkt): Allow an update of that new subpkt.
	* sig-check.c (check_key_signature2): Add verification caching
	(cache_selfsig_result): New.
	* export.c (do_export_stream): Delete that sig subpkt before exporting.
	* import.c (remove_bad_stuff): New.
	(import): Apply that function to all imported data

	2001-03-03 Werner Koch <wk@gnupg.org>

	* getkey.c: Introduced a new lookup context flag "exact" and used
	it in all place where we once used primary.
	(classify_user_id2): Replaced the old function and add an extra
	argument to return whether an exact keyID has been requested.
	(key_byname): Removed the unused ctx.primary flag
	(get_seckey_byname2): Ditto.
	(finish_lookup): Changed debugging output.

	2001-03-02 Werner Koch <wk@gnupg.org>

	* keylist.c (list_one): Remove the merge key calls.

	2001-03-01 Werner Koch <wk@gnupg.org>

	* getkey.c (finish_lookup): Don't use it if we no specific usage
	has been requested.
	(merge_selfsigs_main): fix UID only if we have an signature.
	(lookup): Return UNU_PUBKEY etc. instead of NO_PUBKEY if we found
	a key but the requested usage does not allow this key.
	* import.c (import_one): Take UNU_PUBKEY into account.
	* mainproc.c (list_node): Ditto.
	* keylist.c (list_keyblock): Ditto.
	* keyedit.c (print_and_check_one_sig): Ditto.

	2001-02-09 Werner Koch <wk@gnupg.org>

	* delkey.c (delete_key): Removed that silly assert which rendered
	the whole new stuff meaningless.

	2001-02-08 Werner Koch <wk@gnupg.org>

	* getkey.c (key_byname): It can happen that we have both, sk and pk
	NULL, fix for that.

	* parse-packet.c (parse_one_sig_subpkt): Add support for
	primary_uid and key_flags.
	(can_handle_critical): Ditto

	* parse-packet.c (parse_encrypted): Fixed listing of pktlen for
	MDC packets.

	* getkey.c: Backported the version of this file from gpg 1.1. this
	involved some changes in other files too.
	* parse-packet.c (parse_key): Clear req_usage.
	* skclist.c (build_sk_list): Use req_usage to pass the usage
	information to the lookup function.
	* pkclist.c (build_pk_list): Ditto.
	* free-packet.c (copy_public_parts_to_secret_key): New.
	* keydb.h: Add IS_* macros to check the sig_class.
	* misc.c (openpgp_cipher_test_algo): New.
	(openpgp_pk_test_algo): New.
	(openpgp_pk_algo_usage): New.
	(openpgp_md_test_algo): New.
	* packet.h: Add a few fields to PKT_{public,secret}_key and
	PKT_user_id.
	* seckey-cert.c (do_check): Use the new main_keyid field.

	2001-02-04 Werner Koch <wk@gnupg.org>

	* encr-data.c (decrypt_data): Catch error when we had problems to
	parse the encrypted packet. By Timo.

	2001-01-29 Werner Koch <wk@gnupg.org>

	* g10.c (main): --batch does now set nogreeting.

	* delkey.c (do_delete_key): Fixed delete-both functionality.

	2001-01-22 Werner Koch <wk@gnupg.org>

	* g10.c: New command --delete-secret-and-public-key.
	* delkey.c (delete_key): Add new arg allow_both.
	(do_delete_key): Move most stuff from above to this new function.

	2001-01-12 Werner Koch <wk@gnupg.org>

	* passphrase.c (passphrase_to_dek): Use MD5 when IDEA is installed
	and we have no S2K.
	* mainproc.c (proc_encrypted): Likewise

	2001-01-11 Werner Koch <wk@gnupg.org>

	* sig-check.c (do_check): Print the signature key expire message
	only in verbose mode and added the keyID.

	2001-01-09 Werner Koch <wk@gnupg.org>

	* status.c, status.h: New status USERID_HINT.
	(write_status_text): Replace LF and CR int text by C-escape sequence.

	* passphrase.c (passphrase_to_dek): Fixed the NEED_PASSPHRASE
	output. It does now always print 2 keyIDs. Emit the new
	USERID_HINT.

	2001-01-08 Werner Koch <wk@gnupg.org>

	* g10.c, options.h: New option --no-expensive-trust-checks.
	* keylist.c (list_keyblock): Act on this option.

	2001-01-04 Werner Koch <wk@gnupg.org>

	* g10.c (main): Set homedir only in the pre-parsing phase and
	replace backslashes in the W32 version.

	2001-01-03 Werner Koch <wk@gnupg.org>

	* status.c, status.h : New status KEY_CREATED
	* keygen.c (do_generate_keypair,generate_subkeypair): Emit it.

	2000-12-28 Werner Koch <wk@gnupg.org>

	* signal.c (got_fatal_signal): Remove lockfiles here because the
	atexit stuff does not work due to the use of raise. Suggested by
	Peter Fales.
	* gpgv.c (remove_lockfiles): New stub.

	2000-12-19 Werner Koch <wk@gnupg.org>

	* status.c, status.h (cpr_get_no_help): New.
	* keyedit.c (keyedit_menu): Use it here because we have our own
	help list here.

	2000-12-18 Werner Koch <wk@gnupg.org>

	* mainproc.c (print_failed_pkenc): Don't print the sometimes
	confusing message about unavailabe secret key. Renamed ...
	(print_pkenc_list): ... to this and introduced failed arg.
	(proc_encrypted): Print the failed encryption keys and then
	the one to be used.
	(proc_pubkey_enc): Store also the key we are going to use.

	* mainproc.c (check_sig_and_print): Don't list revoked user IDs.
	(is_uid_revoked): New.

	2000-12-08 Werner Koch <wk@gnupg.org>

	* pipemode.c: Made the command work. Currently only for
	non-armored detached signatures.
	* mainproc.c (release_list): Reset the new pipemode vars.
	(add_gpg_control): Handle the control packets for pipemode
	* status.c, status.h: New stati {BEGIN,END}_STREAM.

	2000-12-07 Werner Koch <wk@gnupg.org>

	* g10.c: New option --allow-secret-key-import.
	* import.c (import_keys,import_keys_stream): Honor this option.
	(import): New arg allow_secret and pass that arg down to ...
	(import_secret_one): to this and print a warning if secret key
	importing is not allowed.

	2000-12-05 Werner Koch <wk@gnupg.org>

	* cipher.c (cipher_filter): Moved the end_encryption status ...
	* encode.c (encode_simple,encode_crypt): to here
	* sign.c (sign_file): and here.

	* status.c (mywrite): Removed.
	(get_status_string): Removed the LFs from the strings.
	(set_status_fd,is_status_enabed,write_status_text,
	write_status_buffer): Replaced all mywrite by stdio calls and use
	fdopen to create a strem. This is needed to make things smoother
	in the W32 version.

	2000-12-04 Werner Koch <wk@gnupg.org>

	* import.c (merge_blocks): Increment n_sigs for revocations.

	2000-11-30 Werner Koch <wk@gnupg.org>

	* g10.c (main): Use iobuf_translate_file_handle for all options
	with filehandles as arguments. This is function does some magic
	for the W32 API.

	* verify.c (verify_signatures): Add a comment rant about the
	detached signature problem.
	* mainproc.c (proc_tree): Issue an error if a detached signature
	is assumed but a standard one was found.
	* plaintext.c (hash_datafiles): Don't fall back to read signature
	from stdin.
	* openfile.c (open_sigfile): Print verbose message only if the
	file could be accessed.

	2000-11-24 Werner Koch <wk@gnupg.org>

	* passphrase.c [HAVE_DOSISH_SYSTEM]: Disabled all the agent stuff.

	2000-11-16 Werner Koch <wk@gnupg.org>

	* g10.c: New option --use-agent
	* passphrase.c (agent_open,agent_close): New.
	(agent_get_passphrase,agent_clear_passphrase): New.
	(passphrase_clear_cache): New.
	(passphrase_to_dek): Use the agent here.
	* seckey-cert.c (do_check): Clear cached passphrases.

	2000-11-15 Werner Koch <wk@gnupg.org>

	* status.c (write_status_text): Moved the big switch to ...
	(get_status_string): ... new function.
	(write_status_buffer): New.

	* status.c (mywrite): New and replaced all write() by this.

	* status.c, status.h: Add 3 status lcodes for notaions and policy.
	* mainproc.c (print_notation_data): Do status output of notations.

	2000-11-13 Werner Koch <wk@gnupg.org>

	* sign.c (clearsign_file): Use LF macro to print linefeed.

	2000-11-11 Paul Eggert <eggert@twinsun.com>

	Clean up the places in the code that incorrectly use "long" or
	"unsigned long" for file offsets. The correct type to use is
	"off_t". The difference is important on large-file hosts,
	where "off_t" is longer than "long".

	* keydb.h (struct keyblock_pos_struct.offset):
	Use off_t, not ulong, for file offsets.
	* packet.h (dbg_search_packet, dbg_copy_some_packets,
	search_packet, copy_some_packets): Likewise.
	* parse-packet.c (parse, dbg_search_packet, search_packet,
	dbg_copy_some_packets, copy_some_packets): Likewise.
	* ringedit.c (keyring_search): Likewise.

	* parse-packet.c (parse): Do not use %lu to report file
	offsets in error diagnostics; it's not portable.
	* ringedit.c (keyring_search): Likewise.

	2000-11-09 Werner Koch <wk@gnupg.org>

	* g10.c (main): New option --enable-special-filenames.

	2000-11-07 Werner Koch <wk@gnupg.org>

	* g10.c (main): New command --pipemode.
	* pipemode.c: New.

	2000-10-23 Werner Koch <wk@gnupg.org>

	* armor.c (armor_filter): Changed output of hdrlines, so that a CR
	is emitted for DOS systems.

	* keygen.c (read_parameter_file): Add a cast for isspace().

	* status.c (myread): Use SIGINT instead of SIGHUP for DOS.

	2000-10-19 Werner Koch <wk@gnupg.org>

	* g10.c: New option --ignore-crc-error
	* armor.c (invalid_crc): New.
	(radix64_read): Act on new option.

	* openfile.c (try_make_homedir): Klaus Singvogel fixed a stupid
	error introduced on Sep 6th.

	2000-10-18 Werner Koch <wk@gnupg.org>

	* misc.c (print_cipher_algo_note): Don't print the note for AES.
	Changed wording.

	2000-10-16 Werner Koch <wk@gnupg.org>

	* mainproc.c (do_proc_packets): Hack to fix the problem that
	signatures are not detected when there is a MDC packet but no
	compression packet.

	* g10.c (print_hashline): New.
	(print_mds): Use above func with --with-colons.

	* mainproc.c (check_sig_and_print): Detect multiple signatures
	and don't verify them.

	2000-10-14 Werner Koch <wk@gnupg.org>

	* mainproc.c (add_onepass_sig): There is an easier solution to the
	error fixed yesterday; just check that we only have onepass
	packets. However, the other solution provides an cleaner
	interface and opens the path to get access to other information
	from the armore headers.
	(release_list): Reset some more variables.

	2000-10-13 Werner Koch <wk@gnupg.org>

	* mainproc.c (add_gpg_control): New.
	(do_proc_packets): use it.
	(proc_plaintext): Changed logic to detect clearsigns.
	(proc_tree): Check the cleartext sig with some new code.

	* packet.h: New packet PKT_GPG_CONTROL.
	* parse-packet.c (parse_gpg_control): New.
	* misc.c (get_session_marker): New.
	* armor.c (armor_filter): Replaced the faked 1-pass packet by the
	new control packet.

	* keyedit.c (keyedit_menu): Allow batchmode with a command_fd.
	* status.c (my_read): New.
	(do_get_from_fd): use it.

	2000-10-12 Werner Koch <wk@gnupg.org>

	* keygen.c (keygen_add_std_prefs): Add Rijndael to the prefs.

	2000-10-07 Werner Koch <wk@gnupg.org>

	* gpgv.c: Add more stubs for ununsed code to make the binary smaller.

	Wed Oct 4 15:50:18 CEST 2000 Werner Koch <wk@openit.de>

	* sign.c (hash_for): New arg to take packet version in account, changed
	call callers.

	* gpgv.c: New.
	* Makefile.am: Rearranged source files so that gpgv can be build with
	at least files as possible.

	Mon Sep 18 12:13:52 CEST 2000 Werner Koch <wk@openit.de>

	* hkp.c (not_implemented): Print a notice for W32

	Fri Sep 15 18:40:36 CEST 2000 Werner Koch <wk@openit.de>

	* keygen.c (keygen_add_std_prefs): Changed order of preferences to
	twofish, cast5, blowfish.

	* pkclist.c (algo_available): Removed hack to disable Twofish.

	Thu Sep 14 17:45:11 CEST 2000 Werner Koch <wk@openit.de>

	* parse-packet.c (dump_sig_subpkt): Dump key flags. Print special
	warning in case of faked ARRs.

	* getkey.c (finsih_lookup): Hack so that for v4 RSA keys the subkey
	is used for encryption.

	Thu Sep 14 14:20:38 CEST 2000 Werner Koch <wk@openit.de>

	* g10.c (main): Default S2K algorithms are now SHA1 and CAST5 - this
	should solve a lot of compatibility problems with other OpenPGP
	apps because those algorithms are SHOULD and not optional. The old
	way to force it was by using the --openpgp option whith the drawback
	that this would disable a couple of workarounds for PGP.

	* g10.c (main): Don't set --quite along with --no-tty. By Frank Tobin.

	* misc.c (disable_core_dump): Don't display a warning here but a return
	a status value and ...
	* g10.c (main): ...print warnining here. Suggested by Sam Roberts.

	Wed Sep 13 18:12:34 CEST 2000 Werner Koch <wk@openit.de>

	* keyedit.c (keyedit_menu): Allow to use "debug" on the secret key.

	* ringedit.c (cmp_seckey): Fix for v4 RSA keys.
	* seckey-cert.c (do_check): Workaround for PGP 7 bug.

	Wed Sep 6 17:55:47 CEST 2000 Werner Koch <wk@openit.de>

	* misc.c (print_pubkey_algo_note): Do not print the RSA notice.
	* sig-check.c (do_signature_check): Do not emit the RSA status message.
	* pubkey-enc.c (get_session_key): Ditto.

	* encode.c (encode_simple, encode_crypt): Fix for large files.
	* sign.c (sign_file): Ditto.

	Wed Sep 6 14:59:09 CEST 2000 Werner Koch <wk@openit.de>

	* passphrase.c (hash_passphrase): Removed funny assert. Reported by
	David Mathog.

	* openfile.c (try_make_homedir): Changes for non-Posix systems.
	* g10.c (main): Take the default homedir from macro.

	* g10.c: The --trusted-key option is back.
	* trustdb.c (verify_own_key): Handle this option.
	(add_ultimate_key): Moved stuff from verify_own_key to this new func.
	(register_trusted_key): New.

	Fri Aug 25 16:05:38 CEST 2000 Werner Koch <wk@openit.de>

	* parse-packet.c (dump_sig_subpkt): Print info about the ARR.

	* openfile.c (overwrite_filep): Always return okay if the file is
	called /dev/null.
	(make_outfile_name): Add ".sign" to the list of know extensions.
	(open_sigfile): Ditto.

	Wed Aug 23 19:52:51 CEST 2000 Werner Koch <wk@openit.de>

	* g10.c: New option --allow-freeform-uid. By Jeroen C. van Gelderen.
	* keygen.c (ask_user_id): Implemented here.

	Fri Aug 4 14:23:05 CEST 2000 Werner Koch <wk@openit.de>

	* status.c (do_get_from_fd): Ooops, we used fd instead of opt.command_fd.
	Thanks to Michael Tokarev.

	Tue Aug 1 20:06:23 CEST 2000 Werner Koch <wk@openit.de>

	* g10.c: New opttion --try-all-secrets on suggestion from Matthias Urlichs.
	* pubkey-enc.c (get_session_key): Quite easy to implement here.

	Thu Jul 27 17:33:04 CEST 2000 Werner Koch <wk@openit.de>

	* g10.c: New option --merge-only. Suggested by Brendan O'Dea.
	* import.c (import_one): Implemented it here
	(import_secret_one): Ditto.
	(print_stats): and give some stats.

	Thu Jul 27 12:01:00 CEST 2000 Werner Koch <wk@openit.de>

	* g10.c: New options --show-session-key and --override-session-key
	* pubkey-enc.c (hextobyte): New.
	(get_override_session_key): New.
	* mainproc.c (proc_pubkey_enc): Add session-key stuff.
	* status.h, status.c (STATUS_SESSION_KEY): New.

	Thu Jul 27 10:02:38 CEST 2000 Werner Koch <wk@openit.de>

	* g10.c (main): Use setmode(O_BINARY) for MSDOS while generating random bytes
	(print_mds): Likewise for stdin.
	* plaintext.c (handle_plaintext): Likewise for stdout.

	Mon Jul 24 10:30:17 CEST 2000 Werner Koch <wk@openit.de>

	* keyedit.c (menu_expire): expire date for primary key can be set again.

	Wed Jul 19 11:26:43 CEST 2000 Werner Koch <wk@openit.de>

	* keylist.c (is_uid_valid): New.
	(list_keyblock): Print validity information for all user IDs. Note, this
	has to be done at other places too; for now we have only minimal support.

	Wed Jul 12 13:32:06 CEST 2000 Werner Koch <wk@openit.de>

	* helptext.c, pkclist.c: s/superseeded/superseded/

	Mon Jul 10 16:08:57 CEST 2000 Werner Koch <wk@openit.de>

	* parse-packet.c (enum_sig_subpkt): Fixed testing on crtitical bit in case
	of a NULL buffer. Reported by Peter Marschall.

	Wed Jul 5 13:28:45 CEST 2000 Werner Koch <wk@openit.de>

	* keyedit.c, keyid.c: Add some _()

	* argparse.c: Changed the flag to suppress --version handling to also
	suppress --help.

	Wed Jun 28 11:54:44 CEST 2000 Werner Koch <wk@openit.de>

	* armor.c (armor_filter): Set sigclass to 0 in case of non-dash-escaped
	clearsig. This makes this mode work again.

	* mainproc.c (proc_tree): Fixed handling of one-pass-sig packets in textmode.
	Disabled the ugly workaround for PGP 5 - let's see whether thi breaks less
	cases. Found by Ted Cabeen.

	* options.h (DBG_HASHING): New. All commented md_start_debug are now
	controlled by this debug option.

	* sign.c (print_status_sig_created): New and called from 2 places.

	* keygen.c (gen_rsa): New, but commented.
	(ask_algo): Commented support for RSA.

	* seckey-cert.c (protect_secret_key): Started to fix the code for v4 RSA
	keys - it is not solved yet. However, we have time until, Sep 20th ;)

	Wed Jun 14 12:27:09 CEST 2000 Werner Koch <wk@openit.de>

	* status.c (init_shm_coprocessing): Changed the sequence of the get,attach
	to cope with the changes in newer Linux kernels. This bug has been found
	by <dmitri@advantrix.com> who also proposed this solution. Hopefully
	this does not break gpg on to many systems.

	* cipher.c (write_header): Protect the IV with the MDC too.
	* encr-data.c (decrypt_data): Likewise.

	Fri Jun 9 10:09:52 CEST 2000 Werner Koch <wk@openit.de>

	* g10.c: New options --no-auto-key-retrieve
	* options.h (auto_key_retrieve): New.
	* mainproc.c (check_sig_and_print): Implemented that.

	Wed Jun 7 19:19:09 CEST 2000 Werner Koch <wk@openit.de>

	* sig-check.c (do_check): Use EMULATE_MDENCODE also on v4 packets.

	Wed Jun 7 17:25:38 CEST 2000 Werner Koch <wk@openit.de>

	* cipher.c (write_header): Use plain CFB mode for MDC encrypted packets.
	* encr-data.c (decrypt_data): Ditto.

	Mon Jun 5 23:41:54 CEST 2000 Werner Koch <wk@openit.de>

	* seskey.c (do_encode_md, encode_md_value): Add new arg v3compathack to work
	around a bug in old versions.
	* sig-check.c (do_check): use the aboved workaround when enabled.
	* g10.c: New option --emulate-md-decode-bug

	Mon Jun 5 12:37:43 CEST 2000 Werner Koch <wk@openit.de>

	* build-packet.c (do_mdc): New.
	(do_encrypted_mdc): Changed for the new proposal.
	* parse-packet.c (parse_mdc): New.
	(parse_encrypted): Fixed for the new proposal.
	* packet.h (PKT_MDC): New.
	* cipher.c (cipher_filter): Build the MDC packet here.
	* g10.c (main): Enable --force-mdc.
	* encr-data.c (mdc_decode_filter): Fixed for new MDC method

	* options.h(rfc2440): New.
	* g10.c (main): Changed the selected values for --openpgp to not include
	optional algorithms.

	Thu May 18 11:38:54 CEST 2000 Werner Koch <wk@openit.de>

	* keyedit.c (keyedit_menu): Add a keyword arg to the prompt.

	* status.c, status.h: Added 3 new status tokens.
	* status.c (do_get_from_fd): New.
	(cpr_enabled,cpr_get,cpr_get_hidden,cpr_kill_prompt,
	cpr_get_answer_is_yes,cpr_get_answer_yes_no_quit): Modified to work
	with the new function.
	* g10.c: Add new option --command-fd.

	* status.c (progress_cb): New.
	(set_status_fd): Register progress functions

	Fri May 12 14:01:20 CEST 2000 Werner Koch <wk@openit.de>

	* delkey.c (delete_key): Add 2 new status messages
	* status.c, status.h (STATUS_DELETE_PROBLEM): New.

	Fixed years of copyright in all source files.

	Mon May 1 17:08:14 CEST 2000 Werner Koch <wk@openit.de>

	* trustdb.c (propagate_validity): Fixed the bug that only one uid
	gets fully trusted even when all are signed by an ultimate key.

	Mon May 1 15:38:04 CEST 2000 Werner Koch <wk@openit.de>

	* getkey.c (key_byname): Always returned a defined context. Fixed
	a segv for invalid user id specifications. Reported by Walter Koch.

	* getkey.c (get_user_id): I18ned "no user id" string. By Walter.

	* pkclist.c (do_show_revocation_reason): Typo fixes.
	* helptext.c: Ditto.

	* armor.c (armor_filter): Fixed some CRLF issues. By Mike McEwan.

	Fri Apr 14 19:37:08 CEST 2000 Werner Koch <wk@openit.de>

	* pkclist.c (do_show_revocation_reason): New.
	(show_revocation_reason): New and called at various places.

	* g10.c (main): Fixed small typo.

	* pkclist.c (do_we_trust): Act on always_trust but not for revoked
	keys. Suggested by Chip Salzenberg.

	* g10.c: New option --lock-never.

	* ringedit.c (get_writable_keyblock_file): New.
	* keygen.c (do_generate_keypair): Use this instead of the hardwired one.

	* keygen.c (ask_user_id): Check that the email address is in the
	correct field. Suggested by Christian Kurz.

	Mon Apr 10 13:34:19 CEST 2000 Werner Koch <wk@openit.de>

	* keyedit.c (show_key_with_all_names): s/sbb/ssb/

	Tue Mar 28 14:26:58 CEST 2000 Werner Koch <wk@openit.de>

	* trustdb.c (verify_own_keys): Do not print warning about unprotected
	key when in quiet mode.

	Wed Mar 22 13:50:24 CET 2000 Werner Koch <wk@openit.de>

	* mainproc.c (print_userid): Do UTF8 conversion before printing.
	* import.c (import_one): Ditto.
	(import_secret_one): Ditto.
	(delete_inv_parts): Ditto.

	Thu Mar 16 16:20:23 CET 2000 Werner Koch <wk@openit.de>

	* keylist.c (print_key_data): Handle a NULL pk gracefully.

	* getkey.c (merge_one_pk_and_selfsig): Fixed silly code for
	getting the primary keys keyID but kept using the one from the
	subkey.
	* pubkey-enc.c (get_it): Print a note for expired subkeys.

	* getkey.c (has_expired): New.
	(subkeys_expiretime): New.
	(finish_lookup): Check for expired subkeys needed for encryption.
	(merge_keys_and_selfsig): Fixed expiration date merging for subkeys.

	* keylist.c (list_keyblock): Print expiration time for "sub".
	(list_one): Add missing merging for public keys.
	* mainproc.c (list_node): Ditto.

	2000-03-14 13:49:38 Werner Koch (wk@habibti.openit.de)

	* keygen.c (keyedit_menu): Do not allow to use certain commands
	while the secret key is selected.

	2000-03-09 12:53:09 Werner Koch (wk@habibti.openit.de)

	* keygen.c (ask_expire_interval): Movede parsig to ...
	(parse_expire_string): ... this new function. And some new control
	commands.
	(proc_parameter_file): Add expire date parsing.
	(do_generate_keypair): Allow the use of specified output files.

	2000-03-08 10:38:38 Werner Koch (wk@habibti.openit.de)

	* keygen.c (ask_algo): Removed is_v4 return value and the commented
	code to create Elg keys in a v3 packet. Removed the rounding
	of key sizes here.
	(do_create): Likewise removed arg v4_packet.
	(gen_elg): Likewise removed arg version. Now rounding keysizes here.
	(gen_dsa): Rounding keysize now here.
	(release_parameter_list): New
	(get_parameter*): New.
	(proc_parameter_file): New.
	(read_parameter_file): New.
	(generate_keypair): Splitted. Now uses read_parameter_file when in
	batch mode. Additional argument to specify a parameter file.
	(do_generate_keypair): Main bulk of above fucntion and uses the
	parameter list.
	(do_create): Don't print long notice in batch mode.
	* g10.c (main): Allow batched key generation.

	Thu Mar 2 15:37:46 CET 2000 Werner Koch <wk@gnupg.de>

	* pubkey-enc.c (get_it): Print a note about unknown cipher algos.

	* g10.c (opts): Add a note to the help listing about the man page
	and removed some options from the help listing.

	* keyedit.c (print_and_check_one_sig): Use a new function to truncate
	the output of the user ID. Suggested by Jan-Benedict Glaw.

	Wed Feb 23 10:07:57 CET 2000 Werner Koch <wk@gnupg.de>

	* helptext.c: typo fix.

	Thu Feb 17 13:39:32 CET 2000 Werner Koch <wk@gnupg.de>

	* revoke.c: Removed a bunch of commented code.

	* packet.h (SIGSUBPKT_REVOC_REASON): New.
	* build-packet.c (build_sig_subpkt): Support new sub packet.
	* parse-packet.c (parse_one_sig_subpkt): Ditto.
	(dump_sig_subpkt): Ditto.
	* revoke.c (ask_revocation_reason): New.
	(release_revocation_reason_info): New.
	(revocation_reason_build_cb): New.
	(gen_revoke): Ask for reason.
	* main.h (struct revocation_reason_info): Add declaration.
	* keyedit.c (menu_revsig): Add support for revocation reason.
	(menu_revkey): Ditto.
	(sign_uid_mk_attrib): Renamed to ...
	(sign_mk_attrib): ... this, made static and add support for reasons.

	Tue Feb 15 08:48:13 CET 2000 Werner Koch <wk@gnupg.de>

	* build-packet.c (build_packet): Fixed fixing of old comment packets.

	* import.c (import_keys): Fixed importing from stdin when called with
	nnames set to zero as it normally happens.

	Mon Feb 14 14:30:20 CET 2000 Werner Koch <wk@gnupg.de>

	* sig-check.c (check_key_signature2): Add new arg r_expired.
	(do_signature_check): New arg to pass it down to ...
	(do_check): New arg r-expire which is set when the signature
	has expired.
	* trustdb.c (check_sig_record): Set SIGF_EXPIRED flag and set
	the expiretime to zero so that thi signature will not be checked
	anymore.

	Fri Feb 11 17:44:40 CET 2000 Werner Koch <wk@gnupg.de>

	* g10.c (g10_exit): Update the random seed_file.
	(main): Set the random seed file. New option --no-random-seed-file.

	Thu Feb 10 17:39:44 CET 2000 Werner Koch <wk@gnupg.de>

	* keyedit.c (menu_expire): Fixed segv due to unitialized sub_pk.
	By Rémi.

	Thu Feb 10 11:39:41 CET 2000 Werner Koch <wk@gnupg.de>

	* keylist.c (list_keyblock): Don't print warnings in the middle of
	regulat output lines. By Rémi.

	* sig-check.c: Include options.h

	Wed Feb 9 15:33:44 CET 2000 Werner Koch <wk@gnupg.de>

	* gpg.c: New option --ignore-time-conflict
	* sig-check.c (do_check): Implemented this option.
	* trustdb.c (check_trust): Ditto.
	* sign.c (do_sign): Ditto.
	* keygen.c (generate_subkeypair): Ditto.

	* encode.c (encode_simple): use iobuf_cancel after open failure.
	Reported by Huy Le.

	Fri Jan 14 18:32:01 CET 2000 Werner Koch <wk@gnupg.de>

	* packet.h (STRING2KEY): Changed mode from byte to int.
	* parse-packet.c (parse_key): Add the special GNU protection stuff
	* build-packet.c (so_secret_key): Ditto.
	* seckey-cert.c (do_check): Ditto.
	* keyedit.c (change_passphrase): Ditto.
	* export.c (export_secsubkeys): New.
	(do_export_stream): Hack to export the primary key using mode 1001.
	* g10.c: New command --export-secret-subkeys

	Thu Jan 13 19:31:58 CET 2000 Werner Koch <wk@gnupg.de>

	* armor.c (is_armored): Check for 1-pass-sig packets. Reported by
	David Hallinan <hallinan@rtd.com>.
	(armor_filter): Replaced one LF by the LF macro. Reported by
	Wolfgang Redtenbacher.

	Wed Jan 5 11:51:17 CET 2000 Werner Koch <wk@gnupg.de>

	* g10.c (main): Reset new global flag opt.pgp2_workarounds
	when --openpgp is used.
	* mainproc.c (proc_plaintext): Do the PGP2,5 workarounds only
	when the global flag is set.
	(proc_tree): Ditto.
	* textfilter.c (copy_clearsig_text): Ditto.
	* armor.c (armor_filter): Ditto.

	* g10.c: New option --list-only
	* mainproc.c (proc_tree): Don't do it if opt.list_only is active.
	(proc_pubkey_enc): Implement option.

	* status.h, status.c ({BEGIN,END}_{EN,DE}CRYPTION): New.
	* cipher.c (cipher_filter): New status outputs.
	* mainproc.c (proc_encrypted): New status outputs.

	Fri Dec 31 14:08:15 CET 1999 Werner Koch <wk@gnupg.de>

	* armor.c (armor_filter): Made the "Comment:" header translatable.

	* hkp.c (hkp_import): Make sure that the program does not return
	success when there is a connection problem. Reported by Phillip Jones.

	Sun Dec 19 15:22:26 CET 1999 Werner Koch <wk@gnupg.de>

	* armor.c (LF): Use this new macro at all places where a line LF
	is needed. This way DOSish textfiles should be created when the
	input data is also in dos mode.
	* sign.c (LF): Ditto.
	* textfilter.c (LF): Ditto.
	(copy_clearsig_text): Disabled the forcing of CR,LF sequences
	for DOS systems.

	* plaintext.c (handle_plaintext): Fixes for line endings on DOS.
	and react on a LF in cleartext.
	* armor.c (fake_packet): Restore the original line ending after
	removing trailing spaces.

	* signal.c (got_fatal_signal): DOS fix.

	Thu Dec 16 10:07:58 CET 1999 Werner Koch <wk@gnupg.de>

	* mainproc.c (print_failed_pkenc): Fix for unknown algorithm.
	Found by fygrave@epr0.org.

	Thu Dec 9 10:31:05 CET 1999 Werner Koch <wk@gnupg.de>

	* hkp.c: i18n the strings.

	Sat Dec 4 15:32:20 CET 1999 Werner Koch <wk@gnupg.de>

	* trustdb.c (verify_key): Shortcut for ultimately trusted keys.

	Sat Dec 4 12:30:28 CET 1999 Werner Koch <wk@gnupg.de>

	* pkclist.c (build_pk_list): Validate the trust using the namehash
	if this one has been set by the key lookup.

	* g10.c: Add --delete-secret-key to the help page.

	* openfile.c (copy_options_file): Made static.
	(try_make_homedir): New.
	* ringedit.c (add_keyblock_resource): Use the try_make_hoemdir logic.
	* tdbio.c (tdbio_set_dbname): Likewise.

	* keygen.c (generate_user_id): Use m_alloc_clear() here. We should
	better use an allocation function specific to the user_id packet.

	* keygen.c (keygen_add_std_prefs): Changed symmetric preferences
	to include Blowfish again. This is due to it's better speed compared
	to CAST5.

	* g10.c (strusage): Print the home directory.

	* armor.c (armor_filter): Take action on the cancel control msg.
	* filter.h (armor_filter_context_t): Add cancel flag.

	Mon Nov 29 21:52:11 CET 1999 Werner Koch <wk@gnupg.de>

	* g10.c: New option --fast-list-mode ..
	* keylist.c (list_keyblock): .. and implemented.
	* mainproc.c (list_node): Ditto.

	* import.c (mark_non_selfsigned_uids_valid): Fixed the case that there
	is a uid without any packet following.

	Mon Nov 22 11:14:53 CET 1999 Werner Koch <wk@gnupg.de>

	* mainproc.c (proc_plaintext): Never enable the hash processing
	when skip_verify is active.

	* armor.c (parse_header_line): Stop parsing on a WS line too.
	Suggested by Aric Cyr.

	* tdbdump.c (HEXTOBIN): Changed the name of the argument, so that
	traditional cpp don't mess up the macros. Suggested by Jos Backus.

	* mainproc.c (list_node): Print the PK algo in the --with-colon mode.
	* keylist.c (list_keyblock): Ditto.

	* signal.c (got_fatal_signal): Found the reason why exit(8) did not
	work - it is better to set the disposition back to default before
	raising the signal. Print the notice on stderr always.

	Fri Nov 12 20:33:19 CET 1999 Werner Koch <wk@gnupg.de>

	* g10.c (make_username): Swapped the logic.
	* keylist.c (public_key_list): Now takes a STRLIST as arg and moved
	the creation ot this list to the caller, so that he can copy with
	UTF-conversion of user IDs. Changed all callers.
	(secret_key_list): Likewise.

	* getkey.c (get_user_id_string_native): New and ...
	* encode.c (write_pubkey_enc_from_list): ... use it here.

	* pubring.asc: Updated.

	* packet.h (PKT_PHOTO_ID): New.
	* parse-packet.c (parse_photo_id): New.
	* build-packet.c (do_user_id: Handle photo IDs.
	(build_packet): Change CTB for photo IDs
	* free-packet.c (free_user_id): Release memory used for photo IDs
	* sig-check.c (hash_uid_node): Handle photo IDs too.
	* trustdb.c (print_uid_from_keyblock): Hash photo ID.
	(make_uid_records): Ditto.
	* getkey.c (find_by_name): Ditto.
	* keyedit.c (show_prefs): Ditto.
	* keylist.c (list_keyblock): Ditto.

	Thu Oct 28 16:08:20 CEST 1999 Werner Koch <wk@gnupg.de>

	* keygen.c (ask_expire_interval): Print a warning for systems
	with a signed 32 time_t if the exiration time is beyoind 2038.

	Fri Oct 8 20:40:50 CEST 1999 Werner Koch <wk@gnupg.de>

	* ringedit.c (enum_keyblocks): The last fix way really stupid;
	reverted and set rt to Unknown.

	Fri Oct 8 20:32:01 CEST 1999 Werner Koch <wk@gnupg.de>

	* ringedit.c (enum_keyblocks): Zero the entire kbpos out on open.

	* g10.c (oEntropyDLL): Removed option.
	(main): Made the warning on development versions more verbose.

	* g10.c (oHonorHttpProxy): New option.
	* hkp.c (hkp_ask_import,hkp_export): Implement this option.
	* options.skel: Enable this option for new installations

	Mon Oct 4 21:23:04 CEST 1999 Werner Koch <wk@gnupg.de>

	* import.c (import_keys): Changed calling interface, adjusted caller.
	(import): Moved printing of stats out ...
	(print_stats): New. ... to here.
	(import_keys_stream): Call stats print here.
	(import_keys): Print stats as totals for all files.

	* tdbio.h (DIRF_NEWKEYS): New
	* tdbio.c (tdbio_dump_record): Print the new flag.
	* trustdb.c (check_trust_record): New arg sigs_only. Adapted all
	callers.
	(do_update_trust_record): Removed recheck arg and add a new sigs_only
	do we can later improve on the performance. Changed all callers too.
	(check_trustdb): Evalutate the new flag and add a status output.
	Do a check when the dir record has not been checked.
	(build_cert_tree): Evaluate the new flag.
	(check_trust): Ditto. Do a trust_record check, when the dir record
	is not marked as checked.
	(mark_fresh_keys): New.
	(clear_lid_table): New.
	(sync_trustdb): New.
	* import.c (import_keys): Call sync_trustdb() after processing.
	(import_keys_stream): Ditto.
	* tdbdump.c (import_ownertrust): Ditto.

	* import.c (import_revoke_cert): Notify the trust DB.
	(do_update_trust_record): Use \|= to set the REVOKED bit and not &=;
	shame on me for this bad copy+paste introduced bug.
	(do_we_trust): Add trustmask to allow revoked key override to work.
	Chnaged are to allow return of a mofified trustlevel. Adapted the
	one caller.

	* g10.c: New options --emulate-3des-s2k-bug
	* passphrase.c (hash_passphrase): Implemented above.

	* mainproc.c (proc_tree): Check for standalone signatures.
	(do_check_sig): Print a notice for a standalone revocation
	(check_sig_and_print): Do not print an error for unchecked standalone
	revocations.

	Tue Sep 28 20:54:37 CEST 1999 Werner Koch <wk@gnupg.de>

	* encode.c (encode_simple): Use new CTB when we don't have the
	length of the file. This is somewhat strange as the comment above
	indicates that this part is actually fixed for PGP 5 - maybe I simply
	lost the source line, tsss.

	* armor.c (armor_filter): Set a flag if no OpenPGP data has been found.
	* verify.c (verify_signatures): Add an error helptext.

	Thu Sep 23 19:24:30 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* openfile.c (open_outfile): Fixed the 8dot3 handling.

	* passphrase.c (passphrase_to_dek): Print uid using utf8 func.
	* delkey.c (delete_key): Ditto.
	* pkclist.c (show_paths,do_edit_ownertrust,do_we_trust): Ditto
	(do_we_trust_pre): Ditto.
	* trustdb.c (print_user_id,check_uidsigs): Ditto.
	* revoke.c (gen_revoke,ask_revoke_sig): Ditto.

	Thu Sep 23 09:52:58 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* verify.c (print_file_status): New.
	(verify_one_file): Moved status print to th new fnc. Add error status.
	* status.c, status.h (STATUS_FILE_ERROR): New

	Wed Sep 22 10:14:17 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* openfile.c (make_outfile_name): Use case-insenstive compare for
	DOS systems. Add ".pgp" to the list of know extensions.
	(open_outfile): For DOS systems try to replace the suffiy instead of
	appending it.

	* status.c, status.h: Add STATUS_FILE_{START,DONE}.
	* verify.c (verify_one_file): Emit these new stati.

	* sign.c (clearsign_file): Avoid duplicated Entries in the "Hash:"
	line. Those headers are now only _not_ printed when there are
	only old-style keys _and_ all hashs are MD5.

	Mon Sep 20 12:24:41 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>


	* verify.c (verify_files, ferify_one_file): New.
	* g10.c: New command --verify-files

	Fri Sep 17 12:56:42 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c: Add UK spelling as alias for armor options ;-)

	* import.c (append_uid): Fixed a SEGV when there is no selfsig and
	no subkey.
	(merge_sigs): Ditto. Removed the assertion.

	Wed Sep 15 16:22:17 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c: New option --entropy-dll-name

	Mon Sep 13 10:51:29 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* signal.c (got_fatal_signal): Print message using write(2) and
	only for development versions.

	Mon Sep 6 19:59:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* tdbio.c (tdbio_set_dbname): Use mkdir macro
	* ringedit.c (add_keyblock_resource): Ditto.

	Fri Sep 3 10:04:45 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (build_pk_list): Skip keys set with --encrypt-to also
	when asking for a key.

	* plaintext.c (handle_plaintext): Make sure that we don't read a
	second EOF in the read loop for partial length packets.

	* mainproc.c (check_sig_and_print): print user ID as utf-8.

	Thu Sep 2 16:40:55 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* import.c (merge_blocks): First add new subkeys, then merge subkey
	certificates.
	(merge_sigs): Don't merge subkey signatures here.

	Wed Sep 1 15:30:44 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* keygen.c (ask_expire_interval): Fixed bug related to cpr_xx (tnx
	Francis J. Lacoste).

	Tue Aug 31 17:20:44 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* plaintext.c (do_hash): Hash CR,LF for a single CR.
	(ask_for_detached_datafile): Changed arguments to be closer to
	those of hash_datafiles and cleanup the code a bit.
	* mainproc.c (proc_tree): Workaround for pgp5 textmode detached
	signatures. Changed behavior of asking for data file to be the same
	as with provided data files.

	* keylist.c (list_keyblock): Use UTF8 print functions.

	Mon Aug 30 20:38:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* import.c (chk_self_sigs): some s/log_error/log_info/ so that gpg
	does not return an error if a key has some invalid packets.

	* helptext.c: Fixed some typos and changed the way the
	translation works. The english text is now the keyword for gettext
	and not anymore the keyword supplied to the function. Done after
	some discussion with Walter who thinks this is much easier for the
	translators.

	* misc.c (disable_core_dumps): Don't do it for DOSish systems.

	* signal.c (signal_name): Bounds check on signum.

	Wed Aug 4 10:34:18 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pubring.asc: Updated.

	* pkclist.c (do_we_trust_pre,check_signatures_trust): Do not print
	the warning about --always_trust when --quiet is used.

	* pkclist.c (fpr_info): New and called at several places.

	* parse-packet.c (dump_sig_subpkt): List revocation key contents.

	Mon Jul 26 09:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (build_pk_list): Fixed typo in format string.

	* trustdb.c (create_shadow_dir): Don't translate the error string.

	* g10.c (main): Fixed spelling of user-id.
	* getkey.c (find_by_name_pk,find_by_name_sk,
	find_by_keyid,find_by_keyid_sk): Ditto and translate it.
	* import.c (mark_non_selfsigned_uids_valid,delete_inv_parts): Ditto.


	Mon Jul 26 01:01:39 CEST 1999 Michael Roth <mroth@nessie.de>

	* g10.c, options.h: New options --no-literal and --set-filesize

	* encode.c (encode_simple, encode_crypt): Support for the options
	--no-literal and --set-filesize.

	* sign.c (sign_file): ditto.

	Fri Jul 23 13:53:03 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>


	* ringedit.c (enum_keyblocks): Removed annoying error message in cases
	when we have no keyring at all to enum.

	* getkey.c (classify_user_id): Rewrote to relax the recognition of
	keyIDs and fingerprints (Michael).

	* mainproc.c (check_sig_and_print): Print status NO_PUBKEY.
	(print_failed_pkenc): Print status NO_SECKEY.

	* import.c (mark_non_selfsigned_uids_valid): New.
	* g10.c: New option --allow-non-selfsigned-uid.

	* pkclist.c (print_fpr): New.
	(do_we_trust_pre): Print the fpr before asking whether to use the key
	anyway.
	(do_edit_ownertrust): Likewise.

	Thu Jul 22 20:03:03 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>


	* ringedit.c (enum_keyblocks): Removed annoying error message in cases
	when we have no keyring at all to enum.

	* getkey.c (classify_user_id): Rewrote to relax the recognition of
	keyIDs and fingerprints (Michael).

	* mainproc.c (check_sig_and_print): Print status NO_PUBKEY.
	(print_failed_pkenc): Print status NO_SECKEY.

	* import.c (mark_non_selfsigned_uids_valid): New.
	* g10.c: New option --allow-non-selfsigned-uid.

	Thu Jul 15 10:15:35 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c: New options --disable-{cipher,pubkey}-algo.

	Wed Jul 14 19:42:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* status.h (STATUS_IMPORTED): New.
	* import.c (import): Print some status information (Holger Schurig).

	* g10.c (main): Make --no-greeting work again. Add a warning when
	--force-mds is used.

	Tue Jul 13 17:39:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (do_edit_ownertrust): Changed the way help works.
	(build_pk_list): Implemented default recipient stuff.
	* g10.c: New options --default-recipient[-self]
	(main): Suppress greeting in most cases, entering a passphrase or
	a missing value is not considered to be interactive use.
	Merged --print-md and --print-mds; the latter is now obsolete.
	Changed the way --gen-random works and documented it.
	Changed the way --gen-prime works and add a man entry.
	* g10.c (MAINTAINER_OPTIONS): Removed.

	Mon Jul 12 18:45:57 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* keyedit.c (keyedit_menu): Add arg sign_mode and changed callers
	* g10.c (main): New command --lsign-key.

	Mon Jul 12 14:55:34 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* mainproc.c (kidlist_item): New.
	(release_list): Release failed pk-enc-list.
	(print_failed_pkenc): New
	(proc_encrypted): Print info about failed PK enc.

	* openfile.c (make_outfile_name): s/error/info/

	* passphrase.c (passphrase_to_dek): Return an empty passphrase when
	in batch mode and don't make the warning message fatal
	* seckey-cert.c (check_secret_key): Try only once when in batch mode.

	* g10.c (make_username): New.

	Thu Jul 8 16:21:27 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>


	* packet.h (PKT_ring_trust): New
	* parse-packet.c (parse_trust): Store trust value
	* build-packet (build_packet): Ignore ring trust packets.
	* mainproc.c (add_ring_trust): New.
	(list_node): Print "rtv" records.
	* g10.c: New option --with-fingerprint.

	* trustdb.c (verify_own_keys): Don't insert if we are dry running
	(check_trust): Ditto.

	Wed Jul 7 13:08:40 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* Makefile.am: Support for libtool.

	* keygen.c (ask_expire_interval): Hack to allow for an expire date.

	* trustdb.c (do_update_trust_record,update_trust_record): Splitted.
	(check_trust_record): New.
	(check_trust,build_cert_tree): Check the dir record as needed.
	(upd_pref_record): Removed.
	(make_pref_record): New.
	(propagate_validity): Stop as soon as we have enough validity.

	* tbdio.c (MAX_CACHE_ENTRIES_HARD): Increased the limit.


	Fri Jul 2 11:45:54 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c (g10_exit): Dump random stats.

	* sig-check.c (check_key_signature,check_key_signature2): Enhanced
	version and wrapper for old function.
	(do_signature_check,signature_check): Ditto.

	Thu Jul 1 12:47:31 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>


	* keyedit.c (show_key_with_all_names): Print a notice for disabled keys.
	(enable_disable_keys): Add functionality
	* pkclist.c (edit_ownertrust): preserve disabled state.
	(build_pk_list): Skip disabled keys.
	* trustdb.c (upd_one_ownertrust): Ditto.
	(build_cert_tree): Mask the ownertrust.
	(trust_letter): Mask the value.
	(do_check): Take disabled flag into account.

	* passphrase.c (passphrase_to_dek): Add a pubkey_algo arg and changed
	all callers.

	* g10.c (utf8_strings): 2 new options.

	* trustdb.c (insert_trust_record_by_pk): New, replaces the next one.
	(insert_trust_record): Now takes a keyblock as arg. Changed all
	callers to use the appropritae function.

	* openfile.c (ask_outfile_name): New.
	* plaintext.c (handle_plaintext): Ask for filename if there is
	no valid syntax. Don't use fname varbatim but filter it.

	Tue Jun 29 21:44:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>


	* trustdb.h (TRUST_FLAG_DISABLED): New.

	* status.c (USE_CAPABILITIES): Capabilities support (Remi).

	* tdbio.c : Added new fields to the DIR record.
	(tdbio_write_record): Fixed the update of the hash tables.
	(tdbio_delete_record): Drop the record from the hash tables.
	(drop_from_hashtbl): New.

	* status.c (cpr_get): Special online help mode.
	* helptext.c ("keyedit.cmd"): Removed.
	* keyedit.c (keyedit_menu): Use only help system.
	(enable_disable_key): New bit doies not yet work.

	Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>


	* dearmor.c (enarmor_file): Fixed comment string.
	* tdbdump.c (export_ownertrust): Text fix.
	* tbio.c (tdbio_invalid): Ditto.

	* parse-packet.c (parse_key): Made temp buffer larger.

	* Makefile.am (install-data-local): Add missing backslashes

	Tue Jun 15 12:21:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c (main): Made iterated+salted the default S2K method.

	* Makefile.am (install-data-local): Use DESTDIR.

	* passphrase.c (passphrase_to_dek): Emit missing-passphrase while in
	batchmode.

	* parse-packet.c (parse_pubkeyenc): Fixed a SEGV.

	Mon Jun 14 21:18:54 CEST 1999 Michael Roth <mroth@nessie.de>

	* g10.c: New options --openpgp, --no-tty, --emit-version,
	--default-comment and --lock-multiple

	Thu Jun 10 14:18:23 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* free-packet.c (free_encrypted): Fixed EOF case (Remi).
	(free_plaintext): Ditto.

	* helptext.c (keyedit.delsig.unknown): New (Remi).
	* keyedit.c (print_and_check_one_sig): Add arg print_without_key and
	changed all callers to make use of it (Remi):

	Tue Jun 8 13:36:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* keylist.c (print_key_data): New and called elsewhere.
	* g10.c: New option --with-key-data

	Wed Jun 2 14:17:19 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* mainproc.c (proc_tree): Yet another bad hack to cope with
	broken pgp2 created detached messages in textmode.

	Tue Jun 1 16:01:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* openfile.c (make_outfile_name): New.
	* plaintext.c (handle_plaintext): Outputfile is now the inputfile
	without the suffix.
	* g10.c: New option --use-embedded-filename

	Mon May 31 19:41:10 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c (main): Fix for SHM init (Michael).

	* compress.c, encr-data.c, mdfilter.c,
	plaintext.c, free-packet.c: Speed patches (Rémi).

	Thu May 27 09:40:55 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* status.c (cpr_get_answer_yes_no_quit): New.
	* keyedit.c (menu_delsig): New.
	(check_all_keysigs): Splitted.
	(print_and_check_one_sig): New.

	Wed May 26 14:36:29 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* build-packet.c (build_sig_subpkt): Support large packets.
	* parse-packet.c (enum_sig_subpkt): Replaces parse_sig_subpkt.
	* mainproc.c (print_notation_data): Print all notation packets.
	* g10.c (add_notation_data): Add a way to specify the critical flag.
	(main): Add option --set-policy-url.
	(check_policy_url): Basic checks.
	* sign.c (mk_notation_and_policy): Replaces mk_notation.

	* parse-packet.c (can_handle_critical): Moved decision whether we can
	handle critical subpacket to an extra function.

	Tue May 25 19:50:32 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* sign.c (sign_file): Always use compression algo 1 for signed
	onyl file becuase we can´ be sure the the verifier supports other
	algorithms.

	* build-packet.c (build_sig_subpkt): Support for notation data.
	* sign.c (sign_file,clearsign_file,make_keysig_packet): Ditto.
	(mk_notation): New.
	* g10.c (add_notation_data): New and add option -N
	* mainproc.c (print_notation_data): New.
	(check_sig_and_print): Print any notation data of the signed text.

	Sun May 23 14:20:22 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (check_signatures_trust): Print a warning and return
	immediateley if opt.always_trust is true.

	* g10.c (main): Corrected handling of no-default-keyring

	* pkclist.c (algo_available): Disable Twofish until we have settled
	how to do the MDC.

	* hkp.c: Disable everything for mingw32

	Sat May 22 22:47:26 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* mainproc.c (check_sig_and_print): Add sig creation time to the
	VALIDSIG status output. Add more info to the ERRSIG output.
	* sig-check.c (signature_check): Add sig time after epoch to SIG_ID.

	* import.c (import_one): Merge duplicate user IDs.
	(collapse_uids): New.
	* kbnode.c (move_kbnode): New.
	(remove_kbnode): New.
	* keyedit.c (keyedit_menu): Call collapse_uids.

	* g10.c: new option --logger-fd.

	* import.c: s/log__f/log_/

	Thu May 20 14:04:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* misc.c (pull_in_libs): do the volatile only for gcc

	* sig-check (signature_check): Emit SIG_iD only for classes 0 and 1.

	* armor.c (armor_filter): Add detection of PGP2 created clearsigs.
	(fake_packet): A tab is not a WS for pgp2 - handle this.
	* textfilter.c (len_without_trailing_chars): New.
	(copy_clearsig_text): Add pgp2mode arg.
	* sign.c (clearsign_file): pass old_style to the above fnc.


	Wed May 19 16:04:30 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c: New option --interactive.

	* mainproc.c (proc_plaintext): Add workaround for pgp2 bug
	(do_check_sig): Ditto.
	(proc_tree): Ditto.
	* plaintext.c (do_hash): Ditto.
	(hash_datafiles): Ditto, add an arg, changed all callers.
	* mdfilter.c (md_filter): Add support for the alternate hash context.

	Mon May 17 21:54:43 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* parse-packet.c (parse_encrypted): Support for PKT_ENCRYPTED_MDC.
	* build-packet.c (do_encrypted_mdc): Ditto.
	* cipher.c (write_header): Add mdc hashing.
	(cipher_filter): write out the hash.
	* mainproc.c (do_proc_packets): Add PKT_ENCRYPTED_MDC.
	* encr-data.c (decrypt_data): Add mdc hashing.
	(mdc_decode_filter): New.

	* parse-packet.c (parse_sig_subpkt): Fixed stupid bug for subpkt
	length calculation
	(parse_signature): Fixed even more stupid bug.

	Sat May 8 19:28:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* build-packet.c (do_signature): Removed MDC hack.
	* encode.c (encode_crypt_mdc): Removed.
	* mainproc.c (do_check_sig): Removed MDC hack.
	(check_sig_and_print): Ditto.
	* parse-packet.c (parse_signature): Ditto.
	* sig-check.c (mdc_kludge_check): Ditto.
	* free-packte.c (copy_signature, free_seckey_enc): Ditto.

	* parse-packet.c (parse_signature,parse_key): Store data of
	unknown algorithms with mpi_set_opaque inseatd of the old
	faked data stuff.
	(read_rest): Removed.
	(read_rest2): Renamed to read_rest
	* build-packet.c (write_fake_data): Use mpi_get_opaque.
	* free-packet.c (cp_fake_data): Removed and cahnged all callers
	to use mpi_copy.
	(free_pubkey_enc,free_seckey_enc,release_public_key_parts,
	release_secret_key_parts): Use mpi_free for opaque data.

	Thu May 6 14:18:17 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* trustdb.c (check_trust): Check for revoked subkeys.
	* pkclist.c (do_we_trust): Handled revoked subkeys.
	(do_we_trust_pre): Ditto.
	(check_signatures_trust): Ditto.

	* build-packet.c (hash_public_key): Fix for ancient g10 keys.

	* mainproc.c (do_proc_packets): Return EOF if no data has been read.
	* g10.c (main): Catch errors for default operation.

	Thu Apr 29 12:29:22 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* sign.c (sign_file): Fixed hashing in case of no subpackets.
	(clearsign_file): Ditto.
	(make_keysig_packet): Ditto.

	Wed Apr 28 13:03:03 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* keyedit.c (keyedit_menu): Add new command revkey.
	* (menu_revkey): New.


	Mon Apr 26 17:48:15 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* parse-packet.c (parse_signature): Add the MDC hack.
	* build-packet.c (do_signature): Ditto.
	* free-packet.c (free_seckey_enc,copy_signature,cmp_signatures): Ditto.
	* mainproc.c (do_check_sig): Ditto.
	* sig-check.c (mdc_kludge_check): New.
	* encode.c (encrypt_mdc_file): New.

	* keyedit.c (check_all_keysigs): List revocations.
	* (menu_revsig): New.
	* sign (make_keysig_packet): Support for class 0x30.

	Sun Apr 18 20:48:15 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (select_algo_from_prefs): Fixed the case that one key
	has no preferences (Remi Guyomarch).

	keylist.c (list_keyblock): ulti_hack to propagate trust to all uids.

	Sun Apr 18 10:11:28 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* seckey-cert.c (do_check): Use real IV instead of a 0 one, so that
	it works even if the length of the IV doesn't match the blocksize.
	Removed the save_iv stuff.
	(protect_secret_key): Likewise. Create the IV here.
	* packet.h (PKT_secret_key): Increased size of IV field and add a
	ivlen field.
	* parse-packet.c (parse_key): Use the len protect.ivlen.
	* build-packet.c (do_secret_key). Ditto.

	* getkey.c (key_byname): Close keyblocks.

	* Makefile.am (gpgm): Removed this
	* g10.c: Merged gpg and gpgm

	* import.c (import): Utilize option quiet.
	* tdbio.c (tdbio_set_dbname): Ditto.
	* ringedit.c (add_keyblock_resource,keyring_copy): Ditto.

	* keyedit.c (sign_uids): Add some batch support.

	* g10.c (main): add call to tty_batchmode.

	Fri Apr 9 12:26:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* status.c (write_status_text): Some more status codes.
	* passphrase_to_dek (passphrase_to_dek): add a status code.
	* seckey_cert.c (check_secret_key): Likewise.

	* encr-data.c (decrypt_data): Reverse the last changes
	* cipher.c (write_header): Ditto.

	* parse-packet.c (parse_key): Dropped kludge for ancient blowfish mode.

	Thu Apr 8 09:35:53 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* mainproc.c (proc_encrypted): Add a new status output
	* passphrase.c (passphrase_to_dek): Ditto.
	* status.h status.c: Add new status tokens.

	Wed Apr 7 20:51:39 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* encr-data.c (decrypt_data): Fixes for 128 bit blocksize
	* cipher.c (write_header): Ditto.
	* seckey-cert.c (do_check): Ditto.
	(protect_secret_key). Ditto.
	* misc.c (print_cipher_algo_note): Twofish is now a standard algo.

	* keygen.c (do_create): Fixed spelling (Gaël Quéri)
	(ask_keysize): Only allow keysizes up to 4096

	* ringedit.c (add_keyblock_resource): chmod newly created secrings.

	* import.c (delete_inv_parts): Fixed accidently deleted subkeys.

	Tue Apr 6 19:58:12 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

	* armor.c: Removed duped include (John Bley)
	* mainproc.c: Ditto.

	* build-packet.c (hash_public_key): Fixed hashing of the header.

	* import.c (delete_inv_parts): Allow import of own non-exportable sigs.

	Sat Mar 20 13:59:47 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* armor.c (fake_packet): Fix for not not-dash-escaped

	Sat Mar 20 11:44:21 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c (main): Added command --recv-keys
	* hkp.c (hkp_import): New.

	Wed Mar 17 13:09:03 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* trustdb.c (check_trust): add new arg add_fnc and changed all callers.
	(do_check): Ditto.
	(verify_key): Ditto.
	(propagate_validity): Use the new add_fnc arg.
	(print_user_id): Add the FILE arg.
	(propagate_ownertrust): New.
	* pkclist.c (add_ownertrust_cb): New and changed the add_ownertrust
	logic.

	* getkey.c (get_keyblock_bylid): New.
	* trustdb.c (print_uid_from_keyblock): New.
	(dump_tn_tree_with_colons): New.
	(list_trust_path): Add colon print mode.

	* trustdb.c (insert_trust_record): Always use the primary key.

	* encode.c (encode_simple): Added text_mode filter (Rémi Guyomarch)
	(encode_crypt): Ditto.

	* mainproc.c (proc_pubkey_enc): Added status ENC_TO.
	* armor.c (armor_filter): Added status NODATA.
	* passphrase.c (passphrase_to_dek): Always print NEED_PASSPHRASE
	* seckey_cert.c (check_secret_key): Added BAD_PASS status.

	* g10.c (main): Set g10_opt_homedir.

	Sun Mar 14 19:34:36 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* keygen.c (do_create): Changed wording of the note (Hugh Daniel)

	Thu Mar 11 16:39:46 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* tdbdump.c: New

	* trustdb.c (walk_sigrecs,do_list_sigs,list_sigs,
	list_records,list_trustdb,export_ownertrust,import_ownertrust): Moved
	to tdbdump.c
	(init_trustdb): renamed to setup_trustdb. Changed all callers.
	(do_init_trustdb): renamed to init_trustdb().
	* trustdb.c (die_invalid_db): replaced by tdbio_invalid.
	* tdbio.c (tdbio_invalid): New.

	* import.c (delete_inv_parts): Skip non exportable signatures.
	* keyedit.c (sign_uid_mk_attrib): New.
	(sign_uids): Add the local argument.
	(keyedit_menu): New "lsign" command.
	* trustdb.c (register_trusted_key): Removed this and all related stuff.
	* g10.c (oTrustedKey): Removed option.

	* tdbio.h (dir.valcheck): New trustdb field.
	* tdbio.c: Add support for this field
	(tdbio_read_modify_stamp): New.
	(tdbio_write_modify_stamp): New.
	* trustdb.c (do_check): Check against this field. Removed cache update.
	(verify_key): Add cache update.
	(upd_uid_record): Some functional changes.
	(upd_cert_record): Ditto

	Wed Mar 10 11:26:18 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* keylist.c (list_keyblock): Fixed segv in uid. Print 'u' as
	validity of sks.

	Mon Mar 8 20:47:17 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* getkey.c (classify_user_id): Add new mode 12 (#<lid>).

	* seckey-cert.c (check_secret_key): replaced error by info.

	* trustdb.c (query_trust_info): Add another arg, changed all callers.
	(check_trust): Ditto.
	(do_check): Ditto.
	(verify_key): Handle namehash.
	* keylist.c (list_keyblock): print trust info for user ids.

	* sig-check.c (signature_check): Add sig-created to status output.

	Tue Mar 2 16:44:57 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* textfilter.c (copy_clearsig_text): New.
	(clearsign): Removed.
	* sign.c (clearsign_file): does not use textfiler anymore.

	* keygen.c (ask_user_id): print a note about the used charset.

	Tue Mar 2 10:38:42 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* sig-check.c (signature_check): sig-id now works for all algos.

	* armor.c (armor_filter): Fixed armor bypassing.

	Sun Feb 28 19:11:00 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* keygen.c (ask_user_id): Don't change the case of email addresses.
	(has_invalid_email_chars): Adjusted.

	* keylist.c (list_one): Really list serect keys (Remi Guyomarch)

	* keyedit.c (menu_select_uid): Add some braces to make egcs happy.
	(menu_select_key): Ditto.

	* mainproc.c (do_proc_packets): List sym-enc packets (Remi Guyomarch)

	Fri Feb 26 17:55:41 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (build_pk_list): Return error if there are no recipients.

	* sig-check.c (signature_check): New signature id feature.
	* armor.c (make_radic64_string): New.

	* mainproc.c (proc_pubkey_enc): early check for seckey availability.

	* pkclist.c (do_we_trust_pre): print user id before asking.

	* ringedit.c (add_keyblock_resource,get_keyblock_handle): Cleaner
	handling of default resource.


	Thu Feb 25 18:47:39 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (algo_available): New.
	(select_algo_from_prefs): Check whether algo is available.

	* ringedit.c (keyring_copy): Take care of opt.dry_run.
	(do_gdbm_store): Ditto.
	* openfile.c (open_outfile). Ditto.
	(copy_options_file): Ditto.
	* trustdb.c (update_trustdb): Ditto.
	(clear_trust_checked_flag): Ditto.
	(update_trust_record): Ditto.
	(insert_trust_record): Ditto.

	Wed Feb 24 11:07:27 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* keylist.c (secret_key_list): Now really list the secret key.

	* trustdb.c (do_init_trustdb): New. Init is now deferred.

	Mon Feb 22 20:04:00 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* getkey.c (lookup_sk): Return G10ERR_NO_SECKEY and not x_PUBKEY.

	Fri Feb 19 15:49:15 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (select_algo_from_prefs): retrieve LID if not there.

	* armor.c (fake_packet): Replaced ugly lineending handling.

	* g10.c (oNoEncryptTo): New.
	* pkclist.c (build_pk_list): Implemented this option.

	* g10.c (main): Greeting is now printed to stderr and not to tty.
	Use add_to_strlist() instead of direct coding.

	* import.c (import): Use iobuf_push_filter2.

	* mainproc.c (check_sig_and_print): Print all user ids
	for good signatures.
	* getkey.c (get_pubkeyblock): New.

	* import.c (chk_self_sigs): Fixed SEGV for unbounded class 0x18 keys.
	(delete_inv_parts): Delete special marked packets.

	Tue Feb 16 14:10:02 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c (main): New option --encrypt-to

	* pkclist.c (build_pk_list): Implemented encrypt-to.

	* parse-packet.c (parse_user_id): Removed the hack to work with
	utf-8 strings.

	* g10.c (main): Install lockfile cleanup handler.
	* tdbio.c (cleanup): Removed: this is now handled by dotlock.

	Sat Feb 13 14:13:04 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* tdbio.c (tdbio_set_dbname): Init lockhandle for a new trustdb

	Wed Feb 10 17:15:39 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c (main): check for development version now in configure

	* tdbio.c (tdbio_write_record): Add uid.validity
	(tdbio_read_record) : Ditto.
	(tdbio_dump_record) : Ditto.

	* keygen.c (keygen_add_std_prefs): Replaced Blowfish by Twofish,
	removed MD5 and Tiger.
	* pubkey-enc.c (get_it): Suppress warning about missing Blowfish
	in preferences in certain cases.

	* ringedit.c (lock_rentry,unlock_rentry): New.

	* getkey.c (key_byname): Pass ret_kb down to lookup_xx.

	* armor.c (armor_filter): No output of of empty comment lines.
	Add option --no-version to suppress the output of the version string.

	* getkey.c: Release the getkey context for auto context variables.

	Sun Jan 24 18:16:26 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* getkey.c: Changed the internal design to allow simultaneous
	lookup of multible user ids
	(get_pubkey_bynames): New.
	(get_seckey_bynames): New.
	(get_seckey_next): New.
	(get_seckey_end): New.
	* keylist.c (list_one): Use the new functions.

	* keylist.c (list_keyblock): add a newline for normal listings.

	* g10.c (--recipient): New option name to replace --remote-user


	Wed Jan 20 18:59:49 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* textfilter.c: Mostly rewritten
	* plaintext.c (handle_plaintext): Use now text_filter semantics.

	Tue Jan 19 19:34:58 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* export.c (export_pubkeys_stream): New.
	(do_export_stream): New.
	* g10.c (aSendKeys): New command.
	* hkp.c (hkp_export): New.

	* compress.c (do_uncompress): Hack for algo 1 and 1.1.3

	Sun Jan 17 11:04:33 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* textfilter.c (text_filter): Now uses iobuf_read_line().
	(read_line): Removed.

	* armor.c (trim_trailing_spaces): Removed and replaced
	by trim_trailing_ws from libutil

	Sat Jan 16 12:03:27 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* hkp.c (hkp_ask_import): Use only the short keyid

	Sat Jan 16 09:27:30 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* import.c (import_key_stream): New
	(import): New, moved most of import_keys here.
	* g10.c: New option --keyserver
	* mainproc.c (check_sig_and_print): Hook to import a pubkey.

	* pref.c pref.h : Removed

	* hkp.c hkp.h: New

	Wed Jan 13 14:10:15 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* armor.c (radix64_read): Print an error if a bad armor was detected.

	Wed Jan 13 12:49:36 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* armor.c (radix64_read): Now handles malformed armors produced
	by some buggy MUAs.

	Tue Jan 12 11:17:18 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* ringedit.c (find_keyblock_bysk): New.

	* skc_list.c (is_insecure): New.
	(build_sk_list): usage check for insecure keys.

	* import.c (chk_self_sigs): Add handling for subkeys.
	(delete_inv_parts): Skip unsigned subkeys

	* sig-check.c (do_check): Print info if the signature is older
	than the key.
	* keygen.c (generate_subkeypair): Fail on time warp.
	* sign.c (do_sign): Ditto.

	Sun Jan 10 15:10:02 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* armor.c (fake_packet): Fixed not-dash-escaped bug.

	Sat Jan 9 16:02:23 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* sig-check.c (do_check): Output time diff on error

	* status.c (STATUS_VALIDSIG): New.
	(is_status_enabled): New.
	* mainproc.c (check_sig_and_print): Issue that status message.

	* plaintext.c (special_md_putc): Removed

	* armor.c (armor_filter): print error for truncated lines.

	* free-packet.c (free_encrypted): Revomed call to set_block_mode.
	(free_plaintext): Ditto.

	Thu Jan 7 18:00:58 CET 1999 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (add_ownertrust): Fixed return value.

	* encr-data.c (decrypt_data): Disabled iobuf_set_limit and
	iobuf_pop_filter stuff.
	* compress.c (handle_compressed): Disabled iobuf_pop_filter.

	* packet.h (PKT_secret_key): Add is_primary flag.
	* parse-packet.c (parse_key): Set this flag.
	* passphrase.c (passphrase_to_dek): Kludge to print the primary
	keyid - changed the API: keyid must now hold 2 keyids.
	* getkey.c (get_primary_seckey): New.
	* seckey-cert.c (do_check): pass primary keyid to passphrase query

	* tbdio.c (open_db): removed the atexit
	(tdbio_set_dbname): and moved it to here.

	* armor.c: Rewrote large parts.

	Tue Dec 29 19:55:38 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* revoke.c (gen_revoke): Removed compression.

	* pkclist.c (do_we_trust_pre): special check for revoked keys

	* trustdb.c (update_trust_record): Fixed revoke flag.

	Tue Dec 29 14:41:47 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* misc.c (disable_core_dumps): Check for EINVAL (Atari)

	* getkey (merge_one_pk_and_selfsig): Fixed search of expiredate.
	(merge_keys_and_selfsig): Ditto.

	* free-packet.c (cmp_public_keys): cmp expire only for v3 packets
	(cmp_secret_keys): Ditto.
	(cmp_public_secret_key): Ditto.

	Wed Dec 23 17:12:24 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* armor.c (find_header): Reset not_dashed at every header

	Wed Dec 23 13:18:14 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* pkclist.c (add_ownertrust): Refresh validity values.

	* trustdb.c (enum_cert_paths_print): New arg refresh.

	* ringedit.c: Fixed problems fix keyrings
	* parse-packet.c (dbg_parse_packet): New debug functions.

	* getkey.c (getkey_disable_caches): New.
	* import.c (import_keys): Disable caches.

	Thu Dec 17 18:31:15 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* misc.c (trap_unaligned): Only for glibc 1

	* sign.c (write_dash_escaped): Now escapes "From " lines
	* g10.c: New option --escape-from-lines

	* trustdb.c (sort_tsl_list): New
	(list_trust_path): Now prints sorted list.
	(enum_cert_paths): Likewise.
	(enum_cert_paths_print): New.
	(print_paths): New printing format.
	* pkclist.c (add_ownertrust): New arg quit.
	(edit_ownertrust): New quit selection and does not query
	the recipients ownertrust anymore.
	(add_ownertrust): Print the ceritficate path.


	Mon Dec 14 21:18:49 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* parse-packet.c (parse_signature): Now checks for critical bit
	(parse_sig_subpkt): Splitted.
	(parse_one_sig_subpkt): New.
	* sig-check.c (do_check): handle critical bit.

	Sun Dec 13 14:10:56 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* pcklist.c (select_algo_from_prefs): Preferences should
	now work (lost the != ? )

	Thu Dec 10 20:15:36 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* ringedit.c (gdbm_store): Fix for inserts

	* g10.c (main): New option --export-all
	* export.c (export_pubkeys): New arg.
	(do_export): Now may skip old keys.

	* status.c: Minor patches for Sun's cc

	* keygen.c (ask_algo): Disabled v3 ElGamal choice, rearranged
	the numbers. Add a warning question when a sign+encrypt key
	is selected.

	* g10.c (do_not_use_RSA): Removed.
	* misc.c (print_pubkey_algo_note): New as replacement for the
	do_not_use_RSA() and chnaged all callers.
	(print_cipher_algo_note): New.
	(print_hash_algo_note): New.

	* cipher.c (write_header): Add a call to print_cipher_algo_note.
	* seckey-cert.c (protect_secret_key): Ditto
	* sign.c (do_sign): Add a call to print_digest_algo_note.

	* getkey.c (get_long_user_id_string): New.
	* mainproc.c (check_sig_and_print): Changed the format of the
	status output.

	* encrypt.c (write_pubkey_enc_from_list): print used symmetric cipher.

	* pkclist.c (do_we_trust): Changed a message.

	Wed Dec 9 13:41:06 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* misc.c (trap_unaligned) [ALPHA]: Only if UAC_SIGBUS is defined.

	* sign.c (write_dash_escaped): Add the forgotten patch by Brian Moore.

	* compress.c (do_uncompress): Fixed the inflating bug.


	Tue Dec 8 13:15:16 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* trustdb.c (upd_uid_record): Now uses the newest self-signature
	(insert_trust_record): Now calls update with recheck set to true.
	(register_trusted_key): New.
	(verify_own_keys): Enhanced by list of trusted keys.

	* g10.c (main): Print a warning when a devel version is used.
	(main): New option --trusted-key

	* import.c (merge_blocks): Fixed merging of new user ids and
	added merging of subkeys.
	(append_uid): Ditto.
	(merge_keysig): New.
	(append_key): New.
	* getkey.c (merge_one_pk_and_selfsig): Get the expiration time
	from the newest self-signature.
	(merge_keys_and_selfsig): Ditto.

	* free-packet.c (cmp_secret_key): New.


	Fri Nov 27 21:37:41 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* g10.c: New option --lock-once
	* tdbio.c (open_db): Add an atexit
	(cleanup): New.
	(tdbio_sync): Add locking.
	(tdbio_end_transaction): Ditto.
	(put_record_into_cache): Ditto.
	* ringedit.c (keyring_copy): Ditto.
	(cleanup): New.
	(add_keyblock_resource): Add an atexit.

	Fri Nov 27 15:30:24 CET 1998 Werner Koch <wk@isil.d.shuttle.de>

	* armor.c (find_header): Another fix for clearsigs.

	Fri Nov 27 12:39:29 CET 1998 Werner Koch <wk@isil.d.shuttle.de>


	* status.c (display_help): Removed.
	* helptext.c: New and removed the N_() from all cpr_gets.


	Fri Nov 20 16:54:52 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): New option --not-dash-escaped
	* sign.c (write_dashed_escaped): Ditto.
	* armor.c (find_header): Support for NotDashEscaped header.

	* getkey.c: print "disabled cache.." only if verbose is used.

	Thu Nov 19 07:17:31 1998 Werner Koch <werner.koch@guug.de>

	* parse-packet.c (dump_sig_subpkt): Fixed expire listing
	* getkey.c (merge_keys_and_selfsig): Fixed expire calculation.
	(merge_one_pk_and_selfsig): Ditto.
	* keyedit.c (menu_expire). Ditto.
	* keygen.c (keygen_add_key_expire): Ditto.
	(ask_expire_interval): New and changed all local function to use
	this instead.
	(keygen_add_key_expire): Opaque should now be a public key;
	changed all callers.

	* parse.packet.c (parse): use skip_rest to skip packets.

	* keyedit.c (keyedit_menu): New arg for cmdline cmds.

	Wed Nov 18 20:33:50 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (check_trustdb): Now rechecks all gived userids.
	(collect_paths): Some fixes.
	(upd_pref_records): Skips empty items, evaluate all items.

	* parse-packet.c (dump_sig_subpkt): Better listing of prefs.
	(skip_packet): Now knows about marker packet

	* g10.c: removed cmd "--edit-sig".

	* pubring.asc: Updated.

	Sat Nov 14 14:01:29 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): Changed syntax of --list-trust-path
	* trustdb.c (list_trust_path): Replaced max_depth by
	opt.max_cert_depth

	Fri Nov 13 07:39:58 1998 Werner Koch <werner.koch@guug.de>

	* trustdb.c (collect_paths): Removed a warning message.
	(enum_trust_web): Removed.
	(enum_cert_paths): New.
	* pkclist.c (add_ownertrust): Changed to use enum_cert_paths.
	(edit_ownertrust): Now list ceritficates on request.
	(show_paths): New.

	Wed Nov 11 18:05:44 1998 Werner Koch <werner.koch@guug.de>

	* g10.c (main): New option --max-cert-depth
	* tdbio.h: add new fields to ver and dir record.
	* tdbio.c: read/write/dump of these fields.
	(tdbio_db_matches_options): New.
	* trustdb.c: replaced MAC_CERT_DEPTH by opt.max_cert_depth.
	(do_check): cache validity and changed other functions
	to reset the cached value.

	* keylist.c (list_one): Now lists the ownertrust.
	* mainproc.c (list_node): Ditto.

	Tue Nov 10 10:08:59 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (g10_exit): Now looks at the new g10_errors_seen.
	* mainproc.c (check_sig_and_print): Sets g10_errors_seen.

	* *.c : i18n many more strings.

	* ringedit.c (locate_keyblock_by_keyid): Add HAVE_LIBGDBM
	(locate_keyblock_by_fpr): Ditto.

	* g10.c (main): removed unsused "int errors".
	(main): Add new option --charset.

	* g10.c (main): special message for the unix newbie.

	Mon Nov 9 07:17:42 1998 Werner Koch <werner.koch@guug.de>

	* getkey.c (finish_lookup): Kludge to prefere algo 16.

	* trustdb.c (new_lid_table): Clear cached item.

	* status.c (cpr_get_utf8): New.
	* pkclist.c (build_pk_list): Uses this.

	Sun Nov 8 17:20:39 1998 Werner Koch (wk@isil.d.shuttle.de)

	* mainproc.c (check_sig_and_print): Why did I use strlen()-1
	in the printf? - This truncated the TZ.

	Sat Nov 7 15:57:28 1998 me,,, (wk@tobold)

	* getkey.c (lookup): Changes to support a read_next.
	(get_pubkey): Fixed a memory leak.

	* keylist.c (list_one): Now lists all matching user IDs.

	Tue Nov 3 16:19:21 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keygen.c (ask_user_id): Now converted to UTF-8

	* g10.c (main): Kludge for pgp clearsigs and textmode.

	Fri Oct 30 16:40:39 1998 me,,, (wk@tobold)

	* signal.c (block_all_signals): New.
	(unblock_all_signals): New
	* tdbio.c (tdbio_end_transaction): Now blocks all signals.

	* trustdb.c (new_lid_table): Changed the representation of the
	former local_lid_info stuff.

	* trustdb.c (update_trust_record): Reorganized the whole thing.
	* sig-check.c (check_key_signature): Now handles class 0x28


	Wed Oct 28 18:56:33 1998 me,,, (wk@tobold)

	* export.c (do_export): Takes care of the exportable sig flag.

	Tue Oct 27 14:53:04 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (update_trust_record): New "fast" parameter.

	Sun Oct 25 19:32:05 1998 Werner Koch (wk@isil.d.shuttle.de)

	* openfile.c (copy_options_File): New.
	* ringedit.c (add_keyblock_resource): Creates options file
	* tdbio.c (tdbio_set_dbname): Ditto.

	Sat Oct 24 14:10:53 1998 brian moore <bem@cmc.net>

	* mainproc.c (proc_pubkey_enc): Don't release the DEK
	(do_proc_packets): Ditto.

	Fri Oct 23 06:49:38 1998 me,,, (wk@tobold)

	* keyedit.c (keyedit_menu): Comments are now allowed

	* trustdb.c: Rewrote large parts.


	Thu Oct 22 15:56:45 1998 Michael Roth (mroth@nessie.de)

	* encode.c: (encode_simple): Only the plain filename without
	a given directory is stored in generated packets.
	(encode_crypt): Ditto.

	* sign.c: (sign_file) Ditto.


	Thu Oct 22 10:53:41 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (update_trust_record): Add new optional arg.

	* import.c (import_keys): Add statistics output
	* trustdb.c (update_trustdb): Ditto.
	(insert_trustdb): Ditto.

	* tdbio.c (tdbio_begin_transaction): New.
	(tdbio_end_transaction): New.
	(tdbio_cancel_transaction): New.

	* g10.c (main): New option --quit.

	* trustdb.c (check_hint_sig): No tests for user-id w/o sig.
	This caused an assert while checking the sigs.

	* trustdb.c (upd_sig_record): Splitted into several functions.

	* import.c (import_keys): New arg "fast".
	* g10.c (main): New command --fast-import.

	Wed Oct 21 18:19:36 1998 Michael Roth <mroth@nessie.de>

	* ringedit.c (add_keyblock_resource): Directory is now created.
	* tdbio.c (tdbio_set_dbname): New info message.

	Wed Oct 21 11:52:04 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (update_trustdb): released keyblock in loop.

	* keylist.c (list_block): New.
	(list_all): Changed to use list_block.

	* trustdb.c: Completed support for GDBM

	* sign.c (only_old_style): Changed the way force_v3 is handled
	(sign_file): Ditto.
	(clearsign_file): Ditto.

	* keygen.c (has_invalid_email_chars): Splitted into mailbox and
	host part.

	* keylist.c (list_one): Add a merge_keys_and_selfsig.
	* mainproc.c (proc_tree): Ditto.

	Sun Oct 18 11:49:03 1998 Werner Koch (wk@isil.d.shuttle.de)

	* sign.c (only_old_style): Add option force_v3_sigs
	(sign_file): Fixed a bug in sig->version
	(clearsign_file): Ditto.

	* parse-packet.c (dump_sig_subpkt): New

	* keyedit.c (menu_expire): New.
	* free-packet.c (cmp_signatures): New


	Sat Oct 17 10:22:39 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c: changed output line length from 72 to 64.

	* keyedit.c (fix_keyblock): New.

	Fri Oct 16 10:24:47 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c: Rewrote most.
	* tdbio.c: Add cache and generalized hash tables.

	* options.h (ENABLE_COMMENT_PACKETS): New but undef'ed.
	* encode.c, sign.c, keygen.c: Disabled comment packets.
	* export.c (do_export): Comment packets are never exported,
	except for those in the secret keyring.

	* g10.c (main): Removed option do-no-export-rsa; should be
	be replaced by a secpial tool.
	* export.c (do_export): Removed the code for the above option.

	* armor.c (find_header): Support for new only_keyblocks.
	* import.c (import_keys): Only looks for keyblock armors.

	* packet.h: replaced valid_days by expiredate and changed all users.
	* build-packet.c (do_public_key): calculates valid-days
	(do_secret_key): Ditto.
	* parse-packet.c (parse_key): expiredate is calucated from the
	valid_period in v3 packets.
	* keyid.c (do_fingerprint_md): calculates valid_dates.

	* keygen.c (add_key_expire): fixed key expiration time for v4 packets.

	* armor.c (find_header): A LF in the first 28 bytes
	was skipped for non-armored data.

	Thu Oct 8 11:35:51 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (is_armored): Add test on old comment packets.

	* tdbio.c (tdbio_search_dir_bypk): fixed memory leak.

	* getkey.c: Changed the caching algorithms.

	Wed Oct 7 19:33:28 1998 Werner Koch (wk@isil.d.shuttle.de)

	* kbnodes.c (unused_nodes): New.

	Wed Oct 7 11:15:36 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keyedit.c (sign_uids): Fixed a problem with SK which could caused
	a save of an unprotected key.
	(menu_adduid): Ditto.

	* keyedit.c (keyedit_menu): Prefs are now correctly listed for
	new user ids.

	* trustdb.c (update_trust_record): New.
	(insert_trust_record): Now makes use of update_trust_record.

	Tue Oct 6 16:18:03 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (read_record): replaces most of the tdbio_read_records.
	(write_record): Ditto.

	Sat Oct 3 11:01:21 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keygen.c (ask_alogo): enable ElGamal enc-only only for addmode.

	Wed Sep 30 10:15:33 1998 Werner Koch (wk@isil.d.shuttle.de)

	* import.c (import_one): Fixed update of wrong keyblock.

	Tue Sep 29 08:32:08 1998 me,,, (wk@tobold)

	* mainproc.c (proc_plaintext): Display note for special filename.
	* plaintext.c (handle_plaintext): Suppress output of special file.

	Mon Sep 28 12:57:12 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (verify_own_keys): Add warning if a key is not protected.

	* passphrase (hash_passphrase): Fixed iterated+salted mode and
	setup for keysizes > hashsize.

	* g10.c (main): New options: --s2k-{cipher,digest,mode}.

	Fri Sep 25 09:34:23 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c: Chnaged some help texts.

	Tue Sep 22 19:34:39 1998 Werner Koch (wk@isil.d.shuttle.de)

	* passphrase.c (read_passphrase_from_fd): fixed bug for long
	passphrases.

	Mon Sep 21 11:28:05 1998 Werner Koch (wk@(none))

	* getkey.c (lookup): Add code to use the sub key if the primary one
	does not match the usage.

	* armor.c (armor_filter): New error message: no valid data found.
	(radix64_read): Changes to support multiple messages.
	(i18n.h): New.
	* mainproc.c (add_onepass_sig): bug fix.

	Mon Sep 21 08:03:16 1998 Werner Koch (wk@isil.d.shuttle.de)

	* pkclist.c (do_we_trust): Add keyid to most messages.

	* passphrase.c (read_passphrase_from_fd): New.
	(have_static_passphrase): New
	(get_passphrase_fd): Removed.
	(set_passphrase_fd): Removed.
	* g10.c (main): passphrase is now read here.

	* keyedit.c (keyedit_menu): "help" texts should now translate fine.

	Mon Sep 21 06:40:02 1998 Werner Koch (wk@isil.d.shuttle.de)

	* encode.c (encode_simple): Now disables compression
	when --rfc1991 is used.
	(encode_crypt): Ditto.

	Fri Sep 18 16:50:32 1998 Werner Koch (wk@isil.d.shuttle.de)

	* getkey.c (merge_key_and_selfsig): New.

	Fri Sep 18 10:20:11 1998 Werner Koch (wk@isil.d.shuttle.de)

	* pkclist.c (select_algo_from_prefs): Removed 3DES kludge.

	* seskey.c (make_session_key): Fixed SERIOUS bug introduced
	by adding the weak key detection code.

	* sign.c (sign_file): Changed aremor header in certain cases.

	Tue Sep 15 17:52:55 1998 Werner Koch (wk@isil.d.shuttle.de)

	* mainproc.c (check_sig_and_print): Replaced ascime by asctimestamp.

	Mon Sep 14 11:40:52 1998 Werner Koch (wk@isil.d.shuttle.de)

	* seskey.c (make_session_key): Now detects weak keys.

	* trustdb (clear_trust_checked_flag): New.

	* plaintext.c (handle_plaintext): Does no anymore suppress CR from
	cleartext signed messages.

	Sun Sep 13 12:54:29 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (insert_trust_record): Fixed a stupid bug in the free
	liunked list loops.

	Sat Sep 12 15:49:16 1998 Werner Koch (wk@isil.d.shuttle.de)

	* status.c (remove_shmid): New.
	(init_shm_comprocess): Now sets permission to the real uid.

	Wed Sep 9 11:15:03 1998 Werner Koch (wk@isil.d.shuttle.de)

	* packet.h (PKT_pubkey_enc): New flah throw_keyid, and add logic to
	implement it.
	* g10.c (main): New Option --throw-keyid

	* getkey.c (enum_secret_keys): Add new ar and changed all callers.

	Tue Sep 8 20:04:09 1998 Werner Koch (wk@isil.d.shuttle.de)

	* delkey.c (delete_key): Moved from keyedit.c.

	Mon Sep 7 16:37:52 1998 Werner Koch (wk@isil.d.shuttle.de)

	* build-packet.c (calc_length_header): New arg new_ctb to correctly
	calculate the length of new style packets.

	* armor.c (is_armored): Checks for symkey_enc packets.

	* pkclist.c (select_algo_from_prefs): 3DEs substitute is now CAST5.

	Tue Aug 11 17:54:50 1998 Werner Koch (wk@isil.d.shuttle.de)

	* build-packet.c (do_secret_key): Fixed handling of old keys.

	* getkey.c (compare_name): Fixed exact and email matching

	* openfile.c (open_outfile): Changed arguments and all callers.

	Tue Aug 11 09:14:35 1998 Werner Koch (wk@isil.d.shuttle.de)

	* encode.c (encode_simple): Applied option set-filename and comment.
	(encode_crypt): Ditto.
	* sign.c (sign_file): Ditto.
	* armor.c (armor_filter): Applied option comment.

	* encode.c (encode_crypt): Moved init_packet to the begin.
	(encode_simple): add an init_packet().

	* comment (write_comment): Now enforces a hash sign as the 1st byte.

	* import.c (import_one): Add explanation for "no user ids".

	* compress.c (do_uncompress): Applied Brian Warner's patch to support
	zlib 1.1.3 etc.

	* trustdb.c (check_trust): Fixed a problem after inserting new keys.

	* getkey (lookup): do not return the primary key if usage is given
	(lookup_sk): Ditto and take usage into account.

	* status.c (cpr_get_answer_is_yes): add display_help.

	Mon Aug 10 10:11:28 1998 Werner Koch (wk@isil.d.shuttle.de)

	* getkey.c (lookup_sk): Now always returns the primary if arg
	primary is true.
	(lookup): Likewise.
	(get_pubkey_byname): Now returns the primary key
	(get_seckey_byname): Ditto.


	Mon Aug 10 08:34:03 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keyid.c (pubkey_letter): ELG_E is now a small g.

	Sat Aug 8 17:26:12 1998 Werner Koch (wk@isil.d.shuttle.de)

	* openfile (overwrite_filep): Changed semantics and all callers.

	Sat Aug 8 12:17:07 1998 Werner Koch (wk@isil.d.shuttle.de)

	* status.c (display_help): New.

	Thu Aug 6 16:30:41 1998 Werner Koch,mobil,,, (wk@tobold)

	* seskey.c (encode_session_key): Now uses get_random_bits().

	Thu Aug 6 07:34:56 1998 Werner Koch,mobil,,, (wk@tobold)

	* ringedit.c (keyring_copy): No more backupfiles for
	secret keyrings and add additional warning in case of
	a failed secret keyring operation.

	Wed Aug 5 11:54:37 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (check_opts): Moved to main. Changed def_cipher_algo
	semantics and chnaged all users.

	* pubkey-enc.c (get_sssion_key): New informational output
	about preferences.

	* parse-packet.c (parse_symkeyenc): Fixed salted+iterated S2K
	(parse_key): Ditto.
	* build-packet.c (do_secret_key): Ditto.
	(do_symkey_enc): Ditto.

	Tue Aug 4 08:59:10 1998 Werner Koch (wk@isil.d.shuttle.de)

	* getkey.c (enum_secret_keys): Now returns only primary keys.

	* getkey (lookup): Now sets the new namehash field.

	* parse-packet.c (parse_sig_subpkt2): New.

	* sign.c (sign_file): one-pass sigs are now emiited reverse.
	Preference data is considered when selecting the compress algo.

	Wed Jul 29 12:53:03 1998 Werner Koch (wk@isil.d.shuttle.de)

	* free-packet.c (copy_signature): New.

	* keygen.c (generate_subkeypair): rewritten
	* g10.c (aKeyadd): Removed option --add-key

	Mon Jul 27 10:37:28 1998 Werner Koch (wk@isil.d.shuttle.de)

	* seckey-cert.c (do_check): Additional check on cipher blocksize.
	(protect_secret_key): Ditto.
	* encr-data.c: Support for other blocksizes.
	* cipher.c (write_header): Ditto.

	Fri Jul 24 16:47:59 1998 Werner Koch (wk@isil.d.shuttle.de)

	* kbnode.c (insert_kbnode): Changed semantics and all callers.
	* keyedit.c : More or less a complete rewrite

	Wed Jul 22 17:10:04 1998 Werner Koch (wk@isil.d.shuttle.de)

	* build-packet.c (write_sign_packet_header): New.

	Tue Jul 21 14:37:09 1998 Werner Koch (wk@isil.d.shuttle.de)

	* import.c (import_one): Now creates a trustdb record.

	* g10.c (main): New command --check-trustdb

	Mon Jul 20 11:15:07 1998 Werner Koch (wk@isil.d.shuttle.de)

	* genkey.c (generate_keypair): Default key is now DSA with
	encryption only ElGamal subkey.

	Thu Jul 16 10:58:33 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keyid.c (keyid_from_fingerprint): New.
	* getkey.c (get_pubkey_byfprint): New.

	Tue Jul 14 18:09:51 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keyid.c (fingerprint_from_pk): Add argument and changed all callers.
	(fingerprint_from_sk): Ditto.

	Tue Jul 14 10:10:03 1998 Werner Koch (wk@isil.d.shuttle.de)

	* plaintext.c (handle_plaintext): Now returns create error if
	the file could not be created or the user responded not to overwrite
	the file.
	* mainproc.c (proc_plaintext): Tries again if the file could not
	be created to check the signature without output.

	* misc.c (disable_core_dumps): New.
	* g10.c (main): disable coredumps for gpg

	* g10.c (MAINTAINER_OPTIONS): New to disable some options

	Mon Jul 13 16:47:54 1998 Werner Koch (wk@isil.d.shuttle.de)

	* plaintext.c (hash_datafiles): New arg for better support of
	detached sigs. Changed all callers.
	* mainproc.c (proc_signature_packets): Ditto.

	* g10.c (main): New option "compress-sigs"
	* sig.c (sign_file): detached signatures are not anymore compressed
	unless the option --compress-sigs is used.

	Thu Jul 9 19:54:54 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c: Fixes to allow zero length cleartext signatures

	Thu Jul 9 14:52:47 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (build_list): Now drops setuid.
	(main): Changed the way keyrings and algorithms are registered .

	Wed Jul 8 14:17:30 1998 Werner Koch (wk@isil.d.shuttle.de)

	* packet.h (PKT_public_key): Add field keyid.
	* parse-packet.c (parse_key): Reset the above field.
	* keyid.c (keyid_from_pk): Use above field as cache.

	* tdbio.c, tdbio.h: New
	* trustdb.c: Moved some functions to tdbio.c.
	(print_keyid): New.

	* pkclist.c (check_signatures_trust): New.

	Wed Jul 8 10:45:28 1998 Werner Koch (wk@isil.d.shuttle.de)

	* plaintext.c (special_md_putc): New.
	(handle_plaintext): add clearsig argument
	* mainproc.c (proc_plaintext): detection of clearsig
	* sign.c (write_dased_escaped): Changed clearsig format

	Tue Jul 7 18:56:19 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (find_header): Now makes sure that there is only one
	empty line for clearsigs, as this is what OP now says.

	Mon Jul 6 13:09:07 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): New option default-secret-key
	* getkey.c (get_seckey_byname): support for this option.

	Mon Jul 6 09:03:49 1998 Werner Koch (wk@isil.d.shuttle.de)

	* getkey.c (add_keyring): Keyrings are now added to end of the
	list of keyrings. The first added keyringwill be created.
	(add_secret_keyring): Likewise.

	* ringedit.c (add_keyblock_resource): Files are created here.

	* g10.c (aNOP): Removed

	* getkey.c (lookup): Add checking of usage for name lookups
	* packet.h (pubkey_usage): Add a field which may be used to store
	usage capabilities.
	* pkclist.c (build_pk_list): getkey now called with usage arg.
	* skclist.c (build_sk_list): Ditto.

	* sign.c (clearsign_file): Fixed "Hash:" headers

	Sat Jul 4 13:33:31 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (list_ownertrust): New.
	* g10.c (aListOwnerTrust): New.

	* g10.c (def_pubkey_algo): Removed.

	* trustdb.c (verify_private_data): Removed and also the call to it.
	(sign_private_data): Removed.

	Fri Jul 3 13:26:10 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (aEditKey): was aEditSig. Changed usage msg.

	* keyedit.c: Done some i18n stuff.

	* g10.c (do_not_use_RSA): New.
	* sign.c (do_sign): Add call to above function.
	* encode.c (write_pubkey_enc_from_list): Ditto.

	Thu Jul 2 21:01:25 1998 Werner Koch (wk@isil.d.shuttle.de)

	* parse-packet.c: Now is able sto store data of unknown
	algorithms.
	* free-packet.c: Support for this.
	* build-packet.c: Can write data of packet with unknown algos.

	Thu Jul 2 11:46:36 1998 Werner Koch (wk@isil.d.shuttle.de)

	* parse-packet.c (parse): fixed 4 byte length header

	Wed Jul 1 12:36:55 1998 Werner Koch (wk@isil.d.shuttle.de)

	* packet.h (new_ctb): New field for some packets
	* build-packet.c (build_packet): Support for new_ctb
	* parse-packet.c (parse): Ditto.

	Mon Jun 29 12:54:45 1998 Werner Koch (wk@isil.d.shuttle.de)

	* packet.h: changed all "_cert" to "_key", "subcert" to "subkey".

	* free-packet.c (free_packet): Removed memory leak for subkeys.

	Sun Jun 28 18:32:27 1998 Werner Koch (wk@isil.d.shuttle.de)

	* import.c (import_keys): Renamed from import_pubkeys.
	(import_secret_one): New.

	* g10.c (aExportSecret): New.

	* export.c (export_seckeys): New.

	* parse-packet.c (parse_certificate): Cleaned up.
	(parse_packet): Trust packets are now considered as unknown.
	(parse_pubkey_warning): New.

	Fri Jun 26 10:37:35 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keygen.c (has_invalid_email_chars): New.

	Wed Jun 24 16:40:22 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (armor_filter): Now creates valid onepass_sig packets
	with all detected hash algorithms.
	* mainproc.c (proc_plaintext): Now uses the hash algos as specified
	in the onepass_sig packets (if there are any)

	Mon Jun 22 11:54:08 1998 Werner Koch (wk@isil.d.shuttle.de)

	* plaintext.c (handle_plaintext): add arg to disable outout
	* mainproc.c (proc_plaintext): disable output when in sigs_only mode.

	Thu Jun 18 13:17:27 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keygen.c: Removed all rsa packet stuff, chnaged defaults
	for key generation.

	Sun Jun 14 21:28:31 1998 Werner Koch (wk@isil.d.shuttle.de)

	* misc.c (checksum_u16): Fixed a stupid bug which caused a
	wrong checksum calculation for the secret key protection and
	add a backward compatibility option.
	* g10.c (main): Add option --emulate-checksum-bug.

	Thu Jun 11 13:26:44 1998 Werner Koch (wk@isil.d.shuttle.de)

	* packet.h: Major changes to the structure of public key material
	which is now stored in an array and not anaymore in a union of
	algorithm specific structures. These is needed to make the system
	more extendable and makes a lot of stuff much simpler. Changed
	all over the system.

	* dsa.c, rsa.c, elg.c: Removed.

	Wed Jun 10 07:22:02 1998 Werner Koch,mobil,,, (wk@tobold)

	* g10.c ("load-extension"): New option.

	Mon Jun 8 22:23:37 1998 Werner Koch (wk@isil.d.shuttle.de)

	* seckey-cert.c (do_check): Removed cipher constants
	(protect_secret_key): Ditto.

	Fri May 29 10:00:28 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (query_trust_info): New.
	* keylist.c (list_one): Add output of trust info
	* mainproc (list_node): ditto.
	* g10.c (main): full trustdb init if -with-colons and any of the
	key list modes.

	Thu May 28 10:34:42 1998 Werner Koch (wk@isil.d.shuttle.de)

	* status.c (STATUS_RSA_OR_IDEA): New.
	* sig-check.c (check_signature): Output special status message.
	* pubkey-enc.c (get_session_key): Ditto.

	* mainproc.c (check_sig_and_print): Changed format of output.
	* passpharse.c (passphrase_to_dek): Likewise.

	Wed May 27 13:46:48 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (aListSecretKeys): New option --list-secret-keys
	* keylist.c (std_key_list): Renamed to public_key_list.
	(secret_key_list): New
	(list_one, list_all): Add support for secret keys.
	* getkey.c (get_secret_keyring): New.
	* mainproc.c (list_node): Add option --with-colons for secret keys

	* sig-check.c (check_key_signature): detection of selfsigs
	* mainproc.c (list_node): fixed listing.

	* g10.c (aListSecretKeys): New option --always-trust
	* pkclist.c (do_we_trust): Override per option added

	* status.c (write_status_text): Add a prefix to every output line.

	Wed May 27 07:49:21 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10 (--compress-keys): New.
	* options.h (compress_keys): New.
	* export.c (export_pubkeys): Only compresses with the new option.

	Tue May 26 11:24:33 1998 Werner Koch (wk@isil.d.shuttle.de)

	* passphrase.c (get_last_passphrase): New
	(set_next_passphrase): New.
	(passphrase_to_dek): add support for the above functions.
	* keyedit.c (make_keysig_packet): Add sigclass 0x18,
	changed all callers due to a new argument.
	* keygen.c (write_keybinding): New
	(generate_subkeypair): Add functionality
	(ask_algo, ask_keysize, ask_valid_days): Broke out of generate_keypair
	(ask_user_id, ask_passphrase): Ditto.

	Thu May 21 11:26:13 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c,gpgd.c (main): Does now return an int, so that egcs does
	not complain.

	* armor.c (fake_packet): Removed erro message and add a noticed
	that this part should be fixed.

	* sign.c (sign_file): Compression now comes in front of encryption.
	* encode.c (encode_simple): Ditto.
	(encode_crypt): Ditto.

	Tue May 19 16:18:19 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (fake_packet): Changed assertion to log_error

	Sat May 16 16:02:06 1998 Werner Koch (wk@isil.d.shuttle.de)

	* build-packet.c (build_packet): Add SUBKEY packets.

	Fri May 15 17:57:23 1998 Werner Koch (wk@isil.d.shuttle.de)

	* sign.c (hash_for): New and used in all places here.
	* main.h (DEFAULT_): new macros.
	* g10.c (opt.def_digest_algo): Now set to 0

	* compress.c (init_compress): Add support for algo 1
	* options.h (def_compress_algo): New
	* g10.c (main): New option --compress-algo

	Fri May 15 13:23:59 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (print_mds): New feature to print only one hash,
	chnaged formatting.

	Thu May 14 15:36:24 1998 Werner Koch (wk@isil.d.shuttle.de)

	* misc.c (trap_unaligned) [__alpha__]: New
	* g10.c (trap_unaligned): Add call to this to track down SIGBUS
	on Alphas (to avoid the slow emulation code).

	Wed May 13 11:48:27 1998 Werner Koch (wk@isil.d.shuttle.de)

	* build-packet.c (do_signature): Support for v4 pakets.
	* keyedit.c (make_keysig_packet): Ditto.
	* build-packet.c (build_sig_subpkt_from_sig): New.
	(build_sig_subpkt): New.

	* elg.c (g10_elg_sign): removed keyid_from_skc.
	* dsa.c (g10_dsa_sign): Ditto.
	* rsa.c (g10_rsa_sign): Ditto.
	* keyedit.c (make_keysig_packet): Add call to keyid_from_skc

	* sign.c (clearsign_file): Support for v4 signatures.
	(sign_file): Ditto.

	Wed May 6 09:31:24 1998 Werner Koch (wk@isil.d.shuttle.de)

	* parse-packet.c (do_parse): add support for 5 byte length leader.
	(parse_subpkt): Ditto.
	* build-packet.c (write_new_header): Ditto.

	* packet.h (SIGSUBPKT_): New constants.
	* parse-packet.c (parse_sig_subpkt): Changed name, made global,
	and arg to return packet length, chnaged all callers


	Tue May 5 22:11:59 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keygen.c (gen_dsa): New.
	* build_packet.c (do_secret_cert): Support for DSA

	Mon May 4 19:01:25 1998 Werner Koch (wk@isil.d.shuttle.de)

	* compress.c: doubled buffer sizes
	* parse-packet.c (do_plaintext): now uses iobuf_read/write.

	Mon May 4 09:35:53 1998 Werner Koch (wk@isil.d.shuttle.de)

	* seskey.c (encode_md_value): Add optional argument hash_algo,
	changed all callers.

	* passphrase.c (make_dek_from_passphrase): Removed
	* (get_passhrase_hash): Changed name to passphrase_to_dek, add arg,
	changed all callers.

	* all: Introduced the new ELG identifier and added support for the
	encryption only one (which is okay to use by GNUPG for signatures).

	Sun May 3 17:50:26 1998 Werner Koch (wk@isil.d.shuttle.de)

	* packet.h (PKT_OLD_COMMENT): New name for type 16.
	* parse-packet.c (parse_comment): Now uses type 61

	Fri May 1 12:44:39 1998 Werner Koch,mobil,,, (wk@tobold)

	* packet.h (count): Chnaged s2k count from byte to u32.
	* seckey-cert.c (do_check): Changed s2k algo 3 to 4, changed
	reading of count.
	* build-packet.c (do_secret_cert): ditto.
	* parse-packet.c (parse_certificate): ditto.

	* parse-packet.c (parse_symkeyenc): New.
	* build-packet.c (do_symkey_enc): New.

	Thu Apr 30 16:33:34 1998 Werner Koch (wk@isil.d.shuttle.de)

	* sign.c (clearsign_file): Fixed "Hash: " armor line.

	Tue Apr 28 14:27:42 1998 Werner Koch (wk@isil.d.shuttle.de)

	* parse-packet.c (parse_subpkt): Some new types.

	Mon Apr 27 12:53:59 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): Add option --skip-verify.
	* mainproc.c (check_sig_and_print): Ditto.

	* g10.c (print_mds): Add output for Tiger.

	* sign.c (sign_file): Now uses partial length headers if used
	in canonical textmode (kludge to fix a bug).

	* parse-packet.c (parse_certificate): Changed BLOWFISH id.
	* pubkey-enc.c (get_session_key): Ditto.
	* seskey.c (make_session_key): Ditto.
	* seckey-cert.c (protect_secret_key,do_check): Add BLOWFISH160.

	Fri Apr 24 17:38:48 1998 Werner Koch,mobil,,, (wk@tobold)

	* sig-check.c (check_key_signature): Add sig-class 0x14..0x17
	* keyedit.c (sign-key): Some changes to start with support of
	the above new sig-classes.

	Wed Apr 22 09:01:57 1998 Werner Koch,mobil,,, (wk@tobold)

	* getkey.c (compare_name): add email matching

	Tue Apr 21 16:17:12 1998 Werner Koch,mobil,,, (wk@tobold)

	* armor.c (armor_filter): fixed missing last LF before CSUM.

	Thu Apr 9 11:35:22 1998 Werner Koch (wk@isil.d.shuttle.de)

	* seckey-cert.c (do_check): New; combines all the check functions
	into one.

	* sign.c: removed all key management functions
	* keyedit.c: New.

	Thu Apr 9 09:49:36 1998 Werner Koch (wk@isil.d.shuttle.de)

	* import.c (chk_self_sigs): Changed an error message.

	Wed Apr 8 16:19:39 1998 Werner Koch (wk@isil.d.shuttle.de)

	* packet.h: packet structs now uses structs from the pubkey,
	removed all copy operations from packet to pubkey structs.

	Wed Apr 8 13:40:33 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (verify_own_certs): Fixed "public key not found".

	* getkey.c (key_byname): New, combines public and secret key search.

	* pkclist.c (build_pkc_list): Add new arg usage, changed all callers.
	* skclist.c (build_skc_list): Likewise.

	* ringedit.c (find_keyblock, keyring_search2): Removed.

	Wed Apr 8 09:47:21 1998 Werner Koch (wk@isil.d.shuttle.de)

	* sig-check.c (do_check): Applied small fix from Ulf Möller.

	Tue Apr 7 19:28:07 1998 Werner Koch (wk@isil.d.shuttle.de)

	* cipher.c, encr-data.c, seckey-cert.c: Now uses cipher_xxxx
	functions instead of blowfish_xxx or cast_xxx

	Tue Apr 7 11:04:02 1998 Werner Koch (wk@isil.d.shuttle.de)

	* Makefile.am (g10maint.o): Changed the way it is created.

	Mon Apr 6 11:17:08 1998 Werner Koch (wk@isil.d.shuttle.de)

	* misc.c: New.
	* keygen.c (checksum,checksum_u16,checksum_mpi): Moved to misc.c
	* seckey-cert.c: Kludge for wrong ELG checksum implementation.

	Sat Apr 4 20:07:01 1998 Werner Koch (wk@isil.d.shuttle.de)

	* cipher.c (cipher_filter): Support for CAST5
	* encr-data.c (decode_filter): Ditto.
	(decrypt_data): Ditto.
	* seskey.c (make_session_key): Ditto.
	* seckey-cert.c (check_elg, check_dsa): Ditto,
	(protect_secret_key): Ditto.
	* pubkey-enc.c (get_session_key): Ditto.
	* passphrase.c (hash_passphrase): Ditto.

	Thu Apr 2 20:22:35 1998 Werner Koch (wk@isil.d.shuttle.de)

	* gpgd.c: New

	Thu Apr 2 10:38:16 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keygen.c (generate_keypair): Add valid_days stuff.
	* trustdb.c (check_trust): Add check for valid_days.

	Wed Apr 1 16:15:58 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keygen.c (generate_keypair): Addional question whether the
	selected large keysize is really needed.

	Wed Apr 1 15:56:33 1998 Werner Koch (wk@isil.d.shuttle.de)

	* seckey-cert.c (protect_secret_key): merged protect_xxx to here.

	Wed Apr 1 10:34:46 1998 Werner Koch (wk@isil.d.shuttle.de)

	* Makefile.am (g10maint.c): Changed creation rule, so that it works
	on FreeBSD (missing CFLAGS).

	* parse-packet.c (parse_subkey): Removed.

	Thu Mar 19 15:22:36 1998 Werner Koch (wk@isil.d.shuttle.de)

	* ringedit.c (keyring_enum): Fixed problem with reading too
	many packets. Add support to read secret keyrings.

	* getkey.c (scan_keyring): Removed
	(lookup): New to replace scan_keyring.
	(scan_secret_keyring): Removed.
	(lookup_skc): New.

	Wed Mar 18 11:47:34 1998 Werner Koch (wk@isil.d.shuttle.de)

	* ringedit.c (enum_keyblocks): New read mode 11.

	* keyid.c (elg_fingerprint_md): New and changed all other functions
	to call this if the packet version is 4 or above.

	Tue Mar 17 20:46:16 1998 Werner Koch (wk@isil.d.shuttle.de)

	* parse-packet.c (parse_certificate): Add listing support for subkeys.

	Tue Mar 17 20:32:22 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (is_armored): Allow marker packet.

	Thu Mar 12 13:36:49 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (check_trust): Checks timestamp of pubkey.
	* sig-check. (do_check): Compares timestamps.

	Tue Mar 10 17:01:56 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): Add call to init_signals.
	* signal.c: New.

	Mon Mar 9 12:43:42 1998 Werner Koch (wk@isil.d.shuttle.de)

	* dsa.c: New
	* packet.h, free-packet.c, parse-packet.c : Add support for DSA
	* sig-check.c, getkey.c, keyid.c, ringedit.c: Ditto.
	* seckey-cert.c: Ditto.

	* packet.h : Moved .digest_algo of signature packets to outer
	structure. Changed all references

	Sun Mar 8 13:06:42 1998 Werner Koch (wk@isil.d.shuttle.de)

	* openfile.c : Support for stdout filename "-".

	* mainproc.c (check_sig_and_print): Enhanced status output:
	* status.c (write_status_text): New.

	Fri Mar 6 16:10:54 1998 Werner Koch (wk@isil.d.shuttle.de)

	* kbnode.c (clone_kbnode): Fixed private_flag.

	* mainproc.c (list_node): Output of string "Revoked" as user-id.

	Fri Mar 6 14:26:39 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): Add userids to "-kv" and cleaned up this stuff.

	Fri Mar 6 12:45:58 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): Changed semantics of the list-... commands
	and added a new one. Removed option "-d"

	* decrypt.c: New.

	* trustdb.c (init_trustdb): Autocreate directory only if it ends
	in "/.gnupg".

	Thu Mar 5 12:12:11 1998 Werner Koch (wk@isil.d.shuttle.de)

	* mainproc.c (do_proc_packets): New. Common part of proc_packet.
	(proc_signature_packets): special version to handle signature data.
	* verify.c: New.
	* g10.c (aVerify): New.
	* plaintext.c (hash_datafiles): New.
	* compress.c (handle_compressed): Add callback arg, changed caller.

	Thu Mar 5 10:20:06 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c: Is nom the common source for gpg and gpgm
	* g10maint.c: Removed
	* Makefile.am: Add rule to build g10maint.c

	Thu Mar 5 08:43:59 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): Changed the way clear text sigs are faked.

	Wed Mar 4 19:47:37 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10maint.c (aMuttKeyList): New
	* keylist.c: New.

	Wed Mar 4 17:20:33 1998 Werner Koch (wk@isil.d.shuttle.de)

	* getkey.c (get_pubkey_byname): Kludge to allow 0x prefix.

	Tue Mar 3 13:46:55 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10maint.c (main): New option --gen-random.

	Tue Mar 3 09:50:08 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (aDeleteSecretKey): New.
	(aEditSig): Add option "--edit-key" as synonym for "--edit-sig".
	(aDeleteSecretKey): New.
	* getkey.c (seckey_available): New.
	* sign.c (delete_key): Enhanced to delete secret keys, changed all
	callers.

	Mon Mar 2 21:23:48 1998 Werner Koch (wk@isil.d.shuttle.de)

	* pkc_list.c (build_pkc_list): Add interactive input of user ID.

	Mon Mar 2 20:54:05 1998 Werner Koch (wk@isil.d.shuttle.de)

	* pkclist.c (do_we_trust_pre): New.
	(add_ownertrust): Add message.
	* trustdb.c (enum_trust_web): Quick fix.

	Mon Mar 2 13:50:53 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): New action aDeleteKey
	* sign.c (delete_key): New.

	Sun Mar 1 16:38:58 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (do_check): No returns TRUST_UNDEFINED instead of
	eof error.

	Fri Feb 27 18:14:03 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (find_header): Removed trailing CR on headers.

	Fri Feb 27 18:02:48 1998 Werner Koch (wk@isil.d.shuttle.de)

	* ringedit.c (keyring_search) [MINGW32]: Open and close file here
	because rename does not work on open files. Chnaged callers.

	Fri Feb 27 16:43:11 1998 Werner Koch (wk@isil.d.shuttle.de)

	* sig-check.c (do_check): Add an md_enable.
	* mainproc.c (do_check_sig): Use md_open in case of detached sig
	(proc_tree): Take detached sigs into account.

	Fri Feb 27 15:22:46 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): Make use of GNUPGHOME envvar.
	* g10main.c (main): Ditto.

	Wed Feb 25 11:40:04 1998 Werner Koch (wk@isil.d.shuttle.de)

	* plaintext.c (ask_for_detached_datafile): add opt.verbose to
	info output.

	* openfile.c (open_sigfile): Try also name ending in ".asc"

	Wed Feb 25 08:41:00 1998 Werner Koch (wk@isil.d.shuttle.de)

	* keygen.c (generate_keypair): Fixed memory overflow.

	Tue Feb 24 15:51:55 1998 Werner Koch (wk@isil.d.shuttle.de)

	* parse-packet.c (parse_certificate): Support for S2K.
	* build-packet.c (do_secret_cert): Ditto.
	* keygen.c (gen_elg): Ditto.
	* seckey-cert.c (check_elg): Ditto
	(protect_elg): Ditto.
	* sign.c (chnage_passphrase): Ditto.
	* passphrase.c (get_passphrase_hash): Support for a salt and
	changed all callers.
	(make_dek_from_passphrase): Ditto.

	Tue Feb 24 12:30:56 1998 Werner Koch (wk@isil.d.shuttle.de)

	* build-packet.c (hash_public_cert): Disabled debug output.

	Fri Feb 20 17:22:28 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (init_trustdb) [MINGW32]: Removed 2nd mkdir arg.
	(keyring_copy) [MINGW32]: Add a remove prior to the renames.

	Wed Feb 18 18:39:02 1998 Werner Koch (wk@isil.d.shuttle.de)

	* Makefile.am (OMIT_DEPENDENCIES): New.

	* rsa.c: Replaced log_bug by BUG.

	Wed Feb 18 13:35:58 1998 Werner Koch (wk@isil.d.shuttle.de)

	* mainproc.c (do_check_sig): Now uses hash_public_cert.
	* parse-packet.c (parse_certificate): Removed hashing.
	* packet.h (public_cert): Removed hash variable.
	* free-packet.c (copy_public_cert, free_public_cert): Likewise.

	* sig-check.c (check_key_signatures): Changed semantics.

	Wed Feb 18 12:11:28 1998 Werner Koch (wk@isil.d.shuttle.de)

	* trustdb.c (do_check): Add handling for revocation certificates.
	(build_sigrecs): Ditto.
	(check_sigs): Ditto.

	Wed Feb 18 09:31:04 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (armor_filter): Add afx->hdrlines.
	* revoke.c (gen_revoke): Add comment line.
	* dearmor.c (enarmor_file): Ditto.

	* sig-check.c (check_key_signature): Add handling for class 0x20.
	* mainproc.c : Ditto.

	Tue Feb 17 21:24:17 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c : Add header lines "...ARMORED FILE .."
	* dearmor.c (enarmor_file): New.
	* g10maint.c (main): New option "--enarmor"

	Tue Feb 17 19:03:33 1998 Werner Koch (wk@isil.d.shuttle.de)

	* mainproc.c : Changed a lot, because the packets are now stored
	a simple linlked list and not anymore in a complicatd tree structure.

	Tue Feb 17 10:14:48 1998 Werner Koch (wk@isil.d.shuttle.de)

	* free_packet.c (cmp_public_certs): New.
	(cmp_user_ids): New.

	* kbnode.c (clone_kbnode): New.
	(release_kbnode): Add clone support.

	* ringedit.c (find_keyblock_bypkc): New.

	* sign.c (remove_keysigs): Self signatures are now skipped,
	changed arguments and all callers.

	* import.c : Add functionality.

	Tue Feb 17 09:31:40 1998 Werner Koch (wk@isil.d.shuttle.de)

	* options.h (homedir): New option.
	* g10.c, g10maint.c, getkey.c, keygen.c, trustdb.c (opt.homedir): New.

	* trustdb.c (init_trustdb): mkdir for hoem directory
	(sign_private_data): Renamed "sig" to "g10.sig"

	Mon Feb 16 20:02:03 1998 Werner Koch (wk@isil.d.shuttle.de)

	* kbnode.c (commit_kbnode): New.
	(delete_kbnode): removed unused first arg. Changed all Callers.

	* ringedit.c (keyblock_resource_name): New.
	(get_keyblock_handle): NULL for filename returns default resource.

	Mon Feb 16 19:38:48 1998 Werner Koch (wk@isil.d.shuttle.de)

	* sig-check.s (check_key_signature): Now uses the supplied
	public key to check the signature and not any more the one
	from the getkey.c
	(do_check): New.
	(check_signature): Most work moved to do_check.

	Mon Feb 16 14:48:57 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (find_header): Fixed another bug.

	Mon Feb 16 12:18:34 1998 Werner Koch (wk@isil.d.shuttle.de)

	* getkey.c (scan_keyring): Add handling of compressed keyrings.

	Mon Feb 16 10:44:51 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c, g10maint.c (strusage): Rewrote.
	(build_list): New

	Mon Feb 16 08:58:41 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (use_armor): New.

	Sat Feb 14 14:30:57 1998 Werner Koch (wk@isil.d.shuttle.de)

	* mainproc.c (proc_tree): Sigclass fix.

	Sat Feb 14 14:16:33 1998 Werner Koch (wk@isil.d.shuttle.de)

	* armor.c (armor_filter): Changed version and comment string.
	* encode.c, sign.c, keygen.c: Changed all comment packet strings.

	Sat Feb 14 12:39:24 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (aGenRevoke): New command.
	* revoke.c: New.
	* sign.c (make_keysig_packet): Add support for sigclass 0x20.

	Fri Feb 13 20:18:14 1998 Werner Koch (wk@isil.d.shuttle.de)

	* ringedit.c (enum_keyblocks, keyring_enum): New.

	Fri Feb 13 19:33:40 1998 Werner Koch (wk@isil.d.shuttle.de)

	* export.c: Add functionality.

	* keygen.c (generate_keypair): Moved the leading comment behind the
	key packet.
	* kbnode.c (walk_kbnode): Fixed.

	* g10.c (main): listing armored keys now work.

	Fri Feb 13 16:17:43 1998 Werner Koch (wk@isil.d.shuttle.de)

	* parse-packet.c (parse_publickey, parse_signature): Fixed calls
	to mpi_read used for ELG b.

	Fri Feb 13 15:13:23 1998 Werner Koch (wk@isil.d.shuttle.de)

	* g10.c (main): changed formatting of help output.

	Thu Feb 12 22:24:42 1998 Werner Koch (wk@frodo)

	* pubkey-enc.c (get_session_key): rewritten


	Copyright 1998, 1999, 2000, 2001, 2002, 2003,
	2004 Free Software Foundation, Inc.

	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/g10/app-openpgp.c b/g10/app-openpgp.c
	index c302bd3a3..d6cbe88a6 100644
	--- a/g10/app-openpgp.c
	+++ b/g10/app-openpgp.c
	@@ -1,1763 +1,1842 @@
	/* app-openpgp.c - The OpenPGP card application.
	* Copyright (C) 2003, 2004 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 2 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, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
	+ *
	+ * $Id$
	*/

	#include <config.h>
	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <assert.h>
	#include <time.h>

	#if GNUPG_MAJOR_VERSION == 1
	/* This is used with GnuPG version < 1.9. The code has been source
	copied from the current GnuPG >= 1.9 and is maintained over
	there. */
	#include "options.h"
	#include "errors.h"
	#include "memory.h"
	#include "util.h"
	-#include "i18n.h"
	#include "cardglue.h"
	#else /* GNUPG_MAJOR_VERSION != 1 */
	#include "scdaemon.h"
	#endif /* GNUPG_MAJOR_VERSION != 1 */

	+#include "i18n.h"
	#include "iso7816.h"
	#include "app-common.h"
	#include "tlv.h"


	static struct {
	int tag;
	int constructed;
	int get_from; /* Constructed DO with this DO or 0 for direct access. */
	int binary;
	int dont_cache;
	int flush_on_error;
	int get_immediate_in_v11; /* Enable a hack to bypass the cache of
	this data object if it is used in 1.1
	and later versions of the card. This
	does not work with composite DO and is
	currently only useful for the CHV
	status bytes. */
	char *desc;
	} data_objects[] = {
	{ 0x005E, 0, 0, 1, 0, 0, 0, "Login Data" },
	{ 0x5F50, 0, 0, 0, 0, 0, 0, "URL" },
	{ 0x0065, 1, 0, 1, 0, 0, 0, "Cardholder Related Data"},
	{ 0x005B, 0, 0x65, 0, 0, 0, 0, "Name" },
	{ 0x5F2D, 0, 0x65, 0, 0, 0, 0, "Language preferences" },
	{ 0x5F35, 0, 0x65, 0, 0, 0, 0, "Sex" },
	{ 0x006E, 1, 0, 1, 0, 0, 0, "Application Related Data" },
	{ 0x004F, 0, 0x6E, 1, 0, 0, 0, "AID" },
	{ 0x0073, 1, 0, 1, 0, 0, 0, "Discretionary Data Objects" },
	{ 0x0047, 0, 0x6E, 1, 1, 0, 0, "Card Capabilities" },
	{ 0x00C0, 0, 0x6E, 1, 1, 0, 0, "Extended Card Capabilities" },
	{ 0x00C1, 0, 0x6E, 1, 1, 0, 0, "Algorithm Attributes Signature" },
	{ 0x00C2, 0, 0x6E, 1, 1, 0, 0, "Algorithm Attributes Decryption" },
	{ 0x00C3, 0, 0x6E, 1, 1, 0, 0, "Algorithm Attributes Authentication" },
	{ 0x00C4, 0, 0x6E, 1, 0, 1, 1, "CHV Status Bytes" },
	{ 0x00C5, 0, 0x6E, 1, 0, 0, 0, "Fingerprints" },
	{ 0x00C6, 0, 0x6E, 1, 0, 0, 0, "CA Fingerprints" },
	{ 0x007A, 1, 0, 1, 0, 0, 0, "Security Support Template" },
	{ 0x0093, 0, 0x7A, 1, 1, 0, 0, "Digital Signature Counter" },
	{ 0 }
	};


	struct cache_s {
	struct cache_s *next;
	int tag;
	size_t length;
	unsigned char data[1];
	};

	struct app_local_s {
	struct cache_s *cache;
	struct
	{
	unsigned int get_challenge:1;
	unsigned int key_import:1;
	unsigned int change_force_chv:1;
	unsigned int private_dos:1;
	} extcap;
	+ struct
	+ {
	+ unsigned int no_sync:1; /* Do not sync CHV1 and CHV2 */
	+ unsigned int def_chv2:1; /* Use 123456 for CHV2. */
	+ } flags;
	};


	static unsigned long convert_sig_counter_value (const unsigned char *value,
	size_t valuelen);
	static unsigned long get_sig_counter (APP app);

	/* Deconstructor. */
	static void
	do_deinit (app_t app)
	{
	if (app && app->app_local)
	{
	struct cache_s c, c2;

	for (c = app->app_local->cache; c; c = c2)
	{
	c2 = c->next;
	xfree (c);
	}
	xfree (app->app_local);
	app->app_local = NULL;
	}
	}


	/* Wrapper around iso7816_get_data which first tries to get the data
	from the cache. */
	static gpg_error_t
	get_cached_data (app_t app, int tag,
	unsigned char *result, size_t resultlen)
	{
	gpg_error_t err;
	int i;
	unsigned char *p;
	size_t len;
	struct cache_s *c;

	*result = NULL;
	*resultlen = 0;

	for (c=app->app_local->cache; c; c = c->next)
	if (c->tag == tag)
	{
	if(c->length)
	{
	p = xtrymalloc (c->length);
	if (!p)
	return gpg_error (gpg_err_code_from_errno (errno));
	memcpy (p, c->data, c->length);
	*result = p;
	}

	*resultlen = c->length;

	return 0;
	}


	err = iso7816_get_data (app->slot, tag, &p, &len);
	if (err)
	return err;
	*result = p;
	*resultlen = len;

	/* Check whether we should cache this object. */
	for (i=0; data_objects[i].tag; i++)
	if (data_objects[i].tag == tag)
	{
	if (data_objects[i].dont_cache)
	return 0;
	break;
	}

	/* No, cache it. */

	for (c=app->app_local->cache; c; c = c->next)
	assert (c->tag != tag);

	c = xtrymalloc (sizeof *c + len);
	if (c)
	{
	memcpy (c->data, p, len);
	c->length = len;
	c->tag = tag;
	c->next = app->app_local->cache;
	app->app_local->cache = c;
	}

	return 0;
	}

	/* Remove DO at TAG from the cache. */
	static void
	flush_cache_item (app_t app, int tag)
	{
	struct cache_s c, cprev;
	int i;

	if (!app->app_local)
	return;

	for (c=app->app_local->cache, cprev=NULL; c ; cprev=c, c = c->next)
	if (c->tag == tag)
	{
	if (cprev)
	cprev->next = c->next;
	else
	app->app_local->cache = c->next;
	xfree (c);

	for (c=app->app_local->cache; c ; c = c->next)
	{
	assert (c->tag != tag); /* Oops: duplicated entry. */
	}
	return;
	}

	/* Try again if we have an outer tag. */
	for (i=0; data_objects[i].tag; i++)
	if (data_objects[i].tag == tag && data_objects[i].get_from
	&& data_objects[i].get_from != tag)
	flush_cache_item (app, data_objects[i].get_from);
	}

	/* Flush all entries from the cache which might be out of sync after
	an error. */
	static void
	flush_cache_after_error (app_t app)
	{
	int i;

	for (i=0; data_objects[i].tag; i++)
	if (data_objects[i].flush_on_error)
	flush_cache_item (app, data_objects[i].tag);
	}


	/* Flush the entire cache. */
	static void
	flush_cache (app_t app)
	{
	if (app && app->app_local)
	{
	struct cache_s c, c2;

	for (c = app->app_local->cache; c; c = c2)
	{
	c2 = c->next;
	xfree (c);
	}
	app->app_local->cache = NULL;
	}
	}


	/* Get the DO identified by TAG from the card in SLOT and return a
	buffer with its content in RESULT and NBYTES. The return value is
	NULL if not found or a pointer which must be used to release the
	buffer holding value. */
	static void *
	get_one_do (app_t app, int tag, unsigned char *result, size_t nbytes)
	{
	int rc, i;
	unsigned char *buffer;
	size_t buflen;
	unsigned char *value;
	size_t valuelen;

	*result = NULL;
	*nbytes = 0;
	for (i=0; data_objects[i].tag && data_objects[i].tag != tag; i++)
	;

	if (app->card_version > 0x0100 && data_objects[i].get_immediate_in_v11)
	{
	if( iso7816_get_data (app->slot, tag, &buffer, &buflen))
	return NULL;
	*result = buffer;
	*nbytes = buflen;
	return buffer;
	}

	value = NULL;
	rc = -1;
	if (data_objects[i].tag && data_objects[i].get_from)
	{
	rc = get_cached_data (app, data_objects[i].get_from,
	&buffer, &buflen);
	if (!rc)
	{
	const unsigned char *s;

	s = find_tlv (buffer, buflen, tag, &valuelen);
	if (!s)
	value = NULL; /* not found */
	else if (valuelen > buflen - (s - buffer))
	{
	log_error ("warning: constructed DO too short\n");
	value = NULL;
	xfree (buffer); buffer = NULL;
	}
	else
	value = buffer + (s - buffer);
	}
	}

	if (!value) /* Not in a constructed DO, try simple. */
	{
	rc = get_cached_data (app, tag, &buffer, &buflen);
	if (!rc)
	{
	value = buffer;
	valuelen = buflen;
	}
	}

	if (!rc)
	{
	*nbytes = valuelen;
	*result = value;
	return buffer;
	}
	return NULL;
	}


	static void
	dump_all_do (int slot)
	{
	int rc, i, j;
	unsigned char *buffer;
	size_t buflen;

	for (i=0; data_objects[i].tag; i++)
	{
	if (data_objects[i].get_from)
	continue;

	rc = iso7816_get_data (slot, data_objects[i].tag, &buffer, &buflen);
	if (gpg_err_code (rc) == GPG_ERR_NO_OBJ)
	;
	else if (rc)
	log_info ("DO `%s' not available: %s\n",
	data_objects[i].desc, gpg_strerror (rc));
	else
	{
	if (data_objects[i].binary)
	{
	log_info ("DO `%s': ", data_objects[i].desc);
	log_printhex ("", buffer, buflen);
	}
	else
	log_info ("DO `%s': `%.*s'\n",
	data_objects[i].desc,
	(int)buflen, buffer); /* FIXME: sanitize */

	if (data_objects[i].constructed)
	{
	for (j=0; data_objects[j].tag; j++)
	{
	const unsigned char *value;
	size_t valuelen;

	if (j==i \|\| data_objects[i].tag != data_objects[j].get_from)
	continue;
	value = find_tlv (buffer, buflen,
	data_objects[j].tag, &valuelen);
	if (!value)
	; /* not found */
	else if (valuelen > buflen - (value - buffer))
	log_error ("warning: constructed DO too short\n");
	else
	{
	if (data_objects[j].binary)
	{
	log_info ("DO `%s': ", data_objects[j].desc);
	log_printhex ("", value, valuelen);
	}
	else
	log_info ("DO `%s': `%.*s'\n",
	data_objects[j].desc,
	(int)valuelen, value); /* FIXME: sanitize */
	}
	}
	}
	}
	xfree (buffer); buffer = NULL;
	}
	}


	/* Count the number of bits, assuming the A represents an unsigned big
	integer of length LEN bytes. */
	static unsigned int
	count_bits (const unsigned char *a, size_t len)
	{
	unsigned int n = len * 8;
	int i;

	for (; len && !*a; len--, a++, n -=8)
	;
	if (len)
	{
	for (i=7; i && !(*a & (1<<i)); i--)
	n--;
	}
	return n;
	}

	+/* GnuPG makes special use of the login-data DO, this fucntion parses
	+ the login data to store the flags for later use. It may be called
	+ at any time and should be called after changing the login-data DO.
	+
	+ Everything up to a LF is considered a mailbox or account name. If
	+ the first LF is follewed by DC4 (0x14) control sequence are
	+ expected up to the next LF. Control sequences are separated by FS
	+ (0x28) and consist of key=value pairs. There is one key defined:
	+
	+ F=<flags>
	+
	+ Were FLAGS is a plain hexadecimal number representing flag values.
	+ The lsb is here the rightmost bit. Defined flags bits are:
	+
	+ Bit 0 = CHV1 and CHV2 are not syncronized
	+ Bit 1 = CHV2 has been been set to the default PIN of "123456"
	+ (this implies that bit 0 is also set).
	+
	+*/
	+static void
	+parse_login_data (app_t app)
	+{
	+ unsigned char buffer, p;
	+ size_t buflen, len;
	+ void *relptr;
	+
	+ /* Set defaults. */
	+ app->app_local->flags.no_sync = 0;
	+ app->app_local->flags.def_chv2 = 0;
	+
	+ /* Read the DO. */
	+ relptr = get_one_do (app, 0x005E, &buffer, &buflen);
	+ if (!relptr)
	+ return; /* Ooops. */
	+ for (; buflen; buflen--, buffer++)
	+ if (*buffer == '\n')
	+ break;
	+ if (buflen < 2 \|\| buffer[1] != '\x14')
	+ return; /* No control sequences. */
	+ buflen--;
	+ buffer++;
	+ do
	+ {
	+ buflen--;
	+ buffer++;
	+ if (buflen > 1 && *buffer == 'F' && buffer[1] == '=')
	+ {
	+ /* Flags control sequence found. */
	+ int lastdig = 0;
	+
	+ /* For now we are only interested in the last digit, so skip
	+ any leading digits but bail out on invalid characters. */
	+ for (p=buffer+2, len = buflen-2; len && hexdigitp (p); p++, len--)
	+ lastdig = xtoi_1 (p);
	+ if (len && !(p == '\n' \|\| p == '\x18'))
	+ goto next; /* Invalid characters in field. */
	+ app->app_local->flags.no_sync = !!(lastdig & 1);
	+ app->app_local->flags.def_chv2 = (lastdig & 3) == 3;
	+ }
	+ next:
	+ for (; buflen && *buffer != '\x18'; buflen--, buffer++)
	+ if (*buffer == '\n')
	+ buflen = 1;
	+ }
	+ while (buflen);
	+
	+ xfree (relptr);
	+}
	+
	/* Note, that FPR must be at least 20 bytes. */
	static int
	store_fpr (int slot, int keynumber, u32 timestamp,
	const unsigned char *m, size_t mlen,
	const unsigned char *e, size_t elen,
	unsigned char *fpr, unsigned int card_version)
	{
	unsigned int n, nbits;
	unsigned char buffer, p;
	int rc;

	for (; mlen && !m; mlen--, m++) / strip leading zeroes */
	;
	for (; elen && !e; elen--, e++) / strip leading zeroes */
	;

	n = 6 + 2 + mlen + 2 + elen;
	p = buffer = xtrymalloc (3 + n);
	if (!buffer)
	return gpg_error (gpg_err_code_from_errno (errno));

	p++ = 0x99; / ctb */
	p++ = n >> 8; / 2 byte length header */
	*p++ = n;
	p++ = 4; / key packet version */
	*p++ = timestamp >> 24;
	*p++ = timestamp >> 16;
	*p++ = timestamp >> 8;
	*p++ = timestamp;
	p++ = 1; / RSA */
	nbits = count_bits (m, mlen);
	*p++ = nbits >> 8;
	*p++ = nbits;
	memcpy (p, m, mlen); p += mlen;
	nbits = count_bits (e, elen);
	*p++ = nbits >> 8;
	*p++ = nbits;
	memcpy (p, e, elen); p += elen;

	gcry_md_hash_buffer (GCRY_MD_SHA1, fpr, buffer, n+3);

	xfree (buffer);

	rc = iso7816_put_data (slot, (card_version > 0x0007? 0xC7 : 0xC6)
	+ keynumber, fpr, 20);
	if (rc)
	log_error (_("failed to store the fingerprint: %s\n"),gpg_strerror (rc));

	if (!rc && card_version > 0x0100)
	{
	unsigned char buf[4];

	buf[0] = timestamp >> 24;
	buf[1] = timestamp >> 16;
	buf[2] = timestamp >> 8;
	buf[3] = timestamp;

	rc = iso7816_put_data (slot, 0xCE + keynumber, buf, 4);
	if (rc)
	log_error (_("failed to store the creation date: %s\n"),
	gpg_strerror (rc));
	}

	return rc;
	}


	static void
	-send_fpr_if_not_null (CTRL ctrl, const char *keyword,
	+send_fpr_if_not_null (ctrl_t ctrl, const char *keyword,
	int number, const unsigned char *fpr)
	{
	int i;
	char buf[41];
	char numbuf[25];

	for (i=0; i < 20 && !fpr[i]; i++)
	;
	if (i==20)
	return; /* All zero. */
	for (i=0; i< 20; i++)
	sprintf (buf+2*i, "%02X", fpr[i]);
	if (number == -1)
	numbuf = 0; / Don't print the key number */
	else
	sprintf (numbuf, "%d", number);
	send_status_info (ctrl, keyword,
	numbuf, (size_t)strlen(numbuf),
	buf, (size_t)strlen (buf), NULL, 0);
	}

	static void
	-send_key_data (CTRL ctrl, const char *name,
	+send_key_data (ctrl_t ctrl, const char *name,
	const unsigned char *a, size_t alen)
	{
	char p, buf = xmalloc (alen*2+1);

	for (p=buf; alen; a++, alen--, p += 2)
	sprintf (p, "%02X", *a);

	send_status_info (ctrl, "KEY-DATA",
	name, (size_t)strlen(name),
	buf, (size_t)strlen (buf),
	NULL, 0);
	xfree (buf);
	}

	/* Implement the GETATTR command. This is similar to the LEARN
	command but returns just one value via the status interface. */
	static int
	-do_getattr (APP app, CTRL ctrl, const char *name)
	+do_getattr (app_t app, ctrl_t ctrl, const char *name)
	{
	static struct {
	const char *name;
	int tag;
	int special;
	} table[] = {
	{ "DISP-NAME", 0x005B },
	{ "LOGIN-DATA", 0x005E },
	{ "DISP-LANG", 0x5F2D },
	{ "DISP-SEX", 0x5F35 },
	{ "PUBKEY-URL", 0x5F50 },
	{ "KEY-FPR", 0x00C5, 3 },
	{ "CA-FPR", 0x00C6, 3 },
	{ "CHV-STATUS", 0x00C4, 1 },
	{ "SIG-COUNTER", 0x0093, 2 },
	{ "SERIALNO", 0x004F, -1 },
	{ "AID", 0x004F },
	{ "EXTCAP", 0x0000, -2 },
	{ NULL, 0 }
	};
	int idx, i;
	void *relptr;
	unsigned char *value;
	size_t valuelen;

	for (idx=0; table[idx].name && strcmp (table[idx].name, name); idx++)
	;
	if (!table[idx].name)
	return gpg_error (GPG_ERR_INV_NAME);

	if (table[idx].special == -1)
	{
	/* The serial number is very special. We could have used the
	AID DO to retrieve it, but we have it already in the app
	context and the stamp argument is required anyway which we
	can't by other means. The AID DO is available anyway but not
	hex formatted. */
	char *serial;
	time_t stamp;
	char tmp[50];

	if (!app_get_serial_and_stamp (app, &serial, &stamp))
	{
	sprintf (tmp, "%lu", (unsigned long)stamp);
	send_status_info (ctrl, "SERIALNO",
	serial, strlen (serial),
	tmp, strlen (tmp),
	NULL, 0);
	xfree (serial);
	}
	return 0;
	}
	if (table[idx].special == -2)
	{
	char tmp[50];

	sprintf (tmp, "gc=%d ki=%d fc=%d pd=%d",
	app->app_local->extcap.get_challenge,
	app->app_local->extcap.key_import,
	app->app_local->extcap.change_force_chv,
	app->app_local->extcap.private_dos);
	send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
	return 0;
	}

	relptr = get_one_do (app, table[idx].tag, &value, &valuelen);
	if (relptr)
	{
	if (table[idx].special == 1)
	{
	char numbuf[7*23];

	for (i=0,*numbuf=0; i < valuelen && i < 7; i++)
	sprintf (numbuf+strlen (numbuf), " %d", value[i]);
	send_status_info (ctrl, table[idx].name,
	numbuf, strlen (numbuf), NULL, 0);
	}
	else if (table[idx].special == 2)
	{
	char numbuf[50];

	sprintf (numbuf, "%lu", convert_sig_counter_value (value, valuelen));
	send_status_info (ctrl, table[idx].name,
	numbuf, strlen (numbuf), NULL, 0);
	}
	else if (table[idx].special == 3)
	{
	if (valuelen >= 60)
	for (i=0; i < 3; i++)
	send_fpr_if_not_null (ctrl, table[idx].name, i+1, value+i*20);
	}
	else
	send_status_info (ctrl, table[idx].name, value, valuelen, NULL, 0);

	xfree (relptr);
	}
	return 0;
	}


	static int
	-do_learn_status (APP app, CTRL ctrl)
	+do_learn_status (app_t app, ctrl_t ctrl)
	{
	do_getattr (app, ctrl, "EXTCAP");
	do_getattr (app, ctrl, "DISP-NAME");
	do_getattr (app, ctrl, "DISP-LANG");
	do_getattr (app, ctrl, "DISP-SEX");
	do_getattr (app, ctrl, "PUBKEY-URL");
	do_getattr (app, ctrl, "LOGIN-DATA");
	do_getattr (app, ctrl, "KEY-FPR");
	do_getattr (app, ctrl, "CA-FPR");
	do_getattr (app, ctrl, "CHV-STATUS");
	do_getattr (app, ctrl, "SIG-COUNTER");

	return 0;
	}


	/* Verify CHV2 if required. Depending on the configuration of the
	card CHV1 will also be verified. */
	static int
	verify_chv2 (app_t app,
	int (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	int rc = 0;

	if (!app->did_chv2)
	{
	char *pinvalue;

	rc = pincb (pincb_arg, "PIN", &pinvalue);
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"), gpg_strerror (rc));
	return rc;
	}

	if (strlen (pinvalue) < 6)
	{
	- log_error (_("prassphrase (CHV%d) is too short;"
	+ log_error (_("PIN for CHV%d is too short;"
	" minimum length is %d\n"), 2, 6);
	xfree (pinvalue);
	return gpg_error (GPG_ERR_BAD_PIN);
	}

	rc = iso7816_verify (app->slot, 0x82, pinvalue, strlen (pinvalue));
	if (rc)
	{
	log_error (_("verify CHV%d failed: %s\n"), 2, gpg_strerror (rc));
	xfree (pinvalue);
	flush_cache_after_error (app);
	return rc;
	}
	app->did_chv2 = 1;

	if (!app->did_chv1 && !app->force_chv1)
	{
	rc = iso7816_verify (app->slot, 0x81, pinvalue, strlen (pinvalue));
	if (gpg_err_code (rc) == GPG_ERR_BAD_PIN)
	rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED);
	if (rc)
	{
	log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc));
	xfree (pinvalue);
	flush_cache_after_error (app);
	return rc;
	}
	app->did_chv1 = 1;
	}
	xfree (pinvalue);
	}
	return rc;
	}

	/* Verify CHV3 if required. */
	static int
	-verify_chv3 (APP app,
	+verify_chv3 (app_t app,
	int (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	int rc = 0;

	#if GNUPG_MAJOR_VERSION != 1
	if (!opt.allow_admin)
	{
	log_info (_("access to admin commands is not configured\n"));
	return gpg_error (GPG_ERR_EACCES);
	}
	#endif

	if (!app->did_chv3)
	{
	char *pinvalue;
	void *relptr;
	unsigned char *value;
	size_t valuelen;
	int reread_chv_status;


	relptr = get_one_do (app, 0x00C4, &value, &valuelen);
	if (!relptr \|\| valuelen < 7)
	{
	log_error (_("error retrieving CHV status from card\n"));
	xfree (relptr);
	return gpg_error (GPG_ERR_CARD);
	}
	if (value[6] == 0)
	{
	log_info (_("card is permanently locked!\n"));
	xfree (relptr);
	return gpg_error (GPG_ERR_BAD_PIN);
	}

	reread_chv_status = (value[6] < 3);

	log_info(_("%d Admin PIN attempts remaining before card"
	" is permanently locked\n"), value[6]);
	xfree (relptr);

	rc = pincb (pincb_arg, _("Admin PIN"), &pinvalue);
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"), gpg_strerror (rc));
	return rc;
	}

	if (strlen (pinvalue) < 6)
	{
	log_error (_("prassphrase (CHV%d) is too short;"
	" minimum length is %d\n"), 3, 6);
	xfree (pinvalue);
	return gpg_error (GPG_ERR_BAD_PIN);
	}

	rc = iso7816_verify (app->slot, 0x83, pinvalue, strlen (pinvalue));
	xfree (pinvalue);
	if (rc)
	{
	log_error (_("verify CHV%d failed: %s\n"), 3, gpg_strerror (rc));
	flush_cache_after_error (app);
	return rc;
	}
	app->did_chv3 = 1;
	/* If the PIN has been entered wrongly before, we need to flush
	the cached value so that the next read correctly reflects the
	resetted retry counter. Note that version 1.1 of the specs
	allow direct reading of that DO, so that we could actually
	flush it in all cases. */
	if (reread_chv_status)
	flush_cache_item (app, 0x00C4);
	}
	return rc;
	}


	/* Handle the SETATTR operation. All arguments are already basically
	checked. */
	static int
	-do_setattr (APP app, const char *name,
	+do_setattr (app_t app, const char *name,
	int (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *value, size_t valuelen)
	{
	gpg_error_t rc;
	int idx;
	static struct {
	const char *name;
	int tag;
	int special;
	} table[] = {
	{ "DISP-NAME", 0x005B },
	- { "LOGIN-DATA", 0x005E },
	+ { "LOGIN-DATA", 0x005E, 2 },
	{ "DISP-LANG", 0x5F2D },
	{ "DISP-SEX", 0x5F35 },
	{ "PUBKEY-URL", 0x5F50 },
	{ "CHV-STATUS-1", 0x00C4, 1 },
	{ "CA-FPR-1", 0x00CA },
	{ "CA-FPR-2", 0x00CB },
	{ "CA-FPR-3", 0x00CC },
	{ NULL, 0 }
	};


	for (idx=0; table[idx].name && strcmp (table[idx].name, name); idx++)
	;
	if (!table[idx].name)
	return gpg_error (GPG_ERR_INV_NAME);

	rc = verify_chv3 (app, pincb, pincb_arg);
	if (rc)
	return rc;

	/* Flush the cache before writing it, so that the next get operation
	will reread the data from the card and thus get synced in case of
	errors (e.g. data truncated by the card). */
	flush_cache_item (app, table[idx].tag);
	rc = iso7816_put_data (app->slot, table[idx].tag, value, valuelen);
	if (rc)
	log_error ("failed to set `%s': %s\n", table[idx].name, gpg_strerror (rc));

	if (table[idx].special == 1)
	app->force_chv1 = (valuelen && *value == 0);
	+ else if (table[idx].special == 2)
	+ parse_login_data (app);

	return rc;
	}


	/* Handle the PASSWD command. */
	static int
	-do_change_pin (APP app, CTRL ctrl, const char *chvnostr, int reset_mode,
	+do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr, int reset_mode,
	int (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	int rc = 0;
	int chvno = atoi (chvnostr);
	char *pinvalue;

	if (reset_mode && chvno == 3)
	{
	rc = gpg_error (GPG_ERR_INV_ID);
	goto leave;
	}
	else if (reset_mode \|\| chvno == 3)
	{
	/* we always require that the PIN is entered. */
	app->did_chv3 = 0;
	rc = verify_chv3 (app, pincb, pincb_arg);
	if (rc)
	goto leave;
	}
	else if (chvno == 1 \|\| chvno == 2)
	{
	/* CHV1 and CVH2 should always have the same value, thus we
	enforce it here. */
	int save_force = app->force_chv1;

	app->force_chv1 = 0;
	app->did_chv1 = 0;
	app->did_chv2 = 0;
	rc = verify_chv2 (app, pincb, pincb_arg);
	app->force_chv1 = save_force;
	if (rc)
	goto leave;
	}
	else
	{
	rc = gpg_error (GPG_ERR_INV_ID);
	goto leave;
	}

	if (chvno == 3)
	app->did_chv3 = 0;
	else
	app->did_chv1 = app->did_chv2 = 0;

	rc = pincb (pincb_arg, chvno == 3? "New Admin PIN" : "New PIN", &pinvalue);
	if (rc)
	{
	log_error ("error getting new PIN: %s\n", gpg_strerror (rc));
	goto leave;
	}

	if (reset_mode)
	{
	rc = iso7816_reset_retry_counter (app->slot, 0x81,
	pinvalue, strlen (pinvalue));
	if (!rc)
	rc = iso7816_reset_retry_counter (app->slot, 0x82,
	pinvalue, strlen (pinvalue));
	}
	else
	{
	if (chvno == 1 \|\| chvno == 2)
	{
	rc = iso7816_change_reference_data (app->slot, 0x81, NULL, 0,
	pinvalue, strlen (pinvalue));
	if (!rc)
	rc = iso7816_change_reference_data (app->slot, 0x82, NULL, 0,
	pinvalue, strlen (pinvalue));
	}
	else
	rc = iso7816_change_reference_data (app->slot, 0x80 + chvno, NULL, 0,
	pinvalue, strlen (pinvalue));
	}
	xfree (pinvalue);
	if (rc)
	flush_cache_after_error (app);

	leave:
	return rc;
	}



	/* Handle the GENKEY command. */
	static int
	-do_genkey (APP app, CTRL ctrl, const char *keynostr, unsigned int flags,
	+do_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags,
	int (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	int rc;
	int i;
	char numbuf[30];
	unsigned char fprbuf[20];
	const unsigned char *fpr;
	const unsigned char keydata, m, *e;
	unsigned char *buffer;
	size_t buflen, keydatalen, n, mlen, elen;
	time_t created_at;
	int keyno = atoi (keynostr);
	int force = (flags & 1);
	time_t start_at;

	if (keyno < 1 \|\| keyno > 3)
	return gpg_error (GPG_ERR_INV_ID);
	keyno--;

	/* We flush the cache to increase the traffic before a key
	generation. This _might_ help a card to gather more entropy. */
	flush_cache (app);

	rc = iso7816_get_data (app->slot, 0x006E, &buffer, &buflen);
	if (rc)
	{
	log_error ("error reading application data\n");
	return gpg_error (GPG_ERR_GENERAL);
	}
	fpr = find_tlv (buffer, buflen, 0x00C5, &n);
	if (!fpr \|\| n != 60)
	{
	rc = gpg_error (GPG_ERR_GENERAL);
	log_error ("error reading fingerprint DO\n");
	goto leave;
	}
	fpr += 20*keyno;
	for (i=0; i < 20 && !fpr[i]; i++)
	;
	if (i!=20 && !force)
	{
	rc = gpg_error (GPG_ERR_EEXIST);
	log_error ("key already exists\n");
	goto leave;
	}
	else if (i!=20)
	log_info ("existing key will be replaced\n");
	else
	log_info ("generating new key\n");


	rc = verify_chv3 (app, pincb, pincb_arg);
	if (rc)
	goto leave;

	xfree (buffer); buffer = NULL;

	#if 1
	log_info ("please wait while key is being generated ...\n");
	start_at = time (NULL);
	rc = iso7816_generate_keypair
	#else
	#warning key generation temporary replaced by reading an existing key.
	rc = iso7816_read_public_key
	#endif
	(app->slot,
	keyno == 0? "\xB6" :
	keyno == 1? "\xB8" : "\xA4",
	2,
	&buffer, &buflen);
	if (rc)
	{
	rc = gpg_error (GPG_ERR_CARD);
	log_error ("generating key failed\n");
	goto leave;
	}
	log_info ("key generation completed (%d seconds)\n",
	(int)(time (NULL) - start_at));
	keydata = find_tlv (buffer, buflen, 0x7F49, &keydatalen);
	if (!keydata)
	{
	rc = gpg_error (GPG_ERR_CARD);
	log_error ("response does not contain the public key data\n");
	goto leave;
	}

	m = find_tlv (keydata, keydatalen, 0x0081, &mlen);
	if (!m)
	{
	rc = gpg_error (GPG_ERR_CARD);
	log_error ("response does not contain the RSA modulus\n");
	goto leave;
	}
	/* log_printhex ("RSA n:", m, mlen); */
	send_key_data (ctrl, "n", m, mlen);

	e = find_tlv (keydata, keydatalen, 0x0082, &elen);
	if (!e)
	{
	rc = gpg_error (GPG_ERR_CARD);
	log_error ("response does not contain the RSA public exponent\n");
	goto leave;
	}
	/* log_printhex ("RSA e:", e, elen); */
	send_key_data (ctrl, "e", e, elen);

	created_at = gnupg_get_time ();
	sprintf (numbuf, "%lu", (unsigned long)created_at);
	send_status_info (ctrl, "KEY-CREATED-AT",
	numbuf, (size_t)strlen(numbuf), NULL, 0);

	rc = store_fpr (app->slot, keyno, (u32)created_at,
	m, mlen, e, elen, fprbuf, app->card_version);
	if (rc)
	goto leave;
	send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);


	leave:
	xfree (buffer);
	return rc;
	}


	static unsigned long
	convert_sig_counter_value (const unsigned char *value, size_t valuelen)
	{
	unsigned long ul;

	if (valuelen == 3 )
	ul = (value[0] << 16) \| (value[1] << 8) \| value[2];
	else
	{
	log_error ("invalid structure of OpenPGP card (DO 0x93)\n");
	ul = 0;
	}
	return ul;
	}

	static unsigned long
	-get_sig_counter (APP app)
	+get_sig_counter (app_t app)
	{
	void *relptr;
	unsigned char *value;
	size_t valuelen;
	unsigned long ul;

	relptr = get_one_do (app, 0x0093, &value, &valuelen);
	if (!relptr)
	return 0;
	ul = convert_sig_counter_value (value, valuelen);
	xfree (relptr);
	return ul;
	}

	static int
	-compare_fingerprint (APP app, int keyno, unsigned char *sha1fpr)
	+compare_fingerprint (app_t app, int keyno, unsigned char *sha1fpr)
	{
	const unsigned char *fpr;
	unsigned char *buffer;
	size_t buflen, n;
	int rc, i;

	assert (keyno >= 1 && keyno <= 3);

	rc = get_cached_data (app, 0x006E, &buffer, &buflen);
	if (rc)
	{
	log_error ("error reading application data\n");
	return gpg_error (GPG_ERR_GENERAL);
	}
	fpr = find_tlv (buffer, buflen, 0x00C5, &n);
	if (!fpr \|\| n != 60)
	{
	xfree (buffer);
	log_error ("error reading fingerprint DO\n");
	return gpg_error (GPG_ERR_GENERAL);
	}
	fpr += (keyno-1)*20;
	for (i=0; i < 20; i++)
	if (sha1fpr[i] != fpr[i])
	{
	xfree (buffer);
	return gpg_error (GPG_ERR_WRONG_SECKEY);
	}
	xfree (buffer);
	return 0;
	}


	/* If a fingerprint has been specified check it against the one on
	the card. This is allows for a meaningful error message in case
	the key on the card has been replaced but the shadow information
	known to gpg was not updated. If there is no fingerprint we
	assume that this is okay. */
	static int
	-check_against_given_fingerprint (APP app, const char *fpr, int keyno)
	+check_against_given_fingerprint (app_t app, const char *fpr, int keyno)
	{
	unsigned char tmp[20];
	const char *s;
	int n;

	for (s=fpr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 40)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* okay */
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=fpr, n=0; n < 20; s += 2, n++)
	tmp[n] = xtoi_2 (s);
	return compare_fingerprint (app, keyno, tmp);
	}



	/* Compute a digital signature on INDATA which is expected to be the
	raw message digest. For this application the KEYIDSTR consists of
	the serialnumber and the fingerprint delimited by a slash.

	Note that this fucntion may return the error code
	GPG_ERR_WRONG_CARD to indicate that the card currently present does
	not match the one required for the requested action (e.g. the
	serial number does not match). */
	static int
	-do_sign (APP app, const char *keyidstr, int hashalgo,
	+do_sign (app_t app, const char *keyidstr, int hashalgo,
	int (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen )
	{
	static unsigned char sha1_prefix[15] = /* Object ID is 1.3.14.3.2.26 */
	{ 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03,
	0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 };
	static unsigned char rmd160_prefix[15] = /* Object ID is 1.3.36.3.2.1 */
	{ 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03,
	0x02, 0x01, 0x05, 0x00, 0x04, 0x14 };
	int rc;
	unsigned char data[35];
	unsigned char tmp_sn[20]; /* actually 16 but we use it also for the fpr. */
	const char *s;
	int n;
	const char *fpr = NULL;
	unsigned long sigcount;

	if (!keyidstr \|\| !*keyidstr)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (indatalen != 20)
	return gpg_error (GPG_ERR_INV_VALUE);

	/* Check whether an OpenPGP card of any version has been requested. */
	if (strlen (keyidstr) < 32 \|\| strncmp (keyidstr, "D27600012401", 12))
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 32)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* no fingerprint given: we allow this for now. */
	else if (*s == '/')
	fpr = s + 1;
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; n < 16; s += 2, n++)
	tmp_sn[n] = xtoi_2 (s);

	if (app->serialnolen != 16)
	return gpg_error (GPG_ERR_INV_CARD);
	if (memcmp (app->serialno, tmp_sn, 16))
	return gpg_error (GPG_ERR_WRONG_CARD);

	/* If a fingerprint has been specified check it against the one on
	the card. This is allows for a meaningful error message in case
	the key on the card has been replaced but the shadow information
	known to gpg was not updated. If there is no fingerprint, gpg
	will detect a bogus signature anyway due to the
	verify-after-signing feature. */
	rc = fpr? check_against_given_fingerprint (app, fpr, 1) : 0;
	if (rc)
	return rc;

	if (hashalgo == GCRY_MD_SHA1)
	memcpy (data, sha1_prefix, 15);
	else if (hashalgo == GCRY_MD_RMD160)
	memcpy (data, rmd160_prefix, 15);
	else
	return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
	memcpy (data+15, indata, indatalen);

	sigcount = get_sig_counter (app);
	log_info ("signatures created so far: %lu\n", sigcount);

	if (!app->did_chv1 \|\| app->force_chv1 )
	{
	char *pinvalue;

	{
	char *prompt;
	- if (asprintf (&prompt, "PIN [sigs done: %lu]", sigcount) < 0)
	+ if (asprintf (&prompt, _("PIN [sigs done: %lu]"), sigcount) < 0)
	return gpg_error_from_errno (errno);
	rc = pincb (pincb_arg, prompt, &pinvalue);
	free (prompt);
	}
	if (rc)
	{
	- log_info ("PIN callback returned error: %s\n", gpg_strerror (rc));
	+ log_info (_("PIN callback returned error: %s\n"), gpg_strerror (rc));
	return rc;
	}

	if (strlen (pinvalue) < 6)
	{
	- log_error (_("prassphrase (CHV%d) is too short;"
	+ log_error (_("PIN for CHV%d is too short;"
	" minimum length is %d\n"), 1, 6);
	xfree (pinvalue);
	return gpg_error (GPG_ERR_BAD_PIN);
	}

	rc = iso7816_verify (app->slot, 0x81, pinvalue, strlen (pinvalue));
	if (rc)
	{
	- log_error (_("verify CHV%d failed\n"), 1);
	+ log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc));
	xfree (pinvalue);
	flush_cache_after_error (app);
	return rc;
	}
	app->did_chv1 = 1;
	if (!app->did_chv2)
	{
	/* We should also verify CHV2. */
	rc = iso7816_verify (app->slot, 0x82, pinvalue, strlen (pinvalue));
	if (gpg_err_code (rc) == GPG_ERR_BAD_PIN)
	rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED);
	if (rc)
	{
	- log_error (_("verify CHV%d failed\n"), 2);
	+ log_error (_("verify CHV%d failed: %s\n"), 2, gpg_strerror (rc));
	xfree (pinvalue);
	flush_cache_after_error (app);
	return rc;
	}
	app->did_chv2 = 1;
	}
	xfree (pinvalue);
	}

	rc = iso7816_compute_ds (app->slot, data, 35, outdata, outdatalen);
	return rc;
	}

	/* Compute a digital signature using the INTERNAL AUTHENTICATE command
	on INDATA which is expected to be the raw message digest. For this
	application the KEYIDSTR consists of the serialnumber and the
	fingerprint delimited by a slash.

	Note that this fucntion may return the error code
	GPG_ERR_WRONG_CARD to indicate that the card currently present does
	not match the one required for the requested action (e.g. the
	serial number does not match). */
	static int
	-do_auth (APP app, const char *keyidstr,
	+do_auth (app_t app, const char *keyidstr,
	int (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen )
	{
	int rc;
	unsigned char tmp_sn[20]; /* actually 16 but we use it also for the fpr. */
	const char *s;
	int n;
	const char *fpr = NULL;

	if (!keyidstr \|\| !*keyidstr)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (indatalen > 50) /* For a 1024 bit key. */
	return gpg_error (GPG_ERR_INV_VALUE);

	/* Check whether an OpenPGP card of any version has been requested. */
	if (strlen (keyidstr) < 32 \|\| strncmp (keyidstr, "D27600012401", 12))
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 32)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* no fingerprint given: we allow this for now. */
	else if (*s == '/')
	fpr = s + 1;
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; n < 16; s += 2, n++)
	tmp_sn[n] = xtoi_2 (s);

	if (app->serialnolen != 16)
	return gpg_error (GPG_ERR_INV_CARD);
	if (memcmp (app->serialno, tmp_sn, 16))
	return gpg_error (GPG_ERR_WRONG_CARD);

	/* If a fingerprint has been specified check it against the one on
	the card. This is allows for a meaningful error message in case
	the key on the card has been replaced but the shadow information
	known to gpg was not updated. If there is no fingerprint, gpg
	will detect a bogus signature anyway due to the
	verify-after-signing feature. */
	rc = fpr? check_against_given_fingerprint (app, fpr, 3) : 0;
	if (rc)
	return rc;

	rc = verify_chv2 (app, pincb, pincb_arg);
	if (!rc)
	rc = iso7816_internal_authenticate (app->slot, indata, indatalen,
	outdata, outdatalen);
	return rc;
	}


	static int
	-do_decipher (APP app, const char *keyidstr,
	+do_decipher (app_t app, const char *keyidstr,
	int (pincb)(void, const char , char **),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen )
	{
	int rc;
	unsigned char tmp_sn[20]; /* actually 16 but we use it also for the fpr. */
	const char *s;
	int n;
	const char *fpr = NULL;

	if (!keyidstr \|\| !*keyidstr \|\| !indatalen)
	return gpg_error (GPG_ERR_INV_VALUE);

	/* Check whether an OpenPGP card of any version has been requested. */
	if (strlen (keyidstr) < 32 \|\| strncmp (keyidstr, "D27600012401", 12))
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 32)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* no fingerprint given: we allow this for now. */
	else if (*s == '/')
	fpr = s + 1;
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; n < 16; s += 2, n++)
	tmp_sn[n] = xtoi_2 (s);

	if (app->serialnolen != 16)
	return gpg_error (GPG_ERR_INV_CARD);
	if (memcmp (app->serialno, tmp_sn, 16))
	return gpg_error (GPG_ERR_WRONG_CARD);

	/* If a fingerprint has been specified check it against the one on
	the card. This is allows for a meaningful error message in case
	the key on the card has been replaced but the shadow information
	known to gpg was not updated. If there is no fingerprint, the
	decryption will won't produce the right plaintext anyway. */
	rc = fpr? check_against_given_fingerprint (app, fpr, 2) : 0;
	if (rc)
	return rc;

	rc = verify_chv2 (app, pincb, pincb_arg);
	if (!rc)
	rc = iso7816_decipher (app->slot, indata, indatalen, 0,
	outdata, outdatalen);
	return rc;
	}


	/* Perform a simple verify operation for CHV1 and CHV2, so that
	further operations won't ask for CHV2 and it is possible to do a
	cheap check on the PIN: If there is something wrong with the PIN
	entry system, only the regular CHV will get blocked and not the
	dangerous CHV3. KEYIDSTR is the usual card's serial number; an
	optional fingerprint part will be ignored. */
	static int
	-do_check_pin (APP app, const char *keyidstr,
	+do_check_pin (app_t app, const char *keyidstr,
	int (pincb)(void, const char , char **),
	void *pincb_arg)
	{
	unsigned char tmp_sn[20];
	const char *s;
	int n;

	if (!keyidstr \|\| !*keyidstr)
	return gpg_error (GPG_ERR_INV_VALUE);

	/* Check whether an OpenPGP card of any version has been requested. */
	if (strlen (keyidstr) < 32 \|\| strncmp (keyidstr, "D27600012401", 12))
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 32)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* No fingerprint given: we allow this for now. */
	else if (*s == '/')
	; /* We ignore a fingerprint. */
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; n < 16; s += 2, n++)
	tmp_sn[n] = xtoi_2 (s);

	if (app->serialnolen != 16)
	return gpg_error (GPG_ERR_INV_CARD);
	if (memcmp (app->serialno, tmp_sn, 16))
	return gpg_error (GPG_ERR_WRONG_CARD);
	/* Yes, there is a race conditions: The user might pull the card
	right here and we won't notice that. However this is not a
	problem and the check above is merely for a graceful failure
	between operations. */

	return verify_chv2 (app, pincb, pincb_arg);
	}




	/* Select the OpenPGP application on the card in SLOT. This function
	must be used before any other OpenPGP application functions. */
	int
	-app_select_openpgp (APP app)
	+app_select_openpgp (app_t app)
	{
	static char const aid[] = { 0xD2, 0x76, 0x00, 0x01, 0x24, 0x01 };
	int slot = app->slot;
	int rc;
	unsigned char *buffer;
	size_t buflen;
	void *relptr;

	rc = iso7816_select_application (slot, aid, sizeof aid);
	if (!rc)
	{
	unsigned int manufacturer;

	app->apptype = "OPENPGP";

	app->did_chv1 = 0;
	app->did_chv2 = 0;
	app->did_chv3 = 0;
	app->app_local = NULL;

	/* The OpenPGP card returns the serial number as part of the
	AID; because we prefer to use OpenPGP serial numbers, we
	replace a possibly already set one from a EF.GDO with this
	one. Note, that for current OpenPGP cards, no EF.GDO exists
	and thus it won't matter at all. */
	rc = iso7816_get_data (slot, 0x004F, &buffer, &buflen);
	if (rc)
	goto leave;
	if (opt.verbose)
	{
	log_info ("AID: ");
	log_printhex ("", buffer, buflen);
	}

	app->card_version = buffer[6] << 8;
	app->card_version \|= buffer[7];
	manufacturer = (buffer[8]<<8 \| buffer[9]);

	xfree (app->serialno);
	app->serialno = buffer;
	app->serialnolen = buflen;
	buffer = NULL;
	app->app_local = xtrycalloc (1, sizeof *app->app_local);
	if (!app->app_local)
	{
	rc = gpg_error (gpg_err_code_from_errno (errno));
	goto leave;
	}

	relptr = get_one_do (app, 0x00C4, &buffer, &buflen);
	if (!relptr)
	{
	- log_error (_("can't access CHV Status Bytes "
	- "- invalid OpenPGP card?\n"));
	+ log_error (_("can't access %s - invalid OpenPGP card?\n"),
	+ "CHV Status Bytes");
	goto leave;
	}
	app->force_chv1 = (buflen && *buffer == 0);
	xfree (relptr);

	relptr = get_one_do (app, 0x00C0, &buffer, &buflen);
	if (!relptr)
	{
	- log_error (_("can't access Extended Capability Flags - "
	- "invalid OpenPGP card?\n"));
	+ log_error (_("can't access %s - invalid OpenPGP card?\n"),
	+ "Extended Capability Flags" );
	goto leave;
	}
	if (buflen)
	{
	app->app_local->extcap.get_challenge = !!(*buffer & 0x40);
	app->app_local->extcap.key_import = !!(*buffer & 0x20);
	app->app_local->extcap.change_force_chv = !!(*buffer & 0x10);
	app->app_local->extcap.private_dos = !!(*buffer & 0x08);
	}
	xfree (relptr);

	/* Some of the first cards accidently don't set the
	CHANGE_FORCE_CHV bit but allow it anyway. */
	if (app->card_version <= 0x0100 && manufacturer == 1)
	app->app_local->extcap.change_force_chv = 1;

	+ parse_login_data (app);

	if (opt.verbose > 1)
	dump_all_do (slot);

	app->fnc.deinit = do_deinit;
	app->fnc.learn_status = do_learn_status;
	app->fnc.readcert = NULL;
	app->fnc.getattr = do_getattr;
	app->fnc.setattr = do_setattr;
	app->fnc.genkey = do_genkey;
	app->fnc.sign = do_sign;
	app->fnc.auth = do_auth;
	app->fnc.decipher = do_decipher;
	app->fnc.change_pin = do_change_pin;
	app->fnc.check_pin = do_check_pin;
	}

	leave:
	if (rc)
	do_deinit (app);
	return rc;
	}



	/* This function is a hack to retrieve essential information about the
	card to be displayed by simple tools. It mostly resembles what the
	LEARN command returns. All parameters return allocated strings or
	buffers or NULL if the data object is not available. All returned
	values are sanitized. */
	int
	-app_openpgp_cardinfo (APP app,
	+app_openpgp_cardinfo (app_t app,
	char **serialno,
	char **disp_name,
	char **pubkey_url,
	unsigned char **fpr1,
	unsigned char **fpr2,
	unsigned char **fpr3)
	{
	int rc;
	void *relptr;
	unsigned char *value;
	size_t valuelen;

	if (serialno)
	{
	time_t dummy;

	*serialno = NULL;
	rc = app_get_serial_and_stamp (app, serialno, &dummy);
	if (rc)
	{
	log_error (_("error getting serial number: %s\n"),
	gpg_strerror (rc));
	return rc;
	}
	}

	if (disp_name)
	{
	*disp_name = NULL;
	relptr = get_one_do (app, 0x005B, &value, &valuelen);
	if (relptr)
	{
	*disp_name = make_printable_string (value, valuelen, 0);
	xfree (relptr);
	}
	}

	if (pubkey_url)
	{
	*pubkey_url = NULL;
	relptr = get_one_do (app, 0x5F50, &value, &valuelen);
	if (relptr)
	{
	*pubkey_url = make_printable_string (value, valuelen, 0);
	xfree (relptr);
	}
	}

	if (fpr1)
	*fpr1 = NULL;
	if (fpr2)
	*fpr2 = NULL;
	if (fpr3)
	*fpr3 = NULL;
	relptr = get_one_do (app, 0x00C5, &value, &valuelen);
	if (relptr && valuelen >= 60)
	{
	if (fpr1)
	{
	*fpr1 = xmalloc (20);
	memcpy (*fpr1, value + 0, 20);
	}
	if (fpr2)
	{
	*fpr2 = xmalloc (20);
	memcpy (*fpr2, value + 20, 20);
	}
	if (fpr3)
	{
	*fpr3 = xmalloc (20);
	memcpy (*fpr3, value + 40, 20);
	}
	}
	xfree (relptr);

	return 0;
	}



	/* This function is currently only used by the sc-copykeys program to
	- store a key on the smartcard. APP ist the application handle,
	+ store a key on the smartcard. app_t ist the application handle,
	KEYNO is the number of the key and PINCB, PINCB_ARG are used to ask
	for the SO PIN. TEMPLATE and TEMPLATE_LEN describe a buffer with
	the key template to store. CREATED_AT is the timestamp used to
	create the fingerprint. M, MLEN is the RSA modulus and E, ELEN the
	RSA public exponent. This function silently overwrites an existing
	key.*/
	int
	-app_openpgp_storekey (APP app, int keyno,
	+app_openpgp_storekey (app_t app, int keyno,
	unsigned char *template, size_t template_len,
	time_t created_at,
	const unsigned char *m, size_t mlen,
	const unsigned char *e, size_t elen,
	int (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	int rc;
	unsigned char fprbuf[20];

	if (keyno < 1 \|\| keyno > 3)
	return gpg_error (GPG_ERR_INV_ID);
	keyno--;

	rc = verify_chv3 (app, pincb, pincb_arg);
	if (rc)
	goto leave;

	flush_cache (app);

	rc = iso7816_put_data (app->slot,
	(app->card_version > 0x0007? 0xE0 : 0xE9) + keyno,
	template, template_len);
	if (rc)
	{
	log_error (_("failed to store the key: %s\n"), gpg_strerror (rc));
	rc = gpg_error (GPG_ERR_CARD);
	goto leave;
	}

	/* log_printhex ("RSA n:", m, mlen); */
	/* log_printhex ("RSA e:", e, elen); */

	rc = store_fpr (app->slot, keyno, (u32)created_at,
	m, mlen, e, elen, fprbuf, app->card_version);

	leave:
	return rc;
	}


	/* Utility function for external tools: Read the public RSA key at
	KEYNO and return modulus and exponent in (M,MLEN) and (E,ELEN). */
	int
	-app_openpgp_readkey (APP app, int keyno, unsigned char *m, size_t mlen,
	+app_openpgp_readkey (app_t app, int keyno, unsigned char *m, size_t mlen,
	unsigned char *e, size_t elen)
	{
	int rc;
	const unsigned char keydata, a;
	unsigned char *buffer;
	size_t buflen, keydatalen, alen;

	*m = NULL;
	*e = NULL;

	if (keyno < 1 \|\| keyno > 3)
	return gpg_error (GPG_ERR_INV_ID);
	keyno--;

	rc = iso7816_read_public_key(app->slot,
	keyno == 0? "\xB6" :
	keyno == 1? "\xB8" : "\xA4",
	2,
	&buffer, &buflen);
	if (rc)
	{
	rc = gpg_error (GPG_ERR_CARD);
	log_error (_("reading the key failed\n"));
	goto leave;
	}

	keydata = find_tlv (buffer, buflen, 0x7F49, &keydatalen);
	if (!keydata)
	{
	log_error (_("response does not contain the public key data\n"));
	rc = gpg_error (GPG_ERR_CARD);
	goto leave;
	}

	a = find_tlv (keydata, keydatalen, 0x0081, &alen);
	if (!a)
	{
	log_error (_("response does not contain the RSA modulus\n"));
	rc = gpg_error (GPG_ERR_CARD);
	goto leave;
	}
	*mlen = alen;
	*m = xmalloc (alen);
	memcpy (*m, a, alen);

	a = find_tlv (keydata, keydatalen, 0x0082, &alen);
	if (!a)
	{
	log_error (_("response does not contain the RSA public exponent\n"));
	rc = gpg_error (GPG_ERR_CARD);
	goto leave;
	}
	*elen = alen;
	*e = xmalloc (alen);
	memcpy (*e, a, alen);

	leave:
	xfree (buffer);
	if (rc)
	{
	xfree (m); m = NULL;
	xfree (e); e = NULL;
	}
	return rc;
	}
	diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
	index 434cd3547..5c0cc6a1c 100644
	--- a/keyserver/ChangeLog
	+++ b/keyserver/ChangeLog
	@@ -1,610 +1,614 @@
	+2004-10-15 Werner Koch <wk@g10code.com>
	+
	+ * Makefile.am: Add ksutil.h.
	+
	2004-10-14 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_finger.c (main): We do not support relay fingering
	(i.e. "finger://relayhost/user@example.com"), but finger URLs are
	occasionally miswritten that way. Give an error in this case.

	2004-10-14 Werner Koch <wk@g10code.com>

	* gpgkeys_finger.c (get_key): s/unsigned char/byte/ due
	to a strange typedef for RISC OS. Noted by Stefan.

	2004-10-13 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (main), gpgkeys_hkp.c (main), gpgkeys_http.c
	(main), gpgkeys_finger.c (main): Call timeout functions before
	performing an action that could block for a long time.

	* ksutil.h, ksutil.c: New. Right now just contains timeout
	functions.

	2004-10-11 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_finger.c, gpgkeys_hkp.c, gpgkeys_http.c, gpgkeys_ldap.c:
	Fix a few occurances of "filename" to `filename'.

	2004-10-11 Werner Koch <wk@g10code.com>

	* gpgkeys_finger.c: New.

	2004-08-27 Stefan Bellon <sbellon@sbellon.de>

	* gpgkeys_hkp.c (search_key): Fix the prior faulty fix by
	introducing a cast but leaving skey unsigned.

	* gpgkeys_hkp.c (search_key): Change type of variable skey from
	unsigned char* to char* to fix type incompatibility.

	2004-08-23 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (get_key, search_key), gpgkeys_hkp.c (get_key,
	search_key), gpgkeys_http.c (get_key): Do not give informational
	logs since this is now done inside gpg.

	* gpgkeys_hkp.c (dehtmlize): Understand the quote character
	(i.e. """) in HTML responses.
	(search_key): Search key must be unsigned for url encoder to work
	properly for 8-bit values.

	* gpgkeys_ldap.c (get_key): Factor out informational display into
	new function build_info().

	* gpgkeys_ldap.c (build_attrs): Properly terminate user ID strings
	that got shrunk due to encoding.

	2004-08-22 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (find_basekeyspacedn): Use LDAP_SCOPE_BASE along
	with a full DN rather than LDAP_SCOPE_ONELEVEL plus a filter to
	find the pgpServerInfo object. Some LDAP setups don't like the
	search.
	(main): Stop binding to the server since it seems no server really
	requires it, and some require it not be there.

	2004-07-29 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (main): Add "debug" option. This is only really
	useful with OpenLDAP, but it's practically vital to debug SSL and
	TLS setups. Add "basedn" option. This allows users to override
	the autodetection for base DN. SSL overrides TLS, so TLS will not
	be started on SSL connections (starting an already started car).

	2004-07-28 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (build_attrs): Add "pgpKeySize" and "pgpSubKeyID"
	attributes so we can do subkey searches.

	* gpgkeys_ldap.c (main): Under certain error conditions, we might
	try and unbind twice. Don't.

	* gpgkeys_ldap.c (join_two_modlists): New.
	(send_key): Use new function so we can try a modify operation
	first, and fail over to an add if that fails. Add cannot cope
	with the NULLs at the head of the modify request, so we jump into
	the list in the middle.

	2004-07-27 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (main): Don't try and error out before making a
	ldaps connection to the NAI keyserver since we cannot tell if it
	is a NAI keyserver until we connect. Fail if we cannot find a
	base keyspace DN. Fix a false success message for TLS being
	enabled.

	2004-07-20 Werner Koch <wk@gnupg.org>

	* gpgkeys_ldap.c [_WIN32]: Include Windows specific header files.
	Suggested by Brian Gladman.

	2004-05-26 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_http.c: General polish and removal of leftover stuff
	from gpgkeys_hkp.c.

	2004-05-21 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_http.c (get_key): Cosmetic fix - make sure that URLs
	with no path use a path of "/".

	* gpgkeys_ldap.c (ldap2epochtime): We can always rely on timegm()
	being available now, since it's a replacement function.

	2004-05-20 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_http.c: New program to do a simple HTTP file fetch using
	the keyserver interface.

	* Makefile.am: Build it.

	2004-02-28 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: Don't split LDADD across two lines since some make
	programs can't handle blank lines after a \ continuation. Noted
	by Christoph Moench-Tegeder.

	2004-02-25 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (send_key): List pgpCertID as one of the deleted
	attributes. This guarantees that if something goes wrong, we
	won't be able to complete the transaction, thus leaving any key
	already existing on the server intact.

	2004-02-23 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (delete_one_attr): Removed.
	(make_one_attr): Delete functionality added. Optional deduping
	functionality added (currently only used for pgpSignerID).
	(build_attrs): Translate sig entries into pgpSignerID. Properly
	build the timestamp for pgpKeyCreateTime and pgpKeyExpireTime.

	2004-02-22 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (delete_one_attr): New function to replace
	attributes with NULL (a "delete" that works even for nonexistant
	attributes).
	(send_key): Use it here to remove attributes so a modify operation
	starts with a clean playing field. Bias sends to modify before
	add, since (I suspect) people update their existing keys more
	often than they make and send new keys to the server.

	2004-02-21 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (epoch2ldaptime): New. Converse of
	ldap2epochtime.
	(make_one_attr): New. Build a modification list in memory to send
	to the LDAP server.
	(build_attrs): New. Parse INFO lines sent over by gpg.
	(free_mod_values): New. Unwinds a modification list.
	(send_key_keyserver): Renamed from old send_key().
	(send_key): New function to send a key to a LDAP server.
	(main): Use send_key() for real LDAP servers, send_key_keyserver()
	otherwise.

	2004-02-20 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c: Replacement prototypes for setenv and unsetenv.
	(search_key): Catch a SIZELIMIT_EXCEEDED error and show the user
	whatever the server did give us.
	(find_basekeyspacedn): There is no guarantee that namingContexts
	will be readable.

	* Makefile.am: Link gpgkeys_ldap with libutil.a to get the
	replacement functions (and eventually translations, etc).

	2004-02-19 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (ldap2epochtime): LDAP timestamps are UTC, so do
	not correct for timezones.
	(main): Find the basekeyspacedn before we try to start TLS, so we
	can give a better error message when a user tries to use TLS with
	a LDAP keyserver.

	* Makefile.am: Add automake conditionals to symlink gpgkeys_ldaps
	to gpgkeys_ldap when needed.

	* gpgkeys_ldap.c (main): Add support for LDAPS and TLS
	connections. These are only useful and usable when talking to
	real LDAP keyservers. Add new "tls" option to tune TLS use from
	off, to try quietly, to try loudly, or to require TLS.

	* gpgkeys_ldap.c (find_basekeyspacedn): New function to figure out
	what kind of LDAP server we're talking to (either real LDAP or the
	LDAP keyserver), and return the baseKeySpaceDN to find keys under.
	(main): Call it from here, and remove the old code that only
	handled the LDAP keyserver.

	2004-02-18 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (ldap_to_gpg_err): Make sure that
	LDAP_OPT_ERROR_NUMBER is defined before we use it.

	* gpgkeys_mailto.in: Fix VERSION number.

	2004-01-13 Werner Koch <wk@gnupg.org>

	* gpgkeys_hkp.c (send_key): Add a content type.

	2004-01-11 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (search_key): Catch a mangled input file (useful
	if something other than GnuPG is calling the program).
	(main): Avoid possible pre-string write. Noted by Christian
	Biere.

	* gpgkeys_ldap.c (main): Avoid possible pre-string write.

	2003-12-28 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (send_key, get_key, main): Work with new HTTP code
	that passes the proxy in from the outside. If the command file
	sends a proxy, use it. If it sends "http-proxy" with no
	arguments, use $http_proxy from the environment. Suggested by
	Christian Biere.

	2003-12-28 Stefan Bellon <sbellon@sbellon.de>

	* gpgkeys_hkp.c, gpgkeys_ldap.c [__riscos__]: Removal of
	unnecessary #ifdef __riscos__ sections.

	2003-11-27 Werner Koch <wk@gnupg.org>

	* gpgkeys_hkp.c (get_key): Fixed invalid use of fprintf without
	format string.

	2003-10-25 Werner Koch <wk@gnupg.org>

	* Makefile.am (gpgkeys_hkp_LDADD): Replaced INTLLIBS by LIBINTL.

	2003-07-10 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: Use W32LIBS where appropriate.

	2003-05-30 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c, gpgkeys_ldap.c: #include <getopt.h> if it is
	available. Also include extern references for optarg and optind
	since there is no guarantee that any header file will include
	them. Standards? We don't need no stinkin' standards.

	* Makefile.am: Use @GETOPT@ to pull in libiberty on those
	platforms that need it.

	2003-04-08 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (dehtmlize, parse_hkp_index): Fix memory
	corruption bug on some platforms.

	2003-03-11 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (get_key): Properly handle CRLF line endings in
	the armored key.
	(main): Accept "try-dns-srv" option.

	* Makefile.am: Use @CAPLIBS@ to link in -lcap if we are using
	capabilities. Use @SRVLIBS@ to link in the resolver if we are
	using DNS SRV.

	2003-02-11 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: Use a local copy of libexecdir along with @PACKAGE@
	so it can be easily overridden at make time.

	2003-01-29 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_mailto.in: Fix regexp to work properly if the "keyid" is
	not a keyid, but rather a text string from the user ID.

	2003-01-06 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (get_key): Use options=mr when getting a key so
	keyserver doesn't attach the HTML header which we will just have
	to discard.

	2002-11-17 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (main), gpgkeys_hkp.c (main): Use new keyserver
	protocol version.

	2002-11-14 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (get_key): The deduping code requires
	"pgpcertid", but that was not available when running without
	verbose on. Noted by Stefan.

	2002-11-10 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (get_key): Fix typo in deduping code.

	2002-11-05 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (key_in_keylist, add_key_to_keylist,
	free_keylist, get_key, search_key): The LDAP keyserver doesn't
	remove duplicates, so remove them locally. Do not include the key
	modification time in the search response.

	2002-11-04 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key): Properly
	handle an input file that does not include any key data at all.

	2002-10-24 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (main), gpgkeys_ldap.c (main): Add -V flag to
	output protocol and program version.

	2002-10-21 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: Anything linking with libutil.a needs INTLLIBS as
	well on platforms where INTLLIBS is set.

	2002-10-14 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (write_quoted): Use %-encoding instead of
	\-encoding.
	(parse_hkp_index): Use new keyserver key listing format, and add
	support for disabled keys via include-disabled.

	* gpgkeys_ldap.c (get_key): Don't print keysize unless it's >0.
	(printquoted): Use %-encoding instead of \-encoding.
	(search_key): Use new keyserver key listing format.

	2002-10-08 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (search_key, main): Make sure LDAP values are
	freed in case of error.

	* gpgkeys_ldap.c (fail_all): New function to unwind a keylist and
	error each item.
	(main): Call fail_all from here, as needed. Also add a NO_MEMORY
	error in an appropriate place and fix error return code.
	(ldap_err_to_gpg_err): Add KEYSERVER_UNREACHABLE.

	* gpgkeys_hkp.c (fail_all): New function to unwind a keylist and
	error each item.
	(main): Call fail_all from here. Also add a NO_MEMORY error in an
	appropriate place.
	(get_key): Use new UNREACHABLE error for network errors.

	2002-09-26 Werner Koch <wk@gnupg.org>

	* gpgkeys_ldap.c (send_key): Removed non-constant initializers.

	2002-09-24 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (ldap_err_to_gpg_err, ldap_to_gpg_err, send_key,
	get_key, search_key, main): Some minor error reporting
	enhancements for use with GPA (show reasons for KEY FAILED).

	* gpgkeys_hkp.c (send_key, get_key, search_key, main): Some minor
	error reporting enhancements for use with GPA (show reasons for
	KEY FAILED).

	2002-09-20 Werner Koch <wk@gnupg.org>

	* gpgkeys_hkp.c (handle_old_hkp_index): s/input/inp/ to avoid
	shadowing warning.

	2002-09-19 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (get_key, handle_old_hkp_index, search_key):
	Properly handle line truncation.

	2002-09-16 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_mailto.in: Add quasi-RFC-2368 mailto:email@addr?from=
	syntax so people can set their own email address to respond to.

	* gpgkeys_hkp.c (get_key): Properly respond with KEY FAILED (to
	gpg) and "key not found" (to user) on failure.

	2002-09-13 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c: (search_key, handle_old_hkp_index): Try and
	request a machine-readable key index. If the server supports
	this, pass it through. If the server does not support it, parse
	the "index" page.

	2002-09-12 Stefan Bellon <sbellon@sbellon.de>

	* gpgkeys_hkp.c: Tidied up RISC OS initializations.

	2002-09-12 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (main): Remove warning - this is no longer
	experimental code.

	2002-09-09 Werner Koch <wk@gnupg.org>

	* gpgkeys_hkp.c (send_key, get_key, search_key): Check return
	value of malloc.
	(dehtmlize): Use ascii_tolower to protect against weird locales.
	Cast the argument for isspace for the sake of broken HP/UXes.
	(search_key): Check return value of realloc.

	2002-09-09 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (get_key): Some compilers (RISC OS, HPUX c89)
	don't like using variables as array initializers.

	* gpgkeys_hkp.c (send_key): Use CRLF in headers.

	2002-08-28 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (parse_hkp_index): Use same types on all
	platforms. This was probably leftover from earlier code where the
	typing mattered.

	* gpgkeys_hkp.c: Overall cleanup from iobuf conversion. Be
	consistent in m_alloc and malloc usage. Remove include-disabled
	(meaningless on HKP). RISC OS tweak.

	2002-08-27 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c, Makefile.am: Convert over to using iobufs.

	* gpgkeys_hkp.c (http_get, http_post): Use CRLF for line endings.

	* gpgkeys_hkp.c: Include util.h on RISC OS as per Stefan. Include
	a replacement for hstrerror() for those platforms (such as RISC
	OS) that don't have it.

	2002-08-26 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: May as well include gpgkeys_hkp.c in the
	distribution now. It works well enough without proxies, and isn't
	built by default. It would be good to get some test experience
	with it.

	* gpgkeys_hkp.c (main): Don't warn about include-subkeys - it
	isn't unsupported, it's actually non-meaningful in the context of
	HKP (yet).

	* gpgkeys_hkp.c (parse_hkp_index, dehtmlize): Move HTML
	functionality into new "dehtmlize" function. Remove HTML before
	trying to parse each line from the keyserver. If the keyserver
	provides key type information in the listing, use it. (Copy over
	from g10/hkp.c).

	2002-08-19 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (get_key, parse_hkp_index): Bring over latest code
	from g10/hkp.c.

	* gpgkeys_ldap.c (get_key): Fix cosmetic URL display problem
	(extra ":" at the end).

	2002-08-03 Stefan Bellon <sbellon@sbellon.de>

	* gpgkeys_ldap.c: Tidied up RISC OS initializations.

	2002-07-25 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c: "Warning" -> "WARNING"

	2002-07-24 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: Install keyserver helpers in @GNUPG_LIBEXECDIR@

	2002-07-15 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (send_key, get_key, main): Consult the server
	version string to determine whether to use pgpKey or pgpKeyV2.

	2002-07-09 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_mailto.in: Use new OPAQUE tag for non net-path URIs.
	Fail more elegantly if there is no email address to send to. Show
	the GnuPG version in the message body.

	2002-07-04 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (get_key), gpgkeys_hkp.c (get_key): Display
	keyserver URI as a URI, but only if verbose.

	2002-07-01 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (parse_hkp_index): Error if the keyserver returns
	an unparseable HKP response.

	* gpgkeys_hkp.c (main): Warn on honor-http-proxy,
	broken-http-proxy, and include-subkeys (not supported yet).

	* gpgkeys_ldap.c (main), gpgkeys_hkp.c (http_connect, main): Fix
	some shadowing warnings.

	2002-06-11 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am: Don't hard-code the LDAP libraries - get them from
	LDAPLIBS via configure. Also, gpgkeys_hkp is a program, not a
	script.

	2002-06-10 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (include_subkeys): Default "include-subkeys" to
	off, since GnuPG now defaults it to on.

	2002-06-06 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_hkp.c (parse_hkp_index): Type tweaks.

	* gpgkeys_hkp.c (main): Add experimental code warning.

	2002-06-05 David Shaw <dshaw@jabberwocky.com>

	* Makefile.am, gpgkeys_hkp.c (new): Experimental HKP keyserver
	interface.

	2002-05-08 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c: Include <lber.h> if we absolutely must. This
	helps when compiling against a very old OpenLDAP.

	2002-04-29 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_mailto.in: Properly handle key requests in full
	fingerprint form.

	2002-03-29 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (printquoted): Quote backslashes within keyserver
	search responses.

	2002-02-25 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap (get_key): LDAP keyservers do not support v3
	fingerprints, so error out if someone tries. Actually, they don't
	support any fingerprints, but at least we can calculate a keyid
	from a v4 fingerprint.

	2002-02-23 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap: Clarify the notion of a partial failure. This is
	possible if more than one key is being handled in a batch, and one
	fails while the other succeeds. Note that a search that comes up
	with no results is not a failure - that is a valid response of "no
	answer".

	* gpgkeys_ldap.c (get_key): Allow GnuPG to send us full v4
	fingerprints, long key ids, or short key ids while fetching.
	Since the LDAP server doesn't actually handle fingerprints, chop
	them down to long key ids for actual use.

	* gpgkeys_ldap.c (main, get_key): When searching for a keyid,
	search for subkeys as well as primary keys. This is mostly
	significant when automatically fetching the key based on the id in
	a header (i.e. "signature made by...."). "no-include-subkeys"
	disables.

	2002-02-14 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c: Fix compiler warning.

	* gpgkeys_ldap.c: Be much more robust with mangled input files.

	2001-12-28 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_mailto.in: Use the new OUTOFBAND indicator so gpg knows
	not to try and import anything. Also turn on perl -w for
	warnings.

	* gpgkeys_ldap.c (main): If we're using temp files (rather than
	stdin/stdout), make sure the file is closed when we're done.

	2001-12-20 David Shaw <dshaw@jabberwocky.com>

	* Properly free the LDAP response when we're done with it.

	* Now that we handle multiple keys, we must remove duplicates as
	the LDAP keyserver returns keys with multiple user IDs multiple
	times.

	* Properly handle multiple keys with the same key ID (it's really
	rare, so fetch "0xDEADBEEF" to test this).

	2001-12-17 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c, gpgkeys_mailto.in: Fix GNU capitalization
	issues. Prefix log messages with "gpgkeys" to clarify which
	program is generating them.

	2001-12-14 David Shaw <dshaw@jabberwocky.com>

	* gpgkeys_ldap.c (search_key): Use unsigned int rather than uint
	for portability.

	2001-12-04 David Shaw <dshaw@jabberwocky.com>

	* Initial version of gpgkeys_ldap (LDAP keyserver helper) and
	gpgkeys_mailto (email keyserver helper)


	Copyright 1998, 1999, 2000, 2001, 2002, 2003,
	2004 Free Software Foundation, Inc.

	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/keyserver/Makefile.am b/keyserver/Makefile.am
	index f4b970388..9418b1c39 100644
	--- a/keyserver/Makefile.am
	+++ b/keyserver/Makefile.am
	@@ -1,48 +1,48 @@
	# Copyright (C) 2001, 2002, 2004 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 2 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, write to the Free Software
	# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

	## Process this file with automake to produce Makefile.in

	INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
	EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger
	EXTRA_SCRIPTS = gpgkeys_mailto
	libexecdir = @libexecdir@/@PACKAGE@

	libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_HTTP@ @GPGKEYS_FINGER@
	libexec_SCRIPTS = @GPGKEYS_MAILTO@
	noinst_SCRIPTS = gpgkeys_test

	-gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c
	-gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c
	-gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c
	-gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c
	+gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h
	+gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h
	+gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c ksutil.h
	+gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h

	gpgkeys_ldap_LDADD = ../util/libutil.a @LDAPLIBS@ @NETLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@
	gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@
	gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@
	gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@

	install-exec-hook:
	if GPGKEYS_LDAP
	-(cd $(libexecdir) && $(LN_S) gpgkeys_ldap$(EXEEXT) gpgkeys_ldaps$(EXEEXT))
	endif

	uninstall-hook:
	if GPGKEYS_LDAP
	rm -f $(libexecdir)/gpgkeys_ldaps$(EXEEXT)
	endif

File Metadata

Mime Type: text/x-diff
Expires: Thu, Mar 19, 5:36 AM (1 d, 15 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: a5/42/4a3ed1b113fcc89f6091e4736e61

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions