last hour fixes.

11 files changed, 41 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c83c81dd..40a29d74c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-27  Werner Koch  <[email protected]>
+
+	* README: Removed a few outdated paragraphs.
+
 2001-04-17  Werner Koch  <[email protected]>
 
 	* acinclude.m4 (GNUPG_CHECK_DOCBOOK_TO_TEXI): New.
diff --git a/README b/README
index 69fa4f531..277c0c6af 100644
--- a/README
+++ b/README
@@ -36,9 +36,7 @@
     is still available, but because of the larger size of such
     signatures it is deprecated (Please note that the GnuPG
     implementation of ElGamal signatures is *not* insecure).  Symmetric
-    algorithms are: 3DES, Blowfish, CAST5 and Twofish (GnuPG does not
-    yet create Twofish encrypted messages because there is no agreement
-    in the OpenPGP WG on how to use it together with a MDC algorithm)
+    algorithms are: AES, 3DES, Blowfish, CAST5 and Twofish 
     Digest algorithms available are MD5, RIPEMD160 and SHA1.
 
 
@@ -100,41 +98,19 @@
 
 		$ gpg --fingerprint 0x57548DCD
 
-       with the elsewhere published fingerprint, or - if you are able to
-       _positively_ verify the signature of this README file - with
-       this fingerprint: "6BD9 050F D8FC 941B 4341  2DCC 68B7 AB89 5754 8DCD"
+       with the elsewhere published fingerprint
 
        Please note, that you have to use an old version of GnuPG to
        do all this stuff.  *Never* use the version which you are going
        to check!
 
 
-    b) If you have a trusted Version of PGP 2 or 5 installed, you
-       can check the supplied PGP 2 signature:
-
-	$ pgp gnupg-x.y.z.tar.gz.sig gnupg-x.y.z.tar.gz
-
-       This checks that the detached signature gnupg-x.y.z.tar.gz.sig
-       is indeed a a signature of gnupg-x.y.z.tar.gz.  Please note,
-       that this signature has been created with a RSA signature and
-       you probably can't use this method (due to legal reasons) when
-       you are in the U.S.  The key used to create this signature is
-       the same as the one used to sign this README file.  It should be
-       available at the keyservers and is also included in the source
-       of GnuPG in g10/pubring.asc.
-
-       "pub   768R/0C9857A5 1995-09-30 Werner Koch <[email protected]>"
-
-       The fingerprint of this key is published in printed form in the
-	  "Global Trust Register for 1998", ISBN 0-9532397-0-5.
-
-
-    c) If you don't have any of the above programs, you have to verify
+    b) If you don't have any of the above programs, you have to verify
        the MD5 checksum:
 
 	$ md5sum gnupg-x.y.z.tar.gz
 
-       This should yield an output similar_to this:
+       This should yield an output _similar_ to this:
 
 	fd9351b26b3189c1d577f0970f9dcadc  gnupg-x.y.z.tar.gz
 
@@ -146,7 +122,7 @@
     Documentation
     -------------
 
-    The manual will be distributed separate under the name "gnupgdoc".
+    The manual will be distributed separate under the name "gph".
     An online version of the latest manual draft is available at the
     GnuPG web pages:
 
@@ -488,7 +464,7 @@
     ---------------------------
 
     The primary WWW page is "http://www.gnupg.org"
-    The primary FTP site is "ftp://ftp.gnupg.org/pub/gcrypt/"
+    The primary FTP site is "ftp://ftp.gnupg.org/gcrypt/"
 
     See http://www.gnupg.org/mirrors.html for a list of mirrors
     and use them if possible.  You may also find GnuPG mirrored on
diff --git a/THANKS b/THANKS
index 2b75cab42..c9d507cf0 100644
--- a/THANKS
+++ b/THANKS
@@ -98,6 +98,7 @@ Klaus Singvogel            [email protected]
 Lars Kellogg-Stedman	   [email protected]
 L. Sassaman		   [email protected]
 M Taylor                   [email protected]                 
+Marcel Waldvogel           [email protected]
 Marco d'Itri               [email protected]
 Mark Adler		   [email protected]
 Mark Elbrecht		   [email protected]
