diff --git a/ChangeLog b/ChangeLog
index 21697889be9218097c02832f306b467138db1563..84f85a19f6f9e159333a30ba12951ad8a7091c97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
 2002-10-09  Niels M�ller  <nisse@cuckoo.hack.org>
 
+	* Makefile.am (libnettle_a_SOURCES): Added bignum-random.c and
+	dsa-keygen.c. 
+
+	* testsuite/testutils.c (test_dsa_key): New function to sanity
+	check a dsa keypair.
+
+	* testsuite/dsa-test.c (test_main): Call dsa_test_key.
+
+	* testsuite/dsa-keygen-test.c: New test case.
+
+	* dsa.h (DSA_MINIMUM_BITS): New constant.
+
+	* bignum.h (nettle_mpz_random, nettle_mpz_random_size): Added
+	prototypes.
+
+	* dsa-keygen.c: New file.
+
+	* bignum-random.c: New file.
+	(nettle_mpz_random): New function, moved from...
+	* dsa-sign.c (nettle_mpz_random): ... here. Also changed argument
+	ordering and updated callers. 
+	
+	* bignum-random.c: (nettle_mpz_random_size): New function, renamed
+	and moved here from...  
+	* rsa-keygen.c (bignum_random_size): ... here. Updated all
+	callers. 
+
 	* testsuite/testutils.c (test_dsa): Needs both public and private
 	key as arguments.
 
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
index ce920987f3ddc917634bdf84b7511c7875e8f5a2..102da7bcabb14802f1e54feab0bee53e6904db06 100644
--- a/testsuite/.cvsignore
+++ b/testsuite/.cvsignore
@@ -12,6 +12,7 @@ cbc-test
 des-compat-test
 des-test
 des3-test
+dsa-keygen-test
 dsa-test
 hmac-test
 knuth-lfib-test
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index f32a7864c734f7bdffc331ac50df759255b812d8..60d2bbbb5686816648c92b3c45ae97a80aa863bc 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -12,6 +12,7 @@
 /des-compat-test
 /des-test
 /des3-test
+/dsa-keygen-test
 /dsa-test
 /hmac-test
 /knuth-lfib-test