summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2010-07-07 21:33:01 +0200
committerNiels Möller <nisse@lysator.liu.se>2010-07-07 21:33:01 +0200
commit118e26189f1b843e860f01d87a024a588460c42c (patch)
treee8cd3a24161e85a3ff48643a68b7fdd0845c7f3c
parentc8f4cc3588e534cf5dfe8163113e16c64fe33b29 (diff)
downloadnettle-118e26189f1b843e860f01d87a024a588460c42c.tar.gz
Added camellia ciphers.camellia_32bit_20100720
Rev: nettle/ChangeLog:1.92 Rev: nettle/examples/nettle-benchmark.c:1.8
-rw-r--r--ChangeLog2
-rw-r--r--examples/nettle-benchmark.c1
2 files changed, 3 insertions, 0 deletions
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,