Commit a5081191 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Update to trunnel 1.4.4 to fix 18373

parent 2240aa12

changes/trunnel_update

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (code correctness):

    - Update to the latest version of Trunnel, which tries harder

      to avoid generating code that can invoke memcpy(p,NULL,0).

      Bug found by clang address sanitizer. Fixes bug 18373. Bugfix

      on 0.2.7.2-alpha.

src/ext/trunnel/trunnel-impl.h

+1 −1
Original line number Diff line number Diff line 
/* trunnel-impl.h -- copied from Trunnel v1.4.3

/* trunnel-impl.h -- copied from Trunnel v1.4.4

 * https://gitweb.torproject.org/trunnel.git

 * You probably shouldn't edit this file.

 */

src/ext/trunnel/trunnel.c

+1 −1
Original line number Diff line number Diff line 
/* trunnel.c -- copied from Trunnel v1.4.3

/* trunnel.c -- copied from Trunnel v1.4.4

 * https://gitweb.torproject.org/trunnel.git

 * You probably shouldn't edit this file.

 */

src/ext/trunnel/trunnel.h

+1 −1
Original line number Diff line number Diff line 
/* trunnel.h -- copied from Trunnel v1.4.3

/* trunnel.h -- copied from Trunnel v1.4.4

 * https://gitweb.torproject.org/trunnel.git

 * You probably shouldn't edit this file.

 */

src/trunnel/ed25519_cert.c

+5 −3
Original line number Diff line number Diff line 
/* ed25519_cert.c -- generated by Trunnel v1.4.3.

/* ed25519_cert.c -- generated by Trunnel v1.4.4.

 * https://gitweb.torproject.org/trunnel.git

 * You probably shouldn't edit this file.

 */
@@ -289,6 +289,7 @@ ed25519_cert_extension_encode(uint8_t *output, const size_t avail, const ed25519 
          trunnel_assert(written <= avail);

          if (avail - written < elt_len)

            goto truncated;

          if (elt_len)

            memcpy(ptr, obj->un_unparsed.elts_, elt_len);

          written += elt_len; ptr += elt_len;

        }
@@ -374,6 +375,7 @@ ed25519_cert_extension_parse_into(ed25519_cert_extension_t *obj, const uint8_t * 
        /* Parse u8 un_unparsed[] */

        TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->un_unparsed, remaining, {});

        obj->un_unparsed.n_ = remaining;

        if (remaining)

          memcpy(obj->un_unparsed.elts_, ptr, remaining);

        ptr += remaining; remaining -= remaining;

        break;