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_ewma.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_ewma.c')
| -rw-r--r-- | src/core/or/circuitmux_ewma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/or/circuitmux_ewma.c b/src/core/or/circuitmux_ewma.c index 996d87f96d..b50f33528f 100644 --- a/src/core/or/circuitmux_ewma.c +++ b/src/core/or/circuitmux_ewma.c @@ -38,6 +38,7 @@ #include "core/or/circuitmux.h" #include "core/or/circuitmux_ewma.h" #include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "feature/nodelist/networkstatus.h" #include "app/config/or_options_st.h" @@ -186,6 +187,7 @@ ewma_free_cmux_data(circuitmux_t *cmux, pol = TO_EWMA_POL_DATA(pol_data); smartlist_free(pol->active_circuit_pqueue); + memwipe(pol, 0xda, sizeof(ewma_policy_data_t)); tor_free(pol); } @@ -252,7 +254,7 @@ ewma_free_circ_data(circuitmux_t *cmux, if (!pol_circ_data) return; cdata = TO_EWMA_POL_CIRC_DATA(pol_circ_data); - + memwipe(cdata, 0xdc, sizeof(ewma_policy_circ_data_t)); tor_free(cdata); } |