|
@@ -94,7 +94,7 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request,
|
|
|
|
|
|
/* Close any other intro circuits with the same pk. */
|
|
|
c = NULL;
|
|
|
- while ((c = circuit_get_intro_point(pk_digest))) {
|
|
|
+ while ((c = circuit_get_intro_point((const uint8_t *)pk_digest))) {
|
|
|
log_info(LD_REND, "Replacing old circuit for service %s",
|
|
|
safe_str(serviceid));
|
|
|
circuit_mark_for_close(TO_CIRCUIT(c), END_CIRC_REASON_FINISHED);
|
|
@@ -165,7 +165,7 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request,
|
|
|
(char*)request, REND_SERVICE_ID_LEN);
|
|
|
|
|
|
/* The first 20 bytes are all we look at: they have a hash of Bob's PK. */
|
|
|
- intro_circ = circuit_get_intro_point((char*)request);
|
|
|
+ intro_circ = circuit_get_intro_point((const uint8_t*)request);
|
|
|
if (!intro_circ) {
|
|
|
log_info(LD_REND,
|
|
|
"No intro circ found for INTRODUCE1 cell (%s) from circuit %u; "
|
|
@@ -235,7 +235,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request,
|
|
|
goto err;
|
|
|
}
|
|
|
|
|
|
- if (circuit_get_rendezvous((char*)request)) {
|
|
|
+ if (circuit_get_rendezvous(request)) {
|
|
|
log_warn(LD_PROTOCOL,
|
|
|
"Duplicate rendezvous cookie in ESTABLISH_RENDEZVOUS.");
|
|
|
goto err;
|
|
@@ -299,7 +299,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
|
|
|
"Got request for rendezvous from circuit %u to cookie %s.",
|
|
|
(unsigned)circ->p_circ_id, hexid);
|
|
|
|
|
|
- rend_circ = circuit_get_rendezvous((char*)request);
|
|
|
+ rend_circ = circuit_get_rendezvous(request);
|
|
|
if (!rend_circ) {
|
|
|
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
|
|
|
"Rejecting RENDEZVOUS1 cell with unrecognized rendezvous cookie %s.",
|