[tor-commits] [tor/master] Merge branch 'dgoulet_ticket19043_030_03_squashed'

[nickm at torproject.org]

commit c838d34921f3e86841ff75ca8ad78c95bd1e2996
Merge: 963e706 a4eb17e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 14 15:28:28 2016 -0500

    Merge branch 'dgoulet_ticket19043_030_03_squashed'

 changes/bug19043              |   5 +
 src/common/crypto.c           |  29 ++++
 src/common/crypto.h           |   4 +
 src/common/crypto_ed25519.c   |  10 +-
 src/common/crypto_ed25519.h   |  11 +-
 src/or/circuitlist.c          | 179 +--------------------
 src/or/circuitlist.h          |   4 -
 src/or/hs_circuitmap.c        | 328 ++++++++++++++++++++++++++++++++++++++
 src/or/hs_circuitmap.h        |  69 ++++++++
 src/or/hs_common.h            |   7 +-
 src/or/hs_intropoint.c        | 288 +++++++++++++++++++++++++++++++++
 src/or/hs_intropoint.h        |  40 +++++
 src/or/hs_service.c           | 175 ++++++++++++++++++++
 src/or/hs_service.h           |  31 ++++
 src/or/include.am             |   6 +
 src/or/main.c                 |   5 +
 src/or/or.h                   |  22 +--
 src/or/rendcommon.c           |   3 +-
 src/or/rendmid.c              |  32 ++--
 src/or/rendmid.h              |   4 +-
 src/or/rendservice.c          | 103 +++++++-----
 src/or/rendservice.h          |   3 +
 src/test/include.am           |   2 +
 src/test/test.c               |   4 +-
 src/test/test.h               |   2 +
 src/test/test_circuitlist.c   |  63 ++++----
 src/test/test_crypto.c        |  49 ++++++
 src/test/test_hs_intropoint.c | 361 ++++++++++++++++++++++++++++++++++++++++++
 src/test/test_hs_service.c    | 112 +++++++++++++
 29 files changed, 1660 insertions(+), 291 deletions(-)

diff --cc src/or/rendservice.h
index 3b18567,8fb3e8f..4e6b9a2
--- a/src/or/rendservice.h
+++ b/src/or/rendservice.h
@@@ -119,16 -119,9 +119,19 @@@ typedef struct rend_service_t 
  
  STATIC void rend_service_free(rend_service_t *service);
  STATIC char *rend_service_sos_poison_path(const rend_service_t *service);
 +STATIC int rend_service_check_dir_and_add(smartlist_t *service_list,
 +                                          const or_options_t *options,
 +                                          rend_service_t *service,
 +                                          int validate_only);
 +STATIC int rend_service_verify_single_onion_poison(
 +                                                  const rend_service_t *s,
 +                                                  const or_options_t *options);
 +STATIC int rend_service_poison_new_single_onion_dir(
 +                                                  const rend_service_t *s,
 +                                                  const or_options_t* options);
+ STATIC ssize_t encode_establish_intro_cell_legacy(char *cell_body_out,
+                                                   crypto_pk_t *intro_key,
+                                                   char *rend_circ_nonce);
  #endif
  
  int num_rend_services(void);