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

Merge branch 'onion_ntor_malloc_less'

Browse Source
This commit is contained in:
Nick Mathewson 2018-02-15 20:40:03 -05:00
commit ed1d630f0e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/feature25150 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (performance, allocation):
- Avoid a needless malloc()/free() pair every time we handle an ntor
handshake. Closes ticket 25150.

5
src/or/onion.c
View File

@ -563,20 +563,19 @@ onion_skin_server_handshake(int type,
return -1; return -1;
{ {
size_t keys_tmp_len = keys_out_len + DIGEST_LEN; size_t keys_tmp_len = keys_out_len + DIGEST_LEN;
uint8_t *keys_tmp = tor_malloc(keys_out_len + DIGEST_LEN); uint8_t keys_tmp[keys_tmp_len];
if (onion_skin_ntor_server_handshake( if (onion_skin_ntor_server_handshake(
onion_skin, keys->curve25519_key_map, onion_skin, keys->curve25519_key_map,
keys->junk_keypair, keys->junk_keypair,
keys->my_identity, keys->my_identity,
reply_out, keys_tmp, keys_tmp_len)<0) { reply_out, keys_tmp, keys_tmp_len)<0) {
tor_free(keys_tmp); /* no need to memwipe here, since the output will never be used */
return -1; return -1;
} }
memcpy(keys_out, keys_tmp, keys_out_len); memcpy(keys_out, keys_tmp, keys_out_len);
memcpy(rend_nonce_out, keys_tmp+keys_out_len, DIGEST_LEN); memcpy(rend_nonce_out, keys_tmp+keys_out_len, DIGEST_LEN);
memwipe(keys_tmp, 0, keys_tmp_len); memwipe(keys_tmp, 0, keys_tmp_len);
tor_free(keys_tmp);
r = NTOR_REPLY_LEN; r = NTOR_REPLY_LEN;
} }
break; break;