sync

8 files changed, 66 insertions, 86 deletions

diff --git a/Makefile.am b/Makefile.am
index cd8ae7f6..b8f6282b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,5 +17,8 @@ dist-hook:
 		|| cp -p $(srcdir)/$$dir/$$i $(distdir)/$$dir/$$i; \
 	    done ; \
 	done
+	for file in po/cat-id-tbl.c po/gnupg.pot; do \
+	    rm $(distdir)/$$file || true ; \
+	done
 
 
diff --git a/README b/README
index fa2ea8c5..c220c00c 100644
--- a/README
+++ b/README
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-
-
-                  GNUPG - The GNU Privacy Guard
-                 -------------------------------
-                          Version 0.3
+		  GNUPG - The GNU Privacy Guard
+		 -------------------------------
+			  Version 0.3
 
 
     As you can see from the version number, the program may have some
@@ -51,7 +48,7 @@
     is still available, but due to the larger size of such signatures it
     is depreciated (Please note that the GNUPG implementation of ElGamal
     signatures is *not* insecure).  Symmetric algorithms are: Blowfish
-    and CAST5,  Digest algorithms are MD5, RIPEMD160, SHA1 and TIGER/192.
+    and CAST5,	Digest algorithms are MD5, RIPEMD160, SHA1 and TIGER/192.
 
 
 
@@ -60,7 +57,7 @@
 
     See the file INSTALL.  Here is a quick summary:
 
-    1)  "./configure"
+    1)	"./configure"
 
     2) "make"
 
@@ -75,7 +72,7 @@
     Key Generation
     --------------
 
-        gpg --gen-key
+	gpg --gen-key
 
     This asks some questions and then starts key generation. To create
     good random numbers for prime number generation, it uses a /dev/random
@@ -88,7 +85,7 @@
     You should make a revocation certificate in case someone gets
     knowledge of your secret key or you forgot your passphrase:
 
-        gpg --gen-revoke your_user_id
+	gpg --gen-revoke your_user_id
 
     Run this command and store it away; output is always ASCII armored,
     so that you can print it and (hopefully never) re-create it if
@@ -97,18 +94,18 @@
     If you decided to create a DSA key, you should add an ElGamal
     for encryption:
 
-        gpg --add-key user_id_of_your_key
+	gpg --add-key user_id_of_your_key
 
     and follow the displayed instructions (select "ElGamal using v4 packets").
 
 
     You can sign a key with this command:
 
-        gpg --sign-key Donald
+	gpg --sign-key Donald
 
     This let you sign the key of "Donald" with your default userid.
 
-        gpg --sign-key -u Karl -u Joe Donald
+	gpg --sign-key -u Karl -u Joe Donald
 
     This let you sign the key of of "Donald" with the userids of "Karl"
     and "Joe".
@@ -117,7 +114,7 @@
     whether you want to sign this key.
 
     You may remove a signature at any time using the option "--edit-sig",
-    which asks for the sigs to remove.  Self-signatures are not removable.
+    which asks for the sigs to remove.	Self-signatures are not removable.
 
 
 
@@ -125,16 +122,16 @@
     Sign
     ----
 
-        gpg -s file
+	gpg -s file
 
     This creates a file file.gpg which is compressed and has a signature
     attached.
 
-        gpg -sa file
+	gpg -sa file
 
     Same as above, but file.gpg is ascii armored.
 
-        gpg -s -o out file
+	gpg -s -o out file
 
     Creates a signature of file, but writes the output to the file "out".
 
@@ -142,12 +139,12 @@
     Encrypt
     -------
 
-        gpg -e -r heine file
+	gpg -e -r heine file
 
     This encrypts files with the public key of "heine" and writes it
     to "file.gpg"
 
-        echo "hallo" | gpg -ea -r heine | mail heine
+	echo "hallo" | gpg -ea -r heine | mail heine
 
     Ditto, but encrypts "hallo\n" and mails it as ascii armored message.
 
@@ -155,13 +152,13 @@
     Sign and Encrypt
     ----------------
 
-        gpg -se -r heine file
+	gpg -se -r heine file
 
     This encrypts files with the public key of "heine" and writes it
     to "file.gpg" after signing it with the default user id.
 
 
-        gpg -se -r heine -u Suttner file
+	gpg -se -r heine -u Suttner file
 
     Ditto, but sign the file with the user id "Suttner"
 
