Deleted _NETTLE_CIPHER_FIX.

diff --git a/ChangeLog b/ChangeLog
index 0fc58f6184b2dbd402aa9cc701267ed0bf23860c..43dec6d04720fc9f8bd8516431c2d912b442daf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2014-02-06  Niels Möller  <nisse@lysator.liu.se>
 
-       * nettle-meta.h (_NETTLE_CIPHER_SEP, _NETTLE_CIPHER_SEP_SET_KEY):
-       Deleted unused macros.
+       * cast128-meta.c (nettle_cast128): Deleted only use of
+       _NETTLE_CIPHER_FIX.
+
+       * nettle-meta.h (_NETTLE_CIPHER_SEP, _NETTLE_CIPHER_SEP_SET_KEY)
+       (_NETTLE_CIPHER_FIX): Deleted unused macros.
 
        * examples/nettle-benchmark.c (time_cipher): Fixed memset calls.
 

diff --git a/cast128-meta.c b/cast128-meta.c
index 692b1b24d083134f9e54a6f594eabb6c45b44226..e103d7b33e93347b95e176641aaccc00836ad77e 100644 (file)
--- a/cast128-meta.c
+++ b/cast128-meta.c
@@ -28,5 +28,11 @@
 
 #include "cast128.h"
 
-const struct nettle_cipher nettle_cast128
-= _NETTLE_CIPHER_FIX(cast128, CAST128);
+const struct nettle_cipher nettle_cast128 =
+  { "cast128", sizeof(struct cast128_ctx),
+    CAST128_BLOCK_SIZE, CAST128_KEY_SIZE,
+    (nettle_set_key_func *) cast128_set_key,
+    (nettle_set_key_func *) cast128_set_key,
+    (nettle_crypt_func *) cast128_encrypt,
+    (nettle_crypt_func *) cast128_decrypt
+  };

diff --git a/nettle-meta.h b/nettle-meta.h
index bac383533b6ddae1b1eb18293be0d39cdadfa817..8e08cb760dcc5218f91fb9d6e584437651308396 100644 (file)
--- a/nettle-meta.h
+++ b/nettle-meta.h
@@ -63,17 +63,6 @@ struct nettle_cipher
   (nettle_crypt_func *) name##_decrypt,                \
 }
 
-#define _NETTLE_CIPHER_FIX(name, NAME) {       \
-  #name,                                               \
-  sizeof(struct name##_ctx),                           \
-  NAME##_BLOCK_SIZE,                                   \
-  NAME##_KEY_SIZE,                                     \
-  (nettle_set_key_func *) name##_set_key,              \
-  (nettle_set_key_func *) name##_set_key,              \
-  (nettle_crypt_func *) name##_encrypt,                        \
-  (nettle_crypt_func *) name##_decrypt,                        \
-}
-
 /* null-terminated list of ciphers implemented by this version of nettle */
 extern const struct nettle_cipher * const nettle_ciphers[];