diff --git a/ChangeLog b/ChangeLog
index 3a4e259b9d710dafaed16419247b00cd6919fa01..0a6b20d2bc736417016e2d35a73266682608232f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2002-01-14  Niels M�ller  <nisse@cuckoo.hack.org>
+
+	* des.c: Use static const for all tables.
+	(des_set_key): Use a new const * variable for the parity
+	procesing, for constness reasons.
+
+	* list-obj-sizes.awk: New file.
+
+	* nettle-internal.c, nettle-internal.h: New files.
+
+	* testsuite/Makefile.am (TS_PROGS): Added hmac-test. Deleted old
+	m4-stuff. 
+
+	* testsuite/testutils.h (LDATA): Moved this macro here,...
+	* testsuite/rsa-test.c: ... from here.
+
+	* testsuite/hmac-test.c: New file.
+
+	* hmac.h: General cleanup. Added declarations of hmac-md5,
+	hmac-sha1 and hmac-sha256.
+
+	* hmac.c: Bug fixes.
+
+	* hmac-md5.c: First working version.
+
+	* Makefile.am (libnettle_a_SOURCES): Added hmac.c and hmac-md5.c.
+	(libnettleinclude_HEADERS): Added hmac.h.
+
+	* testsuite/rsa-test.c: Also test a 777-bit key.
+
+	* rsa.c (rsa_check_size): Changed argument to an mpz_t. Updated
+	callers. 
+	(rsa_prepare_private_key): Compute the size of the key by
+	computing n = p * q.
+
+	* rsa-compat.c: Adapted to new private key struct.
+	* rsa_md5.c: Likesize.
+	* rsa_sha1.c: Likesize.
+
+	* rsa.c (rsa_check_size): New function, for computing and checking
+	the size of the modulo in octets.
+	(rsa_prepare_public_key): Usa rsa_check_size.
+	(rsa_init_private_key): Removed code handling n, e and d.
+	(rsa_clear_private_key): Likewise.
+	(rsa_compute_root): Always use CRT.
+
+	* rsa.h (struct rsa_private_key): Deleted public key and d from
+	the struct, as they are not needed. Added size attribute.
+
 2002-01-12  Niels M�ller  <nisse@cuckoo.hack.org>
 
 	* Makefile.am: Added *-meta files.
diff --git a/hmac-md5.h b/hmac-md5.h
deleted file mode 100644
index 014e51b98a1c7547bdc105fb81dae42572721f9a..0000000000000000000000000000000000000000
--- a/hmac-md5.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* hmac-md5.h
- *
- * HMAC message authentication code.
- */
-
-/* nettle, low-level cryptographics library
- *
- * Copyright (C) 2001 Niels M�ller
- *  
- * The nettle library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version.
- * 
- * The nettle library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- */
-
-#ifndef NETTLE_HMAC_MD5_H_INCLUDED
-#define NETTLE_HMAC_MD5_H_INCLUDED
-
-#include "hmac.h"
-#include "md5.h"
-
-struct hmac_md5_ctx HMAC_CTX(struct md5_ctx);
-
-void
-hmac_md5_set_key(struct hmac_md5_ctx *ctx,
-		 unsigned key_length, const uint8_t *key);
-
-void
-hmac_md5_update(struct hmac_md5_ctx *ctx,
-		unsigned length, const uint8_t *data);
-
-void
-hmac_md5_digest(struct hmac_md5_ctx *ctx,
-		unsigned length, uint8_t *digest);
-
-#endif /* NETTLE_HMAC_MD5_H_INCLUDED */
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
index 43b8e148f95638c73f86eaf2ff68ce7fa0e129ef..e5ea43f0abda67b56bf95cd90653ee99eef89b3b 100644
--- a/testsuite/.cvsignore
+++ b/testsuite/.cvsignore
@@ -10,6 +10,7 @@ cbc-test
 des-compat-test
 des-test
 des3-test
+hmac-test
 md5-compat-test
 md5-test
 rsa-test
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index d5a69bd2542b7678fd575ef302eac51ef6b1f3af..caf040e089acfab54ddff83dfc58d5dcce61e024 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -10,6 +10,7 @@
 /des-compat-test
 /des-test
 /des3-test
+/hmac-test
 /md5-compat-test
 /md5-test
 /rsa-test