From 9ca4830a5b8392bc7bb01211407c876fd40b49d4 Mon Sep 17 00:00:00 2001
From: Repo Admin <nobody@gnupg.org>
Date: Tue, 5 Aug 2003 17:11:04 +0000
Subject: This commit was manufactured by cvs2svn to create branch
 'GNUPG-1-9-BRANCH'.

---
 common/miscellaneous.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 common/miscellaneous.c

(limited to 'common/miscellaneous.c')

diff --git a/common/miscellaneous.c b/common/miscellaneous.c
new file mode 100644
index 000000000..bdb12c574
--- /dev/null
+++ b/common/miscellaneous.c
@@ -0,0 +1,126 @@
+/* miscellaneous.c - Stuff not fitting elsewhere
+ *	Copyright (C) 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
+ */
+
+#include <config.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "util.h"
+#include "iobuf.h"
+
+/* Decide whether the filename is stdout or a real filename and return
+ * an appropriate string.  */
+const char *
+print_fname_stdout (const char *s)
+{
+    if( !s || (*s == '-' && !s[1]) )
+	return "[stdout]";
+    return s;
+}
+
+
+/* Decide whether the filename is stdin or a real filename and return
+ * an appropriate string.  */
+const char *
+print_fname_stdin (const char *s)
+{
+    if( !s || (*s == '-' && !s[1]) )
+	return "[stdin]";
+    return s;
+}
+
+void
+print_string( FILE *fp, const byte *p, size_t n, int delim )
+{
+  print_sanitized_buffer (fp, p, n, delim);
+}
+
+void
+print_utf8_string2 ( FILE *fp, const byte *p, size_t n, int delim )
+{
+  print_sanitized_utf8_buffer (fp, p, n, delim);
+}
+
+void
+print_utf8_string( FILE *fp, const byte *p, size_t n )
+{
+    print_utf8_string2 (fp, p, n, 0);
+}
+
+char *
+make_printable_string( const byte *p, size_t n, int delim )
+{
+  return sanitize_buffer (p, n, delim);
+}
+
+
+/*
+ * Check if the file is compressed.
+ */
+int
+is_file_compressed (const char *s, int *ret_rc)
+{
+    iobuf_t a;
+    byte buf[4];
+    int i, rc = 0;
+
+    struct magic_compress_s {
+        size_t len;
+        byte magic[4];
+    } magic[] = {
+        { 3, { 0x42, 0x5a, 0x68, 0x00 } }, /* bzip2 */
+        { 3, { 0x1f, 0x8b, 0x08, 0x00 } }, /* gzip */
+        { 4, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */
+    };
+    
+    if ( !s || (*s == '-' && !s[1]) || !ret_rc )
+        return 0; /* We can't check stdin or no file was given */
+
+    a = iobuf_open( s );
+    if ( a == NULL ) {
+        *ret_rc = gpg_error_from_errno (errno);
+        return 0;
+    }
+
+    if ( iobuf_get_filelength( a ) < 4 ) {
+        *ret_rc = 0;
+        goto leave;
+    }
+
+    if ( iobuf_read( a, buf, 4 ) == -1 ) {
+        *ret_rc = a->error;
+        goto leave;
+    }
+
+    for ( i = 0; i < DIM( magic ); i++ ) {
+        if ( !memcmp( buf, magic[i].magic, magic[i].len ) ) {
+            *ret_rc = 0;
+            rc = 1;
+            break;
+        }
+    }
+
+leave:    
+    iobuf_close( a );
+    return rc;
+}
+
+
+
-- 
cgit 


From 8ab35a7d26707dfa0032b3b0dbde6a984a9683cb Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 17 Dec 2003 12:26:38 +0000
Subject: * gettime.c (asctimestamp): Add a note on a non-avoidable gcc
 warning.

* util.h [!HAVE_VASPRINTF]: Add printf format attribute to the
replacement function.

* miscellaneous.c (xasprintf): New.
---
 common/ChangeLog       |  9 +++++++++
 common/gettime.c       |  6 ++++--
 common/miscellaneous.c | 20 ++++++++++++++++++++
 common/util.h          |  8 +++++++-
 4 files changed, 40 insertions(+), 3 deletions(-)

(limited to 'common/miscellaneous.c')

diff --git a/common/ChangeLog b/common/ChangeLog
index 2344868a7..e69df733f 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-17  Werner Koch  <wk@gnupg.org>
+
+	* gettime.c (asctimestamp): Add a note on a non-avoidable gcc warning.
+
+	* util.h [!HAVE_VASPRINTF]: Add printf format attribute to the
+	replacement function.
+
+	* miscellaneous.c (xasprintf): New.
+
 2003-11-14  Werner Koch  <wk@gnupg.org>
 
 	* mkdtemp.c (mkdtemp): Use gcry_create_nonce.
diff --git a/common/gettime.c b/common/gettime.c
index ed1d0c819..93e4ba113 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -246,9 +246,11 @@ asctimestamp( u32 stamp )
       mem2str( fmt, nl_langinfo(D_T_FMT), DIM(fmt)-3 );
       if( strstr( fmt, "%Z" ) == NULL )
 	strcat( fmt, " %Z");
-      strftime( buffer, DIM(buffer)-1, fmt, tp );
+      /* NOTE: gcc -Wformat-noliteral will complain here.  I have
+         found no way to suppress this warning .*/
+      strftime (buffer, DIM(buffer)-1, fmt, tp);
 #else
-      /* fixme: we should check whether the locale appends a " %Z"
+      /* FIXME: we should check whether the locale appends a " %Z"
        * These locales from glibc don't put the " %Z":
        * fi_FI hr_HR ja_JP lt_LT lv_LV POSIX ru_RU ru_SU sv_FI sv_SE zh_CN
        */
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index bdb12c574..4937bd7ce 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -25,6 +25,26 @@
 #include "util.h"
 #include "iobuf.h"
 
+/* Same as asprintf but return an allocated buffer suitable to be
+   freed using xfree.  This function simply dies on memory failure,
+   thus no extra check is required. */
+char *
+xasprintf (const char *fmt, ...)
+{
+  va_list ap;
+  char *buf, *p;
+
+  va_start (ap, fmt);
+  if (vasprintf (&buf, fmt, ap) < 0)
+    log_fatal ("asprintf failed: %s\n", strerror (errno));
+  va_end (ap);
+  p = xstrdup (buf);
+  free (buf);
+  return p;
+}
+
+
+
 /* Decide whether the filename is stdout or a real filename and return
  * an appropriate string.  */
 const char *
diff --git a/common/util.h b/common/util.h
index e38ced337..80a1d01a6 100644
--- a/common/util.h
+++ b/common/util.h
@@ -99,6 +99,12 @@ int answer_is_yes_no_quit (const char *s);
 
 
 /*-- miscellaneous.c --*/
+
+/* Same as asprintf but return an allocated buffer suitable to be
+   freed using xfree.  This function simply dies on memory failure,
+   thus no extra check is required. */
+char *xasprintf (const char *fmt, ...) JNLIB_GCC_A_PRINTF(1,2);
+
 const char *print_fname_stdout (const char *s);
 const char *print_fname_stdin (const char *s);
 void print_string (FILE *fp, const byte *p, size_t n, int delim);
@@ -113,7 +119,7 @@ int is_file_compressed (const char *s, int *ret_rc);
 #if !HAVE_VASPRINTF
 #include <stdarg.h>
 int vasprintf (char **result, const char *format, va_list args);
-int asprintf (char **result, const char *format, ...);
+int asprintf (char **result, const char *format, ...) JNLIB_GCC_A_PRINTF(2,3);
 #endif
 
 
-- 
cgit 


From 0f7a19f3b0e91861dc962780c4738453764247ce Mon Sep 17 00:00:00 2001
From: Marcus Brinkmann <mb@g10code.com>
Date: Fri, 30 Jan 2004 12:37:09 +0000
Subject: 2004-01-30  Marcus Brinkmann  <marcus@g10code.de>

	* Makefile.am (libcommon_a_SOURCES): Add xasprintf.c.
	* miscellaneous.c (xasprintf): Moved to ...
	* xasprintf (xasprintf): ... here.  New file.
	This allows to use xasprintf without sucking in gpg-error.
---
 common/ChangeLog       |  7 +++++++
 common/Makefile.am     |  1 +
 common/miscellaneous.c | 19 -------------------
 common/xasprintf.c     | 44 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 19 deletions(-)
 create mode 100644 common/xasprintf.c

(limited to 'common/miscellaneous.c')

diff --git a/common/ChangeLog b/common/ChangeLog
index 8e5c615d9..1266a88c5 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-30  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (libcommon_a_SOURCES): Add xasprintf.c.
+	* miscellaneous.c (xasprintf): Moved to ...
+	* xasprintf (xasprintf): ... here.  New file.
+	This allows to use xasprintf without sucking in gpg-error.
+
 2004-01-27  Werner Koch  <wk@gnupg.org>
 
 	* sexp-parse.h: New; moved from../agent.
diff --git a/common/Makefile.am b/common/Makefile.am
index 770ed12d6..640051be4 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -35,6 +35,7 @@ libcommon_a_SOURCES = \
 	gettime.c \
 	yesno.c \
 	miscellaneous.c \
+	xasprintf.c \
 	membuf.c membuf.h \
 	iobuf.c iobuf.h \
 	ttyio.c ttyio.h \
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index 4937bd7ce..86b0fcb3a 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -25,25 +25,6 @@
 #include "util.h"
 #include "iobuf.h"
 
-/* Same as asprintf but return an allocated buffer suitable to be
-   freed using xfree.  This function simply dies on memory failure,
-   thus no extra check is required. */
-char *
-xasprintf (const char *fmt, ...)
-{
-  va_list ap;
-  char *buf, *p;
-
-  va_start (ap, fmt);
-  if (vasprintf (&buf, fmt, ap) < 0)
-    log_fatal ("asprintf failed: %s\n", strerror (errno));
-  va_end (ap);
-  p = xstrdup (buf);
-  free (buf);
-  return p;
-}
-
-
 
 /* Decide whether the filename is stdout or a real filename and return
  * an appropriate string.  */
diff --git a/common/xasprintf.c b/common/xasprintf.c
new file mode 100644
index 000000000..2c8fafc06
--- /dev/null
+++ b/common/xasprintf.c
@@ -0,0 +1,44 @@
+/* xasprintf.c
+ *	Copyright (C) 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
+ */
+
+#include <config.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "util.h"
+#include "iobuf.h"
+
+/* Same as asprintf but return an allocated buffer suitable to be
+   freed using xfree.  This function simply dies on memory failure,
+   thus no extra check is required. */
+char *
+xasprintf (const char *fmt, ...)
+{
+  va_list ap;
+  char *buf, *p;
+
+  va_start (ap, fmt);
+  if (vasprintf (&buf, fmt, ap) < 0)
+    log_fatal ("asprintf failed: %s\n", strerror (errno));
+  va_end (ap);
+  p = xstrdup (buf);
+  free (buf);
+  return p;
+}
-- 
cgit 


From deeba405a9a5868ea478db5003be6335ab9aac6f Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 16 Jun 2005 08:12:03 +0000
Subject: gcc-4 defaults forced me to edit many many files to get rid of the
 char * vs. unsigned char * warnings.  The GNU coding standards used to say
 that these mismatches are okay and better than a bunch of casts. Obviously
 this has changed now.

---
 agent/ChangeLog           | 46 ++++++++++++++++++++++
 agent/agent.h             | 15 ++++----
 agent/cache.c             | 20 +++++++---
 agent/call-scd.c          | 19 ++++------
 agent/command-ssh.c       | 75 ++++++++++++++++--------------------
 agent/command.c           |  4 +-
 agent/divert-scd.c        |  9 +++--
 agent/findkey.c           |  4 +-
 agent/genkey.c            |  2 +-
 agent/gpg-agent.c         | 11 ++++--
 agent/minip12.c           |  2 +
 agent/pkdecrypt.c         |  2 +-
 agent/pksign.c            |  2 +-
 agent/protect-tool.c      | 21 +++++-----
 agent/protect.c           | 29 ++++++++------
 agent/query.c             |  9 +++--
 common/ChangeLog          | 26 ++++++++++++-
 common/estream.c          | 21 +++++-----
 common/estream.h          |  8 ++--
 common/iobuf.c            | 19 ++++++----
 common/iobuf.h            |  4 +-
 common/miscellaneous.c    |  2 +-
 common/sexputil.c         |  9 +++--
 common/simple-pwquery.c   |  2 +-
 common/ttyio.c            |  2 +-
 common/util.h             |  2 +-
 doc/gpg-agent.texi        |  8 +++-
 g10/ChangeLog             |  5 +++
 g10/g10.c                 |  4 +-
 g10/misc.c                |  5 ++-
 jnlib/ChangeLog           | 13 +++++++
 jnlib/argparse.c          |  2 +-
 jnlib/logging.c           |  5 ++-
 jnlib/stringhelp.c        | 97 ++++++++++++++++++++++++++++-------------------
 jnlib/stringhelp.h        |  9 ++---
 jnlib/utf8conv.c          | 21 +++++-----
 kbx/ChangeLog             | 11 ++++++
 kbx/kbxutil.c             |  2 +-
 kbx/keybox-blob.c         | 45 ++++++++++++----------
 kbx/keybox-defs.h         |  5 ++-
 kbx/keybox-file.c         |  4 +-
 scd/apdu.c                |  2 +-
 scd/app-help.c            |  2 +-
 scd/app-openpgp.c         | 27 ++++++-------
 scd/app-p15.c             | 28 +++++++-------
 scd/app.c                 |  2 +-
 scd/ccid-driver.c         | 14 +++----
 scd/command.c             | 10 ++---
 scd/iso7816.c             | 18 +++++----
 scd/pcsc-wrapper.c        |  4 +-
 sm/ChangeLog              | 32 ++++++++++++++++
 sm/base64.c               | 14 ++++---
 sm/call-agent.c           | 25 ++++++------
 sm/certcheck.c            | 14 ++++---
 sm/certdump.c             | 28 +++++++-------
 sm/certreqgen.c           |  9 +++--
 sm/delete.c               |  4 +-
 sm/encrypt.c              | 12 +++---
 sm/fingerprint.c          | 17 +++++----
 sm/gpgsm.h                | 10 ++---
 sm/keydb.c                |  9 +++--
 sm/keylist.c              |  4 +-
 sm/server.c               |  4 +-
 sm/sign.c                 |  2 +-
 tools/ChangeLog           |  5 +++
 tools/gpg-connect-agent.c |  2 +-
 tools/gpgconf-comp.c      |  2 +-
 tools/gpgkey2ssh.c        |  3 ++
 tools/watchgnupg.c        |  2 +-
 69 files changed, 558 insertions(+), 348 deletions(-)

(limited to 'common/miscellaneous.c')

diff --git a/agent/ChangeLog b/agent/ChangeLog
index 1a157fa52..055dbe53e 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,49 @@
+2005-06-16  Werner Koch  <wk@g10code.com>
+
+	* protect-tool.c (make_advanced): Makde RESULT a plain char.
+	* call-scd.c (unescape_status_string): Need to cast unsigned char*
+	for strcpy.
+	(agent_card_pksign): Made arg R_BUF an unsigned char**.
+	* divert-scd.c (divert_pksign): Made SIGVAL unsigned char*.
+	(encode_md_for_card): Initialize R_VAL and R_LEN.
+	* genkey.c (store_key): Made BUF unsigned.
+	* protect.c (do_encryption): Ditto.
+	(do_encryption): Made arg PROTBEGIN unsigned. Initialize RESULT
+	and RESULTLEN even on error.
+	(merge_lists): Need to cast unsigned char * for strcpy. Initialize 
+	RESULTand RESULTLEN even on error.
+	(agent_unprotect): Likewise for strtoul.
+	(make_shadow_info): Made P and INFO plain char.
+	(agent_shadow_key): Made P plain char.
+
+2005-06-15  Werner Koch  <wk@g10code.com>
+
+	* query.c (agent_get_passphrase): Made HEXSTRING a char*.
+	* command-ssh.c (ssh_key_grip): Made arg BUFFER unsigned.
+	(ssh_key_grip): Simplified.
+	(data_sign): Initialize variables with the definition.
+	(ssh_convert_key_to_blob): Make sure that BLOB and BLOB_SIZE
+	are set to NULL on error.  Cool, gcc-4 detects uninitialized stuff
+	beyond function boundaries; well it can't know that we do error
+	proper error handling so that this was not a real error.
+	(file_to_buffer): Likewise for BUFFER and BUFFER_N.
+	(data_sign): Likewise for SIG and SIG_N.
+	(stream_read_byte): Set B to a value even on error.
+	* command.c (cmd_genkey): Changed VALUE to char.
+	(cmd_readkey): Cast arg for gcry_sexp_sprint.
+	* agent.h (struct server_control_s): Made KEYGRIP unsigned.
+
+2005-06-13  Werner Koch  <wk@g10code.com>
+
+	* command-ssh.c (start_command_handler_ssh): Reset the SCD.
+
+2005-06-09  Werner Koch  <wk@g10code.com>
+
+	* gpg-agent.c (create_socket_name): New option --max-cache-ttl-ssh.
+	* cache.c (housekeeping): Use it.
+	(agent_put_cache): Use a switch to get the default ttl so that it
+	is easier to add more cases.
+
 2005-06-06  Werner Koch  <wk@g10code.com>
 
 	* gpg-agent.c: New option --default-cache-ttl-ssh.
diff --git a/agent/agent.h b/agent/agent.h
index 350e5c0d2..7a646a85f 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -71,9 +71,10 @@ struct {
   int no_grab;         /* Don't let the pinentry grab the keyboard */
 
   /* The default and maximum TTL of cache entries. */
-  unsigned long def_cache_ttl;     /* Normal. */
-  unsigned long def_cache_ttl_ssh; /* SSH. */
-  unsigned long max_cache_ttl;
+  unsigned long def_cache_ttl;     /* Default. */
+  unsigned long def_cache_ttl_ssh; /* for SSH. */
+  unsigned long max_cache_ttl;     /* Default. */
+  unsigned long max_cache_ttl_ssh; /* for SSH. */
 
 
   int running_detached; /* We are running detached from the tty. */
@@ -107,8 +108,8 @@ struct server_local_s;
 struct scd_local_s;
 
 /* Collection of data per session (aka connection). */
-struct server_control_s {
-
+struct server_control_s 
+{
   /* Private data of the server (command.c). */
   struct server_local_s *server_local;
 
@@ -128,7 +129,7 @@ struct server_control_s {
     int valuelen;
     int raw_value: 1;
   } digest;
-  char keygrip[20];
+  unsigned char keygrip[20];
   int have_keygrip;
 
   int use_auth_call; /* Hack to send the PKAUTH command instead of the
@@ -289,7 +290,7 @@ int agent_card_pksign (ctrl_t ctrl,
                        int (*getpin_cb)(void *, const char *, char*, size_t),
                        void *getpin_cb_arg,
                        const unsigned char *indata, size_t indatalen,
-                       char **r_buf, size_t *r_buflen);
+                       unsigned char **r_buf, size_t *r_buflen);
 int agent_card_pkdecrypt (ctrl_t ctrl,
                           const char *keyid,
                           int (*getpin_cb)(void *, const char *, char*,size_t),
diff --git a/agent/cache.c b/agent/cache.c
index a032b4fa7..32b6ac0c7 100644
--- a/agent/cache.c
+++ b/agent/cache.c
@@ -103,10 +103,17 @@ housekeeping (void)
     }
 
   /* Second, make sure that we also remove them based on the created stamp so
-     that the user has to enter it from time to time.  We do this every hour */
+     that the user has to enter it from time to time. */
   for (r=thecache; r; r = r->next)
     {
-      if (!r->lockcount && r->pw && r->created + opt.max_cache_ttl < current)
+      unsigned long maxttl;
+      
+      switch (r->cache_mode)
+        {
+        case CACHE_MODE_SSH: maxttl = opt.max_cache_ttl_ssh; break;
+        default: maxttl = opt.max_cache_ttl; break;
+        }
+      if (!r->lockcount && r->pw && r->created + maxttl < current)
         {
           if (DBG_CACHE)
             log_debug ("  expired `%s' (%lus after creation)\n",
@@ -203,10 +210,11 @@ agent_put_cache (const char *key, cache_mode_t cache_mode,
 
   if (!ttl)
     {
-      if (cache_mode == CACHE_MODE_SSH)
-        ttl = opt.def_cache_ttl_ssh;
-      else
-        ttl = opt.def_cache_ttl;
+      switch(cache_mode)
+        {
+        case CACHE_MODE_SSH: ttl = opt.def_cache_ttl_ssh; break;
+        default: ttl = opt.def_cache_ttl; break;
+        }
     }
   if (!ttl || cache_mode == CACHE_MODE_IGNORE)
     return 0;
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 4dff8e3c1..7a623fda4 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -465,7 +465,7 @@ unescape_status_string (const unsigned char *s)
 {
   char *buffer, *d;
 
-  buffer = d = xtrymalloc (strlen (s)+1);
+  buffer = d = xtrymalloc (strlen ((const char*)s)+1);
   if (!buffer)
     return NULL;
   while (*s)
@@ -666,7 +666,7 @@ agent_card_pksign (ctrl_t ctrl,
                    int (*getpin_cb)(void *, const char *, char*, size_t),
                    void *getpin_cb_arg,
                    const unsigned char *indata, size_t indatalen,
-                   char **r_buf, size_t *r_buflen)
+                   unsigned char **r_buf, size_t *r_buflen)
 {
   int rc, i;
   char *p, line[ASSUAN_LINELENGTH];
@@ -714,14 +714,11 @@ agent_card_pksign (ctrl_t ctrl,
   /* Create an S-expression from it which is formatted like this:
      "(7:sig-val(3:rsa(1:sSIGBUFLEN:SIGBUF)))" */
   *r_buflen = 21 + 11 + sigbuflen + 4;
-  *r_buf = xtrymalloc (*r_buflen);
-  if (!*r_buf)
-    {
-      gpg_error_t tmperr = out_of_core ();
-      xfree (*r_buf);
-      return unlock_scd (ctrl, tmperr);
-    }
-  p = stpcpy (*r_buf, "(7:sig-val(3:rsa(1:s" );
+  p = xtrymalloc (*r_buflen);
+  *r_buf = (unsigned char*)p;
+  if (!p)
+    return unlock_scd (ctrl, out_of_core ());
+  p = stpcpy (p, "(7:sig-val(3:rsa(1:s" );
   sprintf (p, "%u:", (unsigned int)sigbuflen);
   p += strlen (p);
   memcpy (p, sigbuf, sigbuflen);
@@ -895,7 +892,7 @@ card_getattr_cb (void *opaque, const char *line)
   if (keywordlen == parm->keywordlen
       && !memcmp (keyword, parm->keyword, keywordlen))
     {
-      parm->data = unescape_status_string (line);
+      parm->data = unescape_status_string ((const unsigned char*)line);
       if (!parm->data)
         parm->error = errno;
     }
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 870afe059..a43fee24f 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -297,6 +297,7 @@ stream_read_byte (estream_t stream, unsigned char *b)
 	err = gpg_error_from_errno (errno);
       else
 	err = gpg_error (GPG_ERR_EOF);
+      *b = 0;
     }
   else
     {
@@ -604,6 +605,9 @@ file_to_buffer (const char *filename, unsigned char **buffer, size_t *buffer_n)
   gpg_error_t err;
   int ret;
 
+  *buffer = NULL;
+  *buffer_n = 0;
+
   buffer_new = NULL;
   err = 0;
   
@@ -1381,6 +1385,9 @@ ssh_convert_key_to_blob (unsigned char **blob, size_t *blob_size,
   gpg_error_t err;
   unsigned int i;
 
+  *blob = NULL;
+  *blob_size = 0;
+
   blob_new = NULL;
   stream = NULL;
   err = 0;
@@ -1535,20 +1542,12 @@ ssh_read_key_public_from_blob (unsigned char *blob, size_t blob_size,
    S-Expression KEY and writes it to BUFFER, which must be large
    enough to hold it.  Returns usual error code.  */
 static gpg_error_t
-ssh_key_grip (gcry_sexp_t key, char *buffer)
+ssh_key_grip (gcry_sexp_t key, unsigned char *buffer)
 {
-  gpg_error_t err;
-  char *p;
+  if (!gcry_pk_get_keygrip (key, buffer))
+    return gpg_error (GPG_ERR_INTERNAL);
 
-  /* FIXME: unsigned vs. signed.  */
-  
-  p = gcry_pk_get_keygrip (key, buffer);
-  if (! p)
-    err = gpg_error (GPG_ERR_INTERNAL);	/* FIXME?  */
-  else
-    err = 0;
-
-  return err;
+  return 0;
 }
 
 /* Converts the secret key KEY_SECRET into a public key, storing it in
@@ -1654,7 +1653,7 @@ card_key_available (ctrl_t ctrl, gcry_sexp_t *r_pk, char **cardsn)
     }
 
   pkbuflen = gcry_sexp_canon_len (pkbuf, 0, NULL, NULL);
-  err = gcry_sexp_sscan (&s_pk, NULL, pkbuf, pkbuflen);
+  err = gcry_sexp_sscan (&s_pk, NULL, (char*)pkbuf, pkbuflen);
   if (err)
     {
       log_error ("failed to build S-Exp from received card key: %s\n",
@@ -1877,7 +1876,7 @@ ssh_handler_request_identities (ctrl_t ctrl,
           if (err)
             goto out;
 	      
-          err = gcry_sexp_sscan (&key_secret, NULL, buffer, buffer_n);
+          err = gcry_sexp_sscan (&key_secret, NULL, (char*)buffer, buffer_n);
           if (err)
             goto out;
 
@@ -1984,14 +1983,14 @@ data_sign (ctrl_t ctrl, ssh_signature_encoder_t sig_encoder,
 	   unsigned char **sig, size_t *sig_n)
 {
   gpg_error_t err;
-  gcry_sexp_t signature_sexp;
-  estream_t stream;
-  gcry_sexp_t valuelist;
-  gcry_sexp_t sublist;
-  gcry_mpi_t sig_value;
-  unsigned char *sig_blob;
-  size_t sig_blob_n;
-  char *identifier;
+  gcry_sexp_t signature_sexp = NULL;
+  estream_t stream = NULL;
+  gcry_sexp_t valuelist = NULL;
+  gcry_sexp_t sublist = NULL;
+  gcry_mpi_t sig_value = NULL;
+  unsigned char *sig_blob = NULL;;
+  size_t sig_blob_n = 0;
+  char *identifier = NULL;
   const char *identifier_raw;
   size_t identifier_n;
   ssh_key_type_spec_t spec;
@@ -1999,17 +1998,10 @@ data_sign (ctrl_t ctrl, ssh_signature_encoder_t sig_encoder,
   unsigned int i;
   const char *elems;
   size_t elems_n;
-  gcry_mpi_t *mpis;
+  gcry_mpi_t *mpis = NULL;
 
-  signature_sexp = NULL;
-  identifier = NULL;
-  valuelist = NULL;
-  sublist = NULL;
-  sig_blob = NULL;
-  sig_blob_n = 0;
-  stream = NULL;
-  sig_value = NULL;
-  mpis = NULL;
+  *sig = NULL;
+  *sig_n = 0;
 
   ctrl->use_auth_call = 1;
   err = agent_pksign_do (ctrl,
@@ -2119,7 +2111,7 @@ data_sign (ctrl_t ctrl, ssh_signature_encoder_t sig_encoder,
   if (err)
     goto out;
   
-  *sig = (char *) sig_blob;
+  *sig = sig_blob;
   *sig_n = sig_blob_n;
   
  out:
@@ -2684,7 +2676,7 @@ ssh_request_process (ctrl_t ctrl, estream_t stream_sock)
      secure memory, since we never give out secret keys. 
 
      FIXME: This is a pretty good DoS.  We only have a limited amount
-     of secure memory, we can't trhow hin everything we get from a
+     of secure memory, we can't throw in everything we get from a
      client -wk */
       
   /* Retrieve request.  */
@@ -2824,7 +2816,6 @@ start_command_handler_ssh (int sock_client)
   struct server_control_s ctrl;
   estream_t stream_sock;
   gpg_error_t err;
-  int bad;
   int ret;
 
   /* Setup control structure.  */
@@ -2868,15 +2859,15 @@ start_command_handler_ssh (int sock_client)
       goto out;
     }
 
-  while (1)
-    {
-      bad = ssh_request_process (&ctrl, stream_sock);
-      if (bad)
-	break;
-    };
+  /* Main processing loop. */
+  while ( !ssh_request_process (&ctrl, stream_sock) )
+    ;
 
- out:
+  /* Reset the SCD in case it has been used. */
+  agent_reset_scd (&ctrl);
 
+
+ out:
   if (stream_sock)
     es_fclose (stream_sock);
 
diff --git a/agent/command.c b/agent/command.c
index ebf3a8220..c39bcc6ab 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -168,7 +168,7 @@ parse_keygrip (ASSUAN_CONTEXT ctx, const char *string, unsigned char *buf)
   if (n != 20)
     return set_error (Parameter_Error, "invalid length of keygrip");
 
-  for (p=string, n=0; n < 20; p += 2, n++)
+  for (p=(const unsigned char*)string, n=0; n < 20; p += 2, n++)
     buf[n] = xtoi_2 (p);
 
   return 0;
@@ -494,7 +494,7 @@ cmd_genkey (ASSUAN_CONTEXT ctx, char *line)
 
   init_membuf (&outbuf, 512);
 
-  rc = agent_genkey (ctrl, value, valuelen, &outbuf);
+  rc = agent_genkey (ctrl, (char*)value, valuelen, &outbuf);
   xfree (value);
   if (rc)
     clear_outbuf (&outbuf);
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 41a5dfcda..9d2fa446c 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -139,10 +139,13 @@ static int
 encode_md_for_card (const unsigned char *digest, size_t digestlen, int algo,
                     unsigned char **r_val, size_t *r_len)
 {
-  byte *frame;
-  byte asn[100];
+  unsigned char *frame;
+  unsigned char asn[100];
   size_t asnlen;
 
+  *r_val = NULL;
+  *r_len = 0;
+
   asnlen = DIM(asn);
   if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen))
     {
@@ -295,7 +298,7 @@ divert_pksign (CTRL ctrl,
   int rc;
   char *kid;
   size_t siglen;
-  char *sigval;
+  unsigned char *sigval;
   unsigned char *data;
   size_t ndata;
 
diff --git a/agent/findkey.c b/agent/findkey.c
index 56433c9c4..1cb7efaf3 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -345,7 +345,7 @@ read_key_file (const unsigned char *grip, gcry_sexp_t *result)
     }
 
   /* Convert the file into a gcrypt S-expression object.  */
-  rc = gcry_sexp_sscan (&s_skey, &erroff, buf, buflen);
+  rc = gcry_sexp_sscan (&s_skey, &erroff, (char*)buf, buflen);
   xfree (fname);
   fclose (fp);
   xfree (buf);
@@ -500,7 +500,7 @@ agent_key_from_file (ctrl_t ctrl, const char *desc_text,
     }
 
   buflen = gcry_sexp_canon_len (buf, 0, NULL, NULL);
-  rc = gcry_sexp_sscan (&s_skey, &erroff, buf, buflen);
+  rc = gcry_sexp_sscan (&s_skey, &erroff, (char*)buf, buflen);
   wipememory (buf, buflen);
   xfree (buf);
   if (rc)
diff --git a/agent/genkey.c b/agent/genkey.c
index e07518d5a..d0319f7b4 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -33,7 +33,7 @@ static int
 store_key (gcry_sexp_t private, const char *passphrase, int force)
 {
   int rc;
-  char *buf;
+  unsigned char *buf;
   size_t len;
   unsigned char grip[20];
   
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 6cc08f845..8732c98d7 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -85,6 +85,7 @@ enum cmd_and_opt_values
   oDefCacheTTL,
   oDefCacheTTLSSH,
   oMaxCacheTTL,
+  oMaxCacheTTLSSH,
   oUseStandardSocket,
   oNoUseStandardSocket,
 
@@ -143,6 +144,7 @@ static ARGPARSE_OPTS opts[] = {
                                N_("|N|expire cached PINs after N seconds")},
   { oDefCacheTTLSSH, "default-cache-ttl-ssh", 4, "@" },
   { oMaxCacheTTL, "max-cache-ttl", 4, "@" },
+  { oMaxCacheTTLSSH, "max-cache-ttl-ssh", 4, "@" },
   { oIgnoreCacheForSigning, "ignore-cache-for-signing", 0,
                                N_("do not use the PIN cache when signing")},
   { oAllowMarkTrusted, "allow-mark-trusted", 0,
@@ -156,8 +158,9 @@ static ARGPARSE_OPTS opts[] = {
 };
 
 
-#define DEFAULT_CACHE_TTL (10*60)  /* 10 minutes */
-#define MAX_CACHE_TTL     (120*60) /* 2 hours */
+#define DEFAULT_CACHE_TTL     (10*60)  /* 10 minutes */
+#define DEFAULT_CACHE_TTL_SSH (30*60)  /* 30 minutes */
+#define MAX_CACHE_TTL         (120*60) /* 2 hours */
 
 
 /* flag to indicate that a shutdown was requested */
@@ -369,8 +372,9 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
       opt.pinentry_program = NULL;
       opt.scdaemon_program = NULL;
       opt.def_cache_ttl = DEFAULT_CACHE_TTL;
-      opt.def_cache_ttl_ssh = DEFAULT_CACHE_TTL;
+      opt.def_cache_ttl_ssh = DEFAULT_CACHE_TTL_SSH;
       opt.max_cache_ttl = MAX_CACHE_TTL;
+      opt.max_cache_ttl_ssh = MAX_CACHE_TTL;
       opt.ignore_cache_for_signing = 0;
       opt.allow_mark_trusted = 0;
       opt.disable_scdaemon = 0;
@@ -407,6 +411,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
     case oDefCacheTTL: opt.def_cache_ttl = pargs->r.ret_ulong; break;
     case oDefCacheTTLSSH: opt.def_cache_ttl_ssh = pargs->r.ret_ulong; break;
     case oMaxCacheTTL: opt.max_cache_ttl = pargs->r.ret_ulong; break;
+    case oMaxCacheTTLSSH: opt.max_cache_ttl_ssh = pargs->r.ret_ulong; break;
       
     case oIgnoreCacheForSigning: opt.ignore_cache_for_signing = 1; break;
 
diff --git a/agent/minip12.c b/agent/minip12.c
index 5ca85033d..31be15373 100644
--- a/agent/minip12.c
+++ b/agent/minip12.c
@@ -1552,6 +1552,8 @@ p12_build (gcry_mpi_t *kparms, unsigned char *cert, size_t certlen,
   struct buffer_s seqlist[2];
   int seqlistidx = 0;
 
+  n = buflen = 0; /* (avoid compiler warning). */
+
   if (cert && certlen)
     {
       /* Encode the certificate. */
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index 42ce69697..1d64c1b15 100644
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -52,7 +52,7 @@ agent_pkdecrypt (CTRL ctrl, const char *desc_text,
       goto leave;
     }
 
-  rc = gcry_sexp_sscan (&s_cipher, NULL, ciphertext, ciphertextlen);
+  rc = gcry_sexp_sscan (&s_cipher, NULL, (char*)ciphertext, ciphertextlen);
   if (rc)
     {
       log_error ("failed to convert ciphertext: %s\n", gpg_strerror (rc));
diff --git a/agent/pksign.c b/agent/pksign.c
index 2a355e43e..e9df19351 100644
--- a/agent/pksign.c
+++ b/agent/pksign.c
@@ -117,7 +117,7 @@ agent_pksign_do (ctrl_t ctrl, const char *desc_text,
       len = gcry_sexp_canon_len (buf, 0, NULL, NULL);
       assert (len);
 
-      rc = gcry_sexp_sscan (&s_sig, NULL, buf, len);
+      rc = gcry_sexp_sscan (&s_sig, NULL, (char*)buf, len);
       xfree (buf);
       if (rc)
 	{
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index e8f1d2c10..5f59d5e06 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -239,9 +239,9 @@ make_advanced (const unsigned char *buf, size_t buflen)
   int rc;
   size_t erroff, len;
   gcry_sexp_t sexp;
-  unsigned char *result;
+  char *result;
 
-  rc = gcry_sexp_sscan (&sexp, &erroff, buf, buflen);
+  rc = gcry_sexp_sscan (&sexp, &erroff, (const char*)buf, buflen);
   if (rc)
     {
       log_error ("invalid canonical S-Expression (off=%u): %s\n",
@@ -378,7 +378,7 @@ read_and_protect (const char *fname)
       xfree (result);
       if (!p)
         return;
-      result = p;
+      result = (unsigned char*)p;
       resultlen = strlen (p);
     }
 
@@ -417,7 +417,7 @@ read_and_unprotect (const char *fname)
       xfree (result);
       if (!p)
         return;
-      result = p;
+      result = (unsigned char*)p;
       resultlen = strlen (p);
     }
 
@@ -434,12 +434,13 @@ read_and_shadow (const char *fname)
   unsigned char *key;
   unsigned char *result;
   size_t resultlen;
+  unsigned char dummy_info[] = "(8:313233342:43)";
   
   key = read_key (fname);
   if (!key)
     return;
 
-  rc = agent_shadow_key (key, "(8:313233342:43)", &result);
+  rc = agent_shadow_key (key, dummy_info, &result);
   xfree (key);
   if (rc)
     {
@@ -455,7 +456,7 @@ read_and_shadow (const char *fname)
       xfree (result);
       if (!p)
         return;
-      result = p;
+      result = (unsigned char*)p;
       resultlen = strlen (p);
     }
 
@@ -682,7 +683,7 @@ import_p12_file (const char *fname)
   if (!buf)
     return;
 
-  kparms = p12_parse (buf, buflen, (pw=get_passphrase (2)),
+  kparms = p12_parse ((unsigned char*)buf, buflen, (pw=get_passphrase (2)),
                       import_p12_cert_cb, NULL);
   release_passphrase (pw);
   xfree (buf);
@@ -773,7 +774,7 @@ import_p12_file (const char *fname)
       xfree (result);
       if (!p)
         return;
-      result = p;
+      result = (unsigned char*)p;
       resultlen = strlen (p);
     }
 
@@ -932,7 +933,7 @@ export_p12_file (const char *fname)
 
   if (opt_have_cert)
     {
-      cert = read_file ("-", &certlen);
+      cert = (unsigned char*)read_file ("-", &certlen);
       if (!cert)
         {
           wipememory (key, keylen_for_wipe);
@@ -1040,7 +1041,7 @@ percent_plus_unescape (unsigned char *string)
 static char *
 percent_plus_unescape_string (char *string) 
 {
-  unsigned char *p = string;
+  unsigned char *p = (unsigned char*)string;
   size_t n;
 
   n = percent_plus_unescape (p);
diff --git a/agent/protect.c b/agent/protect.c
index 658c8c529..45bdae496 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -134,19 +134,22 @@ calculate_mic (const unsigned char *plainkey, unsigned char *sha1hash)
 
 */
 static int
-do_encryption (const char *protbegin, size_t protlen, 
+do_encryption (const unsigned char *protbegin, size_t protlen, 
                const char *passphrase,  const unsigned char *sha1hash,
                unsigned char **result, size_t *resultlen)
 {
   gcry_cipher_hd_t hd;
   const char *modestr = "openpgp-s2k3-sha1-" PROT_CIPHER_STRING "-cbc";
   int blklen, enclen, outlen;
-  char *iv = NULL;
+  unsigned char *iv = NULL;
   int rc;
   char *outbuf = NULL;
   char *p;
   int saltpos, ivpos, encpos;
 
+  *resultlen = 0;
+  *result = NULL;
+
   rc = gcry_cipher_open (&hd, PROT_CIPHER, GCRY_CIPHER_MODE_CBC,
                          GCRY_CIPHER_SECURE);
   if (rc)
@@ -250,7 +253,7 @@ do_encryption (const char *protbegin, size_t protlen,
       return tmperr;
     }
   *resultlen = strlen (p);
-  *result = p;
+  *result = (unsigned char*)p;
   memcpy (p+saltpos, iv+2*blklen, 8);
   memcpy (p+ivpos, iv, blklen);
   memcpy (p+encpos, outbuf, enclen);
@@ -261,7 +264,7 @@ do_encryption (const char *protbegin, size_t protlen,
 
 
 
-/* Protect the key encoded in canonical format in plainkey.  We assume
+/* Protect the key encoded in canonical format in PLAINKEY.  We assume
    a valid S-Exp here. */
 int 
 agent_protect (const unsigned char *plainkey, const char *passphrase,
@@ -469,6 +472,9 @@ merge_lists (const unsigned char *protectedkey,
   const unsigned char *startpos, *endpos;
   int i, rc;
   
+  *result = NULL;
+  *resultlen = 0;
+
   if (replacepos < 26)
     return gpg_error (GPG_ERR_BUG);
 
@@ -487,7 +493,7 @@ merge_lists (const unsigned char *protectedkey,
     return out_of_core ();
 
   /* Copy the initial segment */
-  strcpy (newlist, "(11:private-key");
+  strcpy ((char*)newlist, "(11:private-key");
   p = newlist + 15;
   memcpy (p, protectedkey+15+10, replacepos-15-10);
   p += replacepos-15-10;
@@ -669,7 +675,7 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
      is nothing we should worry about */
   if (s[n] != ')' )
     return gpg_error (GPG_ERR_INV_SEXP);
-  s2kcount = strtoul (s, NULL, 10);
+  s2kcount = strtoul ((const char*)s, NULL, 10);
   if (!s2kcount)
     return gpg_error (GPG_ERR_CORRUPTED_PROTECTION);
   s += n;
@@ -838,7 +844,7 @@ unsigned char *
 make_shadow_info (const char *serialno, const char *idstring)
 {
   const char *s;
-  unsigned char *info, *p;
+  char *info, *p;
   char numbuf[21];
   int n;
 
@@ -853,13 +859,13 @@ make_shadow_info (const char *serialno, const char *idstring)
   sprintf (numbuf, "%d:", n);
   p = stpcpy (p, numbuf);
   for (s=serialno; *s && s[1]; s += 2)
-    *p++ = xtoi_2 (s);
+    *(unsigned char *)p++ = xtoi_2 (s);
   sprintf (numbuf, "%d:", strlen (idstring));
   p = stpcpy (p, numbuf);
   p = stpcpy (p, idstring);
   *p++ = ')';
   *p = 0;
-  return info;
+  return (unsigned char *)info;
 }
 
 
@@ -878,7 +884,7 @@ agent_shadow_key (const unsigned char *pubkey,
   const unsigned char *point;
   size_t n;
   int depth = 0;
-  unsigned char *p;
+  char *p;
   size_t pubkey_len = gcry_sexp_canon_len (pubkey, 0, NULL,NULL);
   size_t shadow_info_len = gcry_sexp_canon_len (shadow_info, 0, NULL,NULL);
 
@@ -930,7 +936,8 @@ agent_shadow_key (const unsigned char *pubkey,
   /* Calculate required length by taking in account: the "shadowed-"
      prefix, the "shadowed", "t1-v1" as well as some parenthesis */
   n = 12 + pubkey_len + 1 + 3+8 + 2+5 + shadow_info_len + 1;
-  *result = p = xtrymalloc (n);
+  *result = xtrymalloc (n);
+  p = (char*)*result;
   if (!p)
       return out_of_core ();
   p = stpcpy (p, "(20:shadowed-private-key");
diff --git a/agent/query.c b/agent/query.c
index c1e4dbacc..b231f6fc3 100644
--- a/agent/query.c
+++ b/agent/query.c
@@ -58,7 +58,7 @@ static pth_mutex_t entry_lock;
 struct entry_parm_s {
   int lines;
   size_t size;
-  char *buffer;
+  unsigned char *buffer;
 };
 
 
@@ -372,7 +372,7 @@ agent_askpin (ctrl_t ctrl,
     {
       memset (&parm, 0, sizeof parm);
       parm.size = pininfo->max_length;
-      parm.buffer = pininfo->pin;
+      parm.buffer = (unsigned char*)pininfo->pin;
 
       if (errtext)
         { 
@@ -444,7 +444,8 @@ agent_get_passphrase (CTRL ctrl,
   int rc;
   char line[ASSUAN_LINELENGTH];
   struct entry_parm_s parm;
-  unsigned char *p, *hexstring;
+  unsigned char *p;
+  char *hexstring;
   int i;
 
   *retpass = NULL;
@@ -497,7 +498,7 @@ agent_get_passphrase (CTRL ctrl,
       return unlock_pinentry (map_assuan_err (rc));
     }
   
-  hexstring = gcry_malloc_secure (strlen (parm.buffer)*2+1);
+  hexstring = gcry_malloc_secure (strlen ((char*)parm.buffer)*2+1);
   if (!hexstring)
     {
       gpg_error_t tmperr = out_of_core ();
diff --git a/common/ChangeLog b/common/ChangeLog
index 08fb06775..e7905ea58 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,9 +1,33 @@
+2005-06-15  Werner Koch  <wk@g10code.com>
+
+	* miscellaneous.c (make_printable_string): Made P a void*.
+
+	* sexputil.c (keygrip_from_canon_sexp, cmp_simple_canon_sexp):
+	Fixed signed/unsigned pointer mismatch.
+	(make_simple_sexp_from_hexstr): Ditto.  This is all too ugly; I
+	wonder why gcc-4's default is to warn about them and forcing us to
+	use cast the warning away.
+	* iobuf.c (block_filter): Ditto.
+	(iobuf_flush): Ditto.
+	(iobuf_read_line): Ditto.
+	(iobuf_read): Make BUFFER a void *.
+	(iobuf_write): Make BUFFER a const void *.
+	* ttyio.c (tty_print_utf8_string2): Ditto.
+	* estream.c (estream_cookie_mem): Make MEMORY unsigned char*.
+	(es_write): Make BUFFER a void *.
+	(es_writen): Ditto.
+	(es_func_fd_read, es_func_fd_write, es_func_mem_read) 
+	(es_func_mem_write): Ditto.
+	(es_read, es_readn): Ditto.
+	(es_func_mem_write): Made MEMORY_NEW an unsigned char *.
+	* estream.h (es_cookie_read_function_t)
+	(es_cookie_write_function_t): Changed buffer arg to void*.
+
 2005-06-03  Werner Koch  <wk@g10code.com>
 
 	* estream.c: Use HAVE_CONFIG_H and not USE_CONFIG_H!
 	(es_func_fd_read, es_func_fd_write): Protect against EINTR.
 	
-
 2005-06-01  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (AM_CPPFLAGS): Added.
diff --git a/common/estream.c b/common/estream.c
index bf5b02001..70b3d9c6e 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -294,7 +294,7 @@ es_init_do (void)
 typedef struct estream_cookie_mem
 {
   unsigned int flags;		/* Open flags.  */
-  char *memory;			/* Data.  */
+  unsigned char *memory;	/* Data.  */
   size_t memory_size;		/* Size of MEMORY.  */
   size_t offset;		/* Current offset in MEMORY.  */
   size_t data_len;		/* Length of data in MEMORY.  */
@@ -350,7 +350,7 @@ es_func_mem_create (void *ES__RESTRICT *ES__RESTRICT cookie,
 
 /* Read function for memory objects.  */
 static ssize_t
-es_func_mem_read (void *cookie, char *buffer, size_t size)
+es_func_mem_read (void *cookie, void *buffer, size_t size)
 {
   estream_cookie_mem_t mem_cookie = cookie;
   ssize_t ret;
@@ -371,11 +371,11 @@ es_func_mem_read (void *cookie, char *buffer, size_t size)
 
 /* Write function for memory objects.  */
 static ssize_t
-es_func_mem_write (void *cookie, const char *buffer, size_t size)
+es_func_mem_write (void *cookie, const void *buffer, size_t size)
 {
   estream_cookie_mem_t mem_cookie = cookie;
   func_realloc_t func_realloc = mem_cookie->func_realloc;
-  char *memory_new;
+  unsigned char *memory_new;
   size_t newsize;
   ssize_t ret;
   int err;
@@ -591,7 +591,7 @@ es_func_fd_create (void **cookie, int fd, unsigned int flags)
 
 /* Read function for fd objects.  */
 static ssize_t
-es_func_fd_read (void *cookie, char *buffer, size_t size)
+es_func_fd_read (void *cookie, void *buffer, size_t size)
 
 {
   estream_cookie_fd_t file_cookie = cookie;
@@ -606,7 +606,7 @@ es_func_fd_read (void *cookie, char *buffer, size_t size)
 
 /* Write function for fd objects.  */
 static ssize_t
-es_func_fd_write (void *cookie, const char *buffer, size_t size)
+es_func_fd_write (void *cookie, const void *buffer, size_t size)
 			   
 {
   estream_cookie_fd_t file_cookie = cookie;
@@ -1122,9 +1122,10 @@ es_read_lbf (estream_t ES__RESTRICT stream,
    *the amount of bytes read in BYTES_READ.  */
 static int
 es_readn (estream_t ES__RESTRICT stream,
-	  unsigned char *ES__RESTRICT buffer,
+	  void *ES__RESTRICT buffer_arg,
 	  size_t bytes_to_read, size_t *ES__RESTRICT bytes_read)
 {
+  unsigned char *buffer = (unsigned char *)buffer_arg;
   size_t data_read_unread, data_read;
   int err;
 
@@ -1388,7 +1389,7 @@ es_write_lbf (estream_t ES__RESTRICT stream,
    amount of bytes written in BYTES_WRITTEN.  */
 static int
 es_writen (estream_t ES__RESTRICT stream,
-	   const unsigned char *ES__RESTRICT buffer,
+	   const void *ES__RESTRICT buffer,
 	   size_t bytes_to_write, size_t *ES__RESTRICT bytes_written)
 {
   size_t data_written;
@@ -2289,7 +2290,7 @@ es_ungetc (int c, estream_t stream)
 
 int
 es_read (estream_t ES__RESTRICT stream,
-	 char *ES__RESTRICT buffer, size_t bytes_to_read,
+	 void *ES__RESTRICT buffer, size_t bytes_to_read,
 	 size_t *ES__RESTRICT bytes_read)
 {
   int err;
@@ -2309,7 +2310,7 @@ es_read (estream_t ES__RESTRICT stream,
 
 int
 es_write (estream_t ES__RESTRICT stream,
-	  const char *ES__RESTRICT buffer, size_t bytes_to_write,
+	  const void *ES__RESTRICT buffer, size_t bytes_to_write,
 	  size_t *ES__RESTRICT bytes_written)
 {
   int err;
diff --git a/common/estream.h b/common/estream.h
index c201b666a..ebe575926 100644
--- a/common/estream.h
+++ b/common/estream.h
@@ -72,9 +72,9 @@ typedef struct es__stream *estream_t;
 
 
 typedef ssize_t (*es_cookie_read_function_t) (void *cookie,
-					      char *buffer, size_t size);
+					      void *buffer, size_t size);
 typedef ssize_t (*es_cookie_write_function_t) (void *cookie,
-					       const char *buffer,
+					       const void *buffer,
 					       size_t size);
 typedef int (*es_cookie_seek_function_t) (void *cookie,
 					  off_t *pos, int whence);
@@ -166,10 +166,10 @@ int _es_putc_overflow (int c, estream_t stream);
 int es_ungetc (int c, estream_t stream);
 
 int es_read (estream_t ES__RESTRICT stream,
-	     char *ES__RESTRICT buffer, size_t bytes_to_read,
+	     void *ES__RESTRICT buffer, size_t bytes_to_read,
 	     size_t *ES__RESTRICT bytes_read);
 int es_write (estream_t ES__RESTRICT stream,
-	      const char *ES__RESTRICT buffer, size_t bytes_to_write,
+	      const void *ES__RESTRICT buffer, size_t bytes_to_write,
 	      size_t *ES__RESTRICT bytes_written);
 
 size_t es_fread (void *ES__RESTRICT ptr, size_t size, size_t nitems,
diff --git a/common/iobuf.c b/common/iobuf.c
index 52a388514..32b9e18c6 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -675,10 +675,11 @@ sock_filter (void *opaque, int control, iobuf_t chain, byte * buf,
  * without a filter
  */
 static int
-block_filter (void *opaque, int control, iobuf_t chain, byte * buf,
+block_filter (void *opaque, int control, iobuf_t chain, byte * buffer,
 	      size_t * ret_len)
 {
   block_filter_ctx_t *a = opaque;
+  char *buf = (char *)buffer;
   size_t size = *ret_len;
   int c, needed, rc = 0;
   char *p;
@@ -1762,7 +1763,7 @@ iobuf_flush (iobuf_t a)
 
   if (a->use == 3)
     {				/* increase the temp buffer */
-      char *newbuf;
+      unsigned char *newbuf;
       size_t newsize = a->d.size + 8192;
 
       if (DBG_IOBUF)
@@ -1829,8 +1830,9 @@ iobuf_readbyte (iobuf_t a)
 
 
 int
-iobuf_read (iobuf_t a, byte * buf, unsigned buflen)
+iobuf_read (iobuf_t a, void *buffer, unsigned int buflen)
 {
+  unsigned char *buf = (unsigned char *)buffer;
   int c, n;
 
   if (a->unget.buf || a->nlimit)
@@ -1915,7 +1917,7 @@ iobuf_peek (iobuf_t a, byte * buf, unsigned buflen)
 
 
 int
-iobuf_writebyte (iobuf_t a, unsigned c)
+iobuf_writebyte (iobuf_t a, unsigned int c)
 {
   int rc;
 
@@ -1933,8 +1935,9 @@ iobuf_writebyte (iobuf_t a, unsigned c)
 
 
 int
-iobuf_write (iobuf_t a, byte * buf, unsigned buflen)
+iobuf_write (iobuf_t a, const void *buffer, unsigned int buflen)
 {
+  const unsigned char *buf = (const unsigned char *)buffer;
   int rc;
 
   if (a->directfp)
@@ -2311,7 +2314,7 @@ iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
 		 unsigned *length_of_buffer, unsigned *max_length)
 {
   int c;
-  char *buffer = *addr_of_buffer;
+  char *buffer = (char *)*addr_of_buffer;
   unsigned length = *length_of_buffer;
   unsigned nbytes = 0;
   unsigned maxlen = *max_length;
@@ -2321,7 +2324,7 @@ iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
     {				/* must allocate a new buffer */
       length = 256;
       buffer = xmalloc (length);
-      *addr_of_buffer = buffer;
+      *addr_of_buffer = (unsigned char *)buffer;
       *length_of_buffer = length;
     }
 
@@ -2344,7 +2347,7 @@ iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
 	  length += 3;		/* correct for the reserved byte */
 	  length += length < 1024 ? 256 : 1024;
 	  buffer = xrealloc (buffer, length);
-	  *addr_of_buffer = buffer;
+	  *addr_of_buffer = (unsigned char *)buffer;
 	  *length_of_buffer = length;
 	  length -= 3;		/* and reserve again */
 	  p = buffer + nbytes;
diff --git a/common/iobuf.h b/common/iobuf.h
index 0af94e22d..b991717c2 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -120,12 +120,12 @@ off_t iobuf_tell (iobuf_t a);
 int iobuf_seek (iobuf_t a, off_t newpos);
 
 int iobuf_readbyte (iobuf_t a);
-int iobuf_read (iobuf_t a, byte * buf, unsigned buflen);
+int iobuf_read (iobuf_t a, void *buf, unsigned buflen);
 unsigned iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
 			  unsigned *length_of_buffer, unsigned *max_length);
 int iobuf_peek (iobuf_t a, byte * buf, unsigned buflen);
 int iobuf_writebyte (iobuf_t a, unsigned c);
-int iobuf_write (iobuf_t a, byte * buf, unsigned buflen);
+int iobuf_write (iobuf_t a, const void *buf, unsigned buflen);
 int iobuf_writestr (iobuf_t a, const char *buf);
 
 void iobuf_flush_temp (iobuf_t temp);
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index 86b0fcb3a..d81213ef9 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -66,7 +66,7 @@ print_utf8_string( FILE *fp, const byte *p, size_t n )
 }
 
 char *
-make_printable_string( const byte *p, size_t n, int delim )
+make_printable_string (const void *p, size_t n, int delim )
 {
   return sanitize_buffer (p, n, delim);
 }
diff --git a/common/sexputil.c b/common/sexputil.c
index 802916b44..8a27ad978 100644
--- a/common/sexputil.c
+++ b/common/sexputil.c
@@ -52,7 +52,7 @@ keygrip_from_canon_sexp (const unsigned char *key, size_t keylen,
 
   if (!grip)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = gcry_sexp_sscan (&sexp, NULL, key, keylen);
+  err = gcry_sexp_sscan (&sexp, NULL, (const char *)key, keylen);
   if (err)
     return err;
   if (!gcry_pk_get_keygrip (sexp, grip))
@@ -66,8 +66,11 @@ keygrip_from_canon_sexp (const unsigned char *key, size_t keylen,
    are identical or !0 if they are not.  Not that this function can't
    be used for sorting. */
 int
-cmp_simple_canon_sexp (const unsigned char *a, const unsigned char *b)
+cmp_simple_canon_sexp (const unsigned char *a_orig,
+                       const unsigned char *b_orig)
 {
+  const char *a = (const char *)a_orig;
+  const char *b = (const char *)b_orig;
   unsigned long n1, n2;
   char *endp;
 
@@ -124,7 +127,7 @@ make_simple_sexp_from_hexstr (const char *line, size_t *nscanned)
   buf = xtrymalloc (strlen (numbuf) + len + 1 + 1);
   if (!buf)
     return NULL;
-  p = stpcpy (buf, numbuf);
+  p = (unsigned char *)stpcpy ((char *)buf, numbuf);
   s = line;
   if ((n&1))
     {
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index 8a027e799..de3689810 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -404,7 +404,7 @@ static char *
 copy_and_escape (char *buffer, const char *text)
 {
   int i;
-  const unsigned char *s = text;
+  const unsigned char *s = (unsigned char *)text;
   char *p = buffer;
   
 
diff --git a/common/ttyio.c b/common/ttyio.c
index eab805e20..5749c59fe 100644
--- a/common/ttyio.c
+++ b/common/ttyio.c
@@ -322,7 +322,7 @@ tty_print_utf8_string2( const byte *p, size_t n, size_t max_n )
 	    break;
     }
     if( i < n ) {
-	buf = utf8_to_native( p, n, 0 );
+	buf = utf8_to_native( (const char *)p, n, 0 );
 	if( max_n && (strlen( buf ) > max_n )) {
 	    buf[max_n] = 0;
 	}
diff --git a/common/util.h b/common/util.h
index d233dbf5e..1ced59b67 100644
--- a/common/util.h
+++ b/common/util.h
@@ -153,7 +153,7 @@ const char *print_fname_stdin (const char *s);
 void print_string (FILE *fp, const byte *p, size_t n, int delim);
 void print_utf8_string2 ( FILE *fp, const byte *p, size_t n, int delim);
 void print_utf8_string (FILE *fp, const byte *p, size_t n);
-char *make_printable_string (const byte *p, size_t n, int delim);
+char *make_printable_string (const void *p, size_t n, int delim);
 
 int is_file_compressed (const char *s, int *ret_rc);
 
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index bad6639e2..144745b4c 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -293,7 +293,7 @@ Set the time a cache entry is valid to @var{n} seconds.  The default are
 @item --default-cache-ttl-ssh @var{n}
 @opindex default-cache-ttl
 Set the time a cache entry used for SSH keys is valid to @var{n}
-seconds.  The default are 600 seconds.
+seconds.  The default are 1800 seconds.
 
 @item --max-cache-ttl @var{n}
 @opindex max-cache-ttl
@@ -301,6 +301,12 @@ Set the maximum time a cache entry is valid to @var{n} seconds.  After
 this time a cache entry will get expired even if it has been accessed
 recently.  The default are 2 hours (7200 seconds).
 
+@item --max-cache-ttl-ssh @var{n}
+@opindex max-cache-ttl-ssh
+Set the maximum time a cache entry used for SSH keys is valid to @var{n}
+seconds.  After this time a cache entry will get expired even if it has
+been accessed recently.  The default are 2 hours (7200 seconds).
+
 @item --pinentry-program @var{filename}
 @opindex pinentry-program
 Use program @var{filename} as the PIN entry.  The default is installation
diff --git a/g10/ChangeLog b/g10/ChangeLog
index b33735e1f..0ae73b535 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-15  Werner Koch  <wk@g10code.com>
+
+	* g10.c (print_hashline, add_group): Fixes for signed/unsigned
+	pointer mismatch warnings.
+
 2005-06-01  Werner Koch  <wk@g10code.com>
 
 	* mkdtemp.c: Removed.
diff --git a/g10/g10.c b/g10/g10.c
index 0be5636a2..234d13f41 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -933,7 +933,7 @@ static void add_group(char *string)
       return;
     }
 
-  trim_trailing_ws(name,strlen(name));
+  trim_trailing_ws((unsigned char *)name,strlen(name));
 
   /* Break apart the values */
   while ((value= strsep(&string," \t")))
@@ -3124,7 +3124,7 @@ print_hashline( MD_HANDLE md, int algo, const char *fname )
     const byte *p;
     
     if ( fname ) {
-        for (p = fname; *p; p++ ) {
+        for (p = (const unsigned char *)fname; *p; p++ ) {
             if ( *p <= 32 || *p > 127 || *p == ':' || *p == '%' )
                 printf("%%%02X", *p );
             else 
diff --git a/g10/misc.c b/g10/misc.c
index 7012a8a25..516e80bcc 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -986,9 +986,10 @@ mpi_print( FILE *fp, gcry_mpi_t a, int mode )
     }
     else {
 	int rc;
-	unsigned char *buffer;
+	char *buffer;
 
-	rc = gcry_mpi_aprint( GCRYMPI_FMT_HEX, &buffer, NULL, a );
+	rc = gcry_mpi_aprint( GCRYMPI_FMT_HEX,
+                              &(unsigned char*)buffer, NULL, a );
 	assert( !rc );
 	fputs( buffer, fp );
 	n += strlen(buffer);
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index f308a7ea3..f0463c5b3 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,16 @@
+2005-06-15  Werner Koch  <wk@g10code.com>
+
+	* stringhelp.c (sanitize_buffer): Make P a void*.
+	(ascii_memistr, memistr): Ditto.
+	(ascii_memcasecmp): Ditto.
+	* logging.c (writen): Use void * for arg BUFFER.
+	* stringhelp.c (memistr): Fixed unsigned/signed pointer conflict.
+	(ascii_memistr): Ditto.
+	(ascii_memcasemem): Ditto.
+	* utf8conv.c (utf8_to_native): Ditto.
+	(utf8_to_native): Ditto.
+	* argparse.c (show_version): Removed non-required cast.
+
 2005-01-19  Werner Koch  <wk@g10code.com>
 
 	* logging.c (fun_writer): Don't fallback to stderr. Print to
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index 485c60786..980d1186c 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -852,7 +852,7 @@ show_version()
     /* additional program info */
     for(i=30; i < 40; i++ )
 	if( (s=strusage(i)) )
-	    fputs( (const byte*)s, stdout);
+	    fputs (s, stdout);
     fflush(stdout);
 }
 
diff --git a/jnlib/logging.c b/jnlib/logging.c
index 97a2b9c9e..c944006a5 100644
--- a/jnlib/logging.c
+++ b/jnlib/logging.c
@@ -87,10 +87,11 @@ struct fun_cookie_s {
   char name[1];
 };
 
-/* Write NBYTES of BUF to file descriptor FD. */
+/* Write NBYTES of BUFFER to file descriptor FD. */
 static int
-writen (int fd, const unsigned char *buf, size_t nbytes)
+writen (int fd, const void *buffer, size_t nbytes)
 {
+  const char *buf = buffer;
   size_t nleft = nbytes;
   int nwritten;
   
diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c
index 5a3b41528..760398b0c 100644
--- a/jnlib/stringhelp.c
+++ b/jnlib/stringhelp.c
@@ -1,6 +1,6 @@
 /* stringhelp.c -  standard string helper functions
  * Copyright (C) 1998, 1999, 2000, 2001, 2003,
- *               2004  Free Software Foundation, Inc.
+ *               2004, 2005  Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -35,45 +35,57 @@
 
 /*
  * Look for the substring SUB in buffer and return a pointer to that
- * substring in BUF or NULL if not found.
+ * substring in BUFFER or NULL if not found.
  * Comparison is case-insensitive.
  */
 const char *
-memistr( const char *buf, size_t buflen, const char *sub )
+memistr (const void *buffer, size_t buflen, const char *sub)
 {
-    const byte *t, *s ;
-    size_t n;
+  const unsigned char *buf = buffer;
+  const unsigned char *t = (const unsigned char *)buffer;
+  const unsigned char *s = (const unsigned char *)sub;
+  size_t n = buflen;
 
-    for( t=buf, n=buflen, s=sub ; n ; t++, n-- )
-	if( toupper(*t) == toupper(*s) ) {
-	    for( buf=t++, buflen = n--, s++;
-		 n && toupper(*t) == toupper(*s); t++, s++, n-- )
-		;
-	    if( !*s )
-		return buf;
-	    t = buf; n = buflen; s = sub ;
+  for ( ; n ; t++, n-- )
+    {
+      if ( toupper (*t) == toupper (*s) )
+        {
+          for ( buf=t++, buflen = n--, s++;
+                n && toupper (*t) == toupper (*s); t++, s++, n-- )
+            ;
+          if (!*s)
+            return (const char*)buf;
+          t = buf;
+          s = (const unsigned char *)sub ;
+          n = buflen;
 	}
-
-    return NULL ;
+    }
+  return NULL;
 }
 
 const char *
-ascii_memistr( const char *buf, size_t buflen, const char *sub )
+ascii_memistr ( const void *buffer, size_t buflen, const char *sub )
 {
-    const byte *t, *s ;
-    size_t n;
+  const unsigned char *buf = buffer;
+  const unsigned char *t = (const unsigned char *)buf;
+  const unsigned char *s = (const unsigned char *)sub;
+  size_t n = buflen;
 
-    for( t=buf, n=buflen, s=sub ; n ; t++, n-- )
-	if( ascii_toupper(*t) == ascii_toupper(*s) ) {
-	    for( buf=t++, buflen = n--, s++;
-		 n && ascii_toupper(*t) == ascii_toupper(*s); t++, s++, n-- )
-		;
-	    if( !*s )
-		return buf;
-	    t = buf; n = buflen; s = sub ;
+  for ( ; n ; t++, n-- )
+    {
+      if (ascii_toupper (*t) == ascii_toupper (*s) )
+        {
+          for ( buf=t++, buflen = n--, s++;
+                n && ascii_toupper (*t) == ascii_toupper (*s); t++, s++, n-- )
+            ;
+          if (!*s)
+            return (const char*)buf;
+          t = (const unsigned char *)buf;
+          s = (const unsigned char *)sub ;
+          n = buflen;
 	}
-
-    return NULL ;
+    }
+  return NULL;
 }
 
 /* This function is similar to strncpy().  However it won't copy more
@@ -402,13 +414,14 @@ print_sanitized_utf8_string (FILE *fp, const char *string, int delim)
                                               delim) : 0;
 }
 
-/* Create a string from the buffer P of length N which is suitable for
+/* Create a string from the buffer P_ARG of length N which is suitable for
    printing.  Caller must release the created string using xfree. */
 char *
-sanitize_buffer (const unsigned char *p, size_t n, int delim)
+sanitize_buffer (const void *p_arg, size_t n, int delim)
 {
+  const unsigned char *p = p_arg;
   size_t save_n, buflen;
-  const byte *save_p;
+  const unsigned char *save_p;
   char *buffer, *d;
 
   /* first count length */
@@ -552,15 +565,19 @@ ascii_strncasecmp (const char *a, const char *b, size_t n)
 
 
 int
-ascii_memcasecmp( const char *a, const char *b, size_t n )
+ascii_memcasecmp (const void *a_arg, const void *b_arg, size_t n )
 {
-    if (a == b)
-        return 0;
-    for ( ; n; n--, a++, b++ ) {
-	if( *a != *b  && ascii_toupper (*a) != ascii_toupper (*b) )
-            return *a == *b? 0 : (ascii_toupper (*a) - ascii_toupper (*b));
-    }
+  const char *a = a_arg;
+  const char *b = b_arg;
+
+  if (a == b)
     return 0;
+  for ( ; n; n--, a++, b++ )
+    {
+      if( *a != *b  && ascii_toupper (*a) != ascii_toupper (*b) )
+        return *a == *b? 0 : (ascii_toupper (*a) - ascii_toupper (*b));
+    }
+  return 0;
 }
 
 int
@@ -586,8 +603,8 @@ ascii_memcasemem (const void *haystack, size_t nhaystack,
     return (void*)haystack; /* finding an empty needle is really easy */
   if (nneedle <= nhaystack)
     {
-      const unsigned char *a = haystack;
-      const unsigned char *b = a + nhaystack - nneedle;
+      const char *a = haystack;
+      const char *b = a + nhaystack - nneedle;
       
       for (; a <= b; a++)
         {
diff --git a/jnlib/stringhelp.h b/jnlib/stringhelp.h
index 412da3a0e..bdd7d561c 100644
--- a/jnlib/stringhelp.h
+++ b/jnlib/stringhelp.h
@@ -23,7 +23,7 @@
 
 #include "types.h"
 
-const char *memistr( const char *buf, size_t buflen, const char *sub );
+const char *memistr (const void *buf, size_t buflen, const char *sub);
 char *mem2str( char *, const void *, size_t);
 char *trim_spaces( char *string );
 char *trim_trailing_spaces( char *string );
@@ -46,7 +46,7 @@ size_t print_sanitized_utf8_buffer (FILE *fp, const void *buffer,
                                     size_t length, int delim);
 size_t print_sanitized_string (FILE *fp, const char *string, int delim);
 size_t print_sanitized_utf8_string (FILE *fp, const char *string, int delim);
-char *sanitize_buffer (const unsigned char *p, size_t n, int delim);
+char *sanitize_buffer (const void *p, size_t n, int delim);
 
 
 #ifdef HAVE_W32_SYSTEM
@@ -54,15 +54,14 @@ const char *w32_strerror (int ec);
 #endif
 
 
-const char *ascii_memistr( const char *buf, size_t buflen, const char *sub );
 int ascii_isupper (int c);
 int ascii_islower (int c);
 int ascii_toupper (int c);
 int ascii_tolower (int c);
 int ascii_strcasecmp( const char *a, const char *b );
 int ascii_strncasecmp (const char *a, const char *b, size_t n);
-int ascii_memcasecmp( const char *a, const char *b, size_t n );
-const char *ascii_memistr ( const char *buf, size_t buflen, const char *sub);
+int ascii_memcasecmp( const void *a, const void *b, size_t n );
+const char *ascii_memistr ( const void *buf, size_t buflen, const char *sub);
 void *ascii_memcasemem (const void *haystack, size_t nhaystack,
                         const void *needle, size_t nneedle);
 
diff --git a/jnlib/utf8conv.c b/jnlib/utf8conv.c
index 691176766..4df8b7b32 100644
--- a/jnlib/utf8conv.c
+++ b/jnlib/utf8conv.c
@@ -136,16 +136,17 @@ get_native_charset ()
  * new allocated UTF8 string.
  */
 char *
-native_to_utf8 (const char *string)
+native_to_utf8 (const char *orig_string)
 {
-  const byte *s;
+  const unsigned char *string = (const unsigned char *)orig_string;
+  const unsigned char *s;
   char *buffer;
-  byte *p;
+  unsigned char *p;
   size_t length = 0;
 
   if (no_translation)
     {
-      buffer = jnlib_xstrdup (string);
+      buffer = jnlib_xstrdup (orig_string);
     }
   else if (active_charset)
     {
@@ -156,7 +157,7 @@ native_to_utf8 (const char *string)
 	    length += 2;	/* we may need 3 bytes */
 	}
       buffer = jnlib_xmalloc (length + 1);
-      for (p = buffer, s = string; *s; s++)
+      for (p = (unsigned char *)buffer, s = string; *s; s++)
 	{
 	  if ((*s & 0x80))
 	    {
@@ -187,7 +188,7 @@ native_to_utf8 (const char *string)
 	    length++;
 	}
       buffer = jnlib_xmalloc (length + 1);
-      for (p = buffer, s = string; *s; s++)
+      for (p = (unsigned char *)buffer, s = string; *s; s++)
 	{
 	  if (*s & 0x80)
 	    {
@@ -212,11 +213,12 @@ utf8_to_native (const char *string, size_t length, int delim)
 {
   int nleft;
   int i;
-  byte encbuf[8];
+  unsigned char encbuf[8];
   int encidx;
   const byte *s;
   size_t n;
-  byte *buffer = NULL, *p = NULL;
+  char *buffer = NULL;
+  char *p = NULL;
   unsigned long val = 0;
   size_t slen;
   int resync = 0;
@@ -225,7 +227,8 @@ utf8_to_native (const char *string, size_t length, int delim)
   /* 2. pass (p!=NULL): create string */
   for (;;)
     {
-      for (slen = length, nleft = encidx = 0, n = 0, s = string; slen;
+      for (slen = length, nleft = encidx = 0, n = 0,
+             s = (const unsigned char *)string; slen;
 	   s++, slen--)
 	{
 	  if (resync)
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index 7c112085c..4fd06d5ca 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,3 +1,14 @@
+2005-06-15  Werner Koch  <wk@g10code.com>
+
+	* keybox-file.c (_keybox_read_blob2): Make IMAGE unsigned.
+	(_keybox_write_blob): 
+
+	* keybox-blob.c (create_blob_finish, _keybox_create_x509_blob):
+	Fixed warnings about signed/unsigned pointer mismatches.
+	(x509_email_kludge): Ditto.
+	(_keybox_new_blob): Changed arg IMAGE to unsigned char *.
+	(_keybox_get_blob_image): Changed return type to unsigned char*.
+
 2005-06-01  Werner Koch  <wk@g10code.com>
 
 	* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index 7fe6178d6..0569b5a67 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -386,7 +386,7 @@ import_openpgp (const char *filename)
   buffer = read_file (filename, &buflen);
   if (!buffer)
     return;
-  p = buffer;
+  p = (unsigned char *)buffer;
   for (;;)
     {
       err = _keybox_parse_openpgp (p, buflen, &nparsed, &info);
diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c
index 48bce28e2..67c74b777 100644
--- a/kbx/keybox-blob.c
+++ b/kbx/keybox-blob.c
@@ -646,8 +646,8 @@ static int
 create_blob_finish (KEYBOXBLOB blob)
 {
   struct membuf *a = blob->buf;
-  byte *p;
-  char *pp;
+  unsigned char *p;
+  unsigned char *pp;
   int i;
   size_t n;
 
@@ -656,6 +656,7 @@ create_blob_finish (KEYBOXBLOB blob)
     put32 (a, 0);  /* Hmmm: why put32() ?? */
   
   /* get the memory area */
+  n = 0; /* (Just to avoid compiler warning.) */
   p = get_membuf (a, &n);
   if (!p)
     return gpg_error (GPG_ERR_ENOMEM);
@@ -783,7 +784,7 @@ _keybox_create_pgp_blob (KEYBOXBLOB *r_blob, KBNODE keyblock, int as_ephemeral)
 static char *
 x509_email_kludge (const char *name)
 {
-  const unsigned char *p;
+  const char *p;
   unsigned char *buf;
   int n;
 
@@ -805,7 +806,7 @@ x509_email_kludge (const char *name)
     buf[n] = xtoi_2 (p);
   buf[n++] = '>';
   buf[n] = 0;
-  return buf;
+  return (char *)buf;
 }
 
 
@@ -818,8 +819,9 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert,
 {
   int i, rc = 0;
   KEYBOXBLOB blob;
-  unsigned char *p;
-  unsigned char **names = NULL;
+  unsigned char *sn;
+  char *p;
+  char **names = NULL;
   size_t max_names;
 
   *r_blob = NULL;
@@ -827,28 +829,28 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert,
   if( !blob )
     return gpg_error (gpg_err_code_from_errno (errno));
 
-  p = ksba_cert_get_serial (cert);
-  if (p)
+  sn = ksba_cert_get_serial (cert);
+  if (sn)
     {
       size_t n, len;
-      n = gcry_sexp_canon_len (p, 0, NULL, NULL);
+      n = gcry_sexp_canon_len (sn, 0, NULL, NULL);
       if (n < 2)
         {
-          xfree (p);
+          xfree (sn);
           return gpg_error (GPG_ERR_GENERAL);
         }
-      blob->serialbuf = p;
-      p++; n--; /* skip '(' */
-      for (len=0; n && *p && *p != ':' && digitp (p); n--, p++)
-        len = len*10 + atoi_1 (p);
-      if (*p != ':')
+      blob->serialbuf = sn;
+      sn++; n--; /* skip '(' */
+      for (len=0; n && *sn && *sn != ':' && digitp (sn); n--, sn++)
+        len = len*10 + atoi_1 (sn);
+      if (*sn != ':')
         {
           xfree (blob->serialbuf);
           blob->serialbuf = NULL;
           return gpg_error (GPG_ERR_GENERAL);
         }
-      p++;
-      blob->serial = p;
+      sn++;
+      blob->serial = sn;
       blob->seriallen = len;
     }
 
@@ -863,6 +865,7 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert,
       rc = gpg_error (gpg_err_code_from_errno (errno));
       goto leave;
     }
+  
   p = ksba_cert_get_issuer (cert, 0);
   if (!p)
     {
@@ -872,10 +875,9 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert,
   names[blob->nuids++] = p;
   for (i=0; (p = ksba_cert_get_subject (cert, i)); i++)
     {
-
       if (blob->nuids >= max_names)
         {
-          unsigned char **tmp;
+          char **tmp;
           
           max_names += 100;
           tmp = xtryrealloc (names, max_names * sizeof *names);
@@ -964,7 +966,8 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert,
 
 
 int
-_keybox_new_blob (KEYBOXBLOB *r_blob, char *image, size_t imagelen, off_t off)
+_keybox_new_blob (KEYBOXBLOB *r_blob,
+                  unsigned char *image, size_t imagelen, off_t off)
 {
   KEYBOXBLOB blob;
   
@@ -1000,7 +1003,7 @@ _keybox_release_blob (KEYBOXBLOB blob)
 
 
 
-const char *
+const unsigned char *
 _keybox_get_blob_image ( KEYBOXBLOB blob, size_t *n )
 {
   *n = blob->bloblen;
diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h
index b58294459..7bbed8519 100644
--- a/kbx/keybox-defs.h
+++ b/kbx/keybox-defs.h
@@ -140,10 +140,11 @@ int _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert,
                               unsigned char *sha1_digest, int as_ephemeral);
 #endif /*KEYBOX_WITH_X509*/
 
-int  _keybox_new_blob (KEYBOXBLOB *r_blob, char *image, size_t imagelen,
+int  _keybox_new_blob (KEYBOXBLOB *r_blob,
+                       unsigned char *image, size_t imagelen,
                        off_t off);
 void _keybox_release_blob (KEYBOXBLOB blob);
-const char *_keybox_get_blob_image (KEYBOXBLOB blob, size_t *n);
+const unsigned char *_keybox_get_blob_image (KEYBOXBLOB blob, size_t *n);
 off_t _keybox_get_blob_fileoffset (KEYBOXBLOB blob);
 void _keybox_update_header_blob (KEYBOXBLOB blob);
 
diff --git a/kbx/keybox-file.c b/kbx/keybox-file.c
index fe02c1f9f..3883ce607 100644
--- a/kbx/keybox-file.c
+++ b/kbx/keybox-file.c
@@ -48,7 +48,7 @@ ftello (FILE *stream)
 int
 _keybox_read_blob2 (KEYBOXBLOB *r_blob, FILE *fp, int *skipped_deleted)
 {
-  char *image;
+  unsigned char *image;
   size_t imagelen = 0;
   int c1, c2, c3, c4, type;
   int rc;
@@ -118,7 +118,7 @@ _keybox_read_blob (KEYBOXBLOB *r_blob, FILE *fp)
 int
 _keybox_write_blob (KEYBOXBLOB blob, FILE *fp)
 {
-  const char *image;
+  const unsigned char *image;
   size_t length;
 
   image = _keybox_get_blob_image (blob, &length);
diff --git a/scd/apdu.c b/scd/apdu.c
index 212b9df24..975fffa24 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2393,7 +2393,7 @@ apdu_activate (int slot)
 unsigned char *
 apdu_get_atr (int slot, size_t *atrlen)
 {
-  char *buf;
+  unsigned char *buf;
 
   if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
     return NULL;
diff --git a/scd/app-help.c b/scd/app-help.c
index 1c3c52b15..27cbea5c7 100644
--- a/scd/app-help.c
+++ b/scd/app-help.c
@@ -48,7 +48,7 @@ app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip)
   n = gcry_sexp_canon_len (p, 0, NULL, NULL);
   if (!n)
     return gpg_error (GPG_ERR_INV_SEXP);
-  err = gcry_sexp_sscan (&s_pkey, NULL, p, n);
+  err = gcry_sexp_sscan (&s_pkey, NULL, (char*)p, n);
   xfree (p);
   if (err)
     return err; /* Can't parse that S-expression. */
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 1ff096138..11e6eebaf 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -948,8 +948,8 @@ get_public_key (app_t app, int keyno)
   size_t buflen, keydatalen, mlen, elen;
   unsigned char *mbuf = NULL;
   unsigned char *ebuf = NULL;
-  unsigned char *keybuf = NULL;
-  unsigned char *keybuf_p;
+  char *keybuf = NULL;
+  char *keybuf_p;
 
   if (keyno < 1 || keyno > 3)
     return gpg_error (GPG_ERR_INV_ID);
@@ -963,14 +963,16 @@ get_public_key (app_t app, int keyno)
   app->app_local->pk[keyno].key = NULL;
   app->app_local->pk[keyno].keylen = 0;
 
+  m = e = NULL; /* (avoid cc warning) */
+
   if (app->card_version > 0x0100)
     {
       /* We may simply read the public key out of these cards.  */
-      err = iso7816_read_public_key (app->slot, 
-                                    keyno == 0? "\xB6" :
-                                    keyno == 1? "\xB8" : "\xA4",
-                                    2,  
-                                    &buffer, &buflen);
+      err = iso7816_read_public_key 
+        (app->slot, (const unsigned char*)(keyno == 0? "\xB6" :
+                                           keyno == 1? "\xB8" : "\xA4"),
+         2,  
+         &buffer, &buflen);
       if (err)
         {
           log_error (_("reading public key failed: %s\n"), gpg_strerror (err));
@@ -1107,7 +1109,7 @@ get_public_key (app_t app, int keyno)
   strcpy (keybuf_p, ")))");
   keybuf_p += strlen (keybuf_p);
   
-  app->app_local->pk[keyno].key = keybuf;
+  app->app_local->pk[keyno].key = (unsigned char*)keybuf;
   app->app_local->pk[keyno].keylen = (keybuf_p - keybuf);
 
  leave:
@@ -1889,11 +1891,10 @@ do_genkey (app_t app, ctrl_t ctrl,  const char *keynostr, unsigned int flags,
 #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);
+    (app->slot, (const unsigned char*)(keyno == 0? "\xB6" :
+                                       keyno == 1? "\xB8" : "\xA4"),
+     2,
+     &buffer, &buflen);
   if (rc)
     {
       rc = gpg_error (GPG_ERR_CARD);
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 831f0d1f4..f03e5d5f0 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -43,33 +43,35 @@ typedef enum
   } card_type_t;
 
 /* A list card types with ATRs noticed with these cards. */
+#define X(a) ((unsigned char const *)(a))
 static struct 
 {
   size_t atrlen;
-  unsigned char *atr;
+  unsigned char const *atr;
   card_type_t type;
 } card_atr_list[] = {
-  { 19, "\x3B\xBA\x13\x00\x81\x31\x86\x5D\x00\x64\x05\x0A\x02\x01\x31\x80"
-        "\x90\x00\x8B", 
+  { 19, X("\x3B\xBA\x13\x00\x81\x31\x86\x5D\x00\x64\x05\x0A\x02\x01\x31\x80"
+          "\x90\x00\x8B"), 
     CARD_TYPE_TCOS },  /* SLE44 */
-  { 19, "\x3B\xBA\x14\x00\x81\x31\x86\x5D\x00\x64\x05\x14\x02\x02\x31\x80"
-        "\x90\x00\x91", 
+  { 19, X("\x3B\xBA\x14\x00\x81\x31\x86\x5D\x00\x64\x05\x14\x02\x02\x31\x80"
+          "\x90\x00\x91"), 
     CARD_TYPE_TCOS }, /* SLE66S */
-  { 19, "\x3B\xBA\x96\x00\x81\x31\x86\x5D\x00\x64\x05\x60\x02\x03\x31\x80"
-        "\x90\x00\x66",
+  { 19, X("\x3B\xBA\x96\x00\x81\x31\x86\x5D\x00\x64\x05\x60\x02\x03\x31\x80"
+          "\x90\x00\x66"),
     CARD_TYPE_TCOS }, /* SLE66P */
-  { 27, "\x3B\xFF\x94\x00\xFF\x80\xB1\xFE\x45\x1F\x03\x00\x68\xD2\x76\x00"
-        "\x00\x28\xFF\x05\x1E\x31\x80\x00\x90\x00\x23",
+  { 27, X("\x3B\xFF\x94\x00\xFF\x80\xB1\xFE\x45\x1F\x03\x00\x68\xD2\x76\x00"
+          "\x00\x28\xFF\x05\x1E\x31\x80\x00\x90\x00\x23"),
     CARD_TYPE_MICARDO }, /* German BMI card */
-  { 19, "\x3B\x6F\x00\xFF\x00\x68\xD2\x76\x00\x00\x28\xFF\x05\x1E\x31\x80"
-        "\x00\x90\x00",
+  { 19, X("\x3B\x6F\x00\xFF\x00\x68\xD2\x76\x00\x00\x28\xFF\x05\x1E\x31\x80"
+          "\x00\x90\x00"),
     CARD_TYPE_MICARDO }, /* German BMI card (ATR due to reader problem) */
-  { 26, "\x3B\xFE\x94\x00\xFF\x80\xB1\xFA\x45\x1F\x03\x45\x73\x74\x45\x49"
-        "\x44\x20\x76\x65\x72\x20\x31\x2E\x30\x43",
+  { 26, X("\x3B\xFE\x94\x00\xFF\x80\xB1\xFA\x45\x1F\x03\x45\x73\x74\x45\x49"
+          "\x44\x20\x76\x65\x72\x20\x31\x2E\x30\x43"),
     CARD_TYPE_MICARDO }, /* EstEID (Estonian Big Brother card) */
 
   { 0 }
 };
+#undef X
 
 
 /* The Pin Types as defined in pkcs#15 v1.1 */
diff --git a/scd/app.c b/scd/app.c
index 2c8c915d7..f27b400b1 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -357,7 +357,7 @@ app_munge_serialno (app_t app)
 gpg_error_t 
 app_get_serial_and_stamp (app_t app, char **serial, time_t *stamp)
 {
-  unsigned char *buf, *p;
+  char *buf, *p;
   int i;
 
   if (!app || !serial)
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 9ac655e63..096a6811b 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -555,7 +555,7 @@ get_escaped_usb_string (usb_dev_handle *idev, int idx,
      all in a 2 bute Unicode encoding using little endian. */
   rc = usb_control_msg (idev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR,
                         (USB_DT_STRING << 8), 0, 
-                        buf, sizeof buf, 1000 /* ms timeout */);
+                        (char*)buf, sizeof buf, 1000 /* ms timeout */);
   if (rc < 4)
     langid = 0x0409; /* English.  */
   else
@@ -563,7 +563,7 @@ get_escaped_usb_string (usb_dev_handle *idev, int idx,
 
   rc = usb_control_msg (idev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR,
                         (USB_DT_STRING << 8) + idx, langid,
-                        buf, sizeof buf, 1000 /* ms timeout */);
+                        (char*)buf, sizeof buf, 1000 /* ms timeout */);
   if (rc < 2 || buf[1] != USB_DT_STRING)
     return NULL; /* Error or not a string. */
   len = buf[0];
@@ -1155,7 +1155,7 @@ bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen)
 
   rc = usb_bulk_write (handle->idev, 
                        handle->ep_bulk_out,
-                       msg, msglen,
+                       (char*)msg, msglen,
                        1000 /* ms timeout */);
   if (rc == msglen)
     return 0;
@@ -1188,7 +1188,7 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
  retry:
   rc = usb_bulk_read (handle->idev, 
                       handle->ep_bulk_in,
-                      buffer, length,
+                      (char*)buffer, length,
                       timeout);
   if (rc < 0)
     {
@@ -1300,7 +1300,7 @@ ccid_poll (ccid_driver_t handle)
 
   rc = usb_bulk_read (handle->idev, 
                       handle->ep_intr,
-                      msg, sizeof msg,
+                      (char*)msg, sizeof msg,
                       0 /* ms timeout */ );
   if (rc < 0 && errno == ETIMEDOUT)
     return 0;
@@ -1444,7 +1444,7 @@ ccid_get_atr (ccid_driver_t handle,
     {
       tried_iso = 1;
       /* Try switching to ISO mode. */
-      if (!send_escape_cmd (handle, "\xF1\x01", 2))
+      if (!send_escape_cmd (handle, (const unsigned char*)"\xF1\x01", 2))
         goto again;
     }
   else if (CCID_COMMAND_FAILED (msg))
@@ -2026,7 +2026,7 @@ ccid_transceive_secure (ccid_driver_t handle,
   if (handle->id_vendor == VENDOR_SCM)
     {
       DEBUGOUT ("sending escape sequence to switch to a case 1 APDU\n");
-      rc = send_escape_cmd (handle, "\x80\x02\x00", 3);
+      rc = send_escape_cmd (handle, (const unsigned char*)"\x80\x02\x00", 3);
       if (rc)
         return rc;
     }
diff --git a/scd/command.c b/scd/command.c
index a308078d3..52a86871e 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -679,7 +679,7 @@ pin_cb (void *opaque, const char *info, char **retstr)
       xfree (value);
       return gpg_error (GPG_ERR_INV_RESPONSE);
     }
-  *retstr = value;
+  *retstr = (char*)value;
   return 0;
 }
 
@@ -844,7 +844,7 @@ cmd_getattr (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
-  char *keyword;
+  const char *keyword;
 
   if ((rc = open_card (ctrl, NULL)))
     return rc;
@@ -860,7 +860,6 @@ cmd_getattr (assuan_context_t ctx, char *line)
   /* FIXME: Applications should not return sensistive data if the card
      is locked.  */
   rc = app_getattr (ctrl->app_ctx, ctrl, keyword);
-  xfree (keyword);
 
   TEST_CARD_REMOVAL (ctrl, rc);
   return map_to_assuan_status (rc);
@@ -908,9 +907,10 @@ cmd_setattr (assuan_context_t ctx, char *orig_line)
       *line++ = 0;
   while (spacep (line))
     line++;
-  nbytes = percent_plus_unescape (line);
+  nbytes = percent_plus_unescape ((unsigned char*)line);
 
-  rc = app_setattr (ctrl->app_ctx, keyword, pin_cb, ctx, line, nbytes);
+  rc = app_setattr (ctrl->app_ctx, keyword, pin_cb, ctx,
+                    (const unsigned char*)line, nbytes);
   xfree (linebuf);
 
   TEST_CARD_REMOVAL (ctrl, rc);
diff --git a/scd/iso7816.c b/scd/iso7816.c
index e9dc6541c..742ed9433 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -153,7 +153,7 @@ iso7816_select_file (int slot, int tag, int is_dir,
       p0 = (tag == 0x3F00)? 0: is_dir? 1:2;
       p1 = 0x0c; /* No FC return. */
       sw = apdu_send_simple (slot, 0x00, CMD_SELECT_FILE,
-                             p0, p1, 2, tagbuf );
+                             p0, p1, 2, (char*)tagbuf );
       return map_sw (sw);
     }
 
@@ -285,7 +285,7 @@ iso7816_put_data (int slot, int tag,
 
   sw = apdu_send_simple (slot, 0x00, CMD_PUT_DATA,
                          ((tag >> 8) & 0xff), (tag & 0xff),
-                         datalen, data);
+                         datalen, (const char*)data);
   return map_sw (sw);
 }
 
@@ -303,7 +303,7 @@ iso7816_manage_security_env (int slot, int p1, int p2,
     return gpg_error (GPG_ERR_INV_VALUE);
 
   sw = apdu_send_simple (slot, 0x00, CMD_MSE, p1, p2, 
-                         data? datalen : -1, data);
+                         data? datalen : -1, (const char*)data);
   return map_sw (sw);
 }
 
@@ -323,7 +323,7 @@ iso7816_compute_ds (int slot, const unsigned char *data, size_t datalen,
   *result = NULL;
   *resultlen = 0;
 
-  sw = apdu_send (slot, 0x00, CMD_PSO, 0x9E, 0x9A, datalen, data,
+  sw = apdu_send (slot, 0x00, CMD_PSO, 0x9E, 0x9A, datalen, (const char*)data,
                   result, resultlen);
   if (sw != SW_SUCCESS)
     {
@@ -364,13 +364,15 @@ iso7816_decipher (int slot, const unsigned char *data, size_t datalen,
 
       *buf = padind; /* Padding indicator. */
       memcpy (buf+1, data, datalen);
-      sw = apdu_send (slot, 0x00, CMD_PSO, 0x80, 0x86, datalen+1, buf,
+      sw = apdu_send (slot, 0x00, CMD_PSO, 0x80, 0x86,
+                      datalen+1, (char*)buf,
                       result, resultlen);
       xfree (buf);
     }
   else
     {
-      sw = apdu_send (slot, 0x00, CMD_PSO, 0x80, 0x86, datalen, data,
+      sw = apdu_send (slot, 0x00, CMD_PSO, 0x80, 0x86,
+                      datalen, (const char *)data,
                       result, resultlen);
     }
   if (sw != SW_SUCCESS)
@@ -399,7 +401,7 @@ iso7816_internal_authenticate (int slot,
   *resultlen = 0;
 
   sw = apdu_send (slot, 0x00, CMD_INTERNAL_AUTHENTICATE, 0, 0,
-                  datalen, data,  result, resultlen);
+                  datalen, (const char*)data,  result, resultlen);
   if (sw != SW_SUCCESS)
     {
       /* Make sure that pending buffers are released. */
@@ -426,7 +428,7 @@ do_generate_keypair (int slot, int readonly,
   *resultlen = 0;
 
   sw = apdu_send (slot, 0x00, CMD_GENERATE_KEYPAIR, readonly? 0x81:0x80, 0,
-                  datalen, data,  result, resultlen);
+                  datalen, (const char*)data,  result, resultlen);
   if (sw != SW_SUCCESS)
     {
       /* Make sure that pending buffers are released. */
diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c
index 93e78fdfe..21af16fba 100644
--- a/scd/pcsc-wrapper.c
+++ b/scd/pcsc-wrapper.c
@@ -390,9 +390,9 @@ handle_open (unsigned char *argbuf, size_t arglen)
   unsigned char atr[33];
 
   /* Make sure there is only the port string */
-  if (arglen != strlen (argbuf))
+  if (arglen != strlen ((char*)argbuf))
     bad_request ("OPEN");
-  portstr = argbuf;
+  portstr = (char*)argbuf;
 
   if (driver_is_open)
     {
diff --git a/sm/ChangeLog b/sm/ChangeLog
index ffb61a294..d9f295e1d 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,35 @@
+2005-06-15  Werner Koch  <wk@g10code.com>
+
+	* delete.c (delete_one): Changed FPR to unsigned.
+	* encrypt.c (encrypt_dek): Made ENCVAL unsigned.
+	(gpgsm_encrypt): Ditto.
+	* sign.c (gpgsm_sign): Made SIGVAL unsigned.
+	* base64.c (base64_reader_cb): Need to use some casting to get
+	around signed/unsigned char* warnings.
+	* certcheck.c (gpgsm_check_cms_signature): Ditto.
+	(gpgsm_create_cms_signature): Changed arg R_SIGVAL to unsigned char*.
+	(do_encode_md): Made NFRAME a size_t.
+	* certdump.c (gpgsm_print_serial): Fixed signed/unsigned warning.
+	(gpgsm_dump_serial): Ditto.
+	(gpgsm_format_serial): Ditto.
+	(gpgsm_dump_string): Ditto.
+	(gpgsm_dump_cert): Ditto.
+	(parse_dn_part): Ditto.
+	(gpgsm_print_name2): Ditto.
+	* keylist.c (email_kludge): Ditto.
+	* certreqgen.c (proc_parameters, create_request): Ditto.
+	(create_request): Ditto.
+	* call-agent.c (gpgsm_agent_pksign): Made arg R_BUF unsigned.
+	(struct cipher_parm_s): Made CIPHERTEXT unsigned.
+	(struct genkey_parm_s): Ditto.
+	* server.c (strcpy_escaped_plus): Made arg S signed char*.
+	* fingerprint.c (gpgsm_get_fingerprint): Made ARRAY unsigned.
+	(gpgsm_get_keygrip): Ditto.
+	* keydb.c (keydb_insert_cert): Made DIGEST unsigned.
+	(keydb_update_cert): Ditto.
+	(classify_user_id): Apply cast to signed/unsigned assignment.
+	(hextobyte): Ditto.
+
 2005-06-01  Werner Koch  <wk@g10code.com>
 
 	* misc.c: Include setenv.h.
diff --git a/sm/base64.c b/sm/base64.c
index 4cc6ffa27..62c2c9ad9 100644
--- a/sm/base64.c
+++ b/sm/base64.c
@@ -95,7 +95,7 @@ struct base64_context_s {
 
 
 /* The base-64 character list */
-static unsigned char bintoasc[64] = 
+static char bintoasc[64] = 
        "ABCDEFGHIJKLMNOPQRSTUVWXYZ" 
        "abcdefghijklmnopqrstuvwxyz" 
        "0123456789+/"; 
@@ -202,8 +202,9 @@ base64_reader_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
             {
               /* wait for the header line */
               parm->linelen = parm->readpos = 0;
-              if (!parm->have_lf || strncmp (parm->line, "-----BEGIN ", 11)
-                  || !strncmp (parm->line+11, "PGP ", 4))
+              if (!parm->have_lf 
+                  || strncmp ((char*)parm->line, "-----BEGIN ", 11)
+                  || !strncmp ((char*)parm->line+11, "PGP ", 4))
                 goto next;
               parm->is_pem = 1;
             }
@@ -220,8 +221,9 @@ base64_reader_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
           /* the very first byte does pretty much look like a SEQUENCE tag*/
           parm->is_pem = 0;
         }
-      else if ( parm->have_lf && !strncmp (parm->line, "-----BEGIN ", 11)
-                && strncmp (parm->line+11, "PGP ", 4) )
+      else if ( parm->have_lf
+                && !strncmp ((char*)parm->line, "-----BEGIN ", 11)
+                && strncmp ((char *)parm->line+11, "PGP ", 4) )
         {
           /* Fixme: we must only compare if the line really starts at
              the beginning */
@@ -268,7 +270,7 @@ base64_reader_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
   if (parm->is_pem || parm->is_base64)
     {  
       if (parm->is_pem && parm->have_lf
-          && !strncmp (parm->line, "-----END ", 9))
+          && !strncmp ((char*)parm->line, "-----END ", 9))
         { 
           parm->identified = 0;
           parm->linelen = parm->readpos = 0;
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 885abf421..92a29928c 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -39,24 +39,27 @@
 #include "../common/membuf.h"
 
 
-static ASSUAN_CONTEXT agent_ctx = NULL;
+static assuan_context_t agent_ctx = NULL;
 static int force_pipe_server = 0;
 
-struct cipher_parm_s {
-  ASSUAN_CONTEXT ctx;
-  const char *ciphertext;
+struct cipher_parm_s
+{
+  assuan_context_t ctx;
+  const unsigned char *ciphertext;
   size_t ciphertextlen;
 };
 
-struct genkey_parm_s {
-  ASSUAN_CONTEXT ctx;
-  const char *sexp;
+struct genkey_parm_s
+{
+  assuan_context_t ctx;
+  const unsigned char *sexp;
   size_t sexplen;
 };
 
-struct learn_parm_s {
+struct learn_parm_s
+{
   int error;
-  ASSUAN_CONTEXT ctx;
+  assuan_context_t ctx;
   membuf_t *data;
 };
 
@@ -204,7 +207,7 @@ membuf_data_cb (void *opaque, const void *buffer, size_t length)
 int
 gpgsm_agent_pksign (ctrl_t ctrl, const char *keygrip, const char *desc,
                     unsigned char *digest, size_t digestlen, int digestalgo,
-                    char **r_buf, size_t *r_buflen )
+                    unsigned char **r_buf, size_t *r_buflen )
 {
   int rc, i;
   char *p, line[ASSUAN_LINELENGTH];
@@ -392,7 +395,7 @@ gpgsm_agent_genkey (ctrl_t ctrl,
   struct genkey_parm_s gk_parm;
   membuf_t data;
   size_t len;
-  char *buf;
+  unsigned char *buf;
 
   *r_pubkey = NULL;
   rc = start_agent (ctrl);
diff --git a/sm/certcheck.c b/sm/certcheck.c
index 611d3219c..84dfdb9ab 100644
--- a/sm/certcheck.c
+++ b/sm/certcheck.c
@@ -39,7 +39,8 @@ static int
 do_encode_md (gcry_md_hd_t md, int algo, int pkalgo, unsigned int nbits,
               gcry_mpi_t *r_val)
 {
-  int n, nframe;
+  int n;
+  size_t nframe;
   unsigned char *frame;
 
   if (pkalgo == GCRY_PK_DSA)
@@ -205,7 +206,7 @@ gpgsm_check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert)
       log_printf ("\n");
     }
 
-  rc = gcry_sexp_sscan ( &s_sig, NULL, p, n);
+  rc = gcry_sexp_sscan ( &s_sig, NULL, (char*)p, n);
   ksba_free (p);
   if (rc)
     {
@@ -224,7 +225,7 @@ gpgsm_check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert)
       gcry_sexp_release (s_sig);
       return gpg_error (GPG_ERR_BUG);
     }
-  rc = gcry_sexp_sscan ( &s_pkey, NULL, p, n);
+  rc = gcry_sexp_sscan ( &s_pkey, NULL, (char*)p, n);
   ksba_free (p);
   if (rc)
     {
@@ -278,7 +279,7 @@ gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
       log_error ("libksba did not return a proper S-Exp\n");
       return gpg_error (GPG_ERR_BUG);
     }
-  rc = gcry_sexp_sscan (&s_sig, NULL, sigval, n);
+  rc = gcry_sexp_sscan (&s_sig, NULL, (char*)sigval, n);
   if (rc)
     {
       log_error ("gcry_sexp_scan failed: %s\n", gpg_strerror (rc));
@@ -297,7 +298,7 @@ gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
   if (DBG_CRYPTO)
     log_printhex ("public key: ", p, n);
 
-  rc = gcry_sexp_sscan ( &s_pkey, NULL, p, n);
+  rc = gcry_sexp_sscan ( &s_pkey, NULL, (char*)p, n);
   ksba_free (p);
   if (rc)
     {
@@ -333,7 +334,8 @@ gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
 
 int
 gpgsm_create_cms_signature (ctrl_t ctrl, ksba_cert_t cert,
-                            gcry_md_hd_t md, int mdalgo, char **r_sigval)
+                            gcry_md_hd_t md, int mdalgo,
+                            unsigned char **r_sigval)
 {
   int rc;
   char *grip, *desc;
diff --git a/sm/certdump.c b/sm/certdump.c
index 26510c70d..98f019c4a 100644
--- a/sm/certdump.c
+++ b/sm/certdump.c
@@ -50,8 +50,9 @@ struct dn_array_s {
 
 /* print the first element of an S-Expression */
 void
-gpgsm_print_serial (FILE *fp, ksba_const_sexp_t p)
+gpgsm_print_serial (FILE *fp, ksba_const_sexp_t sn)
 {
+  const char *p = (const char *)sn;
   unsigned long n;
   char *endp;
 
@@ -77,8 +78,9 @@ gpgsm_print_serial (FILE *fp, ksba_const_sexp_t p)
 
 /* Dump the serial number or any other simple S-expression. */
 void
-gpgsm_dump_serial (ksba_const_sexp_t p)
+gpgsm_dump_serial (ksba_const_sexp_t sn)
 {
+  const char *p = (const char *)sn;
   unsigned long n;
   char *endp;
 
@@ -103,8 +105,9 @@ gpgsm_dump_serial (ksba_const_sexp_t p)
 
 
 char *
-gpgsm_format_serial (ksba_const_sexp_t p)
+gpgsm_format_serial (ksba_const_sexp_t sn)
 {
+  const char *p = (const char *)sn;
   unsigned long n;
   char *endp;
   char *buffer;
@@ -168,7 +171,7 @@ gpgsm_dump_string (const char *string)
     {
       const unsigned char *s;
 
-      for (s=string; *s; s++)
+      for (s=(const unsigned char*)string; *s; s++)
         {
           if (*s < ' ' || (*s >= 0x7f && *s <= 0xa0))
             break;
@@ -190,7 +193,7 @@ void
 gpgsm_dump_cert (const char *text, ksba_cert_t cert)
 {
   ksba_sexp_t sexp;
-  unsigned char *p;
+  char *p;
   char *dn;
   ksba_isotime_t t;
 
@@ -260,7 +263,7 @@ parse_dn_part (struct dn_array_s *array, const unsigned char *string)
   };
   const unsigned char *s, *s1;
   size_t n;
-  unsigned char *p;
+  char *p;
   int i;
 
   /* Parse attributeType */
@@ -306,7 +309,7 @@ parse_dn_part (struct dn_array_s *array, const unsigned char *string)
         return NULL;
       for (s1=string; n; s1 += 2, n--, p++)
         {
-          *p = xtoi_2 (s1);
+          *(unsigned char *)p = xtoi_2 (s1);
           if (!*p)
             *p = 0x01; /* Better print a wrong value than truncating
                           the string. */
@@ -351,7 +354,7 @@ parse_dn_part (struct dn_array_s *array, const unsigned char *string)
               s++;
               if (hexdigitp (s))
                 {
-                  *p++ = xtoi_2 (s);
+                  *(unsigned char *)p++ = xtoi_2 (s);
                   s++;
                 }
               else
@@ -485,23 +488,22 @@ print_dn_parts (FILE *fp, struct dn_array_s *dn, int translate)
 void
 gpgsm_print_name2 (FILE *fp, const char *name, int translate)
 {
-  const unsigned char *s;
+  const unsigned char *s = (const unsigned char *)name;
   int i;
 
-  s = name;
   if (!s)
     {
       fputs (_("[Error - No name]"), fp);
     }
   else if (*s == '<')
     {
-      const unsigned char *s2 = strchr (s+1, '>');
+      const char *s2 = strchr ( (char*)s+1, '>');
       if (s2)
         {
           if (translate)
-            print_sanitized_utf8_buffer (fp, s + 1, s2 - s - 1, 0);
+            print_sanitized_utf8_buffer (fp, s + 1, s2 - (char*)s - 1, 0);
           else
-            print_sanitized_buffer (fp, s + 1, s2 - s - 1, 0);
+            print_sanitized_buffer (fp, s + 1, s2 - (char*)s - 1, 0);
         }
     }
   else if (*s == '(')
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 7b29a5b8d..2b920da7e 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -492,7 +492,7 @@ proc_parameters (ctrl_t ctrl,
     }
 
   sprintf (numbuf, "%u", nbits);
-  snprintf (keyparms, DIM (keyparms)-1, 
+  snprintf ((char*)keyparms, DIM (keyparms)-1, 
             "(6:genkey(3:rsa(5:nbits%d:%s)))", (int)strlen (numbuf), numbuf);
   rc = gpgsm_agent_genkey (ctrl, keyparms, &public);
   if (rc)
@@ -627,8 +627,9 @@ create_request (ctrl_t ctrl,
         {
           gcry_sexp_t s_pkey;
           size_t n;
-          unsigned char grip[20], hexgrip[41];
-          char *sigval;
+          unsigned char grip[20];
+          char hexgrip[41];
+          unsigned char *sigval;
           size_t siglen;
 
           n = gcry_sexp_canon_len (public, 0, NULL, NULL);
@@ -638,7 +639,7 @@ create_request (ctrl_t ctrl,
               err = gpg_error (GPG_ERR_BUG);
               goto leave;
             }
-          rc = gcry_sexp_sscan (&s_pkey, NULL, public, n);
+          rc = gcry_sexp_sscan (&s_pkey, NULL, (const char*)public, n);
           if (rc)
             {
               log_error ("gcry_sexp_scan failed: %s\n", gpg_strerror (rc));
diff --git a/sm/delete.c b/sm/delete.c
index 11a0a5476..8e06b9489 100644
--- a/sm/delete.c
+++ b/sm/delete.c
@@ -67,7 +67,7 @@ delete_one (CTRL ctrl, const char *username)
     rc = keydb_get_cert (kh, &cert);
   if (!rc)
     {
-      char fpr[20];
+      unsigned char fpr[20];
 
       gpgsm_get_fingerprint (cert, 0, fpr, NULL);
 
@@ -78,7 +78,7 @@ delete_one (CTRL ctrl, const char *username)
       else if (!rc)
         {
           ksba_cert_t cert2 = NULL;
-          char fpr2[20];
+          unsigned char fpr2[20];
 
           /* We ignore all duplicated certificates which might have
              been inserted due to program bugs. */
diff --git a/sm/encrypt.c b/sm/encrypt.c
index 50da92c32..e4c0d5437 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -164,10 +164,10 @@ encode_session_key (DEK dek, gcry_sexp_t * r_data)
 }
 
 
-/* encrypt the DEK under the key contained in CERT and return it as a
-   canonical S-Exp in encval */
+/* Encrypt the DEK under the key contained in CERT and return it as a
+   canonical S-Exp in encval. */
 static int
-encrypt_dek (const DEK dek, ksba_cert_t cert, char **encval)
+encrypt_dek (const DEK dek, ksba_cert_t cert, unsigned char **encval)
 {
   gcry_sexp_t s_ciph, s_data, s_pkey;
   int rc;
@@ -189,7 +189,7 @@ encrypt_dek (const DEK dek, ksba_cert_t cert, char **encval)
       log_error ("libksba did not return a proper S-Exp\n");
       return gpg_error (GPG_ERR_BUG);
     }
-  rc = gcry_sexp_sscan (&s_pkey, NULL, buf, len);
+  rc = gcry_sexp_sscan (&s_pkey, NULL, (char*)buf, len);
   xfree (buf); buf = NULL;
   if (rc)
     {
@@ -220,7 +220,7 @@ encrypt_dek (const DEK dek, ksba_cert_t cert, char **encval)
       gcry_sexp_release (s_ciph);
       return tmperr;
     }
-  len = gcry_sexp_sprint (s_ciph, GCRYSEXP_FMT_CANON, buf, len);
+  len = gcry_sexp_sprint (s_ciph, GCRYSEXP_FMT_CANON, (char*)buf, len);
   assert (len);
 
   *encval = buf;
@@ -437,7 +437,7 @@ gpgsm_encrypt (CTRL ctrl, CERTLIST recplist, int data_fd, FILE *out_fp)
      each and store them in the CMS object */
   for (recpno = 0, cl = recplist; cl; recpno++, cl = cl->next)
     {
-      char *encval;
+      unsigned char *encval;
       
       rc = encrypt_dek (dek, cl->cert, &encval);
       if (rc)
diff --git a/sm/fingerprint.c b/sm/fingerprint.c
index 7fe619c18..9c3ab85db 100644
--- a/sm/fingerprint.c
+++ b/sm/fingerprint.c
@@ -42,8 +42,9 @@
    If there is a problem , the function does never return NULL but a
    digest of all 0xff.
  */
-char *
-gpgsm_get_fingerprint (ksba_cert_t cert, int algo, char *array, int *r_len)
+unsigned char *
+gpgsm_get_fingerprint (ksba_cert_t cert, int algo,
+                       unsigned char *array, int *r_len)
 {
   gcry_md_hd_t md;
   int rc, len;
@@ -140,8 +141,8 @@ gpgsm_get_short_fingerprint (ksba_cert_t cert)
    key parameters expressed as an canoncial encoded S-Exp.  array must
    be 20 bytes long. returns the array or a newly allocated one if the
    passed one was NULL */
-char *
-gpgsm_get_keygrip (ksba_cert_t cert, char *array)
+unsigned char *
+gpgsm_get_keygrip (ksba_cert_t cert, unsigned char *array)
 {
   gcry_sexp_t s_pkey;
   int rc;
@@ -160,7 +161,7 @@ gpgsm_get_keygrip (ksba_cert_t cert, char *array)
       log_error ("libksba did not return a proper S-Exp\n");
       return NULL;
     }
-  rc = gcry_sexp_sscan ( &s_pkey, NULL, p, n);
+  rc = gcry_sexp_sscan ( &s_pkey, NULL, (char*)p, n);
   xfree (p);
   if (rc)
     {
@@ -223,7 +224,7 @@ gpgsm_get_key_algo_info (ksba_cert_t cert, unsigned int *nbits)
       xfree (p);
       return 0;
     }
-  rc = gcry_sexp_sscan (&s_pkey, NULL, p, n);
+  rc = gcry_sexp_sscan (&s_pkey, NULL, (char *)p, n);
   xfree (p);
   if (rc)
     return 0;
@@ -272,7 +273,7 @@ char *
 gpgsm_get_certid (ksba_cert_t cert)
 {
   ksba_sexp_t serial;
-  unsigned char *p;
+  char *p;
   char *endp;
   unsigned char hash[20];
   unsigned long n;
@@ -288,7 +289,7 @@ gpgsm_get_certid (ksba_cert_t cert)
   serial = ksba_cert_get_serial (cert);
   if (!serial)
     return NULL; /* oops: no serial number */
-  p = serial;
+  p = (char *)serial;
   if (*p != '(')
     {
       log_error ("Ooops: invalid serial number\n");
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 1068e9d5e..2f3e83485 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -181,12 +181,12 @@ gpg_error_t gpgsm_status_with_err_code (ctrl_t ctrl, int no, const char *text,
                                         gpg_err_code_t ec);
 
 /*-- fingerprint --*/
-char *gpgsm_get_fingerprint (ksba_cert_t cert, int algo,
-                             char *array, int *r_len);
+unsigned char *gpgsm_get_fingerprint (ksba_cert_t cert, int algo,
+                                      unsigned char *array, int *r_len);
 char *gpgsm_get_fingerprint_string (ksba_cert_t cert, int algo);
 char *gpgsm_get_fingerprint_hexstring (ksba_cert_t cert, int algo);
 unsigned long gpgsm_get_short_fingerprint (ksba_cert_t cert);
-char *gpgsm_get_keygrip (ksba_cert_t cert, char *array);
+unsigned char *gpgsm_get_keygrip (ksba_cert_t cert, unsigned char *array);
 char *gpgsm_get_keygrip_hexstring (ksba_cert_t cert);
 int  gpgsm_get_key_algo_info (ksba_cert_t cert, unsigned int *nbits);
 char *gpgsm_get_certid (ksba_cert_t cert);
@@ -229,7 +229,7 @@ int gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
 /* fixme: move create functions to another file */
 int gpgsm_create_cms_signature (ctrl_t ctrl,
                                 ksba_cert_t cert, gcry_md_hd_t md, int mdalgo,
-                                char **r_sigval);
+                                unsigned char **r_sigval);
 
 
 /*-- certchain.c --*/
@@ -293,7 +293,7 @@ int gpgsm_agent_pksign (ctrl_t ctrl, const char *keygrip, const char *desc,
                         unsigned char *digest,
                         size_t digestlen,
                         int digestalgo,
-                        char **r_buf, size_t *r_buflen);
+                        unsigned char **r_buf, size_t *r_buflen);
 int gpgsm_agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
                            ksba_const_sexp_t ciphertext, 
                            char **r_buf, size_t *r_buflen);
diff --git a/sm/keydb.c b/sm/keydb.c
index 293e5233d..17f04fe4b 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -681,7 +681,7 @@ keydb_insert_cert (KEYDB_HANDLE hd, ksba_cert_t cert)
 {
   int rc = -1;
   int idx;
-  char digest[20];
+  unsigned char digest[20];
   
   if (!hd) 
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -723,7 +723,7 @@ int
 keydb_update_cert (KEYDB_HANDLE hd, ksba_cert_t cert)
 {
   int rc = 0;
-  char digest[20];
+  unsigned char digest[20];
   
   if (!hd)
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -1010,8 +1010,9 @@ keydb_search_subject (KEYDB_HANDLE hd, const char *name)
 
 
 static int
-hextobyte (const unsigned char *s)
+hextobyte (const char *string)
 {
+  const unsigned char *s = (const unsigned char *)string;
   int c;
 
   if( *s >= '0' && *s <= '9' )
@@ -1122,7 +1123,7 @@ classify_user_id (const char *name,
                 if (!strchr("01234567890abcdefABCDEF", *si))
                   return 0; /* invalid digit in serial number*/
               }
-            desc->sn = s;
+            desc->sn = (const unsigned char*)s;
             desc->snlen = -1;
             if (!*si)
               mode = KEYDB_SEARCH_MODE_SN;
diff --git a/sm/keylist.c b/sm/keylist.c
index 8e1233341..a0ac73fb3 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -256,7 +256,7 @@ print_time (gnupg_isotime_t t, FILE *fp)
 static char *
 email_kludge (const char *name)
 {
-  const unsigned char *p;
+  const char *p;
   unsigned char *buf;
   int n;
 
@@ -278,7 +278,7 @@ email_kludge (const char *name)
     buf[n] = xtoi_2 (p);
   buf[n++] = '>';
   buf[n] = 0;
-  return buf;
+  return (char*)buf;
 }
 
 
diff --git a/sm/server.c b/sm/server.c
index 7bfd3fc20..b3816d3d9 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -53,14 +53,14 @@ struct server_local_s {
 /* Note that it is sufficient to allocate the target string D as
    long as the source string S, i.e.: strlen(s)+1; */
 static void
-strcpy_escaped_plus (char *d, const unsigned char *s)
+strcpy_escaped_plus (char *d, const char *s)
 {
   while (*s)
     {
       if (*s == '%' && s[1] && s[2])
         { 
           s++;
-          *d++ = xtoi_2 ( s);
+          *d++ = xtoi_2 (s);
           s += 2;
         }
       else if (*s == '+')
diff --git a/sm/sign.c b/sm/sign.c
index 5deef6088..3230a0e98 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -575,7 +575,7 @@ gpgsm_sign (CTRL ctrl, CERTLIST signerlist,
           ksba_cms_set_hash_function (cms, HASH_FNC, md);
           for (cl=signerlist,signer=0; cl; cl = cl->next, signer++)
             {
-              char *sigval = NULL;
+              unsigned char *sigval = NULL;
               char *buf, *fpr;
 
               if (signer)
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 39f17e2ce..5965b2871 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-16  Werner Koch  <wk@g10code.com>
+
+	* gpg-connect-agent.c (read_and_print_response): Made LINELEN a
+	size_t.
+
 2005-06-04  Marcus Brinkmann  <marcus@g10code.de>
 
 	* symcryptrun.c (main): Allow any number of arguments, don't use
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index bb05030ee..c9a324fa8 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -458,7 +458,7 @@ static int
 read_and_print_response (assuan_context_t ctx)
 {
   char *line;
-  int linelen;
+  size_t linelen;
   assuan_error_t rc;
   int i, j;
 
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index c49d1dcbb..e8d9ca27e 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2316,7 +2316,7 @@ gc_component_change_options (int component, FILE *in)
       char *linep;
       unsigned long flags = 0;
       char *new_value = "";
-      unsigned long new_value_nr;
+      unsigned long new_value_nr = 0;
 
       /* Strip newline and carriage return, if present.  */
       while (length > 0
diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
index 75b18b29b..e874ab22e 100644
--- a/tools/gpgkey2ssh.c
+++ b/tools/gpgkey2ssh.c
@@ -249,6 +249,9 @@ main (int argc, char **argv)
   pkdbuf = NULL;
   pkdbuf_n = 0;
 
+  algorithm_id = 0;  /* (avoid cc warning) */
+  identifier = NULL; /* (avoid cc warning) */
+
   assert (argc == 2);
 
   keyid = argv[1];
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 25ca8c413..6cb570fbc 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -223,7 +223,7 @@ main (int argc, char **argv)
   int force = 0;
 
   struct sockaddr_un srvr_addr;
-  int addrlen;
+  socklen_t addrlen;
   int server;
   int flags;
   client_t client_list = NULL;
-- 
cgit 


From 4459fcb032268d6164ce70ab750f7b6baded9bf2 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 21 Apr 2006 12:56:40 +0000
Subject: Still merging 1.4.3 code back

---
 common/ChangeLog       |  16 +++
 common/iobuf.c         | 304 ++++++++++++++++++++++++++++---------------------
 common/iobuf.h         |   6 +-
 common/miscellaneous.c |   5 +-
 g10/exec.c             |   2 +-
 g10/keydb.c            |   6 +-
 g10/keylist.c          |   2 +-
 g10/keyserver.c        |   2 +-
 g10/mainproc.c         |   4 +-
 g10/options.h          |   2 +
 g10/plaintext.c        |  39 ++++---
 g10/seckey-cert.c      |   3 +-
 g10/sign.c             |   5 +-
 jnlib/ChangeLog        |   5 +
 jnlib/stringhelp.c     |  10 +-
 jnlib/stringhelp.h     |   2 +-
 16 files changed, 247 insertions(+), 166 deletions(-)

(limited to 'common/miscellaneous.c')

diff --git a/common/ChangeLog b/common/ChangeLog
index 54bce4538..f1b11fc57 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,19 @@
+2006-04-19  Werner Koch  <wk@g10code.com>
+
+	* iobuf.c (iobuf_get_fd): New.  Taken from 1.4.3.
+	(iobuf_is_pipe_filename): New.
+	(pop_filter): Made static.
+	(iobuf_skip_rest): New.  Orginal patch by Florian
+	Weimer.  Added new argument PARTIAL.
+	(block_filter): Remove the old gpg indeterminate length mode.
+	(block_filter): Properly handle a partial body stream
+	that ends with a 5-byte length that happens to be zero.
+	(iobuf_set_block_mode, iobuf_in_block_mode): Removed as
+	superfluous.
+	(iobuf_get_filelength): New arg OVERFLOW.
+	(iobuf_get_filelength) [W32]: Use GetFileSizeEx if available
+	* miscellaneous.c (is_file_compressed): Take care of OVERFLOW.
+
 2006-04-18  Werner Koch  <wk@g10code.com>
 
 	* homedir.c (w32_shgetfolderpath): New.  Taken from gpg 1.4.3.
diff --git a/common/iobuf.c b/common/iobuf.c
index 32b9e18c6..bbb666f67 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -1,5 +1,6 @@
 /* iobuf.c  -  file handling
- * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2003,
+ *               2004, 2006  Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -41,6 +42,11 @@
 #include "util.h"
 #include "iobuf.h"
 
+/* The size of the internal buffers. 
+   NOTE: If you change this value you MUST also adjust the regression
+   test "armored_key_8192" in armor.test! */
+#define IOBUF_BUFFER_SIZE  8192
+
 #undef FILE_FILTER_USES_STDIO
 
 #ifdef HAVE_DOSISH_SYSTEM
@@ -762,32 +768,23 @@ block_filter (void *opaque, int control, iobuf_t chain, byte * buffer,
 			  break;
 			}
 		      a->size |= c;
+                      a->partial = 2;
+                      if (!a->size)
+                        {
+                          a->eof = 1;
+                          if (!n)
+                            rc = -1;
+                          break;
+			}
 		    }
 		  else
-		    {		/* next partial body length */
+		    { /* Next partial body length. */
 		      a->size = 1 << (c & 0x1f);
 		    }
 		  /*  log_debug("partial: ctx=%p c=%02x size=%u\n", a, c, a->size); */
 		}
 	      else
-		{		/* the gnupg partial length scheme - much better :-) */
-		  c = iobuf_get (chain);
-		  a->size = c << 8;
-		  c = iobuf_get (chain);
-		  a->size |= c;
-		  if (c == -1)
-		    {
-		      log_error ("block_filter: error reading length info\n");
-		      rc = GPG_ERR_BAD_DATA;
-		    }
-		  if (!a->size)
-		    {
-		      a->eof = 1;
-		      if (!n)
-			rc = -1;
-		      break;
-		    }
-		}
+		BUG ();	
 	    }
 
 	  while (!rc && size && a->size)
@@ -876,39 +873,7 @@ block_filter (void *opaque, int control, iobuf_t chain, byte * buffer,
 	    }
 	}
       else
-	{			/* the gnupg scheme (which is not openpgp compliant) */
-	  size_t avail, n;
-
-	  for (p = buf; !rc && size;)
-	    {
-	      n = size;
-	      avail = a->size - a->count;
-	      if (!avail)
-		{
-		  if (n > a->size)
-		    {
-		      iobuf_put (chain, (a->size >> 8) & 0xff);
-		      iobuf_put (chain, a->size & 0xff);
-		      avail = a->size;
-		      a->count = 0;
-		    }
-		  else
-		    {
-		      iobuf_put (chain, (n >> 8) & 0xff);
-		      iobuf_put (chain, n & 0xff);
-		      avail = n;
-		      a->count = a->size - n;
-		    }
-		}
-	      if (n > avail)
-		n = avail;
-	      if (iobuf_write (chain, p, n))
-		rc = gpg_error_from_errno (errno);
-	      a->count += n;
-	      p += n;
-	      size -= n;
-	    }
-	}
+	BUG ();
     }
   else if (control == IOBUFCTRL_INIT)
     {
@@ -976,10 +941,7 @@ block_filter (void *opaque, int control, iobuf_t chain, byte * buffer,
 	      a->buflen = 0;
 	    }
 	  else
-	    {
-	      iobuf_writebyte (chain, 0);
-	      iobuf_writebyte (chain, 0);
-	    }
+	    BUG ();
 	}
       else if (a->size)
 	{
@@ -1159,11 +1121,10 @@ iobuf_enable_special_filenames (int yes)
   special_names_enabled = yes;
 }
 
-/*
- * see whether the filename has the for "-&nnnn", where n is a
- * non-zero number.
- * Returns this number or -1 if it is not the case.
- */
+
+/* See whether the filename has the form "-&nnnn", where n is a
+   non-zero number.  Returns this number or -1 if it is not the
+   case.  */
 static int
 check_special_filename (const char *fname)
 {
@@ -1180,6 +1141,17 @@ check_special_filename (const char *fname)
   return -1;
 }
 
+
+/* This fucntion returns true if FNAME indicates a PIPE (stdout or
+   stderr) or a special file name if those are enabled. */
+int
+iobuf_is_pipe_filename (const char *fname)
+{
+  if (!fname || (*fname=='-' && !fname[1]) )
+    return 1;
+  return check_special_filename (fname) != -1;
+}
+
 /****************
  * Create a head iobuf for reading from a file
  * returns: NULL if an error occures and sets errno
@@ -1547,7 +1519,7 @@ iobuf_push_filter2 (iobuf_t a,
 /****************
  * Remove an i/o filter.
  */
-int
+static int
 pop_filter (iobuf_t a, int (*f) (void *opaque, int control,
 			       iobuf_t chain, byte * buf, size_t * len),
 	    void *ov)
@@ -2038,49 +2010,110 @@ iobuf_set_limit (iobuf_t a, off_t nlimit)
 
 
 
-/****************
- * Return the length of an open file
- */
+/* Return the length of an open file A.  IF OVERFLOW is not NULL it
+   will be set to true if the file is larger than what off_t can cope
+   with.  The function return 0 on error or on overflow condition.  */
 off_t
-iobuf_get_filelength (iobuf_t a)
+iobuf_get_filelength (iobuf_t a, int *overflow)
 {
-  struct stat st;
+    struct stat st;
 
-  if (a->directfp)
-    {
-      FILE *fp = a->directfp;
+    if (overflow)
+      *overflow = 0;
 
-      if (!fstat (fileno (fp), &st))
-	return st.st_size;
-      log_error ("fstat() failed: %s\n", strerror (errno));
-      return 0;
+    if( a->directfp )  {
+	FILE *fp = a->directfp;
+
+       if( !fstat(fileno(fp), &st) )
+           return st.st_size;
+	log_error("fstat() failed: %s\n", strerror(errno) );
+	return 0;
     }
 
-  /* Hmmm: file_filter may have already been removed */
-  for (; a; a = a->chain)
-    if (!a->chain && a->filter == file_filter)
-      {
-	file_filter_ctx_t *b = a->filter_ov;
-	FILEP_OR_FD fp = b->fp;
+    /* Hmmm: file_filter may have already been removed */
+    for( ; a; a = a->chain )
+	if( !a->chain && a->filter == file_filter ) {
+	    file_filter_ctx_t *b = a->filter_ov;
+	    FILEP_OR_FD fp = b->fp;
 
 #if defined(HAVE_DOSISH_SYSTEM) && !defined(FILE_FILTER_USES_STDIO)
-	ulong size;
-
-	if ((size = GetFileSize (fp, NULL)) != 0xffffffff)
-	  return size;
-	log_error ("GetFileSize for handle %p failed: ec=%d\n",
-		   fp, (int) GetLastError ());
+            ulong size;
+            static int (* __stdcall get_file_size_ex) 
+              (void *handle, LARGE_INTEGER *size);
+            static int get_file_size_ex_initialized;
+
+            if (!get_file_size_ex_initialized)
+              {
+                void *handle;
+                
+                handle = dlopen ("kernel32.dll", RTLD_LAZY);
+                if (handle)
+                  {
+                    get_file_size_ex = dlsym (handle, "GetFileSizeEx");
+                    if (!get_file_size_ex)
+                    dlclose (handle);
+                  }
+                get_file_size_ex_initialized = 1;
+              }
+
+            if (get_file_size_ex)
+              {
+                /* This is a newer system with GetFileSizeEx; we use
+                   this then becuase it seem that GetFileSize won't
+                   return a proper error in case a file is larger than
+                   4GB. */
+                LARGE_INTEGER size;
+                
+                if (get_file_size_ex (fp, &size))
+                  {
+                    if (!size.u.HighPart)
+                      return size.u.LowPart;
+                    if (overflow)
+                      *overflow = 1;
+                    return 0; 
+                  }
+              }
+            else
+              {
+                if  ((size=GetFileSize (fp, NULL)) != 0xffffffff)
+                  return size;
+              }
+            log_error ("GetFileSize for handle %p failed: %s\n",
+                       fp, w32_strerror (0));
 #else
-	if (!fstat (my_fileno (fp), &st))
-	  return st.st_size;
-	log_error ("fstat() failed: %s\n", strerror (errno));
+            if( !fstat(my_fileno(fp), &st) )
+		return st.st_size;
+	    log_error("fstat() failed: %s\n", strerror(errno) );
 #endif
-	break;
+	    break;
+	}
+
+    return 0;
+}
+
+
+/* Return the file descriptor of the underlying file or -1 if it is
+   not available.  */
+int 
+iobuf_get_fd (iobuf_t a)
+{
+  if (a->directfp)
+    return fileno ( (FILE*)a->directfp );
+
+  for ( ; a; a = a->chain )
+    if (!a->chain && a->filter == file_filter)
+      {
+        file_filter_ctx_t *b = a->filter_ov;
+        FILEP_OR_FD fp = b->fp;
+
+        return my_fileno (fp);
       }
 
-  return 0;
+  return -1;
 }
 
+
+
 /****************
  * Tell the file position, where the next read will take place
  */
@@ -2233,30 +2266,6 @@ iobuf_get_fname (iobuf_t a)
   return NULL;
 }
 
-/****************
- * Start the block write mode, see rfc1991.new for details.
- * A value of 0 for N stops this mode (flushes and writes
- * the end marker)
- */
-void
-iobuf_set_block_mode (iobuf_t a, size_t n)
-{
-  block_filter_ctx_t *ctx = xcalloc (1, sizeof *ctx);
-
-  assert (a->use == 1 || a->use == 2);
-  ctx->use = a->use;
-  if (!n)
-    {
-      if (a->use == 1)
-	log_debug ("pop_filter called in set_block_mode - please report\n");
-      pop_filter (a, block_filter, NULL);
-    }
-  else
-    {
-      ctx->size = n;		/* only needed for use 2 */
-      iobuf_push_filter (a, block_filter, ctx);
-    }
-}
 
 /****************
  * enable partial block mode as described in the OpenPGP draft.
@@ -2286,18 +2295,6 @@ iobuf_set_partial_block_mode (iobuf_t a, size_t len)
 }
 
 
-/****************
- * Checks whether the stream is in block mode
- * Note: This does not work if other filters are pushed on the stream.
- */
-int
-iobuf_in_block_mode (iobuf_t a)
-{
-  if (a && a->filter == block_filter)
-    return 1;			/* yes */
-  return 0;			/* no */
-}
-
 
 /****************
  * Same as fgets() but if the buffer is too short a larger one will
@@ -2416,3 +2413,54 @@ translate_file_handle (int fd, int for_write)
 #endif
   return fd;
 }
+
+
+void
+iobuf_skip_rest (iobuf_t a, unsigned long n, int partial)
+{
+  if ( partial )
+    {
+      for (;;)
+        {
+          if (a->nofast || a->d.start >= a->d.len) 
+            {
+              if (iobuf_readbyte (a) == -1)
+                {
+                  break;
+                }
+	    } 
+          else
+            {
+              unsigned long count = a->d.len - a->d.start;
+              a->nbytes += count;
+              a->d.start = a->d.len;
+	    }
+	}
+    } 
+  else
+    {
+      unsigned long remaining = n;
+      while (remaining > 0) 
+        {
+          if (a->nofast || a->d.start >= a->d.len)
+            {
+              if (iobuf_readbyte (a) == -1)
+                {
+                  break;
+		}
+              --remaining;
+	    } 
+          else 
+            {
+              unsigned long count = a->d.len - a->d.start;
+              if (count > remaining) 
+                {
+                  count = remaining;
+		}
+              a->nbytes += count;
+              a->d.start += count;
+              remaining -= count;
+	    }
+	}
+    }
+}
diff --git a/common/iobuf.h b/common/iobuf.h
index def0a6506..431d573a1 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -90,6 +90,7 @@ struct iobuf_struct
 EXTERN_UNLESS_MAIN_MODULE int iobuf_debug_mode;
 
 void iobuf_enable_special_filenames (int yes);
+int  iobuf_is_pipe_filename (const char *fname);
 iobuf_t iobuf_alloc (int use, size_t bufsize);
 iobuf_t iobuf_temp (void);
 iobuf_t iobuf_temp_with_content (const char *buffer, size_t length);
@@ -134,14 +135,13 @@ int iobuf_write_temp (iobuf_t a, iobuf_t temp);
 size_t iobuf_temp_to_buffer (iobuf_t a, byte * buffer, size_t buflen);
 void iobuf_unget_and_close_temp (iobuf_t a, iobuf_t temp);
 
-off_t iobuf_get_filelength (iobuf_t a);
+off_t iobuf_get_filelength (iobuf_t a, int *overflow);
 #define IOBUF_FILELENGTH_LIMIT 0xffffffff
+int  iobuf_get_fd (iobuf_t a);
 const char *iobuf_get_real_fname (iobuf_t a);
 const char *iobuf_get_fname (iobuf_t a);
 
-void iobuf_set_block_mode (iobuf_t a, size_t n);
 void iobuf_set_partial_block_mode (iobuf_t a, size_t len);
-int iobuf_in_block_mode (iobuf_t a);
 
 int iobuf_translate_file_handle (int fd, int for_write);
 
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index d81213ef9..14d6f020d 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -81,6 +81,7 @@ is_file_compressed (const char *s, int *ret_rc)
     iobuf_t a;
     byte buf[4];
     int i, rc = 0;
+    int overflow;
 
     struct magic_compress_s {
         size_t len;
@@ -91,7 +92,7 @@ is_file_compressed (const char *s, int *ret_rc)
         { 4, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */
     };
     
-    if ( !s || (*s == '-' && !s[1]) || !ret_rc )
+    if ( iobuf_is_pipe_filename (s) || !ret_rc )
         return 0; /* We can't check stdin or no file was given */
 
     a = iobuf_open( s );
@@ -100,7 +101,7 @@ is_file_compressed (const char *s, int *ret_rc)
         return 0;
     }
 
-    if ( iobuf_get_filelength( a ) < 4 ) {
+    if ( iobuf_get_filelength( a, &overflow ) < 4 && !overflow) {
         *ret_rc = 0;
         goto leave;
     }
diff --git a/g10/exec.c b/g10/exec.c
index cdc86e16b..6938a409a 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -473,9 +473,9 @@ int exec_write(struct exec_info **info,const char *program,
     (*info)->tochild=fopen((*info)->tempfile_in,binary?"wb":"w");
   if((*info)->tochild==NULL)
     {
+      ret = gpg_error_from_errno (errno);
       log_error(_("can't create `%s': %s\n"),
 		(*info)->tempfile_in,strerror(errno));
-      ret=G10ERR_WRITE_FILE;
       goto fail;
     }
 
diff --git a/g10/keydb.c b/g10/keydb.c
index dbad8435a..b3595cf36 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -134,9 +134,9 @@ maybe_create_keyring (char *filename, int force)
         log_info ("can't allocate lock for `%s'\n", filename );
 
       if (!force) 
-        return G10ERR_OPEN_FILE; 
+        return gpg_error (GPG_ERR_ENOENT); 
       else
-        return G10ERR_GENERAL;
+        return gpg_error (GPG_ERR_GENERAL);
     }
 
   if ( make_dotlock (lockhd, -1) )
@@ -166,9 +166,9 @@ maybe_create_keyring (char *filename, int force)
   umask (oldmask);
   if (!iobuf) 
     {
+      rc = gpg_error_from_errno (errno);
       log_error ( _("error creating keyring `%s': %s\n"),
                   filename, strerror(errno));
-      rc = G10ERR_OPEN_FILE;
       goto leave;
     }
 
diff --git a/g10/keylist.c b/g10/keylist.c
index 0b1a51b6d..441606299 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1310,7 +1310,7 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
 		  case 0:		        sigrc = '!'; break;
 		  case GPG_ERR_BAD_SIGNATURE:   sigrc = '-'; break;
 		  case GPG_ERR_NO_PUBKEY: 
-		  case Gpg_Err_UNUSABLE_PUBKEY: sigrc = '?'; break;
+		  case GPG_ERR_UNUSABLE_PUBKEY: sigrc = '?'; break;
 		  default:		        sigrc = '%'; break;
 		}
 
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 4fd90d08b..3e72b2820 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -31,13 +31,13 @@
 #endif
 
 #include "gpg.h"
+#include "iobuf.h"
 #include "filter.h"
 #include "keydb.h"
 #include "status.h"
 #include "exec.h"
 #include "main.h"
 #include "i18n.h"
-#include "iobuf.h"
 #include "ttyio.h"
 #include "options.h"
 #include "packet.h"
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 8e9b3ab65..27989d3b2 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -647,7 +647,7 @@ proc_plaintext( CTX c, PACKET *pkt )
 	else if(n->pkt->pkttype==PKT_SIGNATURE)
 	  {
 	    /* For the SIG+LITERAL case that PGP used to use. */
-	    md_enable( c->mfx.md, n->pkt->pkt.signature->digest_algo );
+	    gcry_md_enable ( c->mfx.md, n->pkt->pkt.signature->digest_algo );
 	    any=1;
 	  }
       }
@@ -2010,7 +2010,7 @@ proc_tree( CTX c, KBNODE node )
 		     && is_RSA( sig->pubkey_algo ) ) {
 		/* enable a workaround for a pgp2 bug */
                 if (gcry_md_open (&c->mfx.md2, DIGEST_ALGO_MD5, 0))
-                    BUG ():
+                  BUG ();
 	    }
 	    else if( sig->digest_algo == DIGEST_ALGO_SHA1
 		     && sig->pubkey_algo == PUBKEY_ALGO_DSA
diff --git a/g10/options.h b/g10/options.h
index 7e9d0261c..f61cd4c9e 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -262,6 +262,7 @@ struct {
 #define DBG_CARD_IO_VALUE 2048  /* debug smart card I/O.  */
 
 #define DBG_PACKET (opt.debug & DBG_PACKET_VALUE)
+#define DBG_CIPHER (opt.debug & DBG_CIPHER_VALUE)
 #define DBG_FILTER (opt.debug & DBG_FILTER_VALUE)
 #define DBG_CACHE  (opt.debug & DBG_CACHE_VALUE)
 #define DBG_TRUST  (opt.debug & DBG_TRUST_VALUE)
@@ -304,6 +305,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
 #define EXPORT_RESET_SUBKEY_PASSWD       (1<<3)
 #define EXPORT_MINIMAL                   (1<<4)
 #define EXPORT_CLEAN                     (1<<5)
+#define EXPORT_SEXP_FORMAT               (1<<6)
 
 #define LIST_SHOW_PHOTOS                 (1<<0)
 #define LIST_SHOW_POLICY_URLS            (1<<1)
diff --git a/g10/plaintext.c b/g10/plaintext.c
index 1f8c5759f..2ae851e30 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -133,13 +133,13 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
     else if (is_secured_filename (fname))
       {
         errno = EPERM;
+	rc = gpg_error_from_errno (errno);
 	log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
-	rc = G10ERR_CREATE_FILE;
 	goto leave;
       }
     else if( !(fp = fopen(fname,"wb")) ) {
+	rc = gpg_error_from_errno (errno);
 	log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
-	rc = G10ERR_CREATE_FILE;
 	goto leave;
     }
 #else /* __riscos__ */
@@ -205,7 +205,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 		      {
 			log_error ("error writing to `%s': %s\n",
                                    fname,"exceeded --max-output limit\n");
-			rc = gpg_error (GPG_ERR_GENERAL);
+			rc = gpg_error (GPG_ERR_TOO_LARGE);
 			goto leave;
 		      }
 		    else if( putc( c, fp ) == EOF )
@@ -239,17 +239,17 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 		  {
 		    if(opt.max_output && (count+=len)>opt.max_output)
 		      {
-			log_error("Error writing to `%s': %s\n",
-				  fname,"exceeded --max-output limit\n");
-			rc = G10ERR_WRITE_FILE;
+			log_error ("error writing to `%s': %s\n",
+                                   fname,"exceeded --max-output limit\n");
+			rc = gpg_error (GPG_ERR_TOO_LARGE);
 			xfree( buffer );
 			goto leave;
 		      }
 		    else if( fwrite( buffer, 1, len, fp ) != len )
 		      {
-			log_error("Error writing to `%s': %s\n",
-				  fname, strerror(errno) );
-			rc = G10ERR_WRITE_FILE;
+                        rc = gpg_error_from_errno (errno);
+			log_error ("error writing to `%s': %s\n",
+                                   fname, strerror(errno) );
 			xfree( buffer );
 			goto leave;
 		      }
@@ -274,14 +274,17 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 		      {
 			log_error("Error writing to `%s': %s\n",
 				  fname,"exceeded --max-output limit\n");
-			rc = G10ERR_WRITE_FILE;
+			rc = gpg_error (GPG_ERR_TOO_LARGE);
 			goto leave;
 		      }
 		    else if( putc( c, fp ) == EOF )
 		      {
+                        if ( ferror (fp ) )
+                          rc = gpg_error_from_errno (errno);
+                        else
+                          rc = gpg_error (GPG_ERR_EOF);
 			log_error("Error writing to `%s': %s\n",
 				  fname, strerror(errno) );
-			rc = G10ERR_WRITE_FILE;
 			goto leave;
 		      }
 		  }
@@ -310,7 +313,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 		      {
 			log_error("Error writing to `%s': %s\n",
 				  fname,"exceeded --max-output limit\n");
-			rc = G10ERR_WRITE_FILE;
+			rc = gpg_error (GPG_ERR_TOO_LARGE);
 			xfree( buffer );
 			goto leave;
 		      }
@@ -337,7 +340,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 		  {
 		    log_error("Error writing to `%s': %s\n",
 			      fname,"exceeded --max-output limit\n");
-		    rc = G10ERR_WRITE_FILE;
+                    rc = gpg_error (GPG_ERR_TOO_LARGE);
 		    goto leave;
 		  }
 		else if( putc( c, fp ) == EOF )
@@ -351,8 +354,8 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 	    if( !mfx->md )
 		continue;
 	    if( state == 2 ) {
-		md_putc(mfx->md, '\r' );
-		md_putc(mfx->md, '\n' );
+		gcry_md_putc (mfx->md, '\r' );
+		gcry_md_putc (mfx->md, '\n' );
 		state = 0;
 	    }
 	    if( !state ) {
@@ -361,18 +364,18 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 		else if( c == '\n'  )
 		    state = 2;
 		else
-		    md_putc(mfx->md, c );
+		    gcry_md_putc(mfx->md, c );
 	    }
 	    else if( state == 1 ) {
 		if( c == '\n'  )
 		    state = 2;
 		else {
-		    md_putc(mfx->md, '\r' );
+		    gcry_md_putc(mfx->md, '\r' );
 		    if( c == '\r'  )
 			state = 1;
 		    else {
 			state = 0;
-			md_putc(mfx->md, c );
+			gcry_md_putc(mfx->md, c );
 		    }
 		}
 	    }
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index acb2cdada..ad5b75603 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -294,7 +294,8 @@ check_secret_key( PKT_secret_key *sk, int n )
             log_info (_("%s ...\n"), _(tryagain));
         }
 	rc = do_check( sk, tryagain, mode, &canceled );
-	if ( gpg_err_code (rc) == G10ERR_BAD_PASS && is_status_enabled () ) {
+	if ( gpg_err_code (rc) == GPG_ERR_BAD_PASSPHRASE
+             && is_status_enabled () ) {
 	    u32 kid[2];
 	    char buf[50];
 
diff --git a/g10/sign.c b/g10/sign.c
index 3553079d6..9bb35c898 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -656,7 +656,8 @@ write_signature_packets (SK_LIST sk_list, IOBUF out, gcry_md_hd_t hash,
 	  sig->expiredate = sig->timestamp+duration;
 	sig->sig_class = sigclass;
 
-	md = gcry_md_copy (hash);
+	if (gcry_md_copy (&md, hash))
+          BUG ();
 
 	if (sig->version >= 4)
 	    build_sig_subpkt_from_sig (sig);
@@ -938,9 +939,9 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
                   }
 		if( !inp )
 		  {
+                    rc = gpg_error_from_errno (errno);
 		    log_error(_("can't open `%s': %s\n"),
 			      sl->d,strerror(errno));
-		    rc = G10ERR_OPEN_FILE;
 		    goto leave;
 		  }
                 handle_progress (&pfx, inp, sl->d);
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 32549d136..8816068b0 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-20  Werner Koch  <wk@g10code.com>
+
+	* stringhelp.c (make_basename): New arg INPUTPATH for future
+	riscos compatibility.
+
 2006-04-18  Werner Koch  <wk@g10code.com>
 
 	* libjnlib-config.h (JNLIB_NEED_UTF8CONF): Defined.
diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c
index 760398b0c..e999170dd 100644
--- a/jnlib/stringhelp.c
+++ b/jnlib/stringhelp.c
@@ -234,15 +234,19 @@ length_sans_trailing_ws (const unsigned char *line, size_t len)
  *
  */
 char *
-make_basename(const char *filepath)
+make_basename(const char *filepath, const char *inputpath)
 {
     char *p;
 
+#ifdef __riscos__
+    return riscos_make_basename(filepath, inputpath);
+#endif
+
     if ( !(p=strrchr(filepath, '/')) )
-      #ifdef HAVE_DRIVE_LETTERS
+#ifdef HAVE_DRIVE_LETTERS
 	if ( !(p=strrchr(filepath, '\\')) )
 	    if ( !(p=strrchr(filepath, ':')) )
-      #endif
+#endif
 	      {
 		return jnlib_xstrdup(filepath);
 	      }
diff --git a/jnlib/stringhelp.h b/jnlib/stringhelp.h
index bdd7d561c..4c9e66452 100644
--- a/jnlib/stringhelp.h
+++ b/jnlib/stringhelp.h
@@ -35,7 +35,7 @@ size_t length_sans_trailing_chars (const unsigned char *line, size_t len,
 size_t length_sans_trailing_ws (const unsigned char *line, size_t len);
 
 
-char *make_basename(const char *filepath);
+char *make_basename(const char *filepath, const char *inputpath);
 char *make_dirname(const char *filepath);
 char *make_filename( const char *first_part, ... );
 int compare_filenames( const char *a, const char *b );
-- 
cgit 


From fbe4ac37f6d3e7870e26caffb0d21c3c77198297 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 23 May 2006 16:19:43 +0000
Subject: g10/ does build again.

---
 ChangeLog               |   9 ++
 TODO                    |   9 +-
 common/ChangeLog        |  27 ++++++
 common/Makefile.am      |   4 +-
 common/gettime.c        |  28 +++++-
 common/iobuf.h          |   2 +
 common/miscellaneous.c  |  24 ++++-
 common/pka.c            | 252 ++++++++++++++++++++++++++++++++++++++++++++++++
 common/pka.h            |  27 ++++++
 common/ttyio.c          |  49 +++++++++-
 common/ttyio.h          |  16 +++
 common/util.h           |   3 +
 common/yesno.c          | 142 +++++++++++++++++----------
 configure.ac            |  57 ++++++++++-
 g10/ChangeLog           |  40 ++++++++
 g10/Makefile.am         |   2 +-
 g10/armor.c             |   2 +-
 g10/call-agent.c        |  24 +++--
 g10/call-agent.h        |  17 +++-
 g10/card-util.c         |  18 ++--
 g10/gpg.c               |  27 ++++--
 g10/gpgv.c              |  20 ----
 g10/import.c            |   6 +-
 g10/keydb.h             |   1 +
 g10/keygen.c            |   7 +-
 g10/keyserver.c         |   9 +-
 g10/main.h              |   1 +
 g10/mainproc.c          |   1 +
 g10/misc.c              |  19 +++-
 g10/options.h           |   1 -
 g10/passphrase.c        |   4 +-
 g10/pkclist.c           |   8 +-
 g10/plaintext.c         |  18 ++--
 g10/pubkey-enc.c        |   6 +-
 g10/sign.c              |   2 +-
 g10/skclist.c           |  13 +++
 jnlib/ChangeLog         |  19 ++++
 jnlib/dotlock.c         |  83 ++++++++++++----
 jnlib/dotlock.h         |   1 +
 jnlib/libjnlib-config.h |  26 ++---
 jnlib/stringhelp.c      |  99 ++++++++++++++++---
 jnlib/stringhelp.h      |   6 ++
 jnlib/strlist.c         |  24 ++---
 jnlib/strlist.h         |   4 +-
 scd/app-p15.c           |  10 ++
 sm/ChangeLog            |  10 ++
 sm/Makefile.am          |   2 +-
 sm/keydb.c              |  27 ------
 sm/keylist.c            |   4 +-
 tools/ChangeLog         |   8 ++
 tools/gpgconf-comp.c    |  28 ------
 tools/gpgparsemail.c    |   6 +-
 52 files changed, 990 insertions(+), 262 deletions(-)
 create mode 100644 common/pka.c
 create mode 100644 common/pka.h

(limited to 'common/miscellaneous.c')

diff --git a/ChangeLog b/ChangeLog
index 6e5228817..711cd4751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-23  Werner Koch  <wk@g10code.com>
+
+	* configure.ac (ZLIBS): New for zlib link commands. Add bzip2
+	support.
+
+2006-05-22  Werner Koch  <wk@g10code.com>
+
+	* configure.ac (EXEEXT): New.
+
 2006-04-18  Werner Koch  <wk@g10code.com>
 
 	* configure.ac (PK_UID_CACHE_SIZE): New.
diff --git a/TODO b/TODO
index af3a42605..7958ed18e 100644
--- a/TODO
+++ b/TODO
@@ -110,4 +110,11 @@ might want to have an agent context for each service request
    We can't do that right now because it is only defined by newer
    versions of libgcrypt.  Changes this if we require libgcrypt 1.3
    anyway.
-
+** skclist.c:random_is_faked
+   Remove the whole stuff?
+
+* common/
+** ttyio
+  Add completion support.
+** yesno
+  Update to gpg 1.4.3 version
\ No newline at end of file
diff --git a/common/ChangeLog b/common/ChangeLog
index f1b11fc57..36a733a7f 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,30 @@
+2006-05-23  Werner Koch  <wk@g10code.com>
+
+	* gettime.c (isotimestamp): New.
+
+	* ttyio.c (tty_get_ttyname): Posixly correct usage of ctermid.
+
+	* dns-cert.c: New.  Taken from 1.4.3's util/cert.c.
+	* dns-cert.h: New.
+
+2006-05-22  Werner Koch  <wk@g10code.com>
+
+	* pka.c: New. Taked from 1.4.3.
+	* pka.h: New.
+	* Makefile.am: Added pka.
+
+2006-05-19  Werner Koch  <wk@g10code.com>
+
+	* yesno.c (answer_is_yes_no_default, answer_is_yes_no_quit):
+	Updated from 1.4.3.
+	(answer_is_okay_cancel): new.  From 1.4.3.
+
+	* miscellaneous.c (match_multistr): New.  Taken from 1.4.3.
+
+	* ttyio.c (tty_enable_completion, tty_disable_completion): New
+	dummy functions.
+	* ttyio.h: Add prototypes and stubs.
+
 2006-04-19  Werner Koch  <wk@g10code.com>
 
 	* iobuf.c (iobuf_get_fd): New.  Taken from 1.4.3.
diff --git a/common/Makefile.am b/common/Makefile.am
index 3056be6bc..34819e93f 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -49,7 +49,9 @@ libcommon_a_SOURCES = \
 	w32reg.c \
 	signal.c \
 	dynload.h \
-	estream.c estream.h
+	estream.c estream.h \
+	dns-cert.c dns-cert.h \
+	pka.c pka.h 
 
 
 libsimple_pwquery_a_SOURCES = \
diff --git a/common/gettime.c b/common/gettime.c
index 93e4ba113..ecdc7df95 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -201,7 +201,7 @@ strtimevalue( u32 value )
 }
 
 
-/****************
+/*
  * Note: this function returns GMT
  */
 const char *
@@ -222,6 +222,32 @@ strtimestamp( u32 stamp )
     return buffer;
 }
 
+
+/*
+ * Note: this function returns GMT
+ */
+const char *
+isotimestamp (u32 stamp)
+{
+  static char buffer[25+5];
+  struct tm *tp;
+  time_t atime = stamp;
+  
+  if (atime < 0)
+    {
+      strcpy (buffer, "????" "-??" "-??" " " "??" ":" "??" ":" "??");
+    }
+  else
+    {
+      tp = gmtime ( &atime );
+      sprintf (buffer,"%04d-%02d-%02d %02d:%02d:%02d",
+               1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday,
+               tp->tm_hour, tp->tm_min, tp->tm_sec);
+    }
+  return buffer;
+}
+
+
 /****************
  * Note: this function returns local time
  */
diff --git a/common/iobuf.h b/common/iobuf.h
index 431d573a1..3b8f4b572 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -145,6 +145,8 @@ void iobuf_set_partial_block_mode (iobuf_t a, size_t len);
 
 int iobuf_translate_file_handle (int fd, int for_write);
 
+void iobuf_skip_rest (iobuf_t a, unsigned long n, int partial);
+
 
 /* get a byte form the iobuf; must check for eof prior to this function
  * this function returns values in the range 0 .. 255 or -1 to indicate EOF
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index 14d6f020d..e9f8ed27f 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -1,5 +1,5 @@
 /* miscellaneous.c - Stuff not fitting elsewhere
- *	Copyright (C) 2003 Free Software Foundation, Inc.
+ *	Copyright (C) 2003, 2006 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -47,6 +47,7 @@ print_fname_stdin (const char *s)
     return s;
 }
 
+/* fixme: Globally replace it by print_sanitized_buffer. */
 void
 print_string( FILE *fp, const byte *p, size_t n, int delim )
 {
@@ -125,4 +126,25 @@ leave:
 }
 
 
+/* Try match against each substring of multistr, delimited by | */
+int
+match_multistr (const char *multistr,const char *match)
+{
+  do
+    {
+      size_t seglen = strcspn (multistr,"|");
+      if (!seglen)
+	break;
+      /* Using the localized strncasecmp! */
+      if (strncasecmp(multistr,match,seglen)==0)
+	return 1;
+      multistr += seglen;
+      if (*multistr == '|')
+	multistr++;
+    }
+  while (*multistr);
+
+  return 0;
+}
+
 
diff --git a/common/pka.c b/common/pka.c
new file mode 100644
index 000000000..3d442d16a
--- /dev/null
+++ b/common/pka.c
@@ -0,0 +1,252 @@
+/* pka.c - DNS Public Key Association RR access
+ * Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef USE_DNS_PKA
+#include <sys/types.h>
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+#endif
+#endif /* USE_DNS_PKA */
+
+#include "util.h"
+#include "pka.h"
+
+#ifdef USE_DNS_PKA
+/* Parse the TXT resource record. Format is:
+
+   v=pka1;fpr=a4d94e92b0986ab5ee9dcd755de249965b0358a2;uri=string
+   
+   For simplicity white spaces are not allowed.  Because we expect to
+   use a new RRTYPE for this in the future we define the TXT really
+   strict for simplicity: No white spaces, case sensitivity of the
+   names, order must be as given above.  Only URI is optional.
+
+   This function modifies BUFFER.  On success 0 is returned, the 20
+   byte fingerprint stored at FPR and BUFFER contains the URI or an
+   empty string.
+*/
+static int
+parse_txt_record (char *buffer, unsigned char *fpr)
+{
+  char *p, *pend;
+  int i;
+
+  p = buffer;
+  pend = strchr (p, ';');
+  if (!pend)
+    return -1;
+  *pend++ = 0;
+  if (strcmp (p, "v=pka1"))
+    return -1; /* Wrong or missing version. */
+  
+  p = pend;
+  pend = strchr (p, ';');
+  if (pend)
+    *pend++ = 0;
+  if (strncmp (p, "fpr=", 4))
+    return -1; /* Missing fingerprint part. */
+  p += 4;
+  for (i=0; i < 20 && hexdigitp (p) && hexdigitp (p+1); i++, p += 2)
+    fpr[i] = xtoi_2 (p);
+  if (i != 20)
+    return -1; /* Fingerprint consists not of exactly 40 hexbytes. */
+    
+  p = pend;
+  if (!p || !*p)
+    {
+      *buffer = 0;  
+      return 0; /* Success (no URI given). */
+    }
+  if (strncmp (p, "uri=", 4))
+    return -1; /* Unknown part. */
+  p += 4;
+  /* There is an URI, copy it to the start of the buffer. */
+  while (*p)
+    *buffer++ = *p++;
+  *buffer = 0;
+  return 0;
+}
+
+
+/* For the given email ADDRESS lookup the PKA information in the DNS.
+
+   On success the 20 byte SHA-1 fingerprint is stored at FPR and the
+   URI will be returned in an allocated buffer.  Note that the URI
+   might be an zero length string as this information is optiobnal.
+   Caller must xfree the returned string.
+
+   On error NULL is returned and the 20 bytes at FPR are not
+   defined. */
+char *
+get_pka_info (const char *address, unsigned char *fpr)
+{
+  unsigned char answer[PACKETSZ];
+  int anslen;
+  int qdcount, ancount, nscount, arcount;
+  int rc;
+  unsigned char *p, *pend;
+  const char *domain;
+  char *name;
+
+
+  domain = strrchr (address, '@');
+  if (!domain || domain == address || !domain[1])
+    return NULL; /* invalid mail address given. */
+
+  name = malloc (strlen (address) + 5 + 1);
+  memcpy (name, address, domain - address);
+  strcpy (stpcpy (name + (domain-address), "._pka."), domain+1);
+
+  anslen = res_query (name, C_IN, T_TXT, answer, PACKETSZ);
+  xfree (name);
+  if (anslen < sizeof(HEADER))
+    return NULL; /* DNS resolver returned a too short answer. */
+  if ( (rc=((HEADER*)answer)->rcode) != NOERROR )
+    return NULL; /* DNS resolver returned an error. */
+
+  /* We assume that PACKETSZ is large enough and don't do dynmically
+     expansion of the buffer. */
+  if (anslen > PACKETSZ)
+    return NULL; /* DNS resolver returned a too long answer */
+
+  qdcount = ntohs (((HEADER*)answer)->qdcount);
+  ancount = ntohs (((HEADER*)answer)->ancount);
+  nscount = ntohs (((HEADER*)answer)->nscount);
+  arcount = ntohs (((HEADER*)answer)->arcount);
+
+  if (!ancount)
+    return NULL; /* Got no answer. */
+
+  p = answer + sizeof (HEADER);
+  pend = answer + anslen; /* Actually points directly behind the buffer. */
+
+  while (qdcount-- && p < pend)
+    {
+      rc = dn_skipname (p, pend);
+      if (rc == -1)
+        return NULL;
+      p += rc + QFIXEDSZ; 
+    }
+
+  if (ancount > 1)
+    return NULL; /* more than one possible gpg trustdns record - none used. */
+
+  while (ancount-- && p <= pend)
+    {
+      unsigned int type, class, txtlen, n;
+      char *buffer, *bufp;
+
+      rc = dn_skipname (p, pend);
+      if (rc == -1)
+        return NULL;
+      p += rc;
+      if (p >= pend - 10)
+        return NULL; /* RR too short. */
+
+      type = *p++ << 8;
+      type |= *p++;
+      class = *p++ << 8;
+      class |= *p++;
+      p += 4;
+      txtlen = *p++ << 8;
+      txtlen |= *p++;
+      if (type != T_TXT || class != C_IN)
+        return NULL; /* Answer does not match the query. */
+
+      buffer = bufp = xmalloc (txtlen + 1);
+      while (txtlen && p < pend)
+        {
+          for (n = *p++, txtlen--; txtlen && n && p < pend; txtlen--, n--)
+            *bufp++ = *p++;
+        }
+      *bufp = 0;
+      if (parse_txt_record (buffer, fpr))
+        {
+          xfree (buffer);
+          return NULL; /* Not a valid gpg trustdns RR. */
+        }
+      return buffer;
+    }
+
+  return NULL;
+}
+#else /* !USE_DNS_PKA */
+
+/* Dummy version of the function if we can't use the resolver
+   functions. */
+char *
+get_pka_info (const char *address, unsigned char *fpr)
+{
+  return NULL;
+}
+#endif /* !USE_DNS_PKA */
+
+
+#ifdef TEST
+int
+main(int argc,char *argv[])
+{
+  unsigned char fpr[20];
+  char *uri;
+  int i;
+
+  if (argc < 2)
+    {
+      fprintf (stderr, "usage: pka mail-addresses\n");
+      return 1;
+    }
+  argc--;
+  argv++;
+
+  for (; argc; argc--, argv++)
+    {
+      uri = get_pka_info ( *argv, fpr );
+      printf ("%s", *argv);
+      if (uri)
+        {
+          putchar (' ');
+          for (i=0; i < 20; i++)
+            printf ("%02X", fpr[i]);
+          if (*uri)
+            printf (" %s", uri);
+          xfree (uri);
+        }
+      putchar ('\n');
+    }
+  return 0;
+}
+#endif /* TEST */
+
+/*
+Local Variables:
+compile-command: "cc -DUSE_DNS_PKA -DTEST -I.. -I../include -Wall -g -o pka pka.c -lresolv libutil.a"
+End:
+*/
diff --git a/common/pka.h b/common/pka.h
new file mode 100644
index 000000000..d0b977d0f
--- /dev/null
+++ b/common/pka.h
@@ -0,0 +1,27 @@
+/* pka.h - DNS Public Key Association RR access definitions
+ * Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+#ifndef GNUPG_COMMON_PKA_H
+#define GNUPG_COMMON_PKA_H
+
+char *get_pka_info (const char *address, unsigned char *fpr);
+
+
+#endif /*GNUPG_COMMON_PKA_H*/
diff --git a/common/ttyio.c b/common/ttyio.c
index 5749c59fe..c9f41c626 100644
--- a/common/ttyio.c
+++ b/common/ttyio.c
@@ -1,5 +1,6 @@
 /* ttyio.c -  tty i/O functions
- * Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
+ * Copyright (C) 1998,1999,2000,2001,2002,2003,
+ *               2004, 2006 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -45,6 +46,12 @@
 #endif
 #include <errno.h>
 #include <ctype.h>
+#ifdef HAVE_LIBREADLINE
+#include <readline/readline.h>
+#include <readline/history.h>
+#endif
+
+
 #include "util.h"
 #include "memory.h"
 #include "ttyio.h"
@@ -93,13 +100,21 @@ tty_get_ttyname (void)
   if (!got_name)
     {
       const char *s;
+      /* Note that despite our checks for these macros the function is
+         not necessarily thread save.  We mainly do this for
+         portability reasons, in case L_ctermid is not defined. */
+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(_POSIX_TRHEADS)
+      char buffer[L_ctermid];
+      s = ctermid (buffer);
+# else
       s = ctermid (NULL);
+# endif
       if (s)
         name = strdup (s);
       got_name = 1;
     }
-#endif
-  /* Assume the staandrd tty on memory error or when tehre is no
+#endif /*HAVE_CTERMID*/
+  /* Assume the standard tty on memory error or when tehre is no
      certmid. */
   return name? name : "/dev/tty";
 }
@@ -165,6 +180,34 @@ init_ttyfp(void)
 }
 
 
+#ifdef HAVE_LIBREADLINE
+void
+tty_enable_completion(rl_completion_func_t *completer)
+{
+/*   if( no_terminal ) */
+/*     return; */
+
+/*   if( !initialized ) */
+/*     init_ttyfp(); */
+
+/*   rl_attempted_completion_function=completer; */
+/*   rl_inhibit_completion=0; */
+}
+
+void
+tty_disable_completion(void)
+{
+/*   if( no_terminal ) */
+/*     return; */
+
+/*   if( !initialized ) */
+/*     init_ttyfp(); */
+
+/*   rl_inhibit_completion=1; */
+}
+#endif /*HAVE_LIBREADLINE*/
+
+
 int
 tty_batchmode( int onoff )
 {
diff --git a/common/ttyio.h b/common/ttyio.h
index 6fa7400a9..6148d644a 100644
--- a/common/ttyio.h
+++ b/common/ttyio.h
@@ -20,6 +20,11 @@
 #ifndef GNUPG_COMMON_TTYIO_H
 #define GNUPG_COMMON_TTYIO_H
 
+#ifdef HAVE_LIBREADLINE
+#include <stdio.h>
+#include <readline/readline.h>
+#endif
+
 const char *tty_get_ttyname (void);
 int tty_batchmode (int onoff);
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
@@ -40,5 +45,16 @@ void tty_kill_prompt (void);
 int tty_get_answer_is_yes (const char *prompt);
 int tty_no_terminal (int onoff);
 
+#ifdef HAVE_LIBREADLINE
+void tty_enable_completion(rl_completion_func_t *completer);
+void tty_disable_completion(void);
+#else
+/* Use a macro to stub out these functions since a macro has no need
+   to typedef a "rl_completion_func_t" which would be undefined
+   without readline. */
+#define tty_enable_completion(x)
+#define tty_disable_completion()
+#endif
+
 
 #endif /*GNUPG_COMMON_TTYIO_H*/
diff --git a/common/util.h b/common/util.h
index 68f5222b5..295d785c5 100644
--- a/common/util.h
+++ b/common/util.h
@@ -84,6 +84,7 @@ u32    scan_isodatestr (const char *string);
 u32    add_days_to_timestamp (u32 stamp, u16 days);
 const char *strtimevalue (u32 stamp);
 const char *strtimestamp (u32 stamp); /* GMT */
+const char *isotimestamp (u32 stamp); /* GMT */
 const char *asctimestamp (u32 stamp); /* localized */
 
 
@@ -108,6 +109,7 @@ void gnupg_unblock_all_signals (void);
 int answer_is_yes (const char *s);
 int answer_is_yes_no_default (const char *s, int def_answer);
 int answer_is_yes_no_quit (const char *s);
+int answer_is_okay_cancel (const char *s, int def_answer);
 
 /*-- xreadline.c --*/
 ssize_t read_line (FILE *fp, 
@@ -161,6 +163,7 @@ char *make_printable_string (const void *p, size_t n, int delim);
 
 int is_file_compressed (const char *s, int *ret_rc);
 
+int match_multistr (const char *multistr,const char *match);
 
 
 /*-- Simple replacement functions. */
diff --git a/common/yesno.c b/common/yesno.c
index 2a96b4e5d..737071691 100644
--- a/common/yesno.c
+++ b/common/yesno.c
@@ -28,31 +28,33 @@
 int
 answer_is_yes_no_default( const char *s, int def_answer )
 {
-    const char *long_yes = _("yes");
-    const char *short_yes = _("yY");
-    const char *long_no = _("no");
-    const char *short_no = _("nN");
+  /* TRANSLATORS: See doc/TRANSLATE about this string. */
+  const char *long_yes = _("yes");
+  const char *short_yes = _("yY");
+  /* TRANSLATORS: See doc/TRANSLATE about this string. */
+  const char *long_no = _("no");
+  const char *short_no = _("nN");
 
-    /* Note: we have to use the local dependent strcasecmp here */
-    if( !strcasecmp(s, long_yes ) )
-	return 1;
-    if( *s && strchr( short_yes, *s ) && !s[1] )
-	return 1;
-    /* test for no strings to catch ambiguities for the next test */
-    if( !strcasecmp(s, long_no ) )
-	return 0;
-    if( *s && strchr( short_no, *s ) && !s[1] )
-	return 0;
-    /* test for the english version (for those who are used to type yes) */
-    if( !ascii_strcasecmp(s, "yes" ) )
-	return 1;
-    if( *s && strchr( "yY", *s ) && !s[1] )
-	return 1;
-    return def_answer;
+  /* Note: we have to use the local dependent compare here. */
+  if ( match_multistr(long_yes,s) )
+    return 1;
+  if ( *s && strchr( short_yes, *s ) && !s[1] )
+    return 1;
+  /* Test for "no" strings to catch ambiguities for the next test. */
+  if ( match_multistr(long_no,s) )
+    return 0;
+  if ( *s && strchr( short_no, *s ) && !s[1] )
+    return 0;
+  /* Test for the english version (for those who are used to type yes). */
+  if ( !ascii_strcasecmp(s, "yes" ) )
+    return 1;
+  if ( *s && strchr( "yY", *s ) && !s[1] )
+    return 1;
+  return def_answer;
 }
 
 int
-answer_is_yes( const char *s )
+answer_is_yes ( const char *s )
 {
   return answer_is_yes_no_default(s,0);
 }
@@ -61,36 +63,76 @@ answer_is_yes( const char *s )
  * Return 1 for yes, -1 for quit, or 0 for no
  */
 int
-answer_is_yes_no_quit( const char *s )
+answer_is_yes_no_quit ( const char *s )
 {
-    const char *long_yes = _("yes");
-    const char *long_no = _("no");
-    const char *long_quit = _("quit");
-    const char *short_yes = _("yY");
-    const char *short_no = _("nN");
-    const char *short_quit = _("qQ");
+  /* TRANSLATORS: See doc/TRANSLATE about this string. */
+  const char *long_yes = _("yes");
+  /* TRANSLATORS: See doc/TRANSLATE about this string. */
+  const char *long_no = _("no");
+  /* TRANSLATORS: See doc/TRANSLATE about this string. */
+  const char *long_quit = _("quit");
+  const char *short_yes = _("yY");
+  const char *short_no = _("nN");
+  const char *short_quit = _("qQ");
 
-    /* Note: We have to use the locale dependent strcasecmp */
-    if( !strcasecmp(s, long_no ) )
-	return 0;
-    if( !strcasecmp(s, long_yes ) )
-	return 1;
-    if( !strcasecmp(s, long_quit ) )
-	return -1;
-    if( *s && strchr( short_no, *s ) && !s[1] )
-	return 0;
-    if( *s && strchr( short_yes, *s ) && !s[1] )
-	return 1;
-    if( *s && strchr( short_quit, *s ) && !s[1] )
-	return -1;
-    /* but not here */
-    if( !ascii_strcasecmp(s, "yes" ) )
-	return 1;
-    if( !ascii_strcasecmp(s, "quit" ) )
-	return -1;
-    if( *s && strchr( "yY", *s ) && !s[1] )
-	return 1;
-    if( *s && strchr( "qQ", *s ) && !s[1] )
-	return -1;
+  /* Note: we have to use a local dependent compare here. */
+  if ( match_multistr(long_no,s) )
     return 0;
+  if ( match_multistr(long_yes,s) )
+    return 1;
+  if ( match_multistr(long_quit,s) )
+    return -1;
+  if ( *s && strchr( short_no, *s ) && !s[1] )
+    return 0;
+  if ( *s && strchr( short_yes, *s ) && !s[1] )
+      return 1;
+  if ( *s && strchr( short_quit, *s ) && !s[1] )
+    return -1;
+  /* but not here. */
+  if ( !ascii_strcasecmp(s, "yes" ) )
+    return 1;
+  if ( !ascii_strcasecmp(s, "quit" ) )
+      return -1;
+  if ( *s && strchr( "yY", *s ) && !s[1] )
+    return 1;
+  if ( *s && strchr( "qQ", *s ) && !s[1] )
+    return -1;
+  return 0;
 }
+
+/*
+   Return 1 for okay, 0 for for cancel or DEF_ANSWER for default. 
+ */
+int
+answer_is_okay_cancel (const char *s, int def_answer)
+{
+  /* TRANSLATORS: See doc/TRANSLATE about this string. */
+  const char *long_okay = _("okay|okay");
+  /* TRANSLATORS: See doc/TRANSLATE about this string. */
+  const char *long_cancel = _("cancel|cancel");
+  const char *short_okay = _("oO");
+  const char *short_cancel = _("cC");
+  
+  /* Note: We have to use the locale dependent compare. */
+  if ( match_multistr(long_okay,s) )
+    return 1;
+  if ( match_multistr(long_cancel,s) )
+    return 0;
+  if ( *s && strchr( short_okay, *s ) && !s[1] )
+    return 1;
+  if ( *s && strchr( short_cancel, *s ) && !s[1] )
+    return 0;
+  /* Always test for the English values (not locale here). */
+  if ( !ascii_strcasecmp(s, "okay" ) )
+    return 1;
+  if ( !ascii_strcasecmp(s, "ok" ) )
+    return 1;
+  if ( !ascii_strcasecmp(s, "cancel" ) )
+    return 0;
+  if ( *s && strchr( "oO", *s ) && !s[1] )
+    return 1;
+  if ( *s && strchr( "cC", *s ) && !s[1] )
+    return 0;
+  return def_answer;
+}
+
diff --git a/configure.ac b/configure.ac
index 53cbc38fc..05882c2c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,16 @@ AC_ARG_ENABLE(agent-only,
     build_agent_only=$enableval)
 
 
+# Allow disabling of bzib2 support.
+# It is defined only after we confirm the library is available later
+use_bzip2=yes
+AC_MSG_CHECKING([whether to enable the BZIP2 compression algorithm])
+AC_ARG_ENABLE(bzip2,
+   AC_HELP_STRING([--disable-bzip2],[disable the BZIP2 compression algorithm]),
+   use_bzip2=$enableval)
+AC_MSG_RESULT($use_bzip2)
+
+
 # Configure option to allow or disallow execution of external
 # programs, like a photo viewer.
 AC_MSG_CHECKING([whether to enable external program execution])
@@ -462,6 +472,8 @@ if test "$have_w32_system" = yes; then
 fi
 AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
 
+# These need to go after AC_PROG_CC so that $EXEEXT is defined
+AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any])
 
 
 #
@@ -969,11 +981,13 @@ 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).
+#
+# Do we have zlib? Must do it here because Solaris failed
+# when compiling a conftest (due to the "-lz" from LIBS).
+# Note that we combine zlib and bzlib2 in ZLIBS.
+#
 _cppflags="${CPPFLAGS}"
 _ldflags="${LDFLAGS}"
-
 AC_ARG_WITH(zlib,
   [  --with-zlib=DIR         use libz in DIR],[
     if test -d "$withval"; then
@@ -984,10 +998,43 @@ AC_ARG_WITH(zlib,
 
 AC_CHECK_HEADER(zlib.h,
       AC_CHECK_LIB(z, deflateInit2_,
-       LIBS="$LIBS -lz",
+       ZLIBS="-lz",
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
- 
+
+#
+# Check whether we can support bzip2
+# 
+if test "$use_bzip2" = yes ; then
+  _cppflags="${CPPFLAGS}"
+  _ldflags="${LDFLAGS}"
+  AC_ARG_WITH(bzip2,
+     AC_HELP_STRING([--with-bzip2=DIR],[look for bzip2 in DIR]),
+      [
+      if test -d "$withval" ; then
+        CPPFLAGS="${CPPFLAGS} -I$withval/include"
+        LDFLAGS="${LDFLAGS} -L$withval/lib"
+      fi
+      ],withval="")
+
+  # Checking alongside stdio.h as an early version of bzip2 (1.0)
+  # required stdio.h to be included before bzlib.h, and Solaris 9 is 
+  # woefully out of date.
+  if test "$withval" != no ; then
+     AC_CHECK_HEADER(bzlib.h,
+        AC_CHECK_LIB(bz2,BZ2_bzCompressInit,
+  	  [
+	  have_bz2=yes
+	  ZLIBS="$ZLIBS -lbz2"
+	  AC_DEFINE(HAVE_BZIP2,1,
+		  [Defined if the bz2 compression library is available])
+	  ],
+	  CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
+	  CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags},[#include <stdio.h>])
+  fi
+fi
+AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
+AC_SUBST(ZLIBS)
 
 
 # See wether we want to run the long test suite.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index b8f789e8b..6018bbe13 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,43 @@
+2006-05-23  Werner Koch  <wk@g10code.com>
+
+	* card-util.c (generate_card_keys): Removed temporary kludge for
+	generate_keypair.
+
+	* call-agent.c (agent_scd_setattr): Add arg SERIALNO.
+	(agent_scd_genkey): Ditto.
+	(agent_scd_change_pin): Ditto.
+
+	* call-agent.h (struct agent_card_info_s): Updated to match the
+	one of 1.4.3.
+
+	* Makefile.am (LDADD): Include ZLIBS.
+
+	* gpgv.c: Removed stubs not anymore useful due to libgcrypt.
+
+2006-05-22  Werner Koch  <wk@g10code.com>
+
+	* keyserver.c (keyidlist): Replaced mpi_get_keyid by v3_keyid.
+	* keydb.h (v3_keyid): Added.
+
+	* import.c (import): Better initialize KEYBLOCK as to quiet
+	compiler warning.
+
+	* skclist.c (random_is_faked): New.
+
+	* mainproc.c: Include pka.h.
+
+2006-05-19  Werner Koch  <wk@g10code.com>
+
+	* misc.c (openpgp_pk_test_algo2): Need to use gcry_pk_algo_info
+	directly.
+	(string_count_chr): New.
+
+	* armor.c (parse_header_line): Use renamed function
+	length_sans_trailing_ws.
+
+	* options.h, gpg.c: Option --strict is not used thus removed code
+	but kept option.
+
 2006-04-28  David Shaw  <dshaw@jabberwocky.com>  (wk)
 	
 	* keyserver.c (direct_uri_map): New.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 1deacb9f8..aeb24d7b3 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -107,7 +107,7 @@ gpgv2_SOURCES = gpgv.c           \
 #	       ks-db.h \
 #	       $(common_source)
 
-LDADD =  $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@
+LDADD =  $(needed_libs) $(ZLIBS) @LIBINTL@ @CAPLIBS@ @W32LIBS@ 
 gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error
 gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error
 
diff --git a/g10/armor.c b/g10/armor.c
index e02591372..2336ff6f9 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -336,7 +336,7 @@ parse_header_line( armor_filter_context_t *afx, byte *line, unsigned int len )
     int hashes=0;
     unsigned int len2;
 
-    len2 = check_trailing_ws( line, len );
+    len2 = length_sans_trailing_ws ( line, len );
     if( !len2 ) {
         afx->buffer_pos = len2;  /* (it is not the fine way to do it here) */
 	return 0; /* WS only: same as empty line */
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 31c43cf13..55fc62569 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -626,10 +626,13 @@ agent_scd_getattr (const char *name, struct agent_card_info_s *info)
 }
 
 
-/* Send an setattr command to the SCdaemon. */
+/* Send an setattr command to the SCdaemon.  SERIALNO is not actually
+   used here but required by gpg 1.4's implementation of this code in
+   cardglue.c. */
 int
 agent_scd_setattr (const char *name,
-                   const unsigned char *value, size_t valuelen)
+                   const unsigned char *value, size_t valuelen,
+                   const char *serialno)
 {
   int rc;
   char line[ASSUAN_LINELENGTH];
@@ -719,9 +722,11 @@ scd_genkey_cb (void *opaque, const char *line)
   return 0;
 }
 
-/* Send a GENKEY command to the SCdaemon. */
+/* Send a GENKEY command to the SCdaemon.  SERIALNO is not used in
+   this implementation. */
 int
-agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force)
+agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force,
+                  const char *serialno)
 {
   int rc;
   char line[ASSUAN_LINELENGTH];
@@ -865,9 +870,10 @@ agent_scd_pkdecrypt (const char *serialno,
          3: Change the admin PIN
        101: Set a new PIN and reset the retry counter
        102: Same as 101
+   SERIALNO is not used.
  */
 int
-agent_scd_change_pin (int chvno)
+agent_scd_change_pin (int chvno, const char *serialno)
 {
   int rc;
   char line[ASSUAN_LINELENGTH];
@@ -890,7 +896,7 @@ agent_scd_change_pin (int chvno)
 
 
 /* Perform a CHECKPIN operation.  SERIALNO should be the serial
-   number of the card - optioanlly followed by the fingerprint;
+   number of the card - optionally followed by the fingerprint;
    however the fingerprint is ignored here. */
 int
 agent_scd_checkpin  (const char *serialno)
@@ -910,3 +916,9 @@ agent_scd_checkpin  (const char *serialno)
 }
 
 
+/* Dummy function, only used by the gpg 1.4 implementation. */
+void
+agent_clear_pin_cache (const char *sn)
+{
+
+}
diff --git a/g10/call-agent.h b/g10/call-agent.h
index 3d9f4f9bf..71044e38b 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -21,7 +21,8 @@
 #define GNUPG_G10_CALL_AGENT_H 
 
 
-struct agent_card_info_s {
+struct agent_card_info_s 
+{
   int error;         /* private. */
   char *serialno;    /* malloced hex string. */
   char *disp_name;   /* malloced. */
@@ -29,6 +30,7 @@ struct agent_card_info_s {
   int  disp_sex;     /* 0 = unspecified, 1 = male, 2 = female */
   char *pubkey_url;  /* malloced. */
   char *login_data;  /* malloced. */
+  char *private_do[4]; /* malloced. */
   char cafpr1valid;
   char cafpr2valid;
   char cafpr3valid;
@@ -41,6 +43,9 @@ struct agent_card_info_s {
   char fpr1[20];
   char fpr2[20];
   char fpr3[20];
+  u32  fpr1time;
+  u32  fpr2time;
+  u32  fpr3time;
   unsigned long sig_counter;
   int chv1_cached;   /* True if a PIN is not required for each
                         signing.  Note that the gpg-agent might cache
@@ -73,10 +78,12 @@ int agent_havekey (const char *hexkeygrip);
 
 /* Send a SETATTR command to the SCdaemon. */
 int agent_scd_setattr (const char *name,
-                       const unsigned char *value, size_t valuelen);
+                       const unsigned char *value, size_t valuelen,
+                       const char *serialno);
 
 /* Send a GENKEY command to the SCdaemon. */
-int agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force);
+int agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force,
+                      const char *serialno);
 
 /* Send a PKSIGN command to the SCdaemon. */
 int agent_scd_pksign (const char *keyid, int hashalgo,
@@ -89,11 +96,13 @@ int agent_scd_pkdecrypt (const char *serialno,
                          char **r_buf, size_t *r_buflen);
 
 /* Change the PIN of an OpenPGP card or reset the retry counter. */
-int agent_scd_change_pin (int chvno);
+int agent_scd_change_pin (int chvno, const char *serialno);
 
 /* Send the CHECKPIN command to the SCdaemon. */
 int agent_scd_checkpin  (const char *serialno);
 
+/* Dummy function, only implemented by gpg 1.4. */
+void agent_clear_pin_cache (const char *sn);
 
 
 #endif /*GNUPG_G10_CALL_AGENT_H*/
diff --git a/g10/card-util.c b/g10/card-util.c
index 0c8365405..b5a036e54 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #if GNUPG_MAJOR_VERSION != 1
-#include "gpg.h"
+# include "gpg.h"
 #endif /*GNUPG_MAJOR_VERSION != 1*/
 #include "util.h"
 #include "i18n.h"
@@ -37,13 +37,13 @@
 #include "main.h"
 #include "keyserver-internal.h"
 #if GNUPG_MAJOR_VERSION == 1
-#ifdef HAVE_LIBREADLINE
-#include <stdio.h>
-#include <readline/readline.h>
-#endif /*HAVE_LIBREADLINE*/
-#include "cardglue.h"
+# ifdef HAVE_LIBREADLINE
+# include <stdio.h>
+# include <readline/readline.h>
+# endif /*HAVE_LIBREADLINE*/
+# include "cardglue.h"
 #else /*GNUPG_MAJOR_VERSION!=1*/
-#include "call-agent.h"
+# include "call-agent.h"
 #endif /*GNUPG_MAJOR_VERSION!=1*/
 
 #define CONTROL_D ('D' - 'A' + 1)
@@ -1091,12 +1091,8 @@ generate_card_keys (const char *serialno)
   if (check_pin_for_key_operation (&info, &forced_chv1))
     goto leave;
   
-#if GNUPG_MAJOR_VERSION == 1
   generate_keypair (NULL, info.serialno,
                     want_backup? opt.homedir:NULL);
-#else
-  generate_keypair (NULL, info.serialno);
-#endif
 
  leave:
   agent_release_card_info (&info);
diff --git a/g10/gpg.c b/g10/gpg.c
index 25b55b705..cc00ff3b5 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1376,7 +1376,7 @@ list_config(char *items)
 
 	      for(sl=iter->values;sl;sl=sl->next)
 		{
-		  print_string2(stdout,sl->d,strlen(sl->d),':',';');
+		  print_sanitized_string2 (stdout, sl->d, ':',';');
 		  if(sl->next)
 		    printf(";");
 		}
@@ -1782,13 +1782,11 @@ main (int argc, char **argv )
 	    opt.no_perm_warn=1;
 	else if (pargs.r_opt == oStrict )
 	  {
-	    opt.strict=1;
-	    log_set_strict(1);
+	    /* Not used */
 	  }
 	else if (pargs.r_opt == oNoStrict )
 	  {
-	    opt.strict=0;
-	    log_set_strict(0);
+	    /* Not used */
 	  }
     }
 
@@ -2360,8 +2358,14 @@ main (int argc, char **argv )
 		compress_algo_string = xstrdup(pargs.r.ret_str);
 	    }
 	    break;
-	  case oCertDigestAlgo: cert_digest_string = xstrdup(pargs.r.ret_str); break;
-	  case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break;
+	  case oCertDigestAlgo: 
+            cert_digest_string = xstrdup(pargs.r.ret_str);
+            break;
+
+	  case oNoSecmemWarn: 
+            gcry_control (GCRYCTL_DISABLE_SECMEM_WARN); 
+            break;
+
 	  case oRequireSecmem: require_secmem=1; break;
 	  case oNoRequireSecmem: require_secmem=0; break;
 	  case oNoPermissionWarn: opt.no_perm_warn=1; break;
@@ -2604,8 +2608,12 @@ main (int argc, char **argv )
 		xfree(iter);
 	      }
 	    break;
-	  case oStrict: opt.strict=1; log_set_strict(1); break;
-	  case oNoStrict: opt.strict=0; log_set_strict(0); break;
+
+	  case oStrict: 
+	  case oNoStrict: 
+	    /* Not used */
+            break;
+
           case oMangleDosFilenames: opt.mangle_dos_filenames = 1; break;
           case oNoMangleDosFilenames: opt.mangle_dos_filenames = 0; break;
           case oEnableProgressFilter: opt.enable_progress_filter = 1; break;
@@ -3035,7 +3043,6 @@ main (int argc, char **argv )
     /* Set the random seed file. */
     if( use_random_seed ) {
 	char *p = make_filename(opt.homedir, "random_seed", NULL );
-	set_random_seed_file(p);
 	gcry_control (GCRYCTL_SET_RANDOM_SEED_FILE, p);
         if (!access (p, F_OK))
           register_secured_file (p);
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 9b17b8ad3..579e58a29 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -387,26 +387,6 @@ void cipher_decrypt( gcry_cipher_hd_t c, byte *outbuf,
                      byte *inbuf, unsigned nbytes ) {}
 void cipher_sync( gcry_cipher_hd_t c ) {}
 
-/* Stubs to avoid linking to ../cipher/random.c */
-void random_dump_stats(void) {}
-int quick_random_gen( int onoff ) { return -1;}
-void randomize_buffer( byte *buffer, size_t length, int level ) {}
-int random_is_faked() { return -1;}
-byte *get_random_bits( size_t nbits, int level, int secure ) { return NULL;}
-void set_random_seed_file( const char *name ) {}
-void update_random_seed_file() {}
-void fast_random_poll() {}
-
-/* Stubs to avoid linking of ../cipher/primegen.c */
-void register_primegen_progress ( void (*cb)( void *, int), void *cb_data ) {}
-MPI generate_secret_prime( unsigned  nbits ) { return NULL;}
-MPI generate_public_prime( unsigned  nbits ) { return NULL;}
-MPI generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
-                        gcry_mpi_t g, gcry_mpi_t **ret_factors ) { return NULL;}
-
-/* Do not link to ../cipher/rndlinux.c */
-void rndlinux_constructor(void) {}
-
 
 /* Stubs to avoid linking to ../util/ttyio.c */
 int tty_batchmode( int onoff ) { return 0; }
diff --git a/g10/import.c b/g10/import.c
index ee4ea95da..4526d84d7 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -243,7 +243,9 @@ import( IOBUF inp, const char* fname,struct stats_s *stats,
 	unsigned char **fpr,size_t *fpr_len,unsigned int options )
 {
     PACKET *pending_pkt = NULL;
-    KBNODE keyblock;
+    KBNODE keyblock = NULL;  /* Need to initialize because gcc can't
+                                grasp the return semantics of
+                                read_block. */
     int rc = 0;
 
     getkey_disable_caches();
@@ -596,7 +598,7 @@ check_prefs(KBNODE keyblock)
 
 	      if(prefs->type==PREFTYPE_SYM)
 		{
-		  if (openpgp_cipher_algo_test (prefs->value))
+		  if (openpgp_cipher_test_algo (prefs->value))
 		    {
 		      const char *algo = gcry_cipher_algo_name (prefs->value);
 		      if(!problem)
diff --git a/g10/keydb.h b/g10/keydb.h
index 4923a842c..f8be6efb9 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -254,6 +254,7 @@ int parse_auto_key_locate(char *options);
 
 /*-- keyid.c --*/
 int pubkey_letter( int algo );
+u32 v3_keyid (gcry_mpi_t a, u32 *ki);
 void hash_public_key( gcry_md_hd_t md, PKT_public_key *pk );
 size_t keystrlen(void);
 const char *keystr(u32 *keyid);
diff --git a/g10/keygen.c b/g10/keygen.c
index c7a97a0fc..9c2fd6fb8 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1911,8 +1911,9 @@ ask_user_id( int mode )
 
 	/* append a warning if we do not have dev/random
 	 * or it is switched into  quick testmode */
-	if( quick_random_gen(-1) )
-	    strcpy(p, " (INSECURE!)" );
+        /* FIXME: see skclist.c:random_is_faked */
+        /* 	if( quick_random_gen(-1)  ) */
+        /* 	    strcpy(p, " (INSECURE!)" ); */
 
 	/* print a note in case that UTF8 mapping has to be done */
 	for(p=uid; *p; p++ ) {
@@ -2648,7 +2649,7 @@ read_parameter_file( const char *fname )
 
 /*
  * Generate a keypair (fname is only used in batch mode) If
- * CARD_SERIALNO is not NULL the fucntion will create the keys on an
+ * CARD_SERIALNO is not NULL the function will create the keys on an
  * OpenPGP Card.  If BACKUP_ENCRYPTION_DIR has been set and
  * CARD_SERIALNO is NOT NULL, the encryption key for the card gets
  * generate in software, imported to the card and a backup file
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 3127a4795..bf1bf6cdc 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -42,6 +42,9 @@
 #include "trustdb.h"
 #include "keyserver-internal.h"
 #include "util.h"
+#include "dns-cert.h"
+#include "pka.h"
+
 
 struct keyrec
 {
@@ -1730,8 +1733,8 @@ keyidlist(STRLIST users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
 	     node->pkt->pkt.public_key->version>=4)
 	    {
 	      (*klist)[*count].mode=KEYDB_SEARCH_MODE_LONG_KID;
-	      mpi_get_keyid(node->pkt->pkt.public_key->pkey[0],
-			    (*klist)[*count].u.kid);
+	      v3_keyid (node->pkt->pkt.public_key->pkey[0],
+                        (*klist)[*count].u.kid);
 	      (*count)++;
 
 	      if(*count==num)
@@ -1982,7 +1985,7 @@ keyserver_import_cert(const char *name,unsigned char **fpr,size_t *fpr_len)
   if(domain)
     *domain='.';
 
-  type=get_cert(look,max_cert_size,&key,fpr,fpr_len,&url);
+  type=get_dns_cert(look,max_cert_size,&key,fpr,fpr_len,&url);
   if(type==1)
     {
       int armor_status=opt.no_armor;
diff --git a/g10/main.h b/g10/main.h
index cd6926b69..18d11b567 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -84,6 +84,7 @@ u32 buffer_to_u32( const byte *buffer );
 const byte *get_session_marker( size_t *rlen );
 int openpgp_cipher_test_algo( int algo );
 int openpgp_pk_test_algo( int algo );
+int openpgp_pk_test_algo2 ( int algo, unsigned int use );
 int openpgp_pk_algo_usage ( int algo );
 int openpgp_md_test_algo( int algo );
 
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 1f91c8ca6..67ac784dc 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -41,6 +41,7 @@
 #include "trustdb.h"
 #include "keyserver-internal.h"
 #include "photoid.h"
+#include "pka.h"
 
 
 struct kidlist_item {
diff --git a/g10/misc.c b/g10/misc.c
index a26aa740d..12aa6c689 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -67,6 +67,18 @@
 #include "i18n.h"
 
 
+static int
+string_count_chr (const char *string, int c)
+{
+  int count;
+
+  for (count=0; *string; string++ )
+    if ( *string == c )
+      count++;
+  return count;
+}
+
+
 
 #ifdef ENABLE_SELINUX_HACKS
 /* A object and a global variable to keep track of files marked as
@@ -416,12 +428,17 @@ openpgp_pk_test_algo( int algo )
 int
 openpgp_pk_test_algo2( int algo, unsigned int use )
 {
+  int use_buf = use;
+  size_t sizeof_use_buf = sizeof (use_buf);
+
   if (algo == GCRY_PK_ELG_E)
     algo = GCRY_PK_ELG;
 
   if (algo < 0 || algo > 110)
     return gpg_error (GPG_ERR_PUBKEY_ALGO);
-  return gcry_pk_test_algo2 (algo, use);
+
+  return gcry_pk_algo_info (algo, GCRYCTL_TEST_ALGO,
+                            &use_buf, &sizeof_use_buf);
 }
 
 int 
diff --git a/g10/options.h b/g10/options.h
index de5fa7920..b97b2f3f9 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -193,7 +193,6 @@ struct
   int preserve_permissions;
   int no_homedir_creation;
   struct groupitem *grouplist;
-  int strict;
   int mangle_dos_filenames;
   int enable_progress_filter;
   unsigned int screen_columns;
diff --git a/g10/passphrase.c b/g10/passphrase.c
index c1cdf12ae..1c5cf3b27 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -1017,7 +1017,7 @@ hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k, int create )
     int pwlen = strlen(pw);
 
     assert( s2k->hash_algo );
-    dek->keylen = gcry_cipher_algo_get_keylen (dek->algo );
+    dek->keylen = gcry_cipher_get_algo_keylen (dek->algo);
     if( !(dek->keylen > 0 && dek->keylen <= DIM(dek->key)) )
 	BUG();
 
@@ -1065,7 +1065,7 @@ hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k, int create )
 	i = gcry_md_get_algo_dlen ( s2k->hash_algo );
 	if( i > dek->keylen - used )
 	    i = dek->keylen - used;
-	memcpy( dek->key+used, md_read(md, s2k->hash_algo), i );
+	memcpy (dek->key+used, gcry_md_read (md, s2k->hash_algo), i);
 	used += i;
     }
     gcry_md_close(md);
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 4a12083d3..4516f6769 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -363,7 +363,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
 int
 edit_ownertrust (PKT_public_key *pk, int mode )
 {
-  unsigned int trust;
+  unsigned int trust = 0;
   int no_help = 0;
 
   for(;;)
@@ -897,7 +897,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned int use )
           else if (backlog) 
             {
               /* This is part of our trick to expand and display groups. */
-              answer = pop_strlist (&backlog);
+              answer = strlist_pop (&backlog);
             }
           else
             {
@@ -1032,7 +1032,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned int use )
       rc = get_pubkey_byname (pk, def_rec, NULL, NULL, 1);
       if (rc)
         log_error(_("unknown default recipient \"%s\"\n"), def_rec );
-      else if ( !(rc=check_pubkey_algo2(pk->pubkey_algo, use)) ) 
+      else if ( !(rc=openpgp_pk_test_algo2(pk->pubkey_algo, use)) ) 
         {
           /* Mark any_recipients here since the default recipient
              would have been used if it wasn't already there.  It
@@ -1079,7 +1079,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned int use )
                                             -1);
               goto fail;
             }
-          else if ( !(rc=check_pubkey_algo2(pk->pubkey_algo, use )) ) 
+          else if ( !(rc=openpgp_pk_test_algo2(pk->pubkey_algo, use )) ) 
             {
               /* Key found and usable.  Check validity. */
               int trustlevel;
diff --git a/g10/plaintext.c b/g10/plaintext.c
index c0a6c3e11..8032f15f0 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -282,7 +282,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
                           rc = gpg_error_from_errno (errno);
                         else
                           rc = gpg_error (GPG_ERR_EOF);
-			log_error("Error writing to `%s': %s\n",
+			log_error("error writing to `%s': %s\n",
 				  fname, strerror(errno) );
 			goto leave;
 		      }
@@ -310,7 +310,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 		  {
 		    if(opt.max_output && (count+=len)>opt.max_output)
 		      {
-			log_error("Error writing to `%s': %s\n",
+			log_error("error writing to `%s': %s\n",
 				  fname,"exceeded --max-output limit\n");
 			rc = gpg_error (GPG_ERR_TOO_LARGE);
 			xfree( buffer );
@@ -319,7 +319,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 		    else if( fwrite( buffer, 1, len, fp ) != len ) {
 		      rc = (errno? gpg_error_from_errno (errno)
                             : gpg_error (GPG_ERR_INTERNAL));
-		      log_error("Error writing to `%s': %s\n",
+		      log_error ("error writing to `%s': %s\n",
 				fname, strerror(errno) );
 		      xfree( buffer );
 		      goto leave;
@@ -338,16 +338,17 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 	      {
 		if(opt.max_output && (++count)>opt.max_output)
 		  {
-		    log_error("Error writing to `%s': %s\n",
+		    log_error ("error writing to `%s': %s\n",
 			      fname,"exceeded --max-output limit\n");
                     rc = gpg_error (GPG_ERR_TOO_LARGE);
 		    goto leave;
 		  }
 		else if( putc( c, fp ) == EOF )
 		  {
-		    log_error("Error writing to `%s': %s\n",
+                    rc = (errno? gpg_error_from_errno (errno)
+                          : gpg_error (GPG_ERR_INTERNAL));
+		    log_error ("error writing to `%s': %s\n",
 			      fname, strerror(errno) );
-		    rc = G10ERR_WRITE_FILE;
 		    goto leave;
 		  }
 	      }
@@ -384,9 +385,10 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
     }
 
     if( fp && fp != stdout && fclose(fp) ) {
-	log_error("Error closing `%s': %s\n", fname, strerror(errno) );
+        rc = (errno? gpg_error_from_errno (errno)
+              : gpg_error (GPG_ERR_INTERNAL));
+	log_error ("error closing `%s': %s\n", fname, strerror(errno) );
 	fp = NULL;
-	rc = G10ERR_WRITE_FILE;
 	goto leave;
     }
     fp = NULL;
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index 5af0d5f1d..dc0124bd4 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -214,8 +214,8 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, PKT_secret_key *sk, u32 *keyid )
      * DEK is the encryption key (session key) with length k
      * CSUM
      */
-    if( DBG_CIPHER )
-	log_hexdump("DEK frame:", frame, nframe );
+    if (DBG_CIPHER)
+      log_printhex ("DEK frame:", frame, nframe );
     n=0;
     if (!card)
       {
@@ -267,7 +267,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, PKT_secret_key *sk, u32 *keyid )
 	goto leave;
     }
     if( DBG_CIPHER )
-	log_hexdump("DEK is:", dek->key, dek->keylen );
+        log_printhex ("DEK is:", dek->key, dek->keylen );
     /* check that the algo is in the preferences and whether it has expired */
     {
 	PKT_public_key *pk = NULL;
diff --git a/g10/sign.c b/g10/sign.c
index fa3796758..3e1d7bc53 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -458,7 +458,7 @@ hash_for(PKT_secret_key *sk)
 	  else
 	    {
 	      for (prefs=opt.personal_digest_prefs; prefs->type; prefs++)
-		if (gcry_md-get_algo_dlen (prefs->value) == qbytes)
+		if (gcry_md_get_algo_dlen (prefs->value) == qbytes)
 		  return prefs->value;
 	    }
 	}
diff --git a/g10/skclist.c b/g10/skclist.c
index afaa73814..d8f3b2dc1 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -36,6 +36,19 @@
 #include "cipher.h"
 
 
+/* There is currently no way to get the status of the quick random
+   generator flag from libgcrypt and it is not clear whether this
+   faked RNG is really a good idea.  Thus for now we use this stub
+   function but we should consider to entirely remove this fake RNG
+   stuff. */
+static int
+random_is_faked (void)
+{
+  return 0;
+}
+
+
+
 void
 release_sk_list( SK_LIST sk_list )
 {
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index f3074c6af..61d12d580 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,22 @@
+2006-05-23  Werner Koch  <wk@g10code.com>
+
+	* libjnlib-config.h (JNLIB_NEED_UTF8CONV): Fixed typo in name.
+
+	* dotlock.c (release_dotlock): Don't act if we don't have any
+	locks at all.
+	(destroy_dotlock): New.  From 1.4.3.
+	(dotlock_remove_lockfiles): Make use of destroy function.
+
+2006-05-19  Werner Koch  <wk@g10code.com>
+
+	* strlist.c (append_to_strlist2): Enabled.
+
+	* stringhelp.c (print_sanitized_buffer2): New.  Changed the rules
+	to match the behaviour of print_string2 from gnupg 1.4.3.
+	(print_sanitized_buffer): Use the new function.
+	(print_sanitized_string2): New.
+	(hextobyte): New.  Taken from gpg 1.4.3.
+
 2006-04-28  Werner Koch  <wk@g10code.com>
 
 	* stringhelp.c (print_sanitized_buffer): Fix bug where the count
diff --git a/jnlib/dotlock.c b/jnlib/dotlock.c
index a50a0ee99..b7f892717 100644
--- a/jnlib/dotlock.c
+++ b/jnlib/dotlock.c
@@ -1,5 +1,6 @@
 /* dotlock.c - dotfile locking
- *	Copyright (C) 1998,2000,2001,2003 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 2000, 2001, 2003, 2004, 
+ *               2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -149,9 +150,9 @@ create_dotlock( const char *file_to_lock )
 	dirpart = file_to_lock;
     }
 
-  #ifdef _REENTRANT
+#ifdef _REENTRANT
     /* fixme: aquire mutex on all_lockfiles */
-  #endif
+#endif
     h->next = all_lockfiles;
     all_lockfiles = h;
 
@@ -202,15 +203,54 @@ create_dotlock( const char *file_to_lock )
 	return NULL;
     }
 
-  #ifdef _REENTRANT
+# ifdef _REENTRANT
     /* release mutex */
-  #endif
+# endif
 #endif /* !HAVE_DOSISH_SYSTEM */
     h->lockname = jnlib_xmalloc( strlen(file_to_lock) + 6 );
     strcpy(stpcpy(h->lockname, file_to_lock), EXTSEP_S "lock");
     return h;
 }
 
+
+void
+destroy_dotlock ( DOTLOCK h )
+{
+#if !defined (HAVE_DOSISH_SYSTEM)
+    if ( h )
+      {
+        DOTLOCK hprev, htmp;
+
+        /* First remove the handle from our global list of all locks. */
+        for (hprev=NULL, htmp=all_lockfiles; htmp; hprev=htmp, htmp=htmp->next)
+          if (htmp == h)
+            {
+              if (hprev)
+                hprev->next = htmp->next;
+              else
+                all_lockfiles = htmp->next;
+              h->next = NULL;
+              break;
+            }
+
+        /* Second destroy the lock. */
+	if (!h->disable)
+          {
+	    if (h->locked && h->lockname)
+              unlink (h->lockname);
+            if (h->tname)
+              unlink (h->tname);
+	    jnlib_free (h->tname);
+	    jnlib_free (h->lockname);
+          }
+	jnlib_free(h);
+
+      }
+#endif
+}
+
+
+
 static int
 maybe_deadlock( DOTLOCK h )
 {
@@ -331,6 +371,13 @@ release_dotlock( DOTLOCK h )
 #else
     int pid;
 
+    /* To avoid atexit race conditions we first check whether there
+       are any locks left.  It might happen that another atexit
+       handler tries to release the lock while the atexit handler of
+       this module already ran and thus H is undefined.  */
+    if(!all_lockfiles)
+        return 0;
+
     if( h->disable ) {
 	return 0;
     }
@@ -414,22 +461,16 @@ void
 dotlock_remove_lockfiles()
 {
 #ifndef HAVE_DOSISH_SYSTEM
-    DOTLOCK h, h2;
-
-    h = all_lockfiles;
-    all_lockfiles = NULL;
-
-    while( h ) {
-	h2 = h->next;
-        if (!h->disable ) {
-          if( h->locked )
-	    unlink( h->lockname );
-          unlink(h->tname);
-          jnlib_free(h->tname);
-          jnlib_free(h->lockname);
-        }
-	jnlib_free(h);
-	h = h2;
+  DOTLOCK h, h2;
+  
+  h = all_lockfiles;
+  all_lockfiles = NULL;
+    
+  while ( h )
+    {
+      h2 = h->next;
+      destroy_dotlock (h);
+      h = h2;
     }
 #endif
 }
diff --git a/jnlib/dotlock.h b/jnlib/dotlock.h
index 9235687df..2cb39008a 100644
--- a/jnlib/dotlock.h
+++ b/jnlib/dotlock.h
@@ -26,6 +26,7 @@ typedef struct dotlock_handle *DOTLOCK;
 
 void disable_dotlock (void);
 DOTLOCK create_dotlock(const char *file_to_lock);
+void destroy_dotlock ( DOTLOCK h );
 int make_dotlock (DOTLOCK h, long timeout);
 int release_dotlock (DOTLOCK h);
 void dotlock_remove_lockfiles (void);
diff --git a/jnlib/libjnlib-config.h b/jnlib/libjnlib-config.h
index 8ae2a9ce9..da3991432 100644
--- a/jnlib/libjnlib-config.h
+++ b/jnlib/libjnlib-config.h
@@ -30,31 +30,31 @@
 #include "logging.h"
 
 /* We require support for utf-8 conversion. */
-#define JNLIB_NEED_UTF8CONF 1
+#define JNLIB_NEED_UTF8CONV 1
 
 #ifdef USE_SIMPLE_GETTEXT
   int set_gettext_file( const char *filename );
   const char *gettext( const char *msgid );
 
-  #define _(a) gettext (a)
-  #define N_(a) (a)
+# define _(a) gettext (a)
+# define N_(a) (a)
 
 #else
 #ifdef HAVE_LOCALE_H
-  #include <locale.h>
+#  include <locale.h>
 #endif
 
 #ifdef ENABLE_NLS
-  #include <libintl.h>
-  #define _(a) gettext (a)
-  #ifdef gettext_noop
-    #define N_(a) gettext_noop (a)
-  #else
-    #define N_(a) (a)
-  #endif
+# include <libintl.h>
+# define _(a) gettext (a)
+# ifdef gettext_noop
+# define N_(a) gettext_noop (a)
+# else
+# define N_(a) (a)
+# endif
 #else
-  #define _(a) (a)
-  #define N_(a) (a)
+# define _(a) (a)
+# define N_(a) (a)
 #endif
 #endif /* !USE_SIMPLE_GETTEXT */
 
diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c
index d5a2c29b6..27b8a25e8 100644
--- a/jnlib/stringhelp.c
+++ b/jnlib/stringhelp.c
@@ -218,8 +218,8 @@ length_sans_trailing_chars (const unsigned char *line, size_t len,
   return len;
 }
 
-/****************
- * remove trailing white spaces and return the length of the buffer
+/*
+ *  Return the length of line ignoring trailing white-space.
  */
 size_t
 length_sans_trailing_ws (const unsigned char *line, size_t len)
@@ -336,34 +336,86 @@ compare_filenames( const char *a, const char *b )
 #endif
 }
 
+
+/* Convert 2 hex characters at S to a byte value.  Return this value
+   or -1 if there is an error. */
+int
+hextobyte (const char *s)
+{
+  int c;
+
+  if ( *s >= '0' && *s <= '9' )
+    c = 16 * (*s - '0');
+  else if ( *s >= 'A' && *s <= 'F' )
+    c = 16 * (10 + *s - 'A');
+  else if ( *s >= 'a' && *s <= 'f' )
+    c = 16 * (10 + *s - 'a');
+  else
+    return -1;
+  s++;
+  if ( *s >= '0' && *s <= '9' )
+    c += *s - '0';
+  else if ( *s >= 'A' && *s <= 'F' )
+    c += 10 + *s - 'A';
+  else if ( *s >= 'a' && *s <= 'f' )
+    c += 10 + *s - 'a';
+  else
+    return -1;
+  return c;
+}
+
+
 /* Print a BUFFER to stream FP while replacing all control characters
-   and the character DELIM with standard C escape sequences.  Returns
-   the number of characters printed. */
+   and the characters DELIM and DELIM2 with standard C escape
+   sequences.  Returns the number of characters printed. */
 size_t 
-print_sanitized_buffer (FILE *fp, const void *buffer, size_t length,
-                        int delim)
+print_sanitized_buffer2 (FILE *fp, const void *buffer, size_t length,
+                         int delim, int delim2)
 {
   const unsigned char *p = buffer;
   size_t count = 0;
 
   for (; length; length--, p++, count++)
     {
-      if (*p < 0x20 || *p == 0x7f || *p == delim)
+      /* Fixme: Check whether *p < 0xa0 is correct for utf8 encoding. */
+      if (*p < 0x20 
+          || (*p >= 0x7f && *p < 0xa0)
+          || *p == delim 
+          || *p == delim2
+          || ((delim || delim2) && *p=='\\'))
         {
           putc ('\\', fp);
           count++;
           if (*p == '\n')
-            putc ('n', fp);
+            {
+              putc ('n', fp);
+              count++;
+            }
           else if (*p == '\r')
-            putc ('r', fp);
+            {
+              putc ('r', fp);
+              count++;
+            }
           else if (*p == '\f')
-            putc ('f', fp);
+            {
+              putc ('f', fp);
+              count++;
+            }
           else if (*p == '\v')
-            putc ('v', fp);
+            {
+              putc ('v', fp);
+              count++;
+            }
           else if (*p == '\b')
-            putc ('b', fp);
+            {
+              putc ('b', fp);
+              count++;
+            }
           else if (!*p)
-            putc('0', fp);
+            {
+              putc('0', fp);
+              count++;
+            }
           else
             {
               fprintf (fp, "x%02x", *p);
@@ -371,12 +423,24 @@ print_sanitized_buffer (FILE *fp, const void *buffer, size_t length,
             }
 	}
       else
-        putc (*p, fp);
+        {
+          putc (*p, fp);
+          count++;
+        }
     }
 
   return count;
 }
 
+/* Same as print_sanitized_buffer2 but with just one delimiter. */
+size_t 
+print_sanitized_buffer (FILE *fp, const void *buffer, size_t length,
+                        int delim)
+{
+  return print_sanitized_buffer2 (fp, buffer, length, delim, 0);
+}
+
+
 size_t 
 print_sanitized_utf8_buffer (FILE *fp, const void *buffer,
                              size_t length, int delim)
@@ -404,6 +468,13 @@ print_sanitized_utf8_buffer (FILE *fp, const void *buffer,
 }
 
 
+size_t 
+print_sanitized_string2 (FILE *fp, const char *string, int delim, int delim2)
+{
+  return string? print_sanitized_buffer2 (fp, string, strlen (string),
+                                          delim, delim2):0;
+}
+
 size_t 
 print_sanitized_string (FILE *fp, const char *string, int delim)
 {
diff --git a/jnlib/stringhelp.h b/jnlib/stringhelp.h
index 4c9e66452..405d6dbc4 100644
--- a/jnlib/stringhelp.h
+++ b/jnlib/stringhelp.h
@@ -40,11 +40,17 @@ char *make_dirname(const char *filepath);
 char *make_filename( const char *first_part, ... );
 int compare_filenames( const char *a, const char *b );
 
+int hextobyte (const char *s);
+
 size_t print_sanitized_buffer (FILE *fp, const void *buffer, size_t length,
                                int delim);
+size_t print_sanitized_buffer2 (FILE *fp, const void *buffer, size_t length,
+                                int delim, int delim2);
 size_t print_sanitized_utf8_buffer (FILE *fp, const void *buffer,
                                     size_t length, int delim);
 size_t print_sanitized_string (FILE *fp, const char *string, int delim);
+size_t print_sanitized_string2 (FILE *fp, const char *string,
+                                int delim, int delim2);
 size_t print_sanitized_utf8_string (FILE *fp, const char *string, int delim);
 char *sanitize_buffer (const void *p, size_t n, int delim);
 
diff --git a/jnlib/strlist.c b/jnlib/strlist.c
index d1924c102..52b4d5869 100644
--- a/jnlib/strlist.c
+++ b/jnlib/strlist.c
@@ -95,22 +95,24 @@ append_to_strlist( strlist_t *list, const char *string )
     return sl;
 }
 
-#if 0
+
+#ifdef JNLIB_NEED_UTF8CONV
 strlist_t
 append_to_strlist2( strlist_t *list, const char *string, int is_utf8 )
 {
-    strlist_t sl;
-
-    if( is_utf8 )
-	sl = append_to_strlist( list, string );
-    else {
-	char *p = native_to_utf8( string );
-	sl = append_to_strlist( list, p );
-	m_free( p );
+  strlist_t sl;
+    
+  if( is_utf8 )
+    sl = append_to_strlist( list, string );
+  else
+    {
+      char *p = native_to_utf8 (string);
+      sl = append_to_strlist( list, p );
+      jnlib_free( p );
     }
-    return sl;
+  return sl;
 }
-#endif
+#endif /* JNLIB_NEED_UTF8CONV */
 
 
 /* Return a copy of LIST. */
diff --git a/jnlib/strlist.h b/jnlib/strlist.h
index 47ac5bd4e..3c1252a44 100644
--- a/jnlib/strlist.h
+++ b/jnlib/strlist.h
@@ -35,11 +35,11 @@ strlist_t add_to_strlist (strlist_t *list, const char *string);
 strlist_t add_to_strlist2( strlist_t *list, const char *string, int is_utf8);
 
 strlist_t append_to_strlist (strlist_t *list, const char *string);
+strlist_t append_to_strlist2 (strlist_t *list, const char *string,
+                              int is_utf8);
 
 strlist_t strlist_copy (strlist_t list);
 
-/*strlist_t append_to_strlist2( strlist_t *list, const char *string,
-                              int is_utf8);*/
 strlist_t strlist_prev (strlist_t head, strlist_t node);
 strlist_t strlist_last (strlist_t node);
 char * strlist_pop (strlist_t *list);
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 8bb94cfcd..4203a6840 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -18,6 +18,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
+/* Information pertaining to the BELPIC developer card samples:
+
+       Unblock PUK: "222222111111"
+       Reset PIN:   "333333111111")
+
+   e.g. the APDUs 00:20:00:02:08:2C:33:33:33:11:11:11:FF 
+              and 00:24:01:01:08:24:12:34:FF:FF:FF:FF:FF
+   should change the PIN into 1234.
+*/
+
 #include <config.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/sm/ChangeLog b/sm/ChangeLog
index f161d444c..48e8473fa 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-23  Werner Koch  <wk@g10code.com>
+
+	* keydb.c (hextobyte): Deleted as it is now defined in jnlib.
+
+	* Makefile.am (gpgsm_LDADD): Include ZLIBS.
+
 2006-05-19  Marcus Brinkmann  <marcus@g10code.de>
 
 	* keydb.c (keydb_insert_cert): Do not lock here, but only check if
@@ -9,6 +15,10 @@
 	* delete.c (delete_one): Add new argument to invocation of
 	keydb_delete.
 	
+2006-05-15  Werner Koch  <wk@g10code.com>
+
+	* keylist.c (print_names_raw): Sanitize URI.
+
 2006-03-21  Werner Koch  <wk@g10code.com>
 
 	* certchain.c (get_regtp_ca_info): New.
diff --git a/sm/Makefile.am b/sm/Makefile.am
index aba2081f8..b5882ae1d 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -56,6 +56,6 @@ gpgsm_SOURCES = \
 gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a	\
               ../common/libcommon.a ../gl/libgnu.a \
               $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
-	      $(LIBINTL) $(PTH_LIBS)
+	      $(LIBINTL) $(PTH_LIBS) $(ZLIBS)
 
 
diff --git a/sm/keydb.c b/sm/keydb.c
index 15f5dbdac..d5932135d 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -1009,33 +1009,6 @@ keydb_search_subject (KEYDB_HANDLE hd, const char *name)
 }
 
 
-static int
-hextobyte (const char *string)
-{
-  const unsigned char *s = (const unsigned char *)string;
-  int c;
-
-  if( *s >= '0' && *s <= '9' )
-    c = 16 * (*s - '0');
-  else if ( *s >= 'A' && *s <= 'F' )
-    c = 16 * (10 + *s - 'A');
-  else if ( *s >= 'a' && *s <= 'f' )
-    c = 16 * (10 + *s - 'a');
-  else
-    return -1;
-  s++;
-  if ( *s >= '0' && *s <= '9' )
-    c += *s - '0';
-  else if ( *s >= 'A' && *s <= 'F' )
-    c += 10 + *s - 'A';
-  else if ( *s >= 'a' && *s <= 'f' )
-    c += 10 + *s - 'a';
-  else
-    return -1;
-  return c;
-}
-
-
 static int
 classify_user_id (const char *name, 
                   KEYDB_SEARCH_DESC *desc,
diff --git a/sm/keylist.c b/sm/keylist.c
index 51a066dab..b744a157f 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -529,7 +529,9 @@ print_names_raw (FILE *fp, int indent, ksba_name_t name)
   for (idx=0; (s = ksba_name_enum (name, idx)); idx++)
     {
       char *p = ksba_name_get_uri (name, idx);
-      printf ("%*s%s\n", idx||indent_all?indent:0, "", p?p:s);
+      printf ("%*s", idx||indent_all?indent:0, "");
+      print_sanitized_string (fp, p?p:s, 0);
+      putc ('\n', fp);
       xfree (p);
     }
 }
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 67dcbd860..4ac20ae0b 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-23  Werner Koch  <wk@g10code.com>
+
+	* gpgparsemail.c: Include config.h if available
+	(stpcpy): Conditional include it.
+
+	* gpgconf-comp.c (hextobyte): Removed as it is now availble in
+	jnlib.
+
 2005-12-20  Werner Koch  <wk@g10code.com>
 
 	* gpgconf-comp.c (gc_options_gpg): Add allow-pka-lookup.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index a27da3941..2da88bc49 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -998,34 +998,6 @@ percent_escape (const char *src)
 }
 
 
-/* Convert two hexadecimal digits from STR to the value they
-   represent.  Returns -1 if one of the characters is not a
-   hexadecimal digit.  */
-static int
-hextobyte (const char *str)
-{
-  int val = 0;
-  int i;
-
-#define NROFHEXDIGITS 2
-  for (i = 0; i < NROFHEXDIGITS; i++)
-    {
-      if (*str >= '0' && *str <= '9')
-	val += *str - '0';
-      else if (*str >= 'A' && *str <= 'F')
-	val += 10 + *str - 'A';
-      else if (*str >= 'a' && *str <= 'f')
-	val += 10 + *str - 'a';
-      else
-	return -1;
-      if (i < NROFHEXDIGITS - 1)
-	val *= 16;
-      str++;
-    }
-  return val;
-}
-
-
 
 /* Percent-Deescape special characters.  The string is valid until the
    next invocation of the function.  */
diff --git a/tools/gpgparsemail.c b/tools/gpgparsemail.c
index da56093c3..566f5747f 100644
--- a/tools/gpgparsemail.c
+++ b/tools/gpgparsemail.c
@@ -24,6 +24,9 @@
    for the content of the line.  Several options are available to
    scrutinize the message.  S/MIME and OpenPGP support is included. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -145,6 +148,7 @@ xstrdup (const char *string)
   return p;
 }
 
+#ifndef HAVE_STPCPY
 static char *
 stpcpy (char *a,const char *b)
 {
@@ -154,7 +158,7 @@ stpcpy (char *a,const char *b)
   
   return (char*)a;
 }
-
+#endif
 
 static int
 run_gnupg (int smime, int sig_fd, int data_fd, int *close_list)
-- 
cgit 


From f98537733ac96fd7e786286944fd3c2696229c4f Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 20 Jun 2006 17:21:37 +0000
Subject: Updated FSF's address.

---
 Makefile.am                     |  3 ++-
 NEWS                            |  3 +++
 TODO                            |  5 ++---
 agent/Makefile.am               |  3 ++-
 agent/agent.h                   |  3 ++-
 agent/cache.c                   |  3 ++-
 agent/call-scd.c                |  3 ++-
 agent/command-ssh.c             |  4 ++--
 agent/command.c                 |  3 ++-
 agent/divert-scd.c              |  3 ++-
 agent/findkey.c                 |  3 ++-
 agent/genkey.c                  |  3 ++-
 agent/gpg-agent.c               |  3 ++-
 agent/learncard.c               |  3 ++-
 agent/minip12.c                 |  3 ++-
 agent/minip12.h                 |  3 ++-
 agent/pkdecrypt.c               |  3 ++-
 agent/pksign.c                  |  3 ++-
 agent/preset-passphrase.c       |  3 ++-
 agent/protect-tool.c            |  3 ++-
 agent/protect.c                 |  3 ++-
 agent/query.c                   |  3 ++-
 agent/t-protect.c               |  3 ++-
 agent/trans.c                   |  3 ++-
 agent/trustlist.c               |  3 ++-
 am/cmacros.am                   |  3 ++-
 common/Makefile.am              |  3 ++-
 common/asshelp.c                |  3 ++-
 common/asshelp.h                |  3 ++-
 common/b64enc.c                 |  3 ++-
 common/dynload.h                |  3 ++-
 common/errors.h                 |  3 ++-
 common/estream.c                | 37 +++++++++++++++++++------------------
 common/estream.h                | 37 +++++++++++++++++++------------------
 common/exechelp.c               |  3 ++-
 common/exechelp.h               |  3 ++-
 common/gettime.c                |  3 ++-
 common/homedir.c                |  3 ++-
 common/i18n.h                   |  3 ++-
 common/iobuf.c                  |  3 ++-
 common/iobuf.h                  |  3 ++-
 common/isascii.c                |  3 ++-
 common/maperror.c               |  3 ++-
 common/membuf.c                 |  3 ++-
 common/membuf.h                 |  3 ++-
 common/miscellaneous.c          |  3 ++-
 common/mkerrors                 |  3 ++-
 common/mkerrtok                 |  3 ++-
 common/sexp-parse.h             |  3 ++-
 common/sexputil.c               |  3 ++-
 common/signal.c                 |  3 ++-
 common/simple-gettext.c         |  3 ++-
 common/simple-pwquery.c         |  3 ++-
 common/simple-pwquery.h         |  3 ++-
 common/sysutils.c               |  3 ++-
 common/sysutils.h               |  3 ++-
 common/ttyio.c                  |  3 ++-
 common/ttyio.h                  |  3 ++-
 common/util.h                   |  3 ++-
 common/vasprintf.c              |  4 ++--
 common/w32reg.c                 |  3 ++-
 common/xasprintf.c              |  3 ++-
 common/xreadline.c              |  3 ++-
 common/yesno.c                  |  3 ++-
 configure.ac                    |  3 ++-
 doc/Makefile.am                 |  3 ++-
 doc/gnupg-card-architecture.fig |  3 ++-
 g10/Makefile.am                 |  3 ++-
 g10/call-agent.c                |  3 ++-
 g10/call-agent.h                |  3 ++-
 g10/comment.c                   |  3 ++-
 g10/gpg.c                       |  9 +++++++++
 g10/gpg.h                       |  3 ++-
 g10/pkglue.c                    |  3 ++-
 g10/pkglue.h                    |  3 ++-
 include/_regex.h                |  4 ++--
 include/errors.h                |  3 ++-
 include/memory.h                |  3 ++-
 include/mpi.h                   |  3 ++-
 include/util.h                  |  3 ++-
 jnlib/Makefile.am               |  3 ++-
 jnlib/argparse.c                | 30 ++++++++++++++++--------------
 jnlib/argparse.h                |  3 ++-
 jnlib/dotlock.c                 |  3 ++-
 jnlib/dotlock.h                 |  3 ++-
 jnlib/libjnlib-config.h         |  3 ++-
 jnlib/logging.c                 |  3 ++-
 jnlib/logging.h                 |  3 ++-
 jnlib/mischelp.h                |  3 ++-
 jnlib/stringhelp.c              |  3 ++-
 jnlib/stringhelp.h              |  3 ++-
 jnlib/strlist.c                 |  3 ++-
 jnlib/strlist.h                 |  3 ++-
 jnlib/types.h                   |  3 ++-
 jnlib/utf8conv.c                |  3 ++-
 jnlib/utf8conv.h                |  3 ++-
 jnlib/w32-afunix.c              |  3 ++-
 jnlib/w32-afunix.h              |  3 ++-
 jnlib/w32-pth.c                 |  3 ++-
 jnlib/w32-pth.h                 |  3 ++-
 jnlib/xmalloc.c                 |  3 ++-
 jnlib/xmalloc.h                 |  3 ++-
 kbx/Makefile.am                 |  3 ++-
 kbx/kbxutil.c                   |  3 ++-
 kbx/keybox-blob.c               |  3 ++-
 kbx/keybox-defs.h               |  3 ++-
 kbx/keybox-dump.c               |  3 ++-
 kbx/keybox-file.c               |  3 ++-
 kbx/keybox-init.c               |  3 ++-
 kbx/keybox-openpgp.c            |  3 ++-
 kbx/keybox-search-desc.h        |  3 ++-
 kbx/keybox-search.c             |  3 ++-
 kbx/keybox-update.c             |  3 ++-
 kbx/keybox-util.c               |  3 ++-
 kbx/keybox.h                    |  3 ++-
 kbx/mkerrors                    |  3 ++-
 scd/Makefile.am                 |  3 ++-
 scd/app-common.h                |  3 ++-
 scd/app-dinsig.c                |  3 ++-
 scd/app-help.c                  |  3 ++-
 scd/app-nks.c                   |  3 ++-
 scd/app-openpgp.c               |  3 ++-
 scd/app-p15.c                   |  3 ++-
 scd/app.c                       |  3 ++-
 scd/atr.c                       |  3 ++-
 scd/atr.h                       |  3 ++-
 scd/card-common.h               |  3 ++-
 scd/card-dinsig.c               |  3 ++-
 scd/card-p15.c                  |  3 ++-
 scd/card.c                      |  3 ++-
 scd/command.c                   |  3 ++-
 scd/sc-copykeys.c               |  3 ++-
 scd/scdaemon.c                  |  3 ++-
 scd/scdaemon.h                  |  3 ++-
 scd/tlv.c                       |  3 ++-
 scd/tlv.h                       |  3 ++-
 scripts/compile                 |  3 ++-
 scripts/config.guess            |  3 ++-
 sm/ChangeLog                    |  7 +++++++
 sm/Makefile.am                  |  3 ++-
 sm/base64.c                     |  3 ++-
 sm/call-agent.c                 |  3 ++-
 sm/call-dirmngr.c               |  3 ++-
 sm/certchain.c                  |  3 ++-
 sm/certcheck.c                  |  3 ++-
 sm/certdump.c                   |  3 ++-
 sm/certlist.c                   |  3 ++-
 sm/certreqgen.c                 |  3 ++-
 sm/decrypt.c                    |  3 ++-
 sm/delete.c                     |  3 ++-
 sm/encrypt.c                    |  3 ++-
 sm/export.c                     |  3 ++-
 sm/fingerprint.c                |  3 ++-
 sm/gpgsm.c                      | 16 ++++++++++++----
 sm/gpgsm.h                      |  3 ++-
 sm/import.c                     |  3 ++-
 sm/keydb.c                      |  3 ++-
 sm/keydb.h                      |  3 ++-
 sm/keylist.c                    |  7 ++++++-
 sm/misc.c                       |  3 ++-
 sm/qualified.c                  |  3 ++-
 sm/server.c                     |  3 ++-
 sm/sign.c                       |  3 ++-
 sm/verify.c                     |  3 ++-
 tests/Makefile.am               |  3 ++-
 tests/asschk.c                  |  3 ++-
 tests/pkits/Makefile.am         |  3 ++-
 tests/pkits/common.sh           |  3 ++-
 tests/pkits/import-all-certs    |  3 ++-
 tests/pkits/validate-all-certs  |  3 ++-
 tools/Makefile.am               |  3 ++-
 tools/gpg-connect-agent.c       |  3 ++-
 tools/gpgconf-comp.c            | 36 +++++++++++++++++++-----------------
 tools/gpgconf.c                 |  3 ++-
 tools/gpgconf.h                 |  3 ++-
 tools/gpgkey2ssh.c              | 37 +++++++++++++++++++------------------
 tools/gpgparsemail.c            |  3 ++-
 tools/no-libgcrypt.c            |  3 ++-
 tools/symcryptrun.c             |  3 ++-
 tools/watchgnupg.c              |  3 ++-
 180 files changed, 469 insertions(+), 265 deletions(-)

(limited to 'common/miscellaneous.c')

diff --git a/Makefile.am b/Makefile.am
index 9fafb1102..0c5fbe4c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/NEWS b/NEWS
index 6413242c6..679bf7d5b 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ Noteworthy changes in version 1.9.21
 
  * [scdaemon] Added --hash=xxx option to the PKSIGN command.
 
+ * [gpg-protect-tool] Does now create a MAC for P12 files.  This is for
+   better interoperability.
+
 
 Noteworthy changes in version 1.9.20 (2005-12-20)
 -------------------------------------------------
diff --git a/TODO b/TODO
index 7958ed18e..da3a76e06 100644
--- a/TODO
+++ b/TODO
@@ -21,7 +21,7 @@ might want to have an agent context for each service request
 ** When a certificate chain was sucessfully verified, make ephemeral certs used  in this chain permanent.
 ** Try to keep certificate references somewhere
   This will help with some of our caching code.  We also need to test
-  that cachining; in particular "regtp_ca_chainlen".
+  that caching; in particular "regtp_ca_chainlen".
 
 * sm/decrypt.c
 ** replace leading zero in integer hack by a cleaner solution
@@ -101,7 +101,6 @@ might want to have an agent context for each service request
 
 
 * sm/
-** --include-certs is as of now still a dummy command line option
 ** check that we issue NO_SECKEY xxx if a -u key was not found
 
 * gpg/
@@ -117,4 +116,4 @@ might want to have an agent context for each service request
 ** ttyio
   Add completion support.
 ** yesno
-  Update to gpg 1.4.3 version
\ No newline at end of file
+  Update to gpg 1.4.3 version
diff --git a/agent/Makefile.am b/agent/Makefile.am
index bc96531e0..961f0bb97 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -14,7 +14,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/agent/agent.h b/agent/agent.h
index 1542d6b9f..fdfe510fb 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef AGENT_H
diff --git a/agent/cache.c b/agent/cache.c
index 32b6ac0c7..2f468396d 100644
--- a/agent/cache.c
+++ b/agent/cache.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/call-scd.c b/agent/call-scd.c
index ff241ce41..d0d24f9d5 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 23f083c2f..18375a9ae 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -15,8 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* Only v2 of the ssh-agent protocol is implemented.  */
diff --git a/agent/command.c b/agent/command.c
index daf9b8698..12770dac8 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* FIXME: we should not use the default assuan buffering but setup
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 926df2622..3dc7984e6 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/findkey.c b/agent/findkey.c
index 73ffb530d..3f793e5dd 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/genkey.c b/agent/genkey.c
index d0319f7b4..04ee865f4 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 22bd5589d..fc2a2001a 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/learncard.c b/agent/learncard.c
index 72238507f..8ddf4ee54 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/minip12.c b/agent/minip12.c
index 6f99bf24d..912d387d8 100644
--- a/agent/minip12.c
+++ b/agent/minip12.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/agent/minip12.h b/agent/minip12.h
index 2fbb490d7..6275f9ccb 100644
--- a/agent/minip12.h
+++ b/agent/minip12.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef MINIP12_H
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index 1d64c1b15..f61f0f844 100644
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/pksign.c b/agent/pksign.c
index e9df19351..9863f9de0 100644
--- a/agent/pksign.c
+++ b/agent/pksign.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c
index 6a9f07a3e..013c9411d 100644
--- a/agent/preset-passphrase.c
+++ b/agent/preset-passphrase.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index 5f59d5e06..bb14ca1e1 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/protect.c b/agent/protect.c
index 45bdae496..19f6ccbc6 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/query.c b/agent/query.c
index a5a3d0153..0516bec03 100644
--- a/agent/query.c
+++ b/agent/query.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/t-protect.c b/agent/t-protect.c
index fee3c561d..9ddd49414 100644
--- a/agent/t-protect.c
+++ b/agent/t-protect.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/agent/trans.c b/agent/trans.c
index 7fa5e3d6b..5eb7d25c0 100644
--- a/agent/trans.c
+++ b/agent/trans.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* To avoid any problems with the gettext implementation (there used
diff --git a/agent/trustlist.c b/agent/trustlist.c
index edb00650d..d234af692 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/am/cmacros.am b/am/cmacros.am
index de68b6f31..7b449e2c0 100644
--- a/am/cmacros.am
+++ b/am/cmacros.am
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 localedir = $(datadir)/locale
 
diff --git a/common/Makefile.am b/common/Makefile.am
index 34819e93f..085440bb3 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/common/asshelp.c b/common/asshelp.c
index 0edaeae0e..1da899522 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/asshelp.h b/common/asshelp.h
index 2d6dc79e6..9f4b5806b 100644
--- a/common/asshelp.h
+++ b/common/asshelp.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_COMMON_ASSHELP_H
diff --git a/common/b64enc.c b/common/b64enc.c
index 5b7a42ab3..bfc49deb6 100644
--- a/common/b64enc.c
+++ b/common/b64enc.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/dynload.h b/common/dynload.h
index 2c074141f..9b67fa9ed 100644
--- a/common/dynload.h
+++ b/common/dynload.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_DYNLOAD_H
diff --git a/common/errors.h b/common/errors.h
index f34f3ba79..131891f65 100644
--- a/common/errors.h
+++ b/common/errors.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_COMMON_ERRORS_H
diff --git a/common/estream.c b/common/estream.c
index 70b3d9c6e..c2030371b 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -1,22 +1,23 @@
 /* estream.c - Extended stream I/O/ Library
-   Copyright (C) 2004 g10 Code GmbH
-
-   This file is part of Libestream.
- 
-   Libestream 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.
- 
-   Libestream 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
-   Lesser General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with Libestream; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+ * Copyright (C) 2004 g10 Code GmbH
+ *
+ * This file is part of Libestream.
+ *
+ * Libestream 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.
+ *
+ * Libestream 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Libestream; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
 
 #ifdef USE_ESTREAM_SUPPORT_H
 # include <estream-support.h>
diff --git a/common/estream.h b/common/estream.h
index ebe575926..a9b4847c8 100644
--- a/common/estream.h
+++ b/common/estream.h
@@ -1,22 +1,23 @@
 /* estream.h - Extended stream I/O/ Library
-   Copyright (C) 2004 g10 Code GmbH
-
-   This file is part of Libestream.
- 
-   Libestream 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.
- 
-   Libestream 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
-   Lesser General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with Libestream; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+ * Copyright (C) 2004 g10 Code GmbH
+ *
+ * This file is part of Libestream.
+ *
+ * Libestream 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.
+ *
+ * Libestream 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Libestream; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
 
 #ifndef ESTREAM_H
 #define ESTREAM_H
diff --git a/common/exechelp.c b/common/exechelp.c
index dc0a6b0e1..e64b69022 100644
--- a/common/exechelp.c
+++ b/common/exechelp.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/exechelp.h b/common/exechelp.h
index f00d18dd8..1df029b7e 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_COMMON_EXECHELP_H
diff --git a/common/gettime.c b/common/gettime.c
index ecdc7df95..c4ea3283a 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/homedir.c b/common/homedir.c
index a118cbac1..39d6dce20 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/i18n.h b/common/i18n.h
index 0e13dca4d..0187ba265 100644
--- a/common/i18n.h
+++ b/common/i18n.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_COMMON_I18N_H
diff --git a/common/iobuf.c b/common/iobuf.c
index bbb666f67..8f7374f8c 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/iobuf.h b/common/iobuf.h
index 3b8f4b572..a3dd7f1c5 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_COMMON_IOBUF_H
diff --git a/common/isascii.c b/common/isascii.c
index 565c71664..b71febe99 100644
--- a/common/isascii.c
+++ b/common/isascii.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/common/maperror.c b/common/maperror.c
index 9efd64338..06546b501 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/membuf.c b/common/membuf.c
index 75f6bdb2a..2d35fefab 100644
--- a/common/membuf.c
+++ b/common/membuf.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/membuf.h b/common/membuf.h
index c199363cc..9033be61e 100644
--- a/common/membuf.h
+++ b/common/membuf.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_COMMON_MEMBUF_H
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index e9f8ed27f..da74f65bc 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/mkerrors b/common/mkerrors
index 5a1ef33da..994c61352 100755
--- a/common/mkerrors
+++ b/common/mkerrors
@@ -17,7 +17,8 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 cat <<EOF
 /* Generated automatically by mkerrors */
diff --git a/common/mkerrtok b/common/mkerrtok
index 1029614af..67ab42c89 100755
--- a/common/mkerrtok
+++ b/common/mkerrtok
@@ -17,7 +17,8 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 cat <<EOF
 /* Generated automatically by mkerrtok */
diff --git a/common/sexp-parse.h b/common/sexp-parse.h
index 89aa7210f..1064e51c4 100644
--- a/common/sexp-parse.h
+++ b/common/sexp-parse.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef SEXP_PARSE_H
diff --git a/common/sexputil.c b/common/sexputil.c
index 8a27ad978..fe0870c56 100644
--- a/common/sexputil.c
+++ b/common/sexputil.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This file implements a few utility functions useful when working
diff --git a/common/signal.c b/common/signal.c
index 2837d7b72..0c79214b2 100644
--- a/common/signal.c
+++ b/common/signal.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/simple-gettext.c b/common/simple-gettext.c
index b6b851c77..56a305fd8 100644
--- a/common/simple-gettext.c
+++ b/common/simple-gettext.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This is a simplified version of gettext written by Ulrich Drepper.
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index f156ca3f1..e405c1ec0 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This module is intended as a standalone client implementation to
diff --git a/common/simple-pwquery.h b/common/simple-pwquery.h
index e3270d6c5..5b941d06f 100644
--- a/common/simple-pwquery.h
+++ b/common/simple-pwquery.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef SIMPLE_PWQUERY_H
diff --git a/common/sysutils.c b/common/sysutils.c
index a8f6f6f5d..3e52cdaa3 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/sysutils.h b/common/sysutils.h
index 08198f685..c40dbfaa9 100644
--- a/common/sysutils.h
+++ b/common/sysutils.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_COMMON_SYSUTILS_H
diff --git a/common/ttyio.c b/common/ttyio.c
index c9f41c626..38883afa5 100644
--- a/common/ttyio.c
+++ b/common/ttyio.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/ttyio.h b/common/ttyio.h
index 6148d644a..32d159863 100644
--- a/common/ttyio.h
+++ b/common/ttyio.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef GNUPG_COMMON_TTYIO_H
 #define GNUPG_COMMON_TTYIO_H
diff --git a/common/util.h b/common/util.h
index 295d785c5..29106bf9c 100644
--- a/common/util.h
+++ b/common/util.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_COMMON_UTIL_H
diff --git a/common/vasprintf.c b/common/vasprintf.c
index 9efea33f2..4bed8de66 100644
--- a/common/vasprintf.c
+++ b/common/vasprintf.c
@@ -15,8 +15,8 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/common/w32reg.c b/common/w32reg.c
index a85ac7348..84308e916 100644
--- a/common/w32reg.c
+++ b/common/w32reg.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/xasprintf.c b/common/xasprintf.c
index 46740a2e6..75ae18072 100644
--- a/common/xasprintf.c
+++ b/common/xasprintf.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/xreadline.c b/common/xreadline.c
index 23aa35269..8400df330 100644
--- a/common/xreadline.c
+++ b/common/xreadline.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/common/yesno.c b/common/yesno.c
index 737071691..9ca513740 100644
--- a/common/yesno.c
+++ b/common/yesno.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/configure.ac b/configure.ac
index f3066a0a9..d77093a63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 47dd36208..dae053ec2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,7 +14,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/doc/gnupg-card-architecture.fig b/doc/gnupg-card-architecture.fig
index e5772cd0f..49351c720 100644
--- a/doc/gnupg-card-architecture.fig
+++ b/doc/gnupg-card-architecture.fig
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 Landscape
 Center
 Metric
diff --git a/g10/Makefile.am b/g10/Makefile.am
index aeb24d7b3..fb54dd9f0 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 55fc62569..e3bd7ed57 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #if 0  /* let Emacs display a red warning */
diff --git a/g10/call-agent.h b/g10/call-agent.h
index 71044e38b..d09b87e3a 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef GNUPG_G10_CALL_AGENT_H
 #define GNUPG_G10_CALL_AGENT_H 
diff --git a/g10/comment.c b/g10/comment.c
index b52104cd7..193087107 100644
--- a/g10/comment.c
+++ b/g10/comment.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/gpg.c b/g10/gpg.c
index 52ae553c1..4235f3f7a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -356,6 +356,7 @@ enum cmd_and_opt_values
     oAllowMultisigVerification,
     oEnableDSA2,
     oDisableDSA2,
+    oDebugAllowRun,
 
     oNoop
   };
@@ -701,6 +702,8 @@ static ARGPARSE_OPTS opts[] = {
     { oNoRequireCrossCert, "no-require-cross-certification", 0, "@"},
     { oAutoKeyLocate, "auto-key-locate", 2, "@"},
     { oNoAutoKeyLocate, "no-auto-key-locate", 0, "@"},
+
+    { oDebugAllowRun, "debug_allow_run", 0, "@"},
     {0,NULL,0,NULL}
 };
 
@@ -1684,6 +1687,7 @@ main (int argc, char **argv )
     int with_fpr = 0; /* make an option out of --fingerprint */
     int any_explicit_recipient = 0;
     int require_secmem=0,got_secmem=0;
+    int allow_run = 0;
 
 #ifdef __riscos__
     opt.lock_once = 1;
@@ -2663,6 +2667,8 @@ main (int argc, char **argv )
 	  case oEnableDSA2: opt.flags.dsa2=1; break;
 	  case oDisableDSA2: opt.flags.dsa2=0; break;
 
+          case oDebugAllowRun: allow_run = 1; break; 
+
 	  case oNoop: break;
 
 	  default : pargs.err = configfp? 1:2; break;
@@ -2716,6 +2722,9 @@ main (int argc, char **argv )
       }
 #endif
 
+    if (!allow_run)
+      log_fatal ("This version of gpg is not ready for use, use gpg 1.4.x\n");
+
     /* FIXME: We should use logging to a file only in server mode;
        however we have not yet implemetyed that.  Thus we try to get
        away with --batch as indication for logging to file
diff --git a/g10/gpg.h b/g10/gpg.h
index 8ef46fdca..100a8e349 100644
--- a/g10/gpg.h
+++ b/g10/gpg.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef GNUPG_G10_GPG_H
 #define GNUPG_G10_GPG_H 
diff --git a/g10/pkglue.c b/g10/pkglue.c
index f062d8366..3f9669d27 100644
--- a/g10/pkglue.c
+++ b/g10/pkglue.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/g10/pkglue.h b/g10/pkglue.h
index 43b82785b..866960bfd 100644
--- a/g10/pkglue.h
+++ b/g10/pkglue.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_G10_PKGLUE_H
diff --git a/include/_regex.h b/include/_regex.h
index fac441dc6..ddd002484 100644
--- a/include/_regex.h
+++ b/include/_regex.h
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA. */
 
 #ifndef _REGEX_H
 #define _REGEX_H 1
diff --git a/include/errors.h b/include/errors.h
index ed437fa99..f3269ce5b 100644
--- a/include/errors.h
+++ b/include/errors.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef GNUPG_INCLUDE_ERRORS_H
 #define GNUPG_INCLUDE_ERRORS_H
diff --git a/include/memory.h b/include/memory.h
index 35719da62..2e2f8fdce 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef G10_MEMORY_H
diff --git a/include/mpi.h b/include/mpi.h
index b732923a2..7402ef6d3 100644
--- a/include/mpi.h
+++ b/include/mpi.h
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/include/util.h b/include/util.h
index c579c152e..1d6d01366 100644
--- a/include/util.h
+++ b/include/util.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifndef G10_UTIL_H
 #define G10_UTIL_H
diff --git a/jnlib/Makefile.am b/jnlib/Makefile.am
index 69eac4bf7..5fd48495c 100644
--- a/jnlib/Makefile.am
+++ b/jnlib/Makefile.am
@@ -14,7 +14,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index 980d1186c..15a7c546e 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -1,21 +1,22 @@
 /* [argparse.c wk 17.06.97] Argument Parser for option handling
  *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
- *  This file is part of GnuPG.
+ * 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 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.
+ * 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
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
@@ -904,7 +905,7 @@ strusage( int level )
     switch( level ) {
       case 11: p = "foo"; break;
       case 13: p = "0.0"; break;
-      case 14: p = "Copyright (C) 2005 Free Software Foundation, Inc."; break;
+      case 14: p = "Copyright (C) 2006 Free Software Foundation, Inc."; break;
       case 15: p =
 "This program comes with ABSOLUTELY NO WARRANTY.\n"
 "This is free software, and you are welcome to redistribute it\n"
@@ -920,7 +921,8 @@ strusage( int level )
 "GNU General Public License for more details.\n\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n";
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA.\n";
 	break;
       case 40: /* short and long usage */
       case 41: p = ""; break;
diff --git a/jnlib/argparse.h b/jnlib/argparse.h
index e8922faa4..531622ea5 100644
--- a/jnlib/argparse.h
+++ b/jnlib/argparse.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_ARGPARSE_H
diff --git a/jnlib/dotlock.c b/jnlib/dotlock.c
index b7f892717..89edb7b91 100644
--- a/jnlib/dotlock.c
+++ b/jnlib/dotlock.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/jnlib/dotlock.h b/jnlib/dotlock.h
index 2cb39008a..1c0f05cb2 100644
--- a/jnlib/dotlock.h
+++ b/jnlib/dotlock.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_DOTLOCK_H
diff --git a/jnlib/libjnlib-config.h b/jnlib/libjnlib-config.h
index da3991432..ded6e057b 100644
--- a/jnlib/libjnlib-config.h
+++ b/jnlib/libjnlib-config.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /****************
diff --git a/jnlib/logging.c b/jnlib/logging.c
index c944006a5..20ba02ccd 100644
--- a/jnlib/logging.c
+++ b/jnlib/logging.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/jnlib/logging.h b/jnlib/logging.h
index b5c0bd741..3ad43b4ec 100644
--- a/jnlib/logging.h
+++ b/jnlib/logging.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_LOGGING_H
diff --git a/jnlib/mischelp.h b/jnlib/mischelp.h
index 54da4cc1f..8e7f9c346 100644
--- a/jnlib/mischelp.h
+++ b/jnlib/mischelp.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_MISCHELP_H
diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c
index 27b8a25e8..9df852754 100644
--- a/jnlib/stringhelp.c
+++ b/jnlib/stringhelp.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/jnlib/stringhelp.h b/jnlib/stringhelp.h
index 405d6dbc4..b8f4dbec0 100644
--- a/jnlib/stringhelp.h
+++ b/jnlib/stringhelp.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_STRINGHELP_H
diff --git a/jnlib/strlist.c b/jnlib/strlist.c
index 52b4d5869..87e121705 100644
--- a/jnlib/strlist.c
+++ b/jnlib/strlist.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/jnlib/strlist.h b/jnlib/strlist.h
index 3c1252a44..ee9f1fa60 100644
--- a/jnlib/strlist.h
+++ b/jnlib/strlist.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_STRLIST_H
diff --git a/jnlib/types.h b/jnlib/types.h
index 934b7a6ee..89d245943 100644
--- a/jnlib/types.h
+++ b/jnlib/types.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_TYPES_H
diff --git a/jnlib/utf8conv.c b/jnlib/utf8conv.c
index 4df8b7b32..9fba1ed4f 100644
--- a/jnlib/utf8conv.c
+++ b/jnlib/utf8conv.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/jnlib/utf8conv.h b/jnlib/utf8conv.h
index 6e2ce9944..344c47f92 100644
--- a/jnlib/utf8conv.h
+++ b/jnlib/utf8conv.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_UTF8CONF_H
diff --git a/jnlib/w32-afunix.c b/jnlib/w32-afunix.c
index c93d389da..84d799f1f 100644
--- a/jnlib/w32-afunix.c
+++ b/jnlib/w32-afunix.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 #ifdef _WIN32
 #include <stdio.h>
diff --git a/jnlib/w32-afunix.h b/jnlib/w32-afunix.h
index 367832299..d0eb8cf7e 100644
--- a/jnlib/w32-afunix.h
+++ b/jnlib/w32-afunix.h
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU Lesser 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 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  */
 #ifdef _WIN32
 #ifndef W32AFUNIX_DEFS_H
diff --git a/jnlib/w32-pth.c b/jnlib/w32-pth.c
index 2f041c490..4107c7cb3 100644
--- a/jnlib/w32-pth.c
+++ b/jnlib/w32-pth.c
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU Lesser 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * ------------------------------------------------------------------
  * This code is based on Ralf Engelschall's GNU Pth, a non-preemptive
diff --git a/jnlib/w32-pth.h b/jnlib/w32-pth.h
index 5ef0ab240..524010d92 100644
--- a/jnlib/w32-pth.h
+++ b/jnlib/w32-pth.h
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU Lesser 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 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA. 
  *
  * ------------------------------------------------------------------
  * This code is based on Ralf Engelschall's GNU Pth, a non-preemptive
diff --git a/jnlib/xmalloc.c b/jnlib/xmalloc.c
index 1cfaab9f7..f5b92ba41 100644
--- a/jnlib/xmalloc.c
+++ b/jnlib/xmalloc.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/jnlib/xmalloc.h b/jnlib/xmalloc.h
index 150ef3664..8bfa7df79 100644
--- a/jnlib/xmalloc.h
+++ b/jnlib/xmalloc.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef LIBJNLIB_XMALLOC_H
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index f42e517bf..063dbb4c0 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index 0569b5a67..19d356007 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c
index eacc0014a..f3fe31617 100644
--- a/kbx/keybox-blob.c
+++ b/kbx/keybox-blob.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h
index 7bbed8519..ad53c71a7 100644
--- a/kbx/keybox-defs.h
+++ b/kbx/keybox-defs.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef KEYBOX_DEFS_H
diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c
index 495fb249e..d28611377 100644
--- a/kbx/keybox-dump.c
+++ b/kbx/keybox-dump.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-file.c b/kbx/keybox-file.c
index 3883ce607..e68e96cf9 100644
--- a/kbx/keybox-file.c
+++ b/kbx/keybox-file.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-init.c b/kbx/keybox-init.c
index 46a29978a..6c01b4f3a 100644
--- a/kbx/keybox-init.c
+++ b/kbx/keybox-init.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-openpgp.c b/kbx/keybox-openpgp.c
index 7401949c9..8ac713979 100644
--- a/kbx/keybox-openpgp.c
+++ b/kbx/keybox-openpgp.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This is a simple OpenPGP parser suitable for all OpenPGP key
diff --git a/kbx/keybox-search-desc.h b/kbx/keybox-search-desc.h
index 4be59c27d..f3a69d0f1 100644
--- a/kbx/keybox-search-desc.h
+++ b/kbx/keybox-search-desc.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* 
diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c
index 2ce3c1923..f95e6eb06 100644
--- a/kbx/keybox-search.c
+++ b/kbx/keybox-search.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index a16c18e23..bb43d287b 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-util.c b/kbx/keybox-util.c
index ed5d93de0..6eb85ba3f 100644
--- a/kbx/keybox-util.c
+++ b/kbx/keybox-util.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/kbx/keybox.h b/kbx/keybox.h
index af1fc4516..0f97fb7fc 100644
--- a/kbx/keybox.h
+++ b/kbx/keybox.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef KEYBOX_H
diff --git a/kbx/mkerrors b/kbx/mkerrors
index 5adb7bfdf..d3d096c5d 100755
--- a/kbx/mkerrors
+++ b/kbx/mkerrors
@@ -17,7 +17,8 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 cat <<EOF
 /* Generated automatically by mkerrors */
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 46f6b9fa3..61c0c05d9 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -14,7 +14,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/scd/app-common.h b/scd/app-common.h
index d294a5c25..3b828780d 100644
--- a/scd/app-common.h
+++ b/scd/app-common.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * $Id$
  */
diff --git a/scd/app-dinsig.c b/scd/app-dinsig.c
index 75cd12c59..752e8a346 100644
--- a/scd/app-dinsig.c
+++ b/scd/app-dinsig.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/scd/app-help.c b/scd/app-help.c
index 27cbea5c7..861d8e3bc 100644
--- a/scd/app-help.c
+++ b/scd/app-help.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/app-nks.c b/scd/app-nks.c
index 73ec8ea01..1ca8d4187 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 5e9281a38..842881f3a 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  *
  * $Id$
  */
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 4203a6840..8a7732c85 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* Information pertaining to the BELPIC developer card samples:
diff --git a/scd/app.c b/scd/app.c
index 363e386ce..e3d42054b 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/atr.c b/scd/atr.c
index 6475e83f8..bd5a22621 100644
--- a/scd/atr.c
+++ b/scd/atr.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/atr.h b/scd/atr.h
index 5fdd57457..c70089ca5 100644
--- a/scd/atr.h
+++ b/scd/atr.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef ATR_H
diff --git a/scd/card-common.h b/scd/card-common.h
index cefaf120f..dd7529d5b 100644
--- a/scd/card-common.h
+++ b/scd/card-common.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef CARD_COMMON_H
diff --git a/scd/card-dinsig.c b/scd/card-dinsig.c
index df09bfb57..d50d758f2 100644
--- a/scd/card-dinsig.c
+++ b/scd/card-dinsig.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* The German signature law and its bylaw (SigG and SigV) is currently
diff --git a/scd/card-p15.c b/scd/card-p15.c
index ae3ef148f..63d537d5a 100644
--- a/scd/card-p15.c
+++ b/scd/card-p15.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/card.c b/scd/card.c
index 9ec2a52c5..7a41ab7bb 100644
--- a/scd/card.c
+++ b/scd/card.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/command.c b/scd/command.c
index 2ed685587..4629d9edf 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/sc-copykeys.c b/scd/sc-copykeys.c
index 66b6894e0..395b4625a 100644
--- a/scd/sc-copykeys.c
+++ b/scd/sc-copykeys.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index e24b42132..b11cc7a91 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/scdaemon.h b/scd/scdaemon.h
index abe9730a7..f9689ee09 100644
--- a/scd/scdaemon.h
+++ b/scd/scdaemon.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef SCDAEMON_H
diff --git a/scd/tlv.c b/scd/tlv.c
index b436d956a..6ddbeaf1f 100644
--- a/scd/tlv.c
+++ b/scd/tlv.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/scd/tlv.h b/scd/tlv.h
index f587dd9df..877573d25 100644
--- a/scd/tlv.h
+++ b/scd/tlv.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef SCD_TLV_H
diff --git a/scripts/compile b/scripts/compile
index ac07cc541..b6e6dcb0f 100755
--- a/scripts/compile
+++ b/scripts/compile
@@ -17,7 +17,8 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA..
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/scripts/config.guess b/scripts/config.guess
index 77c7cbab0..a4929a979 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -17,7 +17,8 @@ timestamp='2004-08-13'
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA..
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 48e8473fa..f191e7512 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-20  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.c (gpgsm_init_default_ctrl): Take care of the command line
+	option --include-certs.
+
+	* keylist.c (list_cert_raw): Print the certid.
+
 2006-05-23  Werner Koch  <wk@g10code.com>
 
 	* keydb.c (hextobyte): Deleted as it is now defined in jnlib.
diff --git a/sm/Makefile.am b/sm/Makefile.am
index b5882ae1d..be53e8d25 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -14,7 +14,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/sm/base64.c b/sm/base64.c
index 62c2c9ad9..59ab6f24b 100644
--- a/sm/base64.c
+++ b/sm/base64.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 9942672ae..85ec78c63 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 85467d4a2..0de09a9ba 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/certchain.c b/sm/certchain.c
index 44d72efd3..4a4ac49f6 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/certcheck.c b/sm/certcheck.c
index 5fb376712..732356149 100644
--- a/sm/certcheck.c
+++ b/sm/certcheck.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/certdump.c b/sm/certdump.c
index 1f2ea7b18..0d5146abc 100644
--- a/sm/certdump.c
+++ b/sm/certdump.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/certlist.c b/sm/certlist.c
index b036a85d7..cde2930ec 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index c523c992a..744969719 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /*
diff --git a/sm/decrypt.c b/sm/decrypt.c
index 9e5518b0f..70d48c983 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/delete.c b/sm/delete.c
index 7533f7291..0d2f1fd9d 100644
--- a/sm/delete.c
+++ b/sm/delete.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/encrypt.c b/sm/encrypt.c
index e4c0d5437..07c2ba8ce 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/export.c b/sm/export.c
index f9d6dac62..b08a017d2 100644
--- a/sm/export.c
+++ b/sm/export.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/fingerprint.c b/sm/fingerprint.c
index 9441483bf..d6a3900f0 100644
--- a/sm/fingerprint.c
+++ b/sm/fingerprint.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 7347bf575..5363b8ad6 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1,5 +1,6 @@
 /* gpgsm.c - GnuPG for S/MIME 
- * Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ *               2006  Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -15,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
@@ -461,6 +463,10 @@ static unsigned int debug_value;
 /* Option --enable-special-filenames */
 static int allow_special_filenames;
 
+/* Default value for include-certs. */
+static int default_include_certs = 1; /* Only include the signer's cert. */
+
+
 
 static char *build_list (const char *text,
 			 const char *(*mapf)(int), int (*chkf)(int));
@@ -998,7 +1004,9 @@ main ( int argc, char **argv)
           ctrl.use_ocsp = opt.enable_ocsp = 1;
           break;
 
-        case oIncludeCerts: ctrl.include_certs = pargs.r.ret_int; break;
+        case oIncludeCerts: 
+          ctrl.include_certs = default_include_certs = pargs.r.ret_int; 
+          break;
 
         case oPolicyFile:
           xfree (opt.policy_file);
@@ -1657,7 +1665,7 @@ gpgsm_exit (int rc)
 void
 gpgsm_init_default_ctrl (struct server_control_s *ctrl)
 {
-  ctrl->include_certs = 1;  /* only include the signer's cert */
+  ctrl->include_certs = default_include_certs;
   ctrl->use_ocsp = opt.enable_ocsp;
 }
 
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 438252050..b49f34640 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GPGSM_H
diff --git a/sm/import.c b/sm/import.c
index 6d00e91ea..b56014a1a 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/keydb.c b/sm/keydb.c
index d5932135d..81936cf6a 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/keydb.h b/sm/keydb.h
index fb4001b64..814ae9f1e 100644
--- a/sm/keydb.h
+++ b/sm/keydb.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GNUPG_KEYDB_H
diff --git a/sm/keylist.c b/sm/keylist.c
index b744a157f..9baf065d0 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -16,7 +16,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
@@ -598,6 +599,10 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
   fprintf (fp, "      md5_fpr: %s\n", dn?dn:"error");
   xfree (dn);
 
+  dn = gpgsm_get_certid (cert);
+  fprintf (fp, "       certid: %s\n", dn?dn:"error");
+  xfree (dn);
+
   dn = gpgsm_get_keygrip_hexstring (cert);
   fprintf (fp, "      keygrip: %s\n", dn?dn:"error");
   xfree (dn);
diff --git a/sm/misc.c b/sm/misc.c
index cd072ce6b..86cb506d6 100644
--- a/sm/misc.c
+++ b/sm/misc.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/qualified.c b/sm/qualified.c
index 07abaadc4..474e1488d 100644
--- a/sm/qualified.c
+++ b/sm/qualified.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/server.c b/sm/server.c
index 87a06ee4e..57e5d8f38 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/sign.c b/sm/sign.c
index 74bfe41aa..d656825e8 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/sm/verify.c b/sm/verify.c
index f37cf4a75..4e6574078 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5264b8859..38b64c6ea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/tests/asschk.c b/tests/asschk.c
index 6a05fe1a8..40b95ba7d 100644
--- a/tests/asschk.c
+++ b/tests/asschk.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 /* This is a simple stand-alone Assuan server test program.  We don't
diff --git a/tests/pkits/Makefile.am b/tests/pkits/Makefile.am
index 41fdec497..d53d35a25 100644
--- a/tests/pkits/Makefile.am
+++ b/tests/pkits/Makefile.am
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/tests/pkits/common.sh b/tests/pkits/common.sh
index 5e773ea5d..09fb62bc8 100644
--- a/tests/pkits/common.sh
+++ b/tests/pkits/common.sh
@@ -16,7 +16,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 # reset some environment variables because we do not want to test locals
 export LANG=C
diff --git a/tests/pkits/import-all-certs b/tests/pkits/import-all-certs
index d1af5fb03..2d70d06df 100755
--- a/tests/pkits/import-all-certs
+++ b/tests/pkits/import-all-certs
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 . ${srcdir:-.}/common.sh || exit 2
 
diff --git a/tests/pkits/validate-all-certs b/tests/pkits/validate-all-certs
index f482fdb51..08f72af71 100755
--- a/tests/pkits/validate-all-certs
+++ b/tests/pkits/validate-all-certs
@@ -16,7 +16,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 . ${srcdir:-.}/common.sh || exit 2
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d9ef8812a..6b4767a79 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,7 +15,8 @@
 # 
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 EXTRA_DIST = Manifest watchgnupg.c \
 	     addgnupghome gpgsm-gencert.sh
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index c9a324fa8..90e321000 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 2da88bc49..04a61a193 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1,21 +1,23 @@
 /* gpgconf-comp.c - Configuration utility for GnuPG.
-   Copyright (C) 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 GnuPG; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ * Copyright (C) 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 GnuPG; if not, write to the Free Software Foundation,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
 
 #if HAVE_CONFIG_H
 #include <config.h>
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index dd505e99d..87ba45ae1 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/tools/gpgconf.h b/tools/gpgconf.h
index 138380b6d..c083c26aa 100644
--- a/tools/gpgconf.h
+++ b/tools/gpgconf.h
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifndef GPGCONF_H
diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
index e874ab22e..3dcb6516e 100644
--- a/tools/gpgkey2ssh.c
+++ b/tools/gpgkey2ssh.c
@@ -1,22 +1,23 @@
 /* gpgkey2ssh.c - Converter ...
- 	Copyright (C) 2005 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.  */
+ *	Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
 
 #include <config.h>
 
diff --git a/tools/gpgparsemail.c b/tools/gpgparsemail.c
index 566f5747f..30759f9a4 100644
--- a/tools/gpgparsemail.c
+++ b/tools/gpgparsemail.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/tools/no-libgcrypt.c b/tools/no-libgcrypt.c
index 82f6a8bb5..636df10c6 100644
--- a/tools/no-libgcrypt.c
+++ b/tools/no-libgcrypt.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index 075e0b444..406cbb2a2 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 6cb570fbc..051ca50fe 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -15,7 +15,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #ifdef HAVE_CONFIG_H
-- 
cgit