Release 0.2.1

diff --git a/AUTHORS b/AUTHORS
index 20ea6e00a4afbe6ac29301e324d595b7fb412d40..76ba895a633aba99b85abd55c71d4e9946d90bbf 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,23 @@
 Program: gpgme
-Maintainer: Werner Koch <wk@gnupg.org>
+Maintainer: Werner Koch <wk@g10code.com>
 
 
 FSF <gnu@gnu.org>
-    * Code taken from GnuPG: gpgme/w32-util.c 
+ - Code taken from GnuPG 1.0: gpgme/w32-util.c, GnuPG 1.1: jnlib/.
+
+g10 Code GmbH <code@g10code.com>
+ - All stuff since mid march 2001.
 
 Werner Koch <wk@gnupg.org>
-    * Design and most stuff.
+ - Design and most stuff.
+
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

diff --git a/ChangeLog b/ChangeLog
index e3c455ab25a3f873226017781556706e287cc3e8..d25591b271c3b59e7471b3f1fe04f666e538f0e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-02  Werner Koch  <wk@gnupg.org>
+
+       Released 0.2.1.
+
+       Changed the copyright notices all over the place.
+       
 2001-02-28  Werner Koch  <wk@gnupg.org>
 
        Released 0.2.0.
@@ -6,3 +12,14 @@
 
        * autogen.sh: Added option --build-w32.
 
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+       
\ No newline at end of file

diff --git a/INSTALL b/INSTALL
index b42a17ac4640e9a2bfe5e480e44d0eef3f365928..ebae9ac9c2155323b1774e09a3fa7455b1f5d1b1 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,17 @@
+Installation Instructions for GPGME
+===================================
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
 Basic Installation
 ==================
 

diff --git a/Makefile.am b/Makefile.am
index e733d27db3b5baa863bf7fe02f470dcc9b6a291a..d48510b9576b468559d8d945596f9810d4eda354 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,23 @@
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME 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.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = README-alpha autogen.sh
 

diff --git a/NEWS b/NEWS
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1db08f863c4f2aa5302089ee2692b4e6e97f5b8b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,20 @@
+Noteworthy changes in version 0.2.1 (2001-04-02)
+------------------------------------------------
+
+ * Changed debug output and GPGME_DEBUG variable (gpgme/debug.c)
+
+ * Handle GnuPG's new key capabilities output and support revocation
+   et al. attributes
+
+ * Made the W32 support more robust.
+
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

diff --git a/bonobo/Makefile.am b/bonobo/Makefile.am
index 48bc03e05c3e2667c0317b29631d01e6fdbe4ffc..27bc13d6fd5d2c574198ae5c14116f571d841ee0 100644 (file)
--- a/bonobo/Makefile.am
+++ b/bonobo/Makefile.am
@@ -1,3 +1,22 @@
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME 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.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = gpgme

diff --git a/complus/Makefile.am b/complus/Makefile.am
index bbae8d59bc9eddd2cd07534f90bacce89e19cd31..ae05e45abd77b22e9eab283a2ef80d6010b1df45 100644 (file)
--- a/complus/Makefile.am
+++ b/complus/Makefile.am
@@ -1,3 +1,22 @@
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME 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.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = WINE-LICENSE WINE-AUTHORS

diff --git a/configure.in b/configure.in
index 903b24c3f2490c0e1b5016fcbdcba61a6bac7652..be971faebd7f8c744ee8e89b672b8e17a58c5184 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,24 @@
 # configure.in  for GPGME
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
 # 
-dnl (Process this file with autoconf to produce a configure script.)
+# This file is part of GPGME.
+# 
+# GPGME 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.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ 
+# (Process this file with autoconf to produce a configure script.)
 AC_REVISION($Revision$)dnl
 
 AC_INIT(gpgme/gpgme.h)
@@ -13,11 +31,11 @@ AM_MAINTAINER_MODE
 #    AGE, set REVISION to 0.
 # 3. Interfaces removed (BAD, breaks upward compatibility): Increment
 #    CURRENT, set AGE and REVISION to 0.
-AM_INIT_AUTOMAKE(gpgme,0.2.0a)
+AM_INIT_AUTOMAKE(gpgme,0.2.1)
 LIBGPGME_LT_CURRENT=3
 LIBGPGME_LT_AGE=3
 LIBGPGME_LT_REVISION=0
-NEED_GPG_VERSION=1.0.4e
+NEED_GPG_VERSION=1.0.4f
 ##############################################
 
 AC_SUBST(LIBGPGME_LT_CURRENT)
@@ -32,7 +50,7 @@ dnl
 AC_ARG_PROGRAM
 
 dnl Don't default to build static libs
-AM_DISABLE_STATIC
+dnl AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
 if test "$GCC" = yes; then

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 45607f9e61954846f6b25b3a9149df95a2876e31..2d186d8035309b344ac0de31ee59d8cf19e5c7e3 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-30  Werner Koch  <wk@gnupg.org>
+
+       * debug.c (debug_init): Allow to specify a debug file.
+       (_gpgme_debug_level): New.
+
+       * posix-io.c (_gpgme_io_read, _gpgme_io_write): Print output.
+       (_gpgme_io_select): Debug only with level > 2.
+
 2001-03-15  Werner Koch  <wk@gnupg.org>
 
        * rungpg.c: Included time.h.
@@ -33,7 +41,7 @@
 
 2001-02-28  Werner Koch  <wk@gnupg.org>
 
-       * w32-io.c (destroy_reader): Set sop_me flag.
+       * w32-io.c (destroy_reader): Set stop_me flag.
        (writer,create_writer,destroy_writer,find_writer,kill_writer): New.
        (_gpgme_io_write): Use a writer thread to avaoid blocking.
        (_gpgme_io_close): Cleanup a writer thread
@@ -163,3 +171,15 @@
 2001-01-05  Werner Koch  <wk@gnupg.org>
 
        * data.c (gpgme_data_rewind): Allow to rewind data_type_none.
+
+
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+       
\ No newline at end of file

diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am
index 59faab48d70bc677ef79d79149bb5e49ed662c98..36029b7ccd42a3096b0fb5312390af4a52d699f4 100644 (file)
--- a/gpgme/Makefile.am
+++ b/gpgme/Makefile.am
@@ -1,4 +1,23 @@
-# Process this file with automake to produce Makefile.in
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME 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.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = gpgme-config.in gpgme.m4 mkerrors mkstatus
 BUILT_SOURCES = errors.c status-table.h

diff --git a/gpgme/context.h b/gpgme/context.h
index de6ca72892fd3d1512c406e8c31eeec0aeea0599..a1992697ea333a0226e2364f8aaeeb36c0107409 100644 (file)
--- a/gpgme/context.h
+++ b/gpgme/context.h
@@ -1,5 +1,6 @@
 /* context.h 
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/data.c b/gpgme/data.c
index 9d8b58eea582ff1c9de2df5a7d4814db4f328c44..f234c50ff292b5b728877f1ad059c8de2fda6b28 100644 (file)
--- a/gpgme/data.c
+++ b/gpgme/data.c
@@ -1,5 +1,6 @@
 /* data.c
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/debug.c b/gpgme/debug.c
index 19de2a7d57ce9a98db5f18425d988db0d814ec11..c18f3d374aa4ebb8179fa358f6111ccac582309f 100644 (file)
--- a/gpgme/debug.c
+++ b/gpgme/debug.c
@@ -1,5 +1,5 @@
 /* debug.c
- *     Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <ctype.h>
 #include <assert.h>
 
 #include "util.h"
@@ -37,6 +38,34 @@ struct debug_control_s {
 };
 
 static int debug_level = 0;
+static FILE *errfp = NULL;
+
+/****************
+ * remove leading and trailing white spaces
+ */
+static char *
+trim_spaces( char *str )
+{
+    char *string, *p, *mark;
+
+    string = str;
+    /* find first non space character */
+    for( p=string; *p && isspace( *(byte*)p ) ; p++ )
+       ;
+    /* move characters */
+    for( (mark = NULL); (*string = *p); string++, p++ )
+       if( isspace( *(byte*)p ) ) {
+           if( !mark )
+               mark = string ;
+       }
+       else
+           mark = NULL ;
+    if( mark )
+       *mark = '\0' ;  /* remove trailing spaces */
+
+    return str ;
+}
+
 
 static void
 debug_init (void)
@@ -48,15 +77,51 @@ debug_init (void)
     LOCK (debug_lock);
     if (!initialized) {
         const char *e = getenv ("GPGME_DEBUG");
-        
-        debug_level =  e? atoi (e): 0;
+        const char *s1, *s2;;
+
         initialized = 1;
+        debug_level = 0;
+        errfp = stderr;
+        if (e) {
+            debug_level = atoi (e);
+            s1 = strchr (e, ':');
+            if (s1 
+#ifndef HAVE_DOSISH_SYSTEM
+                && getuid () == geteuid ()
+#endif
+                ) {
+                char *p;
+                FILE *fp;
+
+                s1++;
+                if ( !(s2 = strchr (s1, ':')) )
+                    s2 = s1 + strlen(s1);
+                p = xtrymalloc (s2-s1+1);
+                if (p) {
+                    memcpy (p, s1, s2-s1);
+                    p[s2-s1] = 0;
+                    trim_spaces (p);
+                    fp = fopen (p,"a");
+                    if (fp) {
+                        setvbuf (fp, NULL, _IOLBF, 0);
+                        errfp = fp;
+                    }
+                    xfree (p);
+                }
+            }
+        }
+
         if (debug_level > 0)
-            fprintf (stderr,"gpgme_debug: level=%d\n", debug_level);
+            fprintf (errfp,"gpgme_debug: level=%d\n", debug_level);
     }
     UNLOCK (debug_lock);
 }
 
