* arctwo.h (arctwo_setkey): Protect variable in CPP macro,

suggested by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 08fd087793a65120515307ec2b07fab35281601a..6d6ec2ca9cdf5563baa6f8b72d7cfd6e131b9de5 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-21  Simon Josefsson  <jas@extundo.com>
+
+       * arctwo.h (arctwo_setkey): Protect variable in CPP macro,
+       suggested by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
+
 2005-10-21  Simon Josefsson  <jas@extundo.com>
 
        * rijndael-api-fst.c: Fix bugs in CBC mode for more than one

diff --git a/lib/arctwo.h b/lib/arctwo.h
index ac97fcf676c7f6f76fa006272fd896a3cb112468..89c581e20fcb75ac33bb67d0a7492ff5d59d03d4 100644 (file)
--- a/lib/arctwo.h
+++ b/lib/arctwo.h
@@ -42,7 +42,7 @@ arctwo_setkey_ekb (arctwo_context *context,
                   size_t keylen, const char *key, size_t effective_keylen);
 
 #define arctwo_setkey(context,keylen,key) \
-  arctwo_setkey_ekb (context, keylen, key, 8 * keylen)
+  arctwo_setkey_ekb (context, keylen, key, 8 * (keylen))
 
 /* Encrypt INBUF of size LENGTH into OUTBUF.  LENGTH must be a
    multiple of ARCTWO_BLOCK_SIZE.  CONTEXT hold the encryption key,