From: Niels Möller <nisse@lysator.liu.se>
Date: Sun, 4 Mar 2012 20:34:31 +0000 (+0100)
Subject: Merge branch 'master' of git.lysator.liu.se:/nettle/nettle
X-Git-Tag: nettle_2.5_release_20120707~73^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4d3a98dd30160bd91dd5409cf2ada24019f8c3d;p=thirdparty%2Fnettle.git

Merge branch 'master' of git.lysator.liu.se:/nettle/nettle
---

c4d3a98dd30160bd91dd5409cf2ada24019f8c3d
diff --cc ChangeLog
index 9a0cc5f2,0ca8a7c1..3a357caf
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,19 +1,24 @@@
 +2012-03-04  Niels Möller  <nisse@lysator.liu.se>
 +
 +	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.4.
 +	(LIBHOGWEED_MINOR): And to 2.2.
 +
  2012-02-27  Niels Möller  <nisse@lysator.liu.se>
  
+ 	* list-obj-sizes.awk: Recognize elf64 objects.
+ 
+ 	* Makefile.in (.texinfo.dvi): Pass -b option to texi2dvi.
+ 
+ 	* Makefile.in (TARGETS): Added twofishdata.
+ 	(SOURCES): Added twofishdata.c.
+ 	(twofishdata): New rule.
+ 
+ 	* twofish.c (q0, q1): Made const, and reformatted to match the
+ 	twofishdata program.
+ 
+ 	* twofishdata.c: Resurrected old file. Used to be called
+ 	generate_q.c, when the twofish code was contributed back in 1999.
+ 
  	* nettle.texinfo: Documentation for base16 and base64 encoding.
  	Text contributed by Jeronimo Pellegrini
  	<pellegrini@mpcnet.com.br>, back in April 2006.