@@ -170,17 +167,17 @@
     ------------------
     To export your complete keyring(s) do this:
 
-        gpg --export
+	gpg --export
 
     To export only some user ids do this:
 
-        gpg --export userids
+	gpg --export userids
 
     Use "-a" or "--armor" to create ASCII armored output.
 
     Importing keys is done with the option, you guessed it, "--import":
 
-        gpg --import [filenames]
+	gpg --import [filenames]
 
     New keys are appended to the default keyring and already existing
     keys are merged.  Keys without a self-signature are ignored.
@@ -192,40 +189,40 @@
 
     * Only by the short keyid (prepend a zero if it begins with A..F):
 
-        "234567C4"
-        "0F34E556E"
-        "01347A56A"
-        "0xAB123456
+	"234567C4"
+	"0F34E556E"
+	"01347A56A"
+	"0xAB123456
 
     * By a complete keyid:
 
-        "234AABBCC34567C4"
-        "0F323456784E56EAB"
-        "01AB3FED1347A5612"
-        "0x234AABBCC34567C4"
+	"234AABBCC34567C4"
+	"0F323456784E56EAB"
+	"01AB3FED1347A5612"
+	"0x234AABBCC34567C4"
 
     * By a fingerprint:
 
-        "1234343434343434C434343434343434"
-        "123434343434343C3434343434343734349A3434"
-        "0E12343434343434343434EAB3484343434343434"
+	"1234343434343434C434343434343434"
+	"123434343434343C3434343434343734349A3434"
+	"0E12343434343434343434EAB3484343434343434"
 
       The first one is MD5 the others are ripemd160 or sha1.
 
     * By an exact string (not yet implemented):
 
-        "=Heinrich Heine <heinrichh@uni-duesseldorf.de>"
+	"=Heinrich Heine <heinrichh@uni-duesseldorf.de>"
 
     * By an email address:
 
-        "<heinrichh@uni-duesseldorf.de>"
+	"<heinrichh@uni-duesseldorf.de>"
 
       This can be used by a keyserver instead of a substring to
       find this key faster.
 
     * By the Local ID (from the trustdb):
 
-        "#34"
+	"#34"
 
       This can be used by a MUA to specify an exact key after selecting
       a key from GNUPG (by the use of a special option or an extra utility)
@@ -233,8 +230,8 @@
 
     * Or by the usual substring:
 
-        "Heine"
-        "*Heine"
+	"Heine"
+	"*Heine"
 
       The '*' indicates substring search explicitly.
 
@@ -264,21 +261,21 @@
     Esoteric commands
     -----------------
 
-        gpg --list-packets datafile
+	gpg --list-packets datafile
 
     Use this to list the contents of a data file. If the file is encrypted
     you are asked for the passphrase, so that GNUPG is able to look at the
     inner structure of a encrypted packet.
 
-        gpgm --list-trustdb
+	gpgm --list-trustdb
 
     List the contents of the trustdb in a human readable format
 
-        gpgm --list-trustdb  <usernames>
+	gpgm --list-trustdb  <usernames>
 
     List the tree of certificates for the given usernames
 
-        gpgm --list-trust-path  depth  username
+	gpgm --list-trust-path	depth  username
 
     List the possible trust paths for the given username, up to the specified
     depth.  If depth is negative, duplicate introducers are not listed,
@@ -287,24 +284,10 @@
      using a negative number). This option may create new entries in the
     trustdb.
 
-        gpgm --print-mds  filenames
+	gpgm --print-mds  filenames
 
     List all available message digest values for the fiven filenames
 
-        gpgm --gen-prime n
-
-    Generate and print a simple prime number of size n
-
-        gpgm --gen-prime n q
-
-    Generate a prime number suitable for ElGamal signatures of size n with
-    a q as largest prime factor of n-1.
-
-        gpgm --gen-prime n q 1
-
-    Ditto, but calculate a generator too.
-
-
     For more options/commands see the file g10/OPTIONS, or use "gpg --help"
 
 
@@ -314,17 +297,17 @@
     can be used multiple times, all values are ORed; n maybe prefixed with
     0x to use hex-values.
 
