diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:45:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:45:46 -0500 |
| commit | 9ad4776e6150a29fdfff607721599eb04c6e76d7 (patch) | |
| tree | 7189ed200ae8f47bf7d3399d0b99243dc93bced3 /src/common/aes.c | |
| parent | 758428dd32128874cefacc92ef63c1b5bc9a656e (diff) | |
| parent | 49dd5ef3a3d1775fdc3c0a7d069d3097b3baeeec (diff) | |
| download | tor-9ad4776e6150a29fdfff607721599eb04c6e76d7.tar tor-9ad4776e6150a29fdfff607721599eb04c6e76d7.tar.gz | |
Merge branch 'bug7352_023_rebased' into maint-0.2.3
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 59d864a3d..295a90749 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); } |