Commit 1c3b823a authored by Roger Dingledine's avatar Roger Dingledine
Browse files

bugfix: create_onion now works with routelen>2 


svn:r66
parent 684d50b1

src/or/onion.c

+3 −6
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ unsigned char *create_onion(routerinfo_t **rarray, size_t rarray_len, unsigned i 
  unsigned char *bufp;

  routerinfo_t *router;



  if ( (rarray) && (route) && (lenp) ) /* valid parameters */

  {

  assert(rarray && route && lenp && routelen);



    /* calculate the size of the onion */

    *lenp = routelen * 28 + 100; /* 28 bytes per layer + 100 bytes padding for the innermost layer */

    log(LOG_DEBUG,"create_onion() : Size of the onion is %u.",*lenp);
@@ -337,13 +337,10 @@ unsigned char *create_onion(routerinfo_t **rarray, size_t rarray_len, unsigned i 
      log(LOG_DEBUG,"create_onion() : Encrypted layer.");

      

      /* calculate pointer to next layer */

      layer = (onion_layer_t *)bufp + (routelen-i-2)*sizeof(onion_layer_t);

      layer = (onion_layer_t *)(bufp + (routelen-i-2)*sizeof(onion_layer_t));

    }



    return bufp;

  } /* valid parameters */

  else

    return NULL;

}



/* encrypts 128 bytes of the onion with the specified public key, the rest with