diff --git a/ChangeLog b/ChangeLog
index ea1140d7958976053630e297291c532165ccc81a..85253ebee0324297a4e0d0f68f144100918a3099 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -341,7 +341,7 @@
 	Put SA--SD in %eax--%edx, so the second byte can be accessed as
 	%ah-%dh. TD is not needed, SD can be reused. Use the register that
 	is saved for the outer loop counter, getting it off the stack.
-	* x86_64/aes-encrypt-internal.asm: Likewise.	
+	* x86_64/aes-encrypt-internal.asm: Likewise.
 
 	* x86_64/aes.m4 (HREG, MOVE_HREG): New macros.
 	(XREG): Fixed bug in handling of %r8 and %r9.
@@ -462,7 +462,7 @@
 
 	* x86/aes-encrypt-internal.asm: Updated use of AES_SUBST_BYTE. USe
 	decl for outer loop.
-	* x86/aes-decrypt-internal.asm: Likewise.	
+	* x86/aes-decrypt-internal.asm: Likewise.
 
 	* x86/aes.m4 (LREG, HREG): New macros.
 	(AES_SUBST_BYTE): Take state registers as argument. Use LREG to
@@ -480,7 +480,7 @@
 	* Makefile.in (stamp-h.in): Use $(AUTOHEADER).
 
 	* x86_64/sha1-compress.asm: New x86_64 assembler, based on the x86
-	version.	
+	version.
 
 	* configure.ac (asm_path): Set up asm_path for x86_64.
 
@@ -495,7 +495,7 @@
 
 	* testsuite/sexp-conv-test (print_raw, print_nl): Use printf.
 	Updated testcases with comments; comments are now preserved.
-	
+
 	* tools/sexp-conv.c (sexp_convert_item): Keep comments in advanced
 	output.
 	(parse_options): New --lock option.
@@ -586,7 +586,7 @@
 2007-06-02  Niels M�ller  <nisse@lysator.liu.se>
 
 	* Makefile.in: Typo fixes to install targets, spotted by Magnus
-	Holmgren. 
+	Holmgren.
 
 2007-05-14  Niels M�ller  <niels@s3.kth.se>
 
@@ -632,14 +632,14 @@
 
 	* testsuite/Makefile.in (TS_NETTLE_SOURCES, TS_HOGWEED_SOURCES):
 	Separate test cases using nettle and those also using hogweed.
-	
+
 2007-04-05  Niels M�ller  <nisse@lysator.liu.se>
 
 	* Moved in CVS tree. Also renamed directory sparc to sparc32.
 
 2007-02-24  Niels M�ller  <nisse@lysator.liu.se>
 
-	* Makefile.in (clean-here): Remove .lib directory. 
+	* Makefile.in (clean-here): Remove .lib directory.
 	(distclean-here): Remove machine.m4.
 
 2006-12-05  Niels M�ller  <nisse@lysator.liu.se>
@@ -678,7 +678,7 @@
 	gold-bug.txt.
 
 	* rsa.h (rsa_sha256_sign, rsa_sha256_verify)
-	(rsa_sha256_sign_digest, rsa_sha256_verify_digest): New declarations. 
+	(rsa_sha256_sign_digest, rsa_sha256_verify_digest): New declarations.
 	(RSA_MINIMUM_N_OCTETS, RSA_MINIMUM_N_BITS): Increased to
 	62 octets and  489 bits, respectively, for supporting sha256.
 
@@ -754,48 +754,48 @@
 
 2006-05-16  Niels M�ller  <niels@s3.kth.se>
 	Merged from the lsh experimental branch.
-	
+
 2006-04-26  Niels M�ller  <nisse@lysator.liu.se>
 
-        * examples/rsa-decrypt.c: Don't include "getopt.h", since it's not used.
-        * examples/nettle-benchmark.c: Include "getopt.h".
+	* examples/rsa-decrypt.c: Don't include "getopt.h", since it's not used.
+	* examples/nettle-benchmark.c: Include "getopt.h".
 
-        * examples/Makefile.in (GETOPT_OBJS): New variable.
-        (rsa-keygen, rsa-encrypt, nettle-benchmark): Depend on and link
-        with $(GETOPT_OBJS).
+	* examples/Makefile.in (GETOPT_OBJS): New variable.
+	(rsa-keygen, rsa-encrypt, nettle-benchmark): Depend on and link
+	with $(GETOPT_OBJS).
 
-        * x86/aes-decrypt-internal.asm: Use ALIGN.
-        * x86/aes-encrypt-internal.asm: Likewise.
-        * x86/arcfour-crypt.asm: Likewise.
-        * x86/md5-compress.asm: Likewise.
-        * x86/sha1-compress.asm: Likewise.
+	* x86/aes-decrypt-internal.asm: Use ALIGN.
+	* x86/aes-encrypt-internal.asm: Likewise.
+	* x86/arcfour-crypt.asm: Likewise.
+	* x86/md5-compress.asm: Likewise.
+	* x86/sha1-compress.asm: Likewise.
 
