torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use symbolic constants; make padding types match.

Browse Source 
svn:r1491
This commit is contained in:
Nick Mathewson
2004-04-05 21:15:14 +00:00
parent 04e8dc9026
commit 5033c366e1
3 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/rendclient.c
+9 -8
View File
@@ -41,13 +41,11 @@ rend_client_send_establish_rendezvous(circuit_t *circ)
return 0;
}
#define LEN_REND_INTRODUCE1 (20+20+20+16+128+42)
int
rend_client_send_introduction(circuit_t *introcirc, circuit_t *rendcirc) {
const char *descp;
int desc_len;
char payload[LEN_REND_INTRODUCE1];
int desc_len, payload_len, r;
char payload[RELAY_PAYLOAD_SIZE];
char tmp[20+20+128];
rend_service_descriptor_t *parsed=NULL;
crypt_path_t *cpath;
@@ -94,18 +92,21 @@ rend_client_send_introduction(circuit_t *introcirc, circuit_t *rendcirc) {
goto err;
}
if(crypto_pk_public_hybrid_encrypt(parsed->pk, tmp,
20+20+128, payload+20,
PK_PKCS1_OAEP_PADDING) < 0) {
r = crypto_pk_public_hybrid_encrypt(parsed->pk, tmp,
20+20+128, payload+20,
PK_PKCS1_OAEP_PADDING);
if (r<0) {
log_fn(LOG_WARN,"hybrid pk encrypt failed.");
goto err;
}
payload_len = 20 + r;
rend_service_descriptor_free(parsed);
if (connection_edge_send_command(NULL, introcirc,
RELAY_COMMAND_INTRODUCE1,
payload, LEN_REND_INTRODUCE1,
payload, payload_len,
introcirc->cpath->prev)<0) {
/* introcirc is already marked for close. leave rendcirc alone. */
log_fn(LOG_WARN, "Couldn't send INTRODUCE1 cell");