summaryrefslogtreecommitdiff
path: root/gcm.h
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2014-11-24 21:11:03 +0100
committerNiels Möller <nisse@lysator.liu.se>2014-11-24 21:11:03 +0100
commitfccdf01b7b6f2c03e7f04db75006797fccc073f0 (patch)
tree002f2a319319f8560eb2a44aea914b21c554f523 /gcm.h
parent68fc6af9cd44cf5eb101ccc956b684a78ba5633d (diff)
downloadnettle-fccdf01b7b6f2c03e7f04db75006797fccc073f0.tar.gz
GCM_SET_KEY: Rename macro argument to avoid collision with struct tag.
Spotted by Nikos Mavrogiannopoulos.
Diffstat (limited to 'gcm.h')
-rw-r--r--gcm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcm.h b/gcm.h
index f66a0dcd..c157f829 100644
--- a/gcm.h
+++ b/gcm.h
@@ -151,9 +151,9 @@ gcm_digest(struct gcm_ctx *ctx, const struct gcm_key *key,
{ struct gcm_key key; struct gcm_ctx gcm; type cipher; }
/* NOTE: Avoid using NULL, as we don't include anything defining it. */
-#define GCM_SET_KEY(ctx, set_key, encrypt, key) \
+#define GCM_SET_KEY(ctx, set_key, encrypt, gcm_key) \
do { \
- (set_key)(&(ctx)->cipher, (key)); \
+ (set_key)(&(ctx)->cipher, (gcm_key)); \
if (0) (encrypt)(&(ctx)->cipher, 0, (void *)0, (void *)0); \
gcm_set_key(&(ctx)->key, &(ctx)->cipher, \
(nettle_cipher_func *) (encrypt)); \