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

clean up an ia64 warning

Browse Source 
svn:r1140
This commit is contained in:
Roger Dingledine 2004-02-27 01:59:36 +00:00
parent 1bc2384c5a
commit 1b3c197fad
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/circuit.c
View File

@ -1109,15 +1109,15 @@ int circuit_finish_handshake(circuit_t *circ, char *reply) {
crypto_dh_free(hop->handshake_state); /* don't need it anymore */ crypto_dh_free(hop->handshake_state); /* don't need it anymore */
hop->handshake_state = NULL; hop->handshake_state = NULL;
log_fn(LOG_INFO,"hop %d init digest forward %u, backward %u.", log_fn(LOG_INFO,"hop init digest forward %u, backward %u.",
(int)hop, (unsigned)*(uint32_t*)keys, (unsigned)*(uint32_t*)(keys+20)); (unsigned)*(uint32_t*)keys, (unsigned)*(uint32_t*)(keys+20));
hop->f_digest = crypto_new_digest_env(CRYPTO_SHA1_DIGEST); hop->f_digest = crypto_new_digest_env(CRYPTO_SHA1_DIGEST);
crypto_digest_add_bytes(hop->f_digest, keys, 20); crypto_digest_add_bytes(hop->f_digest, keys, 20);
hop->b_digest = crypto_new_digest_env(CRYPTO_SHA1_DIGEST); hop->b_digest = crypto_new_digest_env(CRYPTO_SHA1_DIGEST);
crypto_digest_add_bytes(hop->b_digest, keys+20, 20); crypto_digest_add_bytes(hop->b_digest, keys+20, 20);
log_fn(LOG_DEBUG,"hop %d init cipher forward %u, backward %u.", log_fn(LOG_DEBUG,"hop init cipher forward %u, backward %u.",
(int)hop, (unsigned)*(uint32_t*)(keys+40), (unsigned) *(uint32_t*)(keys+40+16)); (unsigned)*(uint32_t*)(keys+40), (unsigned) *(uint32_t*)(keys+40+16));
if (!(hop->f_crypto = if (!(hop->f_crypto =
crypto_create_init_cipher(CIRCUIT_CIPHER,keys+40,iv,1))) { crypto_create_init_cipher(CIRCUIT_CIPHER,keys+40,iv,1))) {
log(LOG_WARN,"forward cipher initialization failed."); log(LOG_WARN,"forward cipher initialization failed.");
@ -1173,7 +1173,6 @@ int circuit_truncated(circuit_t *circ, crypt_path_t *layer) {
return 0; return 0;
} }
void assert_cpath_layer_ok(const crypt_path_t *cp) void assert_cpath_layer_ok(const crypt_path_t *cp)
{ {
assert(cp->f_crypto); assert(cp->f_crypto);