diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-13 09:21:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-13 09:21:47 -0500 |
| commit | baeff46d3625002a9de5781cd86b6c45834bbe56 (patch) | |
| tree | 67b3a19af9a3bf64f6fd4874b4a45059b042076b /src/core/or/circuitmux.c | |
| parent | d0c3350218765d43c538df4dd1d548fa9a7c430a (diff) | |
| parent | fd1686c7d8df8d8159fcaab1c59dfabe154afd88 (diff) | |
| download | tor-baeff46d3625002a9de5781cd86b6c45834bbe56.tar.gz tor-baeff46d3625002a9de5781cd86b6c45834bbe56.zip | |
Merge branch 'ticket33290_v2_042' into ticket33290_v2_043
Conflicts:
src/core/or/circuitmux_ewma.c
Diffstat (limited to 'src/core/or/circuitmux.c')
| -rw-r--r-- | src/core/or/circuitmux.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index 0e932f032d..1f79ea4d91 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -79,6 +79,8 @@ #include "core/or/or_circuit_st.h" +#include "lib/crypt_ops/crypto_util.h" + /* * Private typedefs for circuitmux.c */ @@ -921,7 +923,10 @@ circuitmux_detach_circuit,(circuitmux_t *cmux, circuit_t *circ)) /* Now remove it from the map */ HT_REMOVE(chanid_circid_muxinfo_map, cmux->chanid_circid_map, hashent); - /* Free the hash entry */ + /* Wipe and free the hash entry */ + // This isn't sensitive, but we want to be sure to know if we're accessing + // this accidentally. + memwipe(hashent, 0xef, sizeof(hashent)); tor_free(hashent); } } @@ -1282,4 +1287,3 @@ circuitmux_compare_muxes, (circuitmux_t *cmux_1, circuitmux_t *cmux_2)) return 0; } } - |