Delete benchmarking of openssl arcfour and corresponding glue code

diff --git a/ChangeLog b/ChangeLog
index 845bd7835fc6796f8ed31ac15c91004d94c5a184..970d9c1cabd9ef7542265993e1ccce9da5968dca 100644 (file)
--- 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 1ca277dd0651ec53fe1ed4310c1a282b925ad0c2..ca6346e0eb92828e39fb24084a266ca412147c92 100644 (file)
--- 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 3c487013ccbf5d38aa0bc4fb0baee6fbc85531bf..d1aaf64b371ded939035acab9cebf5e16d955869 100644 (file)
--- 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 dc379f1f53ae090c490593d85f506d0619898dc5..9203a2322906428b84887a62bc361c95dcace71b 100644 (file)
--- 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;