diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:07:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:07:59 -0500 |
| commit | 7e2b012b46a4ade2818e47be15d76255cf6f121e (patch) | |
| tree | 2bd0080fa3ff1e58db831caa2c84dfb18ff651dc /src/or/rendservice.c | |
| parent | 52d7af631cb1075289ba519d0c3b89e0b5816f5e (diff) | |
| parent | ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e (diff) | |
| download | tor-7e2b012b46a4ade2818e47be15d76255cf6f121e.tar.gz tor-7e2b012b46a4ade2818e47be15d76255cf6f121e.zip | |
Merge branch 'maint-0.2.8' into maint-0.2.9
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 9c9b50445a..455fc82854 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1816,6 +1816,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, time_t now = time(NULL); time_t elapsed; int replay; + size_t keylen; /* Do some initial validation and logging before we parse the cell */ if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) { @@ -1889,9 +1890,10 @@ rend_service_receive_introduction(origin_circuit_t *circuit, } /* check for replay of PK-encrypted portion. */ + keylen = crypto_pk_keysize(intro_key); replay = replaycache_add_test_and_elapsed( intro_point->accepted_intro_rsa_parts, - parsed_req->ciphertext, parsed_req->ciphertext_len, + parsed_req->ciphertext, MIN(parsed_req->ciphertext_len, keylen), &elapsed); if (replay) { @@ -3849,6 +3851,10 @@ remove_invalid_intro_points(rend_service_t *service, log_info(LD_REND, "Expiring %s as intro point for %s.", safe_str_client(extend_info_describe(intro->extend_info)), safe_str_client(service->service_id)); + /* We might have put it in the retry list if so, undo. */ + if (retry_nodes) { + smartlist_remove(retry_nodes, intro); + } smartlist_add(service->expiring_nodes, intro); SMARTLIST_DEL_CURRENT(service->intro_nodes, intro); /* Intro point is expired, we need a new one thus don't consider it |