nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Hiding crypt_path_t: Ensure that ->private is initialized."

Browse Source 
This reverts commit 7497c9193a0f2c891a0802bf5fbe73cf7ec1ca99.
This commit is contained in:
George Kadianakis 2019-04-26 14:28:03 +03:00
parent 4060b7623d
commit 2ef0324639
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/or/crypt_path.c
View File

@ -109,7 +109,6 @@ cpath_assert_layer_ok(const crypt_path_t *cp)
// tor_assert(cp->port); // tor_assert(cp->port);
tor_assert(cp); tor_assert(cp);
tor_assert(cp->magic == CRYPT_PATH_MAGIC); tor_assert(cp->magic == CRYPT_PATH_MAGIC);
tor_assert(cp->private);
switch (cp->state) switch (cp->state)
{ {
case CPATH_STATE_OPEN: case CPATH_STATE_OPEN:
@ -154,7 +153,6 @@ cpath_init_circuit_crypto(crypt_path_t *cpath,
{ {
tor_assert(cpath); tor_assert(cpath);
tor_assert(cpath->private);
return relay_crypto_init(&cpath->private->crypto, key_data, key_data_len, return relay_crypto_init(&cpath->private->crypto, key_data, key_data_len,
reverse, is_hs_v3); reverse, is_hs_v3);
} }
@ -163,7 +161,7 @@ cpath_init_circuit_crypto(crypt_path_t *cpath,
void void
cpath_free(crypt_path_t *victim) cpath_free(crypt_path_t *victim)
{ {
if (!victim || BUG(!victim->private)) if (!victim)
return; return;
relay_crypto_clear(&victim->private->crypto); relay_crypto_clear(&victim->private->crypto);
@ -182,9 +180,6 @@ cpath_free(crypt_path_t *victim)
void void
cpath_crypt_cell(const crypt_path_t *cpath, uint8_t *payload, bool is_decrypt) cpath_crypt_cell(const crypt_path_t *cpath, uint8_t *payload, bool is_decrypt)
{ {
tor_assert(cpath);
tor_assert(cpath->private);
if (is_decrypt) { if (is_decrypt) {
relay_crypt_one_payload(cpath->private->crypto.b_crypto, payload); relay_crypt_one_payload(cpath->private->crypto.b_crypto, payload);
} else { } else {
@ -196,8 +191,6 @@ cpath_crypt_cell(const crypt_path_t *cpath, uint8_t *payload, bool is_decrypt)
struct crypto_digest_t * struct crypto_digest_t *
cpath_get_incoming_digest(const crypt_path_t *cpath) cpath_get_incoming_digest(const crypt_path_t *cpath)
{ {
tor_assert(cpath);
tor_assert(cpath->private);
return cpath->private->crypto.b_digest; return cpath->private->crypto.b_digest;
} }
@ -206,8 +199,6 @@ cpath_get_incoming_digest(const crypt_path_t *cpath)
void void
cpath_set_cell_forward_digest(crypt_path_t *cpath, cell_t *cell) cpath_set_cell_forward_digest(crypt_path_t *cpath, cell_t *cell)
{ {
tor_assert(cpath);
tor_assert(cpath->private);
relay_set_digest(cpath->private->crypto.f_digest, cell); relay_set_digest(cpath->private->crypto.f_digest, cell);
} }