Commit 471ab340 authored by Andrea Shepard's avatar Andrea Shepard Committed by Nick Mathewson
Browse files

Refactor INTRODUCE2 parsing code in rend_service_introduce()

parent 36c96849

src/or/rendservice.c

+985 −182

File changed.

Preview size limit exceeded, changes collapsed.

src/or/rendservice.h

+73 −0
Original line number Diff line number Diff line
@@ -12,6 +12,64 @@ 
#ifndef _TOR_RENDSERVICE_H

#define _TOR_RENDSERVICE_H



#include "or.h"



typedef struct rend_intro_cell_s rend_intro_cell_t;



#ifdef RENDSERVICE_PRIVATE



/* This can be used for both INTRODUCE1 and INTRODUCE2 */



struct rend_intro_cell_s {

  /* Is this an INTRODUCE1 or INTRODUCE2? (set to 1 or 2) */

  uint8_t type;

  /* Public key digest */

  uint8_t pk[DIGEST_LEN];

  /* Optionally, store ciphertext here */

  uint8_t *ciphertext;

  ssize_t ciphertext_len;

  /* Optionally, store plaintext */

  uint8_t *plaintext;

  ssize_t plaintext_len;

  /* Have we parsed the plaintext? */

  uint8_t parsed;

  /* intro protocol version (0, 1, 2 or 3) */

  uint8_t version;

  /* Version-specific parts */

  union {

    struct {

      /* Rendezvous point nickname */

      uint8_t rp[20];

    } v0;

    struct {

      /* Rendezvous point nickname or hex-encoded key digest */

      uint8_t rp[42];

    } v1;

    struct {

      /* The extend_info_t struct has everything v2 uses */

      extend_info_t *extend_info;

    } v2;

    struct {

      /* Auth type used */

      uint8_t auth_type;

      /* Length of auth data */

      uint16_t auth_len;

      /* Auth data */

      uint8_t *auth_data;

      /* timestamp */

      uint32_t timestamp;

      /* Rendezvous point's IP address/port, identity digest and onion key */

      extend_info_t *extend_info;

    } v3;

  } u;

  /* Rendezvous cookie */

  uint8_t rc[REND_COOKIE_LEN];

  /* Diffie-Hellman data */

  uint8_t dh[DH_KEY_LEN];

};



#endif



int num_rend_services(void);

int rend_config_services(const or_options_t *options, int validate_only);

int rend_service_load_all_keys(void);
@@ -27,6 +85,21 @@ int rend_service_intro_established(origin_circuit_t *circuit, 
void rend_service_rendezvous_has_opened(origin_circuit_t *circuit);

int rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,

                           size_t request_len);

void rend_service_compact_intro(rend_intro_cell_t *request);

int rend_service_decrypt_intro(rend_intro_cell_t *request,

                               crypto_pk_t *key,

                               char **err_msg_out);

void rend_service_free_intro(rend_intro_cell_t *request);

rend_intro_cell_t * rend_service_begin_parse_intro(const uint8_t *request,

                                                   size_t request_len,

                                                   uint8_t type,

                                                   char **err_msg_out);

int rend_service_parse_intro_plaintext(rend_intro_cell_t *intro,

                                       char **err_msg_out);

int rend_service_validate_intro_early(const rend_intro_cell_t *intro,

                                      char **err_msg_out);

int rend_service_validate_intro_late(const rend_intro_cell_t *intro,

                                     char **err_msg_out);

void rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc);

int rend_service_set_connection_addr_port(edge_connection_t *conn,

                                          origin_circuit_t *circ);