diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-28 06:59:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-28 06:59:03 -0400 |
| commit | a8676b1edecee2d1d472b7f67dd026ef7b084a2f (patch) | |
| tree | d9ba30676becb8e03bbceaae9ba19a8288a2eb1d /src/or/rendservice.c | |
| parent | f0488551e7be4e2d21a104903a86be993a240398 (diff) | |
| parent | 47573038736b96e2a353a25ed3c788dcb77d8fcb (diff) | |
| download | tor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.tar.gz tor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.zip | |
Merge branch 'bug18902_squashed'
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index c50de83f7e..4c88f1fa5f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2701,7 +2701,6 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) char auth[DIGEST_LEN + 9]; char serviceid[REND_SERVICE_ID_LEN_BASE32+1]; int reason = END_CIRC_REASON_TORPROTOCOL; - crypto_pk_t *intro_key; tor_assert(circuit->base_.purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO); #ifndef NON_ANONYMOUS_MODE_ENABLED @@ -2775,7 +2774,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) (unsigned)circuit->base_.n_circ_id, serviceid); /* Use the intro key instead of the service key in ESTABLISH_INTRO. */ - intro_key = circuit->intro_key; + crypto_pk_t *intro_key = circuit->intro_key; /* Build the payload for a RELAY_ESTABLISH_INTRO cell. */ r = crypto_pk_asn1_encode(intro_key, buf+2, RELAY_PAYLOAD_SIZE-2); |