nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of clang warnings

Browse Source
This commit is contained in:
Nick Mathewson 2017-07-07 11:32:15 -04:00
parent c387cc5022
commit c7d2a67274
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/circuitbuild.c
View File

@ -1426,12 +1426,13 @@ circuit_init_cpath_crypto(crypt_path_t *cpath,
tor_assert(digest_len != 0); tor_assert(digest_len != 0);
tor_assert(cipher_key_len != 0); tor_assert(cipher_key_len != 0);
const int cipher_key_bits = (int) cipher_key_len * 8;
crypto_digest_add_bytes(cpath->f_digest, key_data, digest_len); crypto_digest_add_bytes(cpath->f_digest, key_data, digest_len);
crypto_digest_add_bytes(cpath->b_digest, key_data+digest_len, digest_len); crypto_digest_add_bytes(cpath->b_digest, key_data+digest_len, digest_len);
cpath->f_crypto = crypto_cipher_new_with_bits(key_data+(2*digest_len), cpath->f_crypto = crypto_cipher_new_with_bits(key_data+(2*digest_len),
cipher_key_len*8); cipher_key_bits);
if (!cpath->f_crypto) { if (!cpath->f_crypto) {
log_warn(LD_BUG,"Forward cipher initialization failed."); log_warn(LD_BUG,"Forward cipher initialization failed.");
return -1; return -1;
@ -1439,7 +1440,7 @@ circuit_init_cpath_crypto(crypt_path_t *cpath,
cpath->b_crypto = crypto_cipher_new_with_bits( cpath->b_crypto = crypto_cipher_new_with_bits(
key_data+(2*digest_len)+cipher_key_len, key_data+(2*digest_len)+cipher_key_len,
cipher_key_len*8); cipher_key_bits);
if (!cpath->b_crypto) { if (!cpath->b_crypto) {
log_warn(LD_BUG,"Backward cipher initialization failed."); log_warn(LD_BUG,"Backward cipher initialization failed.");
return -1; return -1;

2
src/test/test_hs_client.c
View File

@ -130,7 +130,7 @@ helper_get_circ_and_stream_for_test(origin_circuit_t **circ_out,
static void static void
test_e2e_rend_circuit_setup_legacy(void *arg) test_e2e_rend_circuit_setup_legacy(void *arg)
{ {
int retval; ssize_t retval;
origin_circuit_t *or_circ = NULL; origin_circuit_t *or_circ = NULL;
connection_t *conn = NULL; connection_t *conn = NULL;