Delete benchmarking of openssl blowfish, cast128 and des.

diff --git a/ChangeLog b/ChangeLog
index 7544d36c8d5c2a3d7f7015981b809b8a1714c9a9..075ab1978a654d546d2bb56697b98914af525571 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2023-12-04  Niels Möller  <nisse@lysator.liu.se>
 
+       * examples/nettle-openssl.c (nettle_openssl_blowfish128)
+       (nettle_openssl_des, openssl_cast128_set_encrypt_key): Deleted,
+       since these algorithms are now available in openssl only via the
+       "legacy provider". Also deleted declarations and usage.
+
        * examples/hogweed-benchmark.c (struct openssl_ctx): Unified
        struct, replacing openssl_rsa_ctx and openssl_ecdsa_ctx.
        (bench_openssl_init, bench_openssl_sign, bench_openssl_verify)

diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c
index 1b72d838dbf51c4b263674970529140a24d2a1f2..37073a67a2804401eb273cecbb08e5c48f8c63cc 100644 (file)
--- a/examples/nettle-benchmark.c
+++ b/examples/nettle-benchmark.c
@@ -934,10 +934,10 @@ main(int argc, char **argv)
       OPENSSL(&nettle_openssl_aes128)
       OPENSSL(&nettle_openssl_aes192)
       OPENSSL(&nettle_openssl_aes256)
-      &nettle_blowfish128, OPENSSL(&nettle_openssl_blowfish128)
+      &nettle_blowfish128,
       &nettle_camellia128, &nettle_camellia192, &nettle_camellia256,
-      &nettle_cast128, OPENSSL(&nettle_openssl_cast128)
-      &nettle_des, OPENSSL(&nettle_openssl_des)
+      &nettle_cast128,
+      &nettle_des,
       &nettle_des3,
       &nettle_serpent256,
       &nettle_twofish128, &nettle_twofish192, &nettle_twofish256,

diff --git a/examples/nettle-openssl.c b/examples/nettle-openssl.c
index 31905f0803adf2fabfd4433436f576a1aec8336d..0d798617a937279e85f7cf11a2a461aeac497f3f 100644 (file)
--- a/examples/nettle-openssl.c
+++ b/examples/nettle-openssl.c
@@ -298,70 +298,6 @@ nettle_openssl_gcm_aes256 = {
   openssl_evp_gcm_digest
 };
 
-/* Blowfish */
-static void
-openssl_bf128_set_encrypt_key(void *ctx, const uint8_t *key)
-{
-  openssl_evp_set_encrypt_key(ctx, key, EVP_bf_ecb());
-}
-
-static void
-openssl_bf128_set_decrypt_key(void *ctx, const uint8_t *key)
-{
-  openssl_evp_set_decrypt_key(ctx, key, EVP_bf_ecb());
-}
-
-const struct nettle_cipher
-nettle_openssl_blowfish128 = {
-  "openssl bf128", sizeof(struct openssl_cipher_ctx),
-  8, 16,
-  openssl_bf128_set_encrypt_key, openssl_bf128_set_decrypt_key,
-  openssl_evp_encrypt, openssl_evp_decrypt
-};
-
-
-/* DES */
-static void
-openssl_des_set_encrypt_key(void *ctx, const uint8_t *key)
-{
-  openssl_evp_set_encrypt_key(ctx, key, EVP_des_ecb());
-}
-
-static void
-openssl_des_set_decrypt_key(void *ctx, const uint8_t *key)
-{
-  openssl_evp_set_decrypt_key(ctx, key, EVP_des_ecb());
-}
-
-const struct nettle_cipher
-nettle_openssl_des = {
-  "openssl des", sizeof(struct openssl_cipher_ctx),
-  8, 8,
-  openssl_des_set_encrypt_key, openssl_des_set_decrypt_key,
-  openssl_evp_encrypt, openssl_evp_decrypt
-};
-
-
-/* Cast128 */
-static void
-openssl_cast128_set_encrypt_key(void *ctx, const uint8_t *key)
-{
-  openssl_evp_set_encrypt_key(ctx, key, EVP_cast5_ecb());
-}
-
-static void
-openssl_cast128_set_decrypt_key(void *ctx, const uint8_t *key)
-{
-  openssl_evp_set_decrypt_key(ctx, key, EVP_cast5_ecb());
-}
-
-const struct nettle_cipher
-nettle_openssl_cast128 = {
-  "openssl cast128", sizeof(struct openssl_cipher_ctx),
-  8, 16,
-  openssl_cast128_set_encrypt_key, openssl_cast128_set_decrypt_key,
-  openssl_evp_encrypt, openssl_evp_decrypt
-};
 
 /* Hash functions */
 

diff --git a/non-nettle.h b/non-nettle.h
index ecf8c536681bed16ea852abc5b62118ea88bdc6c..7075540a514d308807a28a538907434dd7d3e091 100644 (file)
--- a/non-nettle.h
+++ b/non-nettle.h
@@ -75,9 +75,6 @@ extern void nettle_openssl_init(void);
 extern const struct nettle_cipher nettle_openssl_aes128;
 extern const struct nettle_cipher nettle_openssl_aes192;
 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_hash nettle_openssl_md5;
 extern const struct nettle_hash nettle_openssl_sha1;