diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:48:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:48:04 -0500 |
| commit | 81deddb08c6b8bf644f663dcdc31720e365f68dc (patch) | |
| tree | 9e67efdfb4451dcc169727dc0e64f8f5bfca95b8 /src/common/aes.c | |
| parent | 9f3f5372b880b3372fd7b9fc98bd3d78f969390a (diff) | |
| parent | 9ad4776e6150a29fdfff607721599eb04c6e76d7 (diff) | |
| download | tor-81deddb08c6b8bf644f663dcdc31720e365f68dc.tar tor-81deddb08c6b8bf644f663dcdc31720e365f68dc.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Conflicts:
src/common/crypto.c
src/or/rendservice.c
Diffstat (limited to 'src/common/aes.c')
| -rw-r--r-- | src/common/aes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index 8e489baae..2d64b8594 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -106,7 +106,7 @@ aes_cipher_free(aes_cnt_cipher_t *cipher) if (!cipher) return; EVP_CIPHER_CTX_cleanup(&cipher->evp); - memset(cipher, 0, sizeof(aes_cnt_cipher_t)); + memwipe(cipher, 0, sizeof(aes_cnt_cipher_t)); tor_free(cipher); } void @@ -373,7 +373,7 @@ aes_cipher_free(aes_cnt_cipher_t *cipher) if (cipher->using_evp) { EVP_CIPHER_CTX_cleanup(&cipher->key.evp); } - memset(cipher, 0, sizeof(aes_cnt_cipher_t)); + memwipe(cipher, 0, sizeof(aes_cnt_cipher_t)); tor_free(cipher); } |