From b9ea30f1bf02a85e1522e13075cfad49d4926c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Mon, 15 Feb 2021 20:33:45 +0100 Subject: [PATCH] Delete benchmarking of openssl arcfour and corresponding glue code --- ChangeLog | 9 +++++++++ examples/nettle-benchmark.c | 2 +- examples/nettle-openssl.c | 25 ------------------------- nettle-internal.h | 1 - 4 files changed, 10 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 845bd783..970d9c1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-02-15 Niels Möller <nisse@lysator.liu.se> + + * examples/nettle-openssl.c (nettle_openssl_arcfour128): Deleted + glue to openssl arcfour. + (openssl_arcfour128_set_encrypt_key) + (openssl_arcfour128_set_decrypt_key): Deleted. + * nettle-internal.h: Deleted declaration. + * examples/nettle-benchmark.c (aeads): Delete benchmarking. + 2021-02-13 Niels Möller <nisse@lysator.liu.se> * configure.ac: Bump package version, to 3.7.1. diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c index 1ca277dd..ca6346e0 100644 --- a/examples/nettle-benchmark.c +++ b/examples/nettle-benchmark.c @@ -925,7 +925,7 @@ main(int argc, char **argv) const struct nettle_aead *aeads[] = { /* Stream ciphers */ - &nettle_arcfour128, OPENSSL(&nettle_openssl_arcfour128) + &nettle_arcfour128, &nettle_salsa20, &nettle_salsa20r12, &nettle_chacha, /* Proper AEAD algorithme. */ &nettle_gcm_aes128, diff --git a/examples/nettle-openssl.c b/examples/nettle-openssl.c index 3c487013..d1aaf64b 100644 --- a/examples/nettle-openssl.c +++ b/examples/nettle-openssl.c @@ -298,31 +298,6 @@ nettle_openssl_gcm_aes256 = { openssl_evp_gcm_digest }; -/* Arcfour */ -static void -openssl_arcfour128_set_encrypt_key(void *ctx, const uint8_t *key) -{ - openssl_evp_set_encrypt_key(ctx, key, EVP_rc4()); -} - -static void -openssl_arcfour128_set_decrypt_key(void *ctx, const uint8_t *key) -{ - openssl_evp_set_decrypt_key(ctx, key, EVP_rc4()); -} - -const struct nettle_aead -nettle_openssl_arcfour128 = { - "openssl arcfour128", sizeof(struct openssl_cipher_ctx), - 1, 16, 0, 0, - openssl_arcfour128_set_encrypt_key, - openssl_arcfour128_set_decrypt_key, - NULL, NULL, - (nettle_crypt_func *)openssl_evp_encrypt, - (nettle_crypt_func *)openssl_evp_decrypt, - NULL, -}; - /* Blowfish */ static void openssl_bf128_set_encrypt_key(void *ctx, const uint8_t *key) diff --git a/nettle-internal.h b/nettle-internal.h index dc379f1f..9203a232 100644 --- a/nettle-internal.h +++ b/nettle-internal.h @@ -110,7 +110,6 @@ extern const struct nettle_cipher nettle_openssl_aes256; extern const struct nettle_cipher nettle_openssl_blowfish128; extern const struct nettle_cipher nettle_openssl_des; extern const struct nettle_cipher nettle_openssl_cast128; -extern const struct nettle_aead nettle_openssl_arcfour128; extern const struct nettle_hash nettle_openssl_md5; extern const struct nettle_hash nettle_openssl_sha1; -- GitLab