From 07db57cd636e08cf365b5346de7f56cf6c29c9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 17 Apr 2013 13:22:35 +0200
Subject: [PATCH] Benchmark salsa20r12.
---
ChangeLog | 6 ++++++
examples/nettle-benchmark.c | 2 +-
nettle-internal.c | 9 +++++++++
nettle-internal.h | 1 +
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index ce8dde47..ca9322bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2013-04-17 Niels Möller <nisse@lysator.liu.se>
+ * examples/nettle-benchmark.c (main): Benchmark salsa20r12.
+
+ * nettle-internal.c (nettle_salsa20r12): Cipher struct for
+ benchmarking only.
+ * nettle-internal.h (nettle_salsa20): Declare it.
+
* Makefile.in (eccdata): Depend on mini-gmp files. Drop -lgmp.
* eccdata.c: Use mini-gmp, to avoid gmp dependency and associated
diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c
index 5be3d49b..5d38aa15 100644
--- a/examples/nettle-benchmark.c
+++ b/examples/nettle-benchmark.c
@@ -662,7 +662,7 @@ main(int argc, char **argv)
&nettle_des3,
&nettle_serpent256,
&nettle_twofish128, &nettle_twofish192, &nettle_twofish256,
- &nettle_salsa20,
+ &nettle_salsa20, &nettle_salsa20r12,
NULL
};
diff --git a/nettle-internal.c b/nettle-internal.c
index d1d76752..f271eac0 100644
--- a/nettle-internal.c
+++ b/nettle-internal.c
@@ -97,6 +97,15 @@ nettle_salsa20 = {
(nettle_crypt_func *) salsa20_crypt
};
+const struct nettle_cipher
+nettle_salsa20r12 = {
+ "salsa20r12", sizeof(struct salsa20_ctx),
+ 0, SALSA20_KEY_SIZE,
+ salsa20_set_key_hack, salsa20_set_key_hack,
+ (nettle_crypt_func *) salsa20r12_crypt,
+ (nettle_crypt_func *) salsa20r12_crypt
+};
+
const struct nettle_aead
nettle_gcm_aes128 = _NETTLE_AEAD(gcm, GCM, aes, 128);
const struct nettle_aead
diff --git a/nettle-internal.h b/nettle-internal.h
index 3b7f771d..71452d45 100644
--- a/nettle-internal.h
+++ b/nettle-internal.h
@@ -62,6 +62,7 @@ extern const struct nettle_cipher nettle_blowfish128;
/* For benchmarking only, sets no iv and lies about the block size. */
extern const struct nettle_cipher nettle_salsa20;
+extern const struct nettle_cipher nettle_salsa20r12;
/* Glue to openssl, for comparative benchmarking. Code in
* examples/nettle-openssl.c. */
--
GitLab