diff --git a/src/common/crypto.c b/src/common/crypto.c
index 4599e0cbb6..cc88f9686a 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -78,8 +78,7 @@ struct crypto_pk_env_t
 struct crypto_cipher_env_t
 {
   unsigned char key[CIPHER_KEY_LEN];
-  unsigned char iv[CIPHER_IV_LEN+1];
-    /* +1 because some compilers don't like a length of 0 */
+  unsigned char iv[_ARRAYSIZE(CIPHER_IV_LEN)];
   aes_cnt_cipher_t *cipher;
 };