Commit 080e8f50 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge commit 'origin/maint-0.2.1'

parents c10c7c9d dfee1732

ChangeLog

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ Changes in version 0.2.1.23 - 2010-0?-?? 
      automatically discard guards picked using the old algorithm. Fixes

      bug 1217; bugfix on 0.2.1.3-alpha. Found by Mike Perry.



  o Major bugfixes:

    - Fix a potential buffer overflow in lookup_last_hid_serv_request()

     that could happen on 32-bit platforms with 64-bit time_t. Also fix

     a memory leak when requesting a hidden service descriptor we've

     requested before. Fixes bug 1242, bugfix on 0.2.0.18-alpha. Found

     by aakova.



  o Minor bugfixes:

    - When deciding whether to use strange flags to turn TLS renegotiation

      on, detect the OpenSSL version at run-time, not compile time.  We

src/or/rendclient.c

+5 −2
Original line number Diff line number Diff line
@@ -332,9 +332,12 @@ lookup_last_hid_serv_request(routerstatus_t *hs_dir, 
  tor_snprintf(hsdir_desc_comb_id, sizeof(hsdir_desc_comb_id), "%s%s",

               hsdir_id_base32, desc_id_base32);

  if (set) {

    last_request_ptr = tor_malloc_zero(sizeof(time_t *));

    time_t *oldptr;

    last_request_ptr = tor_malloc_zero(sizeof(time_t));

    *last_request_ptr = now;

    strmap_set(last_hid_serv_requests, hsdir_desc_comb_id, last_request_ptr);

    oldptr = strmap_set(last_hid_serv_requests, hsdir_desc_comb_id,

                        last_request_ptr);

    tor_free(oldptr);

  } else

    last_request_ptr = strmap_get_lc(last_hid_serv_requests,

                                     hsdir_desc_comb_id);