Merge remote-tracking branch 'nickm/ticket30454_034_01_squashed' into ticket30454_035_01

diff --cc src/feature/hs/hs_cell.c
Simple merge

diff --cc src/feature/hs/hs_cell.h
Simple merge

diff --cc src/feature/hs/hs_client.c
index bd43ef6132cb130eb95ca024ea63af1144b5389f,7d44952e4dbf94cf2b26fc01b55aa94807145d00..2a5765aec203bc7e5e965e833c64ad12fdeab69a
--- 1/src/feature/hs/hs_client.c
--- 2/src/or/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@@ -8,45 -8,35 +8,47 @@@
  
  #define HS_CLIENT_PRIVATE
  
 -#include "or.h"
 -#include "circpathbias.h"
 -#include "circuitbuild.h"
 -#include "circuitlist.h"
 -#include "circuituse.h"
 -#include "config.h"
 -#include "connection.h"
 -#include "connection_edge.h"
 -#include "container.h"
 -#include "crypto_rand.h"
 -#include "crypto_util.h"
 -#include "directory.h"
 -#include "hs_cache.h"
 -#include "hs_cell.h"
 -#include "hs_circuit.h"
 -#include "hs_client.h"
 -#include "hs_control.h"
 -#include "hs_descriptor.h"
 -#include "hs_ident.h"
 -#include "hs_ntor.h"
 -#include "networkstatus.h"
 -#include "nodelist.h"
 -#include "reasons.h"
 -#include "rendclient.h"
 -#include "router.h"
 -#include "routerset.h"
 +#include "core/or/or.h"
 +#include "app/config/config.h"
 +#include "core/crypto/hs_ntor.h"
 +#include "core/mainloop/connection.h"
 +#include "core/or/circuitbuild.h"
 +#include "core/or/circuitlist.h"
 +#include "core/or/circuituse.h"
 +#include "core/or/connection_edge.h"
 +#include "core/or/reasons.h"
 +#include "feature/client/circpathbias.h"
 +#include "feature/dirclient/dirclient.h"
 +#include "feature/dircommon/directory.h"
 +#include "feature/hs/hs_cache.h"
 +#include "feature/hs/hs_cell.h"
 +#include "feature/hs/hs_circuit.h"
 +#include "feature/hs/hs_circuitmap.h"
 +#include "feature/hs/hs_client.h"
 +#include "feature/hs/hs_control.h"
 +#include "feature/hs/hs_descriptor.h"
 +#include "feature/hs/hs_ident.h"
 +#include "feature/nodelist/describe.h"
 +#include "feature/nodelist/networkstatus.h"
 +#include "feature/nodelist/nodelist.h"
 +#include "feature/nodelist/routerset.h"
 +#include "feature/rend/rendclient.h"
 +#include "lib/crypt_ops/crypto_format.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "lib/crypt_ops/crypto_util.h"
 +
 +#include "core/or/cpath_build_state_st.h"
 +#include "feature/dircommon/dir_connection_st.h"
 +#include "core/or/entry_connection_st.h"
 +#include "core/or/extend_info_st.h"
 +#include "core/or/origin_circuit_st.h"
 +
 +/* Client-side authorizations for hidden services; map of service identity
 + * public key to hs_client_service_authorization_t *. */
 +static digest256map_t *client_auths = NULL;
  
+ #include "trunnel/hs/cell_introduce1.h"
+ 
  /* Return a human-readable string for the client fetch status code. */
  static const char *
  fetch_status_to_string(hs_client_fetch_status_t status)

diff --cc src/feature/hs/hs_intropoint.c
Simple merge

diff --cc src/feature/hs/hs_intropoint.h
index 659a9ad0525f3485ece9db4a30978cc85fdc7ce3,1891bffacc1788e02c264d7b9112645775796e15..e82575f05239041bffd9266fac29eed330a48c7d
--- 1/src/feature/hs/hs_intropoint.h
--- 2/src/or/hs_intropoint.h
+++ b/src/feature/hs/hs_intropoint.h
@@@ -9,24 -9,9 +9,9 @@@
  #ifndef TOR_HS_INTRO_H
  #define TOR_HS_INTRO_H
  
 -#include "crypto_curve25519.h"
 -#include "torcert.h"
 +#include "lib/crypt_ops/crypto_curve25519.h"
 +#include "feature/nodelist/torcert.h"
  
- /* Authentication key type in an ESTABLISH_INTRO cell. */
- typedef enum {
-   HS_INTRO_AUTH_KEY_TYPE_LEGACY0 = 0x00,
-   HS_INTRO_AUTH_KEY_TYPE_LEGACY1 = 0x01,
-   HS_INTRO_AUTH_KEY_TYPE_ED25519 = 0x02,
- } hs_intro_auth_key_type_t;
- 
- /* INTRODUCE_ACK status code. */
- typedef enum {
-   HS_INTRO_ACK_STATUS_SUCCESS    = 0x0000,
-   HS_INTRO_ACK_STATUS_UNKNOWN_ID = 0x0001,
-   HS_INTRO_ACK_STATUS_BAD_FORMAT = 0x0002,
-   HS_INTRO_ACK_STATUS_CANT_RELAY = 0x0003,
- } hs_intro_ack_status_t;
- 
  /* Object containing introduction point common data between the service and
   * the client side. */
  typedef struct hs_intropoint_t {

diff --cc src/test/test_hs_cell.c
Simple merge

diff --cc src/test/test_hs_intropoint.c
Simple merge