diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-18 15:54:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-18 15:54:56 -0500 |
| commit | a812e8b6a875241839e2fd367c31b9e446977dff (patch) | |
| tree | 348d58b6bc8b8ae33ea9a5b7e8b0f755586bc534 /src/or/rendcommon.h | |
| parent | d1b40cf2e7bb55d3c421e6eff476330e08ab4750 (diff) | |
| parent | 26e789fbfd4e5a7e2789c1577e8eb967de3eba86 (diff) | |
| download | tor-a812e8b6a875241839e2fd367c31b9e446977dff.tar.gz tor-a812e8b6a875241839e2fd367c31b9e446977dff.zip | |
Merge branch 'bug4893'
Diffstat (limited to 'src/or/rendcommon.h')
| -rw-r--r-- | src/or/rendcommon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index 0d64466dbe..e633155038 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -28,7 +28,7 @@ void rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint, void rend_service_descriptor_free(rend_service_descriptor_t *desc); rend_service_descriptor_t *rend_parse_service_descriptor(const char *str, size_t len); -int rend_get_service_id(crypto_pk_env_t *pk, char *out); +int rend_get_service_id(crypto_pk_t *pk, char *out); void rend_encoded_v2_service_descriptor_free( rend_encoded_v2_service_descriptor_t *desc); void rend_intro_point_free(rend_intro_point_t *intro); @@ -53,7 +53,7 @@ int rend_cache_size(void); int rend_encode_v2_descriptors(smartlist_t *descs_out, rend_service_descriptor_t *desc, time_t now, uint8_t period, rend_auth_type_t auth_type, - crypto_pk_env_t *client_key, + crypto_pk_t *client_key, smartlist_t *client_cookies); int rend_compute_v2_desc_id(char *desc_id_out, const char *service_id, const char *descriptor_cookie, |