Deleted _NETTLE_CIPHER_FIX.

ChangeLog

 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.
 

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
+  };

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[];