From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 7 Jul 2010 19:33:01 +0000 (+0200)
Subject: Added camellia ciphers.
X-Git-Tag: camellia_32bit_20100720
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=118e26189f1b843e860f01d87a024a588460c42c;p=thirdparty%2Fnettle.git

Added camellia ciphers.

Rev: nettle/ChangeLog:1.92
Rev: nettle/examples/nettle-benchmark.c:1.8
---

diff --git a/ChangeLog b/ChangeLog
index 5cc4e407..06f278c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
 	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added
 	camellia-test.c.
 
+	* examples/nettle-benchmark.c: Added camellia ciphers.
+
 	* Makefile.in (nettle_SOURCES): Added camellia.c and
 	camellia-meta.c.
 	(HEADERS): Added camellia.h.
diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c
index d0f3a4a4..95296ba5 100644
--- a/examples/nettle-benchmark.c
+++ b/examples/nettle-benchmark.c
@@ -401,6 +401,7 @@ main(int argc, char **argv)
       OPENSSL(&nettle_openssl_aes256)
       &nettle_arcfour128, OPENSSL(&nettle_openssl_arcfour128)
       &nettle_blowfish128, OPENSSL(&nettle_openssl_blowfish128)
+      &nettle_camellia128, &nettle_camellia192, &nettle_camellia256,
       &nettle_cast128, OPENSSL(&nettle_openssl_cast128)
       &nettle_des, OPENSSL(&nettle_openssl_des)
       &nettle_des3,