-         value  used for
-         -----  ----------------------------------------------
-          1     packet reading/writing
-          2     MPI details
-          4     ciphers and primes (may reveal sensitive data)
-          8     iobuf filter functions
-          16    iobuf stuff
-          32    memory allocation stuff
-          64    caching
-          128   show memory statistics at exit
-          256   trust verification stuff
+	 value	used for
+	 -----	----------------------------------------------
+	  1	packet reading/writing
+	  2	MPI details
+	  4	ciphers and primes (may reveal sensitive data)
+	  8	iobuf filter functions
+	  16	iobuf stuff
+	  32	memory allocation stuff
+	  64	caching
+	  128	show memory statistics at exit
+	  256	trust verification stuff
 
 
     Other Notes
@@ -342,14 +325,3 @@
     post them to the mailing list <g10@net.lut.ac.uk> (this is a closed list,
     please subscribe before posting).
 
-
-
------BEGIN PGP SIGNATURE-----
-Version: 2.6.3ia
-Charset: noconv
-
-iQB1AwUBNaIyMR0Z9MEMmFelAQGGFgMAm0RkKqH6DwIl3cu4ETQROprnwbl0sc21
-05CQCsATs/0oQ8R2GhH1vXyHQnGw4Abg8IHqe+fADUA8cpf1ijfPzgeq+qhp7rqs
-EenOw3xe8RrsrvovkCy91AtYl8zyVdC8
-=IgnL
------END PGP SIGNATURE-----
diff --git a/THANKS b/THANKS
index 4cf90edc..70a82744 100644
--- a/THANKS
+++ b/THANKS
@@ -23,6 +23,7 @@ Marco d'Itri            md@linux.it
 Mark Adler		madler@alumni.caltech.edu
 Martin Schulte		schulte@thp.uni-koeln.de
 Matthew Skala		mskala@ansuz.sooke.bc.ca
+Max Valianskiy		maxcom@maxcom.ml.org
 Nicolas Graner		Nicolas.Graner@cri.u-psud.fr
 Peter Gutmann		pgut001@cs.auckland.ac.nz
 Ralph Gillen		gillen@theochem.uni-duesseldorf.de
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index bee03492..01095286 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 13 21:30:52 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* random.c (read_pool): Simple alloc if secure_alloc is not set.
+	(get_random_bits): Ditto.
+
 Thu Jul  9 13:01:14 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* dynload.c (load_extension): Function now nbails out if
diff --git a/cipher/primegen.c b/cipher/primegen.c
index 23aa1dbe..66d40dbf 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -281,7 +281,6 @@ gen_prime( unsigned  nbits, int secret, int randomlevel )
     mods = m_alloc( no_of_small_prime_numbers * sizeof *mods );
     /* make nbits fit into MPI implementation */
     nlimbs = (nbits + BITS_PER_MPI_LIMB - 1) /	BITS_PER_MPI_LIMB;
-    assert( nlimbs );
     val_2  = mpi_alloc( nlimbs );
     mpi_set_ui(val_2, 2);
     val_3  = mpi_alloc( nlimbs );
diff --git a/cipher/random.c b/cipher/random.c
index f44e4c3a..75754cd0 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -153,7 +153,7 @@ get_random_bits( size_t nbits, int level, int secure )
     size_t nbytes = (nbits+7)/8;
 
     MASK_LEVEL(level);
-    buf = secure? m_alloc_secure( nbytes ) : m_alloc( nbytes );
+    buf = secure && secure_alloc ? m_alloc_secure( nbytes ) : m_alloc( nbytes );
     read_pool( buf, nbytes, level );
     return buf;
 }
@@ -222,7 +222,7 @@ read_pool( byte *buffer, size_t length, int level )
 	needed = length - pool_balance;
 	if( needed > POOLSIZE )
 	    BUG();
-	p = m_alloc_secure( needed );
+	p = secure_alloc ? m_alloc_secure( needed ) : m_alloc(needed);
 	read_random_source( p, needed, 2 ); /* read /dev/random */
 	add_randomness( p, needed, 3);
 	m_free(p);
diff --git a/configure.in b/configure.in
index 005a1b5f..80a5c07d 100644
--- a/configure.in
+++ b/configure.in
@@ -182,7 +182,7 @@ fi
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(strerror stpcpy strlwr tcgetattr rand strtoul mlock mmap)
-AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime)
+AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit)
 
 
 dnl check whether we have a random device
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 020338b4..dc2ee585 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-EXTRA_DIST = DETAILS rfcs gpg.1pod gpg.1
+EXTRA_DIST = DETAILS rfcs gpg.1pod gpg.1 FAQ
 
 man_MANS = gpg.1