From: Niels Möller Date: Mon, 14 Feb 2011 11:32:45 +0000 (+0100) Subject: Renamed some macro arguments. X-Git-Tag: nettle_2.2_release_20110711~132 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c7bddc1723a42e0fa40d0762bfa1101ece01962;p=thirdparty%2Fnettle.git Renamed some macro arguments. Rev: nettle/nettle-meta.h:1.9 --- diff --git a/nettle-meta.h b/nettle-meta.h index c02d146f..2a009546 100644 --- 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, \