Commit 896271d5 authored by John Brooks's avatar John Brooks
Browse files

Use uint8_t for rend descriptor_cookie fields

parent b531fc7d

src/or/connection_edge.c

+2 −2
Original line number Diff line number Diff line
@@ -1503,7 +1503,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, 
    rend_service_authorization_t *client_auth =

      rend_client_lookup_service_authorization(socks->address);



    const char *cookie = NULL;

    const uint8_t *cookie = NULL;

    rend_auth_type_t auth_type = REND_NO_AUTH;

    if (client_auth) {

      log_info(LD_REND, "Using previously configured client authorization "
@@ -1515,7 +1515,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, 
    /* Fill in the rend_data field so we can start doing a connection to

     * a hidden service. */

    rend_data_t *rend_data = ENTRY_TO_EDGE_CONN(conn)->rend_data =

      rend_data_client_create(socks->address, NULL, cookie, auth_type);

      rend_data_client_create(socks->address, NULL, (char *) cookie, auth_type);

    if (rend_data == NULL) {

      return -1;

    }

src/or/or.h

+2 −2
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ typedef enum rend_auth_type_t { 


/** Client-side configuration of authorization for a hidden service. */

typedef struct rend_service_authorization_t {

  char descriptor_cookie[REND_DESC_COOKIE_LEN];

  uint8_t descriptor_cookie[REND_DESC_COOKIE_LEN];

  char onion_address[REND_SERVICE_ADDRESS_LEN+1];

  rend_auth_type_t auth_type;

} rend_service_authorization_t;
@@ -4851,7 +4851,7 @@ typedef enum { 
/** Hidden-service side configuration of client authorization. */

typedef struct rend_authorized_client_t {

  char *client_name;

  char descriptor_cookie[REND_DESC_COOKIE_LEN];

  uint8_t descriptor_cookie[REND_DESC_COOKIE_LEN];

  crypto_pk_t *client_key;

} rend_authorized_client_t;

src/or/rendservice.c

+2 −2
Original line number Diff line number Diff line
@@ -1208,10 +1208,10 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) 
      memcpy(client->descriptor_cookie, parsed->descriptor_cookie,

             REND_DESC_COOKIE_LEN);

    } else {

      crypto_rand(client->descriptor_cookie, REND_DESC_COOKIE_LEN);

      crypto_rand((char *) client->descriptor_cookie, REND_DESC_COOKIE_LEN);

    }

    if (base64_encode(desc_cook_out, 3*REND_DESC_COOKIE_LEN_BASE64+1,

                      client->descriptor_cookie,

                      (char *) client->descriptor_cookie,

                      REND_DESC_COOKIE_LEN, 0) < 0) {

      log_warn(LD_BUG, "Could not base64-encode descriptor cookie.");

      goto err;