+int
+_gpgme_debug_level ()
+{
+    return debug_level;
+}
 
 void
 _gpgme_debug (int level, const char *format, ...)
@@ -69,12 +134,12 @@ _gpgme_debug (int level, const char *format, ...)
     
     va_start ( arg_ptr, format ) ;
     LOCK (debug_lock);
-    vfprintf (stderr, format, arg_ptr) ;
+    vfprintf (errfp, format, arg_ptr) ;
     va_end ( arg_ptr ) ;
     if( format && *format && format[strlen(format)-1] != '\n' )
-        putc ('\n', stderr);
+        putc ('\n', errfp);
     UNLOCK (debug_lock);
-    fflush (stderr);
+    fflush (errfp);
 }
 
 
@@ -144,11 +209,11 @@ _gpgme_debug_end (void **helper, const char *text)
     rewind (ctl->fp);
     LOCK (debug_lock);
     while ( (c=getc (ctl->fp)) != EOF ) {
-        putc (c, stderr);
+        putc (c, errfp);
         last_c = c;
     }
     if (last_c != '\n')
-        putc ('\n', stderr);
+        putc ('\n', errfp);
     UNLOCK (debug_lock);
     
     fclose (ctl->fp);

diff --git a/gpgme/decrypt.c b/gpgme/decrypt.c
index 75d4ac8b24f302da62d3850d8fa78c095e4c3881..526a8156f65748d06aa575e94d13d2822112cc8a 100644 (file)
--- a/gpgme/decrypt.c
+++ b/gpgme/decrypt.c
@@ -1,5 +1,6 @@
 /* decrypt.c -  decrypt functions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/delete.c b/gpgme/delete.c
index 4e3c9b42d7f35e66644a7545df8f51d0960c0dfe..8744efc7b5d78da33e16a76f21bb01c0fe6ca4f2 100644 (file)
--- a/gpgme/delete.c
+++ b/gpgme/delete.c
@@ -1,5 +1,5 @@
 /* delete.c -  delete a key 
- *     Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c
index e4bb38e2812d1ee7f1482c492b254dbfdc71cd9c..5234cc8b0f477e37e2e04097c7ccf532ab544506 100644 (file)
--- a/gpgme/encrypt.c
+++ b/gpgme/encrypt.c
@@ -1,5 +1,6 @@
 /* encrypt.c -  encrypt functions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/export.c b/gpgme/export.c
index c46c3a97e20764de7fe30cd5f20a5bb17430e6f5..506b3a0301d59a51533f1ab3f4ed05245cf300b2 100644 (file)
--- a/gpgme/export.c
+++ b/gpgme/export.c
@@ -1,5 +1,6 @@
 /* export.c -  encrypt functions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/genkey.c b/gpgme/genkey.c
index c2bab3d628d17c989514a0c03a8254416be2288c..c765286c4a99ce0acbe0d81343783b64b746c53a 100644 (file)
--- a/gpgme/genkey.c
+++ b/gpgme/genkey.c
@@ -1,5 +1,6 @@
 /* genkey.c -  key generation
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/gpgme.c b/gpgme/gpgme.c
index 43e89ad2001db8e23ae1be7e0eec8cfd26536688..1c6ffae51cc2242febd992b211578b915a6571f3 100644 (file)
--- a/gpgme/gpgme.c
+++ b/gpgme/gpgme.c
@@ -1,5 +1,6 @@
 /* gpgme.c -  GnuPG Made Easy
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index f1744f02a9f68f4c0547a7004233dba54fc080bf..1e998df884fa44fb2df4e8044dc7befdd18fdbf1 100644 (file)
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -1,5 +1,6 @@
 /* gpgme.h -  GnuPG Made Easy
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -43,7 +44,7 @@ extern "C" {
  * let autoconf (using the AM_PATH_GPGME macro) check that this
  * header matches the installed library.
  * Warning: Do not edit the next line.  configure will do that for you! */
-#define GPGME_VERSION "0.2.0a"
+#define GPGME_VERSION "0.2.1"
 
 
 

