commit 53dd1699baf5cb09086644eaca239596aedbde15 Author: Suphanat Chunhapanya haxx.pop@gmail.com Date: Sun Apr 22 20:51:21 2018 +0700
hs-v3: Re-enable the decoding in the encoding function
Previously, the validation by decoding a created descriptor was disabled because the interface had to be entirely changed and not implemented at the time.
This commit re-enabled it because it is now implemented.
Signed-off-by: David Goulet dgoulet@torproject.org --- src/feature/hs/hs_descriptor.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 3f9b505cb..52b080271 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -2705,14 +2705,16 @@ hs_desc_encode_descriptor,(const hs_descriptor_t *desc, goto err; }
- /* Try to decode what we just encoded. Symmetry is nice! */ - /* XXX: I need to disable this assertation for now to make the test pass. - * I will enable it again when I finish writing the decoding */ - /* ret = hs_desc_decode_descriptor(*encoded_out, */ - /* desc->subcredential, NULL); */ - /* if (BUG(ret < 0)) { */ - /* goto err; */ - /* } */ + /* Try to decode what we just encoded. Symmetry is nice!, but it is + * symmetric only if the client auth is disabled. That is, the descriptor + * cookie will be NULL. */ + if (!descriptor_cookie) { + ret = hs_desc_decode_descriptor(*encoded_out, desc->subcredential, + NULL, NULL); + if (BUG(ret < 0)) { + goto err; + } + }
return 0;