diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-24 17:51:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-24 17:51:52 -0500 |
| commit | aaa5737a2e6141bdff13f03051500d2f0ce84861 (patch) | |
| tree | 48092b2a74632078dc0163f90969d52952b3758b /src/or | |
| parent | c496229b0a8d90a327674a03aa5be455014b4d5c (diff) | |
| parent | 5ed73e3807d90dd0a3a2e5542f98a0a58374a066 (diff) | |
| download | tor-aaa5737a2e6141bdff13f03051500d2f0ce84861.tar tor-aaa5737a2e6141bdff13f03051500d2f0ce84861.tar.gz | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/onion.c | 4 | ||||
| -rw-r--r-- | src/or/rendclient.c | 2 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/or/onion.c b/src/or/onion.c index 323e0003e..9aa16d274 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -184,7 +184,7 @@ onion_skin_create(crypto_pk_env_t *dest_router_key, *handshake_state_out = NULL; memset(onion_skin_out, 0, ONIONSKIN_CHALLENGE_LEN); - if (!(dh = crypto_dh_new())) + if (!(dh = crypto_dh_new(DH_TYPE_CIRCUIT))) goto err; dhbytes = crypto_dh_get_bytes(dh); @@ -258,7 +258,7 @@ onion_skin_server_handshake(const char *onion_skin, /*ONIONSKIN_CHALLENGE_LEN*/ goto err; } - dh = crypto_dh_new(); + dh = crypto_dh_new(DH_TYPE_CIRCUIT); if (crypto_dh_get_public(dh, handshake_reply_out, DH_KEY_LEN)) { log_info(LD_GENERAL, "crypto_dh_get_public failed."); goto err; diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 255c16bf0..7b71850ae 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -122,7 +122,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, cpath = rendcirc->build_state->pending_final_cpath = tor_malloc_zero(sizeof(crypt_path_t)); cpath->magic = CRYPT_PATH_MAGIC; - if (!(cpath->dh_handshake_state = crypto_dh_new())) { + if (!(cpath->dh_handshake_state = crypto_dh_new(DH_TYPE_REND))) { log_warn(LD_BUG, "Internal error: couldn't allocate DH."); goto err; } diff --git a/src/or/rendservice.c b/src/or/rendservice.c index c920ecf04..5d65f473d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1101,7 +1101,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, } /* Try DH handshake... */ - dh = crypto_dh_new(); + dh = crypto_dh_new(DH_TYPE_REND); if (!dh || crypto_dh_generate_public(dh)<0) { log_warn(LD_BUG,"Internal error: couldn't build DH state " "or generate public key."); |