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/or/circuitlist.c | |
| parent | 758428dd32128874cefacc92ef63c1b5bc9a656e (diff) | |
| parent | 49dd5ef3a3d1775fdc3c0a7d069d3097b3baeeec (diff) | |
| download | tor-9ad4776e6150a29fdfff607721599eb04c6e76d7.tar.gz tor-9ad4776e6150a29fdfff607721599eb04c6e76d7.zip | |
Merge branch 'bug7352_023_rebased' into maint-0.2.3
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 7ed942c8fe..93ba69dcf0 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -612,11 +612,11 @@ circuit_free(circuit_t *circ) tor_free(ocirc->dest_address); if (ocirc->socks_username) { - memset(ocirc->socks_username, 0x12, ocirc->socks_username_len); + memwipe(ocirc->socks_username, 0x12, ocirc->socks_username_len); tor_free(ocirc->socks_username); } if (ocirc->socks_password) { - memset(ocirc->socks_password, 0x06, ocirc->socks_password_len); + memwipe(ocirc->socks_password, 0x06, ocirc->socks_password_len); tor_free(ocirc->socks_password); } } else { @@ -657,7 +657,7 @@ circuit_free(circuit_t *circ) * "active" checks will be violated. */ cell_queue_clear(&circ->n_conn_cells); - memset(mem, 0xAA, memlen); /* poison memory */ + memwipe(mem, 0xAA, memlen); /* poison memory */ tor_free(mem); } @@ -721,7 +721,7 @@ circuit_free_cpath_node(crypt_path_t *victim) crypto_dh_free(victim->dh_handshake_state); extend_info_free(victim->extend_info); - memset(victim, 0xBB, sizeof(crypt_path_t)); /* poison memory */ + memwipe(victim, 0xBB, sizeof(crypt_path_t)); /* poison memory */ tor_free(victim); } |