diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-01-13 20:21:11 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-01-13 20:21:11 +0000 |
| commit | 22f7934718f505cc04bbb4b1ee3a09e38e10d272 (patch) | |
| tree | 6cf7ca114fd1c12aac42a2ad33895b69abb29dcb /src/or | |
| parent | 0703d01b13e6f594c51357bad273e0b26078c13c (diff) | |
| download | tor-22f7934718f505cc04bbb4b1ee3a09e38e10d272.tar.gz tor-22f7934718f505cc04bbb4b1ee3a09e38e10d272.zip | |
start generating version 1 style introduce cells
svn:r3352
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/rendclient.c | 13 | ||||
| -rw-r--r-- | src/or/rendmid.c | 3 | ||||
| -rw-r--r-- | src/or/rendservice.c | 3 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index cf16eb7337..be54895249 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -93,20 +93,11 @@ rend_client_send_introduction(circuit_t *introcirc, circuit_t *rendcirc) { } /* write the remaining items into tmp */ -#if 0 /* switch over when 0.0.9pre4 is obsolete */ tmp[0] = 1; /* version 1 of the cell format */ strncpy(tmp+1, rendcirc->build_state->chosen_exit_name, (MAX_HEX_NICKNAME_LEN+1)); /* nul pads */ memcpy(tmp+1+MAX_HEX_NICKNAME_LEN+1, rendcirc->rend_cookie, REND_COOKIE_LEN); -#else - strncpy(tmp, rendcirc->build_state->chosen_exit_name, (MAX_NICKNAME_LEN+1)); /* nul pads */ - memcpy(tmp+MAX_NICKNAME_LEN+1, rendcirc->rend_cookie, REND_COOKIE_LEN); -#endif if (crypto_dh_get_public(cpath->handshake_state, -#if 0 tmp+1+MAX_HEX_NICKNAME_LEN+1+REND_COOKIE_LEN, -#else - tmp+MAX_NICKNAME_LEN+1+REND_COOKIE_LEN, -#endif DH_KEY_LEN)<0) { log_fn(LOG_WARN, "Couldn't extract g^x"); goto err; @@ -115,11 +106,7 @@ rend_client_send_introduction(circuit_t *introcirc, circuit_t *rendcirc) { /*XXX maybe give crypto_pk_public_hybrid_encrypt a max_len arg, * to avoid buffer overflows? */ r = crypto_pk_public_hybrid_encrypt(entry->parsed->pk, payload+DIGEST_LEN, tmp, -#if 0 1+MAX_HEX_NICKNAME_LEN+1+REND_COOKIE_LEN+DH_KEY_LEN, -#else - MAX_NICKNAME_LEN+1+REND_COOKIE_LEN+DH_KEY_LEN, -#endif PK_PKCS1_OAEP_PADDING, 0); if (r<0) { log_fn(LOG_WARN,"hybrid pk encrypt failed."); diff --git a/src/or/rendmid.c b/src/or/rendmid.c index a6f28a4b81..302a6f011f 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -123,8 +123,7 @@ rend_mid_introduce(circuit_t *circ, const char *request, size_t request_len) goto err; } -/* change MAX_NICKNAME_LEN to MAX_HEX_NICKNAME_LEN when 0.0.8.1 and - * 0.0.9pre3-4 are obsolete. */ + /* change to MAX_HEX_NICKNAME_LEN once 0.0.9.x is obsolete */ if (request_len < (DIGEST_LEN+(MAX_NICKNAME_LEN+1)+REND_COOKIE_LEN+ DH_KEY_LEN+CIPHER_KEY_LEN+PKCS1_OAEP_PADDING_OVERHEAD)) { log_fn(LOG_WARN, diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 023ebd4ab7..141a4669f9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -422,8 +422,7 @@ rend_service_introduce(circuit_t *circuit, const char *request, size_t request_l rp_nickname = buf; version = 0; } - /* XXX when 0.0.8.1 and 0.0.9pre3-4 are obsolete, change this to - * reject version != 1. */ + /* XXX when 0.0.9.x is obsolete, change this to reject version != 1. */ ptr=memchr(rp_nickname,0,nickname_field_len); if (!ptr || ptr == rp_nickname) { log_fn(LOG_WARN, "Couldn't find a null-padded nickname in INTRODUCE2 cell"); |