diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-05-07 08:02:39 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-05-07 08:02:39 -0400 |
| commit | b72f5da03d12e0ac2212d18e3dea309d23ded79c (patch) | |
| tree | 82789d2222286e6b5500cb357448def627171df9 /src/feature/rend/rendcache.c | |
| parent | c8c64caf371c2960bf217fc10d2353144e7e24b3 (diff) | |
| parent | 295feeb09377c4d78f9ee43ec3197b908d7cb960 (diff) | |
| download | tor-b72f5da03d12e0ac2212d18e3dea309d23ded79c.tar.gz tor-b72f5da03d12e0ac2212d18e3dea309d23ded79c.zip | |
Merge branch 'tor-github/pr/994'
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/rend/rendcache.c')
| -rw-r--r-- | src/feature/rend/rendcache.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/rend/rendcache.c b/src/feature/rend/rendcache.c index abeb150685..c3f86d8c82 100644 --- a/src/feature/rend/rendcache.c +++ b/src/feature/rend/rendcache.c @@ -19,6 +19,8 @@ #include "feature/rend/rend_intro_point_st.h" #include "feature/rend/rend_service_descriptor_st.h" +#include "lib/ctime/di_ops.h" + /** Map from service id (as generated by rend_get_service_id) to * rend_cache_entry_t. */ STATIC strmap_t *rend_cache = NULL; @@ -889,8 +891,8 @@ rend_cache_store_v2_desc_as_client(const char *desc, if (intro_content && intro_size > 0) { int n_intro_points; if (rend_data->auth_type != REND_NO_AUTH && - !tor_mem_is_zero(rend_data->descriptor_cookie, - sizeof(rend_data->descriptor_cookie))) { + !safe_mem_is_zero(rend_data->descriptor_cookie, + sizeof(rend_data->descriptor_cookie))) { char *ipos_decrypted = NULL; size_t ipos_decrypted_size; if (rend_decrypt_introduction_points(&ipos_decrypted, |