From: Niels Möller <nisse@lysator.liu.se>
Date: Thu, 29 Mar 2012 20:04:43 +0000 (+0200)
Subject: Trivial merge.
X-Git-Tag: nettle_2.5_release_20120707~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83fc50a8a0d0a1dd778ee331a9a320fab02f452b;p=thirdparty%2Fnettle.git

Trivial merge.
---

83fc50a8a0d0a1dd778ee331a9a320fab02f452b
diff --cc ChangeLog
index a0f9801f,3a357caf..cd72866d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,8 +1,28 @@@
 +2012-03-29  Niels Möller  <nisse@lysator.liu.se>
 +
 +	Implementation of Salsa20, contributed by Simon Josefsson.
 +	* salsa20.h: New file.
 +	* salsa20.c: New file.
 +	* Makefile.in (nettle_SOURCES): Added salsa20.c
 +	(HEADERS): Added salsa20.h.
 +	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added salsa20-test.c.
 +	* testsuite/salsa20-test.c: New test case.
 +
 +	* Makefile.in (soname links): Adding missing space before ].
 +
 +2012-03-23  Niels Möller  <nisse@lysator.liu.se>
 +
 +	* arcfour.h (arcfour_stream): Deleted obsolete prototype.
 +
 +2012-03-05  Niels Möller  <nisse@lysator.liu.se>
 +
 +	* configure.ac (enable_shared): Build shared libraries by default.
 +
+ 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.