Renamed some macro arguments.

Rev: nettle/nettle-meta.h:1.9

diff --git a/nettle-meta.h b/nettle-meta.h
index c02d146f28345ecb2be3259531e567b8789af3dc..2a00954614e79fc29588ebbe74d9b38ece70473a 100644 (file)
--- a/nettle-meta.h
+++ b/nettle-meta.h
@@ -52,33 +52,33 @@ struct nettle_cipher
   nettle_crypt_func *decrypt;
 };
 
-#define _NETTLE_CIPHER(name, NAME, keysize) {  \
-  #name #keysize,                              \
+#define _NETTLE_CIPHER(name, NAME, key_size) { \
+  #name #key_size,                             \
   sizeof(struct name##_ctx),                   \
   NAME##_BLOCK_SIZE,                           \
-  keysize / 8,                                 \
+  key_size / 8,                                        \
   (nettle_set_key_func *) name##_set_key,      \
   (nettle_set_key_func *) name##_set_key,      \
   (nettle_crypt_func *) name##_encrypt,                \
   (nettle_crypt_func *) name##_decrypt,                \
 }
 
-#define _NETTLE_CIPHER_SEP(name, NAME, keysize) {      \
-  #name #keysize,                                      \
+#define _NETTLE_CIPHER_SEP(name, NAME, key_size) {     \
+  #name #key_size,                                     \
   sizeof(struct name##_ctx),                           \
   NAME##_BLOCK_SIZE,                                   \
-  keysize / 8,                                         \
+  key_size / 8,                                                \
   (nettle_set_key_func *) name##_set_encrypt_key,      \
   (nettle_set_key_func *) name##_set_decrypt_key,      \
   (nettle_crypt_func *) name##_encrypt,                        \
   (nettle_crypt_func *) name##_decrypt,                        \
 }
 
-#define _NETTLE_CIPHER_SEP_SET_KEY(name, NAME, keysize) {\
-  #name #keysize,                                      \
+#define _NETTLE_CIPHER_SEP_SET_KEY(name, NAME, key_size) {\
+  #name #key_size,                                     \
   sizeof(struct name##_ctx),                           \
   NAME##_BLOCK_SIZE,                                   \
-  keysize / 8,                                         \
+  key_size / 8,                                                \
   (nettle_set_key_func *) name##_set_encrypt_key,      \
   (nettle_set_key_func *) name##_set_decrypt_key,      \
   (nettle_crypt_func *) name##_crypt,                  \