-        * config.m4.in (ASM_ALIGN_LOG): Substitute.
-        * configure.ac (ASM_ALIGN_LOG): Check if .align directive is
-        logarithmic.
-        * asm.m4 (ALIGN): New macro. Takes a logarithmic argument, and
-        expands to a .align directive.
+	* config.m4.in (ASM_ALIGN_LOG): Substitute.
+	* configure.ac (ASM_ALIGN_LOG): Check if .align directive is
+	logarithmic.
+	* asm.m4 (ALIGN): New macro. Takes a logarithmic argument, and
+	expands to a .align directive.
 
 2006-04-21  Niels M�ller  <nisse@lysator.liu.se>
 
-        * nettle.texinfo (Public-key algorithms): Say that the public key
-        operations are undocumented, not unsupported. Reported by Jeronimo
-        Pellegrini. 
+	* nettle.texinfo (Public-key algorithms): Say that the public key
+	operations are undocumented, not unsupported. Reported by Jeronimo
+	Pellegrini.
 
 2006-04-08  Niels M�ller  <nisse@lysator.liu.se>
 
-        * tools/pkcs1-conv.c (read_pem): Fixed c99-style declaration.
-        Reported by Henrik Grubbstr�m.
+	* tools/pkcs1-conv.c (read_pem): Fixed c99-style declaration.
+	Reported by Henrik Grubbstr�m.
 
 2006-01-31  Niels M�ller  <niels@s3.kth.se>
 
-        * examples/rsa-verify.c: Fixed typo in usage message.
-	
+	* examples/rsa-verify.c: Fixed typo in usage message.
+
 2005-12-05  Niels M�ller  <nisse@lysator.liu.se>
 
-        * configure.ac: Bumped version to 1.15,
+	* configure.ac: Bumped version to 1.15,
 
-        * Released nettle-1.14.
+	* Released nettle-1.14.
 
 	* NEWS: Updated for 1.14.
 
@@ -846,7 +846,7 @@
 	executables, in addition to the suffix rules. Hopefully, this
 	should make all of GNU make, BSD make and Solaris make happy.
 	Use $(EXEEXT) and $(OBJEXT) more consistently.
-	
+
 	* examples/Makefile.in: Use explicit rules for all executable
 	targets. Use $(EXEEXT) and $(OBJEXT) more consistently.
 
@@ -869,7 +869,7 @@
 2005-11-21  Niels M�ller  <nisse@lysator.liu.se>
 
 	* testsuite/testutils.c (main): Fixed check for -v option. Spotted
-	by Goran K. 
+	by Goran K.
 
 2005-11-21  Niels M�ller  <niels@s3.kth.se>
 
@@ -895,14 +895,14 @@
 
 	* rsa.h (rsa_public_key_from_der_iterator)
 	(rsa_private_key_from_der_iterator, rsa_keypair_from_der): Declare
-	functions. 
+	functions.
 
 	* der2rsa.c: New file.
 
 	* der-iterator.c (asn1_der_iterator_init): Initialize length and
 	data.
 	(asn1_der_iterator_next): Support for lengths >= 0x80.
-	(asn1_der_decode_constructed_last, asn1_der_decode_bitstring) 
+	(asn1_der_decode_constructed_last, asn1_der_decode_bitstring)
 	(asn1_der_decode_bitstring_last): New functions.
 	(asn1_der_get_bignum): Check for non-mininal encodings.
 
@@ -935,7 +935,7 @@
 	assembler path. Use $host_os, not uname, when setting up shared
 	library flags.
 
-	* Makefile.in (des.$(OBJEXT)): Use OBJEXT. 
+	* Makefile.in (des.$(OBJEXT)): Use OBJEXT.
 
 	* config.guess, config.sub: In the CVS tree, moved files to the
 	lsh top-level directory.
@@ -943,7 +943,7 @@
 2005-10-23  Niels M�ller  <nisse@lysator.liu.se>
 
 	* sparc64/arcfour-crypt.asm: New file, almost the same as
-	sparc/arcfour-crypt.asm. 
+	sparc/arcfour-crypt.asm.
 
 	* examples/nettle-benchmark.c (display): Use two decimal places.
 
@@ -996,7 +996,7 @@
 2005-10-17  Niels M�ller  <niels@s3.kth.se>
 
 	* aes-internal.h (struct aes_table): Deleted idx and sparc_idx
-	arrays. 
+	arrays.
 	* aes-encrypt-table.c (_aes_encrypt_table): Likewise.
 	* aes-decrypt.c (_aes_decrypt_table): Likewise.
 	* asm.m4 (AES): Likewise
@@ -1006,7 +1006,7 @@
 	* tools/input.c (sexp_get_char): Use unsigned for the done flag.
 
 	* sparc64/aes-encrypt-internal.asm: Include sparc/aes.m4.
-	* sparc64/aes-decrypt-internal.asm: Likewise.	
+	* sparc64/aes-decrypt-internal.asm: Likewise.
 
 	* sparc64/machine.m4: Use .register pseudo op to say that we use
 	%g2 and %g3 as scratch registers.