util/

* memory.c (alloc): Malloc at least 1 byte.  Noted by Winona Brown.
g10/
* options.skel: Removed the comment on trusted-keys because this
option is now deprecated.

THANKS

@@ -198,6 +198,7 @@ Walter Koch		   koch@hsp.de
 Wayne Chapeskie 	   waynec@spinnaker.com
 Werner Koch		   wk@gnupg.org
 Wim Vandeputte		   bunbun@reptile.rug.ac.be
+Winona Brown               win@huh.org
 Yosiaki IIDA		   iida@ring.gr.jp
 Yoshihiro Kajiki	   kajiki@ylug.org
                            disastry@saiknes.lv

g10/ChangeLog

@@ -1,3 +1,8 @@
+2002-05-02  Werner Koch  <wk@gnupg.org>
+
+	* options.skel: Removed the comment on trusted-keys because this
+	option is now deprecated.
+
 2002-05-01  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyedit.c (menu_adduid): 2440bis04 says that multiple attribute

g10/options.skel

@@ -31,17 +31,6 @@ $Id$
 
 #default-key 621CC013
 
-# GnuPG ultimately trusts all keys in the secret keyring.  If you do
-# not have all your secret keys online available you should use this
-# option to tell GnuPG about ultimately trusted keys.
-# You have to give the long keyID here which can be obtained by using
-# the --list-key command along with the option --with-colons; you will
-# get a line similiar to this one:
-#    pub:u:1024:17:5DE249965B0358A2:1999-03-15:2006-02-04:59:f:
-# the 5th field is what you want.
-
-#trusted-key 12345678ABCDEF01
-
 
 # If you do not pass a recipient to gpg, it will ask for one.
 # Using this option you can encrypt to a default key.  key validation

po/ChangeLog

@@ -1,3 +1,7 @@
+2002-04-30  Werner Koch  <wk@gnupg.org>
+
+	* ja.po: Updated, also a bit too late for the release.
+
 2002-04-29  Werner Koch  <wk@gnupg.org>
 
 	* pl.po: Update.

po/de.po

@@ -823,7 +823,7 @@ msgstr "WARNUNG: %s ist eine mi
 #: g10/g10.c:1253 g10/g10.c:1270
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "Bitte benutzen Sie stattdessen \"--keyserver-option %s\".\n"
+msgstr "Bitte benutzen Sie stattdessen \"--keyserver-options %s\".\n"
 
 #: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"

util/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-02  Werner Koch  <wk@gnupg.org>
+
+	* memory.c (alloc): Malloc at least 1 byte.  Noted by Winona Brown. 
+
 2002-04-23  David Shaw  <dshaw@jabberwocky.com>
 
  	* miscutil.c: New function answer_is_yes_no_default() to give a

util/memory.c

@@ -415,6 +415,8 @@ FNAME(alloc)( size_t n FNAMEPRT )
     char *p;
 
   #ifdef M_GUARD
+    if(!n)
+      out_of_core(n,0); /* should never happen */
     if( !(p = malloc( n + EXTRA_ALIGN+5 )) )
 	out_of_core(n,0);
     store_len(p,n,0);
@@ -422,6 +424,10 @@ FNAME(alloc)( size_t n FNAMEPRT )
     p[4+EXTRA_ALIGN+n] = MAGIC_END_BYTE;
     return p+EXTRA_ALIGN+4;
   #else
+    /* mallocing zero bytes is undefined by ISO-C, so we better make
+       sure that it won't happen */
+    if (!n)
+      n = 1;
     if( !(p = malloc( n )) )
 	out_of_core(n,0);
     return p;