diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-08-10 18:30:20 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-08-10 18:30:20 -0400 |
| commit | 49fd76be05cf5d0fcf5b766e87ac8a9e2207224f (patch) | |
| tree | a180b0a9e995828b17b356840f78f8d8da45b8d6 /src/or/rendservice.c | |
| parent | ad49ceba1f56109799adb9232ca0422067d1743d (diff) | |
| parent | d5cfbf96a2dbbee4501da92d5a21d0c66732ae24 (diff) | |
| download | tor-49fd76be05cf5d0fcf5b766e87ac8a9e2207224f.tar.gz tor-49fd76be05cf5d0fcf5b766e87ac8a9e2207224f.zip | |
Merge branch 'maint-0.2.4'
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 061efe6cce..2e93fc3f54 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1898,8 +1898,8 @@ rend_service_parse_intro_for_v3( } } - /* Check that we actually have everything up to the timestamp */ - if (plaintext_len < (size_t)(ts_offset)) { + /* Check that we actually have everything up through the timestamp */ + if (plaintext_len < (size_t)(ts_offset)+4) { if (err_msg_out) { tor_asprintf(err_msg_out, "truncated plaintext of encrypted parted of " @@ -1923,12 +1923,6 @@ rend_service_parse_intro_for_v3( } /* - * Apparently we don't use the timestamp any more, but might as well copy - * over just in case we ever care about it. - */ - intro->u.v3.timestamp = ntohl(get_uint32(buf + ts_offset)); - - /* * From here on, the format is as in v2, so we call the v2 parser with * adjusted buffer and length. We are 4 + ts_offset octets in, but the * v2 parser expects to skip over a version byte at the start, so we |