summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-22 12:45:01 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-22 12:45:01 -0500
commitc084ae145e7eb77303ce401083a94b0d9d7fe57e (patch)
treeb83535c6d5e93f8a4b8db13d1c9ff7568bc47939 /src/common
parentd35b8dc5827762cd9cbee90f57ef370f477539fb (diff)
parentf5112fa48754b33aa46c1bf79e11cf400d5084a8 (diff)
downloadtor-c084ae145e7eb77303ce401083a94b0d9d7fe57e.tar.gz
tor-c084ae145e7eb77303ce401083a94b0d9d7fe57e.zip
Merge remote branch 'sebastian/bug1254'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/aes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c
index 451c31f02a..eb7f8fe3fc 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -268,7 +268,7 @@ aes_free_cipher(aes_cnt_cipher_t *cipher)
#ifdef USE_OPENSSL_EVP
EVP_CIPHER_CTX_cleanup(&cipher->key);
#endif
- memset(cipher, 0, sizeof(cipher));
+ memset(cipher, 0, sizeof(aes_cnt_cipher_t));
tor_free(cipher);
}