diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2013-04-17 13:22:35 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2013-04-17 13:22:35 +0200 |
| commit | 07db57cd636e08cf365b5346de7f56cf6c29c9d1 (patch) | |
| tree | 14e8775873d784f00e8e6b3a8ce6fd97c5ada114 | |
| parent | fc9f5348949159189fd349427da7c93bc2fee5d0 (diff) | |
| download | nettle-07db57cd636e08cf365b5346de7f56cf6c29c9d1.tar.gz | |
Benchmark salsa20r12.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | examples/nettle-benchmark.c | 2 | ||||
| -rw-r--r-- | nettle-internal.c | 9 | ||||
| -rw-r--r-- | nettle-internal.h | 1 |
4 files changed, 17 insertions, 1 deletions
@@ -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. */ |