[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[nickm@xxxxxxxxxxxxxx]

commit e908e3a332dd469af2facac0846d0dc8349a30d3
Merge: 919bf6f 4a22046
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 16 14:49:55 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
    
    Fixed trivial conflict due to headers moving into their own .h files
    from or.h.
    
    Conflicts:
    	src/or/or.h

 changes/check-fetched-rend-desc-service-id |    7 +++++++
 changes/check-public-key-exponents         |    5 +++++
 src/common/crypto.c                        |   12 ++++++++++++
 src/common/crypto.h                        |    1 +
 src/or/directory.c                         |    5 +++--
 src/or/rendcommon.c                        |   22 +++++++++++++++++++++-
 src/or/rendcommon.h                        |    3 ++-
 src/or/routerparse.c                       |   17 +++++++++++++++++
 8 files changed, 68 insertions(+), 4 deletions(-)

diff --cc src/or/rendcommon.h
index 44b5227,0000000..c51039f
mode 100644,000000..100644
--- a/src/or/rendcommon.h
+++ b/src/or/rendcommon.h
@@@ -1,66 -1,0 +1,67 @@@
 +/* Copyright (c) 2001 Matej Pfajfar.
 + * Copyright (c) 2001-2004, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2011, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file rendcommon.h
 + * \brief Header file for rendcommon.c.
 + **/
 +
 +#ifndef _TOR_RENDCOMMON_H
 +#define _TOR_RENDCOMMON_H
 +
 +/** Free all storage associated with <b>data</b> */
 +static INLINE void
 +rend_data_free(rend_data_t *data)
 +{
 +  tor_free(data);
 +}
 +
 +int rend_cmp_service_ids(const char *one, const char *two);
 +
 +void rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint,
 +                             int command, size_t length,
 +                             const uint8_t *payload);
 +
 +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);
 +void rend_encoded_v2_service_descriptor_free(
 +                               rend_encoded_v2_service_descriptor_t *desc);
 +void rend_intro_point_free(rend_intro_point_t *intro);
 +
 +void rend_cache_init(void);
 +void rend_cache_clean(void);
 +void rend_cache_clean_v2_descs_as_dir(void);
 +void rend_cache_purge(void);
 +void rend_cache_free_all(void);
 +int rend_valid_service_id(const char *query);
 +int rend_cache_lookup_desc(const char *query, int version, const char **desc,
 +                           size_t *desc_len);
 +int rend_cache_lookup_entry(const char *query, int version,
 +                            rend_cache_entry_t **entry_out);
 +int rend_cache_lookup_v2_desc_as_dir(const char *query, const char **desc);
- int rend_cache_store(const char *desc, size_t desc_len, int published);
++int rend_cache_store(const char *desc, size_t desc_len, int published,
++                     const char *service_id);
 +int rend_cache_store_v2_desc_as_client(const char *desc,
 +                                       const rend_data_t *rend_query);
 +int rend_cache_store_v2_desc_as_dir(const char *desc);
 +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,
 +                               smartlist_t *client_cookies);
 +int rend_compute_v2_desc_id(char *desc_id_out, const char *service_id,
 +                            const char *descriptor_cookie,
 +                            time_t now, uint8_t replica);
 +int rend_id_is_in_interval(const char *a, const char *b, const char *c);
 +void rend_get_descriptor_id_bytes(char *descriptor_id_out,
 +                                  const char *service_id,
 +                                  const char *secret_id_part);
 +
 +#endif
 +



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits