diff --git a/ChangeLog b/ChangeLog
index e7e2e12313945f5dbe1b2ee3e0104a1397757c34..2f78feb00f4e53312691707321faa8c29a110b53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2000-10-03  Niels Möller  <nisse@cuckoo.localdomain>
+
+	* src/spki.c (spki_make_signer): New function. Used in
+	do_spki_sexp2signer() and parse_private_key().
+	(spki_make_public_key): New function. Used in spki_signer2public()
+	and parse_private_key().
+
+	* src/lsh-decode-key.c (do_decode_key): Build
+	<public-key>-expression. 
+
+	* src/interact.h: New class abstract_interact (not yet used). 
+	* src/interact.c: New class interact_unix, still #if:ed out.
+
+	* src/abstract_crypto.h (signer): Changed the conventions for
+	SIGNER_PUBLIC(). Now returns ( <pub-sig-alg-id> <s-expr>* ), not
+	<public-key>. 
+	* src/dsa.c (make_dsa_public_key): Updated for the new convention. 
+	* src/rsa.c (do_rsa_public_key): Likewise.
+
+	* src/testsuite/Makefile.am (TS_PROGS): Added tests for rsa and
+	dsa. 
+
+	* src/sexp-conv.c (do_sexp_select): Bugfix in OP_CAR. 
+
+2000-10-01  Niels Möller  <nisse@cuckoo.localdomain>
+
+	* src/sexp-conv.c: New option --select.
+	(do_sexp_select): New function.
+	(make_sexp_select_command): New function.
+
+	* src/testsuite/macros.m4 (TS_TEST_SIGN): Bug fixes.
+	(main): Recognize options -v, --debug etc.
+
+	* src/rsa.c (rsa_compute_root): Fixed bug in CRT calculation.
+
+	* src/keyexchange.c (select_algorithm): Reversed order of
+	arguments. (Fixes a bug reported by jps).
+	(do_handle_kexinit): Use symbolic constants when indexing
+	connection->kexinits. 
+
 2000-09-26  Niels Möller  <nisse@cuckoo.localdomain>
 
 	* src/dsa_keygen.c (dsa_generate_key): Added lost
diff --git a/src/testsuite/.cvsignore b/src/testsuite/.cvsignore
index 9390d3931d50297b62dc4cbcd1708f33b4a6a76d..6f6f105be0331c925d91fd8b375b4e6b1ab63ece 100644
--- a/src/testsuite/.cvsignore
+++ b/src/testsuite/.cvsignore
@@ -3,13 +3,18 @@ Makefile
 Makefile.in
 des-test
 des-test.c
+dsa-test
+dsa-test.c
 foo
 foo.pub
 md5-test
 md5-test.c
+rsa-test
+rsa-test.c
 sha1-test
 sha1-test.c
 spki-tag-test
 spki-tag-test.c
+temphome
 twofish-test
 twofish-test.c
diff --git a/src/testsuite/.gitignore b/src/testsuite/.gitignore
index 202a731400656316bbff12167fb14262ab0dab2b..11bc18260daab83aa8a841cdfcf2cde28817e15c 100644
--- a/src/testsuite/.gitignore
+++ b/src/testsuite/.gitignore
@@ -3,13 +3,18 @@
 /Makefile.in
 /des-test
 /des-test.c
+/dsa-test
+/dsa-test.c
 /foo
 /foo.pub
 /md5-test
 /md5-test.c
+/rsa-test
+/rsa-test.c
 /sha1-test
 /sha1-test.c
 /spki-tag-test
 /spki-tag-test.c
+/temphome
 /twofish-test
 /twofish-test.c