diff --git a/gpgme/import.c b/gpgme/import.c
index a05f60b356ebe9d756bdde20451c1c089df9d8ea..37bd45ef4d394274ec2132cda8bb7a67a08742ea 100644 (file)
--- a/gpgme/import.c
+++ b/gpgme/import.c
@@ -1,5 +1,6 @@
-/* impoirt.c -  encrypt functions
+/* import.c -  encrypt functions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/io.h b/gpgme/io.h
index 2f9f1b7f8480669a0560d9aa8eee14110c629721..0965a1d952addae7a8cb5d79d0e90d28eaf48378 100644 (file)
--- a/gpgme/io.h
+++ b/gpgme/io.h
@@ -1,5 +1,6 @@
 /* io.h - I/O functions 
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/key.c b/gpgme/key.c
index 6f8f03b6b953455b4e56db49bf0f883dfcee0976..2fae06916bc828c4d07a22deb0db4907fc272ca3 100644 (file)
--- a/gpgme/key.c
+++ b/gpgme/key.c
@@ -1,5 +1,6 @@
 /* key.c - Key and keyList objects
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/key.h b/gpgme/key.h
index 5e9d4c6d3f94ab25dd9dd47d123836554c6e3ace..60244e9735a893ccbb85841b9a5a09abf162152f 100644 (file)
--- a/gpgme/key.h
+++ b/gpgme/key.h
@@ -1,5 +1,6 @@
 /* key.h 
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index 19eaa2a36237c2e7901b86a05b66cb6ce8f3f7d6..9b6279ac1a6a131dcc10e54cbb8dd88f0bf7c00a 100644 (file)
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -1,5 +1,6 @@
 /* keylist.c -  key listing
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/mkerrors b/gpgme/mkerrors
index 4ad581252af89e0f6e554f954fafc1da28360ee1..c5e1281cc8fbc56d21ea6af86e4af4fbe0b9b6ef 100755 (executable)
--- a/gpgme/mkerrors
+++ b/gpgme/mkerrors
@@ -2,6 +2,7 @@
 # mkerrors - Extract error strings from gpgme.h
 #            and create C source for gpgme_strerror
 #      Copyright (C) 2000 Werner Koch (dd9jn)
+#       Copyright (C) 2001 g10 Code GmbH
 #
 # This file is part of GPGME.
 #

diff --git a/gpgme/mkstatus b/gpgme/mkstatus
index ce3b04fd2c0cf31e5487456ae14582eb22fd1a7b..150313d1d8d7924c1a94ff13af941ff86c0556b6 100755 (executable)
--- a/gpgme/mkstatus
+++ b/gpgme/mkstatus
@@ -2,6 +2,7 @@
 # mkstatus - Extract error strings from rungpg.h
 #            and create a lookup table
 #      Copyright (C) 2000 Werner Koch (dd9jn)
+#       Copyright (C) 2001 g10 Code GmbH
 #
 # This file is part of GPGME.
 #

diff --git a/gpgme/ops.h b/gpgme/ops.h
index cbf35299d60e8f09862a20a6c0cca8749fdc0c72..668a18d2579445a10479f7897645cebb702b3c48 100644 (file)
--- a/gpgme/ops.h
+++ b/gpgme/ops.h
@@ -1,5 +1,6 @@
 /* ops.h - internal operations stuff 
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/posix-io.c b/gpgme/posix-io.c
index e10a7ef51b41e97d94f442a6215510d1aa9bb81a..2043854ed96c2e580bd77ea021c3abff0a27b6f6 100644 (file)
--- a/gpgme/posix-io.c
+++ b/gpgme/posix-io.c
@@ -1,5 +1,6 @@
 /* posix-io.c - Posix I/O functions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -52,6 +53,9 @@ _gpgme_io_read ( int fd, void *buffer, size_t count )
         nread = read (fd, buffer, count);
     } while (nread == -1 && errno == EINTR );
     DEBUG2 ("fd %d: got %d bytes\n", fd, nread );
+    if ( nread > 0 ) {
+        _gpgme_debug (2, "fd %d: got `%.*s'\n", fd, nread, buffer );
+    }
     return nread;
 }
 
@@ -62,6 +66,7 @@ _gpgme_io_write ( int fd, const void *buffer, size_t count )
     int nwritten;
 
     DEBUG2 ("fd %d: about to write %d bytes\n", fd, (int)count );
+    _gpgme_debug (2, "fd %d: write `%.*s'\n", fd, (int)count, buffer );
     do {
         nwritten = write (fd, buffer, count);
     } while (nwritten == -1 && errno == EINTR );
@@ -256,13 +261,14 @@ _gpgme_io_select ( struct io_select_fd_s *fds, size_t nfds )
     static fd_set writefds;
     int any, i, max_fd, n, count;
     struct timeval timeout = { 1, 0 }; /* Use a 1s timeout */
-    void *dbg_help;
+    void *dbg_help = NULL;
     
     FD_ZERO ( &readfds );
     FD_ZERO ( &writefds );
     max_fd = 0;
 
-    DEBUG_BEGIN (dbg_help, "gpgme:select on [ ");
+    if ( _gpgme_debug_level () > 2 )
+        DEBUG_BEGIN (dbg_help, "gpgme:select on [ ");
     any = 0;
     for ( i=0; i < nfds; i++ ) {
         if ( fds[i].fd == -1 ) 
@@ -288,7 +294,7 @@ _gpgme_io_select ( struct io_select_fd_s *fds, size_t nfds )
         }
         fds[i].signaled = 0;
     }
-    DEBUG_END (dbg_help, "]" );
+    DEBUG_END (dbg_help, "]" ); 
     if ( !any )
         return 0;
 
@@ -300,7 +306,8 @@ _gpgme_io_select ( struct io_select_fd_s *fds, size_t nfds )
         return -1; /* error */
     }
 
-    DEBUG_BEGIN (dbg_help, "select OK [ " );
+    if ( _gpgme_debug_level () > 2 )
+        DEBUG_BEGIN (dbg_help, "select OK [ " );
     if (DEBUG_ENABLED(dbg_help)) {
         for (i=0; i <= max_fd; i++ ) {
             if (FD_ISSET (i, &readfds) )

diff --git a/gpgme/posix-sema.c b/gpgme/posix-sema.c
index 82f9b8c3a97f411c9e1be4e0acd51779198e5c97..5d56cc44206b41bc6ba163aa5c83cc0284bd574a 100644 (file)
--- a/gpgme/posix-sema.c
+++ b/gpgme/posix-sema.c
@@ -1,5 +1,6 @@
 /* posix-sema.c 
  *     Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/posix-util.c b/gpgme/posix-util.c
index 38fb2f032490261dae5b1912b8e504522b188cc6..34150fb5caf768de41662b468e0ab15efd928261 100644 (file)
--- a/gpgme/posix-util.c
+++ b/gpgme/posix-util.c
@@ -1,5 +1,6 @@
 /* posix-util.c - Utility functions for Posix
  *     Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/recipient.c b/gpgme/recipient.c
index 5a14c0ab2b293790351600d369b479140ac74017..c9a217e2a4de0a80a75d5ad9aaa16300ff857f60 100644 (file)
--- a/gpgme/recipient.c
+++ b/gpgme/recipient.c
@@ -1,5 +1,6 @@
 /* recipient.c - mainatin recipient sets
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index bed8aaca27490425832d03256551730a8ea8f67c..d68de45a67a4d4cdf3b5591143cc3ebd8d6e7d75 100644 (file)
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -1,5 +1,6 @@
 /* rungpg.c 
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/rungpg.h b/gpgme/rungpg.h
index e6ba4a9686708075ab580b011883156f50b6ff29..2895a83a81cd468c8f38b492603a7c76113fa152 100644 (file)
--- a/gpgme/rungpg.h
+++ b/gpgme/rungpg.h
@@ -1,5 +1,6 @@
 /* rungpg.h -  gpg calling functions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/sema.h b/gpgme/sema.h
index db28a714c8604554408b225d15d16c087debf942..e47646731bdbef12fc11842776f2b0492e3d9140 100644 (file)
--- a/gpgme/sema.h
+++ b/gpgme/sema.h
@@ -1,5 +1,6 @@
 /* sema.h -  definitions for semaphores
  *     Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/sign.c b/gpgme/sign.c
index 5b6c61e80b95dca1782ec59005f97d9566329fda..f71e0d6466d902431fa8edd0ed837cd5843b775a 100644 (file)
--- a/gpgme/sign.c
+++ b/gpgme/sign.c
@@ -1,5 +1,6 @@
 /* sign.c -  signing functions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/signers.c b/gpgme/signers.c
index 6432b8f02557a2a80fe8e4068b48988b4498f8a7..95d8a2284abb87f389568e4756d672c2b0d636af 100644 (file)
--- a/gpgme/signers.c
+++ b/gpgme/signers.c
@@ -1,5 +1,6 @@
 /* signers.c - maintain signer sets
  *     Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/syshdr.h b/gpgme/syshdr.h
index 166e874ff6627f49691533c0b6144d8159b93626..af5e4adde09ff968672456193a3eb93ed42b2b2c 100644 (file)
--- a/gpgme/syshdr.h
+++ b/gpgme/syshdr.h
@@ -1,5 +1,6 @@
 /* syshdr.h - System specfic header files 
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/trustlist.c b/gpgme/trustlist.c
index 156bbb810411d34885478e70f13d61fec2fa7435..c6ba8e8bc53a27e91c1a948f3f3d28f81fb8ba03 100644 (file)
--- a/gpgme/trustlist.c
+++ b/gpgme/trustlist.c
@@ -1,5 +1,6 @@
 /* trustlist.c -  key listing
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/types.h b/gpgme/types.h
index e5642e1290e9f466b9a5ef4d5d91c72333d18255..4aa0df76ae9e26fb50062d9c38960b2aa9b5aba1 100644 (file)
--- a/gpgme/types.h
+++ b/gpgme/types.h
@@ -1,5 +1,6 @@
 /* types.h -  Some type definitions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/util.c b/gpgme/util.c
index 021073300f529ba36b688389f4db171ae34f0b26..1d777a5d41d09e12ccfc9513b3160ff70c1ed30c 100644 (file)
--- a/gpgme/util.c
+++ b/gpgme/util.c
@@ -1,5 +1,6 @@
 /* util.c
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/util.h b/gpgme/util.h
index 0d901e65374b028378b1b20c3590f627408a2a7e..437276eab492bc9d31f924786107d1443bfa6c14 100644 (file)
--- a/gpgme/util.h
+++ b/gpgme/util.h
@@ -1,5 +1,6 @@
 /* util.h 
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *
@@ -47,6 +48,7 @@ void  _gpgme_free ( void *a );
 
 
 void _gpgme_debug (int level, const char *format, ...);
+int  _gpgme_debug_level (void);
 void _gpgme_debug_begin ( void **helper, int level, const char *text);
 int  _gpgme_debug_enabled ( void **helper );
 void _gpgme_debug_add (void **helper, const char *format, ...);

diff --git a/gpgme/verify.c b/gpgme/verify.c
index ce6a2bace14305e251366e44cf18f3846f509648..b611ece27d1cc7dfea7ac1fbf6e6ebfaa2ca853f 100644 (file)
--- a/gpgme/verify.c
+++ b/gpgme/verify.c
@@ -1,5 +1,6 @@
 /* verify.c -  signature verification
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/version.c b/gpgme/version.c
index cac19826f7c46c8793ffb0fb9b83390d6e1e1b68..0d8e5a7cbcc80c7d162b5f97f05cc41e954968cc 100644 (file)
--- a/gpgme/version.c
+++ b/gpgme/version.c
@@ -1,5 +1,6 @@
 /* version.c -  version check
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/w32-io.c b/gpgme/w32-io.c
index bfa0ad672ac9c722bd4467c73a50143ac88ac00b..7d06060d18e1417a492d601b5fabfd448944fc65 100644 (file)
--- a/gpgme/w32-io.c
+++ b/gpgme/w32-io.c
@@ -1,5 +1,6 @@
 /* w32-io.c - W32 API I/O functions
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/w32-sema.c b/gpgme/w32-sema.c
index 3b905c91beda741592b941d04fcfb60c0bafda2a..b8507f821a5b2f3860da25459a391a2f7505d94f 100644 (file)
--- a/gpgme/w32-sema.c
+++ b/gpgme/w32-sema.c
@@ -1,5 +1,6 @@
 /* w32-sema.c 
  *     Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/w32-util.c b/gpgme/w32-util.c
index 000ce0486ae87211bc976c6fe7767d892c6bf1a2..693a9c7715d574463cb9d23bae70bc369381bf23 100644 (file)
--- a/gpgme/w32-util.c
+++ b/gpgme/w32-util.c
@@ -1,6 +1,7 @@
 /* w32-util.c - Utility functions for the W32 API
- *     Copyright (C) 2001 Werner Koch (dd9jn)
  *      Copyright (C) 1999 Free Software Foundation, Inc
+ *     Copyright (C) 2001 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/wait.c b/gpgme/wait.c
index ff6524746997f16181dad25803116062519d4e08..47b2261ac851cc3714770727c85bc1d9ce1e7e8b 100644 (file)
--- a/gpgme/wait.c
+++ b/gpgme/wait.c
@@ -1,5 +1,6 @@
 /* wait.c 
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/gpgme/wait.h b/gpgme/wait.h
index 445be6d7785e090b6f5e6bcb2c4ded120eb08f2e..857e5d5bee94eb2969795224a83386c6835b0c00 100644 (file)
--- a/gpgme/wait.h
+++ b/gpgme/wait.h
@@ -1,5 +1,6 @@
 /* wait.h -  definitions for wait.c
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index ed5e20a458f3bd9c9710e7898dbc26cf784e1b52..b9a1c2bb6c44303c732466b77b8023aab3ce2ab6 100644 (file)
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -39,3 +39,14 @@ Mon Jan 24 13:04:28 CET 2000  Werner Koch  <wk@gnupg.de>
   (log_printf): New.
   (do_logv): Add kludge to insert LFs.
 
+
+ Copyright 2000 Werner Koch (dd9jn)
+ Copyright 2001 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

diff --git a/jnlib/Makefile.am b/jnlib/Makefile.am
index 5d6096919d801ff81a8845e81489fbcf275b78c7..1049f3c2ac3e47566012a6ceeefb82892e09a5c0 100644 (file)
--- a/jnlib/Makefile.am
+++ b/jnlib/Makefile.am
@@ -1,3 +1,21 @@
+# Copyright (C) 1999, 2000, 2001 Feee Software Soundation, Inc.
+# 
+# This file is part of GnuPG
+# 
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = README
@@ -16,4 +34,3 @@ libjnlib_a_SOURCES = libjnlib-config.h               \
                     types.h mischelp.h
 
 
-

diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index 0384c5d2569ce5dfadde7966f62fd330e6d990be..ba635585f1f461209d1fb5b6ed52fc8537eb49ba 100644 (file)
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -1,5 +1,5 @@
 /* [argparse.c wk 17.06.97] Argument Parser for option handling
- *     Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ *     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  *  This file is part of GnuPG.
  *

diff --git a/jnlib/argparse.h b/jnlib/argparse.h
index 3668a21cafc253ced5f2f71e4ee6df0d18c06220..e8922faa46fbfe864aa9268cfb8830399eb62019 100644 (file)
--- a/jnlib/argparse.h
+++ b/jnlib/argparse.h
@@ -1,5 +1,5 @@
 /* argparse.h
- *     Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ *     Copyright (C) 1998,1999,2000,2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/dotlock.c b/jnlib/dotlock.c
index 8e61f7a033c755279113d5836c2cd47492278d38..772c770e8bc4ea3dedb431b5bfbd0e71de178a01 100644 (file)
--- a/jnlib/dotlock.c
+++ b/jnlib/dotlock.c
@@ -1,5 +1,5 @@
 /* dotlock.c - dotfile locking
- *     Copyright (C) 1998,2000 Free Software Foundation, Inc.
+ *     Copyright (C) 1998,2000,2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/dotlock.h b/jnlib/dotlock.h
index d54219e232a3cc757685a166fe631fc0a5589f33..7d45c8286c6c49b1419a7ab36c4865ab875157db 100644 (file)
--- a/jnlib/dotlock.h
+++ b/jnlib/dotlock.h
@@ -1,5 +1,5 @@
 /* dotlock.h
- *     Copyright (C) 2000 Free Software Foundation, Inc.
+ *     Copyright (C) 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/libjnlib-config.h b/jnlib/libjnlib-config.h
index 4cc57b299a760b320abec2036dc9660073387a83..de8e6a478c00c4501a90461965e76224d90660b4 100644 (file)
--- a/jnlib/libjnlib-config.h
+++ b/jnlib/libjnlib-config.h
@@ -1,5 +1,5 @@
 /* libjnlib-config.h - local configuration of the jnlib functions
- *     Copyright (C) 2000 Free Software Foundation, Inc.
+ *     Copyright (C) 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/logging.c b/jnlib/logging.c
index 7ab2cb5786acc7f5c4345715637094b0771eaa72..f03c5c45eaf0ffd432677113a71f313d70c2c38f 100644 (file)
--- a/jnlib/logging.c
+++ b/jnlib/logging.c
@@ -1,5 +1,5 @@
 /* logging.c - useful logging functions
- *     Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ *     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/logging.h b/jnlib/logging.h
index 5084b71bdf99eed1ef086f7b22e6c3e202be6e29..83158f0b0271a82ffdd6924242dd0670e369df09 100644 (file)
--- a/jnlib/logging.h
+++ b/jnlib/logging.h
@@ -1,5 +1,5 @@
 /* logging.h
- *     Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ *     Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/mischelp.h b/jnlib/mischelp.h
index 684a6973d2fbde388f528daeabf6977c449cf9f9..58c9250e27660691200c97cec411798dbf6cf255 100644 (file)
--- a/jnlib/mischelp.h
+++ b/jnlib/mischelp.h
@@ -1,5 +1,5 @@
 /* mischelp.h
- *     Copyright (C) 1999 Free Software Foundation, Inc.
+ *     Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c
index 59345f27e6f9f93308978109ddc332bd8084fe53..f222a627c2964e538ad8da99bb4d50745e1990f3 100644 (file)
--- a/jnlib/stringhelp.c
+++ b/jnlib/stringhelp.c
@@ -1,5 +1,5 @@
 /* stringhelp.c -  standard string helper functions
- *     Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ *     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/stringhelp.h b/jnlib/stringhelp.h
index ebdd7b276889a236a82fc87963d164182fdbca75..5d124e401c742e87d74a0ffa3d273d05d2cb77b0 100644 (file)
--- a/jnlib/stringhelp.h
+++ b/jnlib/stringhelp.h
@@ -1,5 +1,5 @@
 /* stringhelp.h
- *     Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ *     Copyright (C) 1998,1999,2000,2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/types.h b/jnlib/types.h
index a5d0e42d3bb535a9dbd9557dad09c4928207171f..230d1502ff363553fd47ca94ae53ae5a481a9017 100644 (file)
--- a/jnlib/types.h
+++ b/jnlib/types.h
@@ -1,5 +1,5 @@
 /* types.h
- *     Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ *     Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/xmalloc.c b/jnlib/xmalloc.c
index 34ecc28a949739db0fb3e9fd8ac94dffcea01cdf..1cfaab9f774b395521b200637f70b2e5614779f8 100644 (file)
--- a/jnlib/xmalloc.c
+++ b/jnlib/xmalloc.c
@@ -1,5 +1,5 @@
 /* xmalloc.c - standard malloc wrappers
- *     Copyright (C) 1999 Free Software Foundation, Inc.
+ *     Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/jnlib/xmalloc.h b/jnlib/xmalloc.h
index 4dd88ec27f4dee4d35ae4a3f3777d1df24e4012e..150ef36640476078e96d9cbfe7028d97381cc0b0 100644 (file)
--- a/jnlib/xmalloc.h
+++ b/jnlib/xmalloc.h
@@ -1,5 +1,5 @@
 /* xmalloc.h
- *     Copyright (C) 1999 Free Software Foundation, Inc.
+ *     Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 27482bb8b8fe8a9184d9d461d65103396227f878..2d56612692bcd295a704dbc82a887a44fd0e3a52 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,24 @@
-## Process this file with automake to create Makefile.in
+# Copyright (C) 2000 Werner Koch (dd9jn)
+# Copyright (C) 2001 g10 Code GmbH
+# 
+# This file is part of GPGME.
+# 
+# GPGME 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.
+# 
+# GPGME is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
+
 
 TESTS_ENVIRONMENT = GNUPGHOME=. 
 

diff --git a/tests/t-decrypt.c b/tests/t-decrypt.c
index 677d3822c9cdd5b807d256f710bb03ac087231f1..af4c2d089893016ad6b6b00b53f89cf11aaaa21d 100644 (file)
--- a/tests/t-decrypt.c
+++ b/tests/t-decrypt.c
@@ -1,5 +1,6 @@
 /* t-encrypt.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/tests/t-encrypt.c b/tests/t-encrypt.c
index 86046902834de38cc9af16498eefc142b823f422..bbb5557bc23801b8c2821a51307d47c8e9722c47 100644 (file)
--- a/tests/t-encrypt.c
+++ b/tests/t-encrypt.c
@@ -1,5 +1,6 @@
 /* t-encrypt.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/tests/t-export.c b/tests/t-export.c
index 768e7394251ab82194f2b26822f46c6fb998e9f0..ca0ee985df13ddeb985528bc975c9d536a883d28 100644 (file)
--- a/tests/t-export.c
+++ b/tests/t-export.c
@@ -1,5 +1,6 @@
 /* t-export.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/tests/t-genkey.c b/tests/t-genkey.c
index d22b95ea1b5142a7e8b82543ce313542cf3751cc..a330056774fd4280278424fa914672d04915454e 100644 (file)
--- a/tests/t-genkey.c
+++ b/tests/t-genkey.c
@@ -1,5 +1,6 @@
 /* t-genkey.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/tests/t-import.c b/tests/t-import.c
index 93353393db2b10ff59f6a7b53d06ac76771771cf..8054ed61aa2f5e571ff8e8b08c92e90c863853f5 100644 (file)
--- a/tests/t-import.c
+++ b/tests/t-import.c
@@ -1,5 +1,6 @@
 /* t-import.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/tests/t-keylist.c b/tests/t-keylist.c
index 317990c6b03beaf0e4b2901e6b4fc89a4a3636c7..aa82a5b63aafe156a7ae7108281b9e773edf4079 100644 (file)
--- a/tests/t-keylist.c
+++ b/tests/t-keylist.c
@@ -1,5 +1,6 @@
 /* t-keylist.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/tests/t-sign.c b/tests/t-sign.c
index 79f6b5cb2f4786cdc477eda1093ea996d7c3ae7c..f57a1eaabc01f168655833cfbe95c7676174cf90 100644 (file)
--- a/tests/t-sign.c
+++ b/tests/t-sign.c
@@ -1,5 +1,6 @@
 /* t-sign.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/tests/t-trustlist.c b/tests/t-trustlist.c
index ce83d62cae77c67947236d1edb8ad5a57f594192..aaa704a115cd7f37402a9b3873da94fe559e80ae 100644 (file)
--- a/tests/t-trustlist.c
+++ b/tests/t-trustlist.c
@@ -1,5 +1,6 @@
 /* t-trustlist.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *

diff --git a/tests/t-verify.c b/tests/t-verify.c
index e0fbbe34542a7191578737179f530df7afe64d1a..b315d1f195a0a4e588f700ed8b77589bf1f9729e 100644 (file)
--- a/tests/t-verify.c
+++ b/tests/t-verify.c
@@ -1,5 +1,6 @@
 /* t-verify.c  - regression test
  *     Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
  *