diff --git a/acinclude.m4 b/acinclude.m4
index d5acb03fb..f11f2c790 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -96,7 +96,7 @@ AC_DEFUN(GNUPG_CHECK_DOCBOOK_TO_TEXI,
     AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no)
     AC_MSG_CHECKING(for sgml to texi tools)
     working_sgmltotexi=no
-    if test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes; then
+    if test "$ac_cv_prog_DOCBOOK_TO_TEXI" = yes; then
       if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then
             working_sgmltotexi=yes
       fi
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 42fe7ddc9..f32db206c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-28  Werner Koch  <[email protected]>
+
+	* getkey.c (merge_public_with_secret): pkttype was not set to subkey.
+
+2001-04-27  Werner Koch  <[email protected]>
+
+	* skclist.c (build_sk_list): Changed one log_debug to log_info.
+
 2001-04-25  Werner Koch  <[email protected]>
 
 	* keyedit.c (show_prefs): Add a verbose mode.
@@ -12,7 +20,7 @@
 	error and made it translatable.
 
 	* build-packet.c (do_secret_key): Ugly, we wrote a zero
-	instead of the calucalted ndays.  Thanks to M Taylor for complaining
+	instead of the computed ndays.  Thanks to M Taylor for complaining
 	about a secret key import problem.
 
 2001-04-23  Werner Koch  <[email protected]>
diff --git a/g10/getkey.c b/g10/getkey.c
index b70918352..6fec97064 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1886,7 +1886,7 @@ merge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
                     if ( !cmp_public_secret_key ( pk, sk ) ) {
                         copy_public_parts_to_secret_key ( pk, sk );
                         free_public_key ( pk );
-                        pub->pkt->pkttype = PKT_SECRET_KEY;
+                        pub->pkt->pkttype = PKT_SECRET_SUBKEY;
                         pub->pkt->pkt.secret_key = copy_secret_key (NULL, sk);
                         break;
                     }
diff --git a/g10/skclist.c b/g10/skclist.c
index dfa4d9865..c40bff91d 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -146,7 +146,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
 	    }
             else if ( key_present_in_sk_list(sk_list, sk) == 0) {
                 free_secret_key(sk); sk = NULL;
-                log_debug(_("skipped: secret key already present\n"));
+                log_info(_("skipped: secret key already present\n"));
             }
             else if ( unlock && (rc = check_secret_key( sk, 0 )) ) {
 		free_secret_key( sk ); sk = NULL;
diff --git a/po/ChangeLog b/po/ChangeLog
index ce3f90444..332ccb621 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-27  Werner Koch  <[email protected]>
+
+	* de.po: Removed an extra "%s".
+
 2001-04-25  Werner Koch  <[email protected]>
 
 	* fr.po: Updated.
diff --git a/po/de.po b/po/de.po
index 19361859c..8ddcc311d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3475,7 +3475,7 @@ msgstr "�bersprungen '%s': %s\n"
 
 #: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
-msgstr "%s: �bersprungen: geheimer Schl�ssel bereits vorhanden\n"
+msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
 #: g10/skclist.c:160
 #, c-format
diff --git a/util/ChangeLog b/util/ChangeLog
index 5e69e7cb4..c91c3d9d0 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-27  Werner Koch  <[email protected]>
+
+	* memory.c (out_of_core): Print an explanation on reasons why
+	secret memory can get exhausted.
+
 2001-04-23  Werner Koch  <[email protected]>
 
 	* http.c (http_wait_response): Implement new flag to inhibit the
diff --git a/util/memory.c b/util/memory.c
index ef9a315dc..0f2d8e12d 100644
--- a/util/memory.c
+++ b/util/memory.c
@@ -383,9 +383,14 @@ m_dump_table( const char *prefix )
 static void
 out_of_core(size_t n, int secure)
 {
-    log_fatal("out of %s memory while allocating %u bytes\n",
-			secure? "secure":"" ,(unsigned)n );
-
+    log_error ("out of %s memory while allocating %u bytes\n",
+               secure? "secure":"" ,(unsigned)n );
+    if (secure) {
+        /*secmem_dump_stats ();*/
+        log_info ("(this may be caused by too many secret keys used "
+                  "simultaneously or due to excessive large key sizes)\n");
+    }
+    exit (2);
 }
 
 /****************