Update to trunnel 1.4.4 to fix 18373

diff --git a/changes/trunnel_update b/changes/trunnel_update
new file mode 100644 (file)
index 0000000..4f8c185
--- /dev/null
+++ b/changes/trunnel_update
@@ -0,0 +1,5 @@
+  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.

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index a97caf282f098eb475c27df1988b5d5ab8ca8da5..dfe5f89e1a526cdb76db051be9dd2fe6cb0eb83b 100644 (file)
--- a/src/ext/trunnel/trunnel-impl.h
+++ b/src/ext/trunnel/trunnel-impl.h
@@ -1,4 +1,4 @@
-/* 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.
  */

diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index 25a46d902230ba12b0c562e710d40328cdfa6ae5..0ed75aa9a45d19d1baa284825e087330b2f94c17 100644 (file)
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* 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.
  */

diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h
index 6140a3953fcdb219d4083d573d8a65a5d7d1f8d9..62e87ee50c7ed30811b87fa7767d5a54fa23842c 100644 (file)
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* 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.
  */

diff --git a/src/trunnel/ed25519_cert.c b/src/trunnel/ed25519_cert.c
index ee010dbff94bb4ab72f2edf0dd1c62e22c86ca38..f495743667bafa24b13706903fba5aa1a38fa74a 100644 (file)
--- a/src/trunnel/ed25519_cert.c
+++ b/src/trunnel/ed25519_cert.c
@@ -1,4 +1,4 @@
-/* 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,7 +289,8 @@ ed25519_cert_extension_encode(uint8_t *output, const size_t avail, const ed25519
           trunnel_assert(written <= avail);
           if (avail - written < elt_len)
             goto truncated;
-          memcpy(ptr, obj->un_unparsed.elts_, elt_len);
+          if (elt_len)
+            memcpy(ptr, obj->un_unparsed.elts_, elt_len);
           written += elt_len; ptr += elt_len;
         }
         break;
@@ -374,7 +375,8 @@ 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;
-        memcpy(obj->un_unparsed.elts_, ptr, remaining);
+        if (remaining)
+          memcpy(obj->un_unparsed.elts_, ptr, remaining);
         ptr += remaining; remaining -= remaining;
         break;
     }

diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h
index face810dbe6cbba11ef1f21e58677ff8406c6015..75a82d8aff4f69579807b7f12ebc779f4e0974ca 100644 (file)
--- a/src/trunnel/ed25519_cert.h
+++ b/src/trunnel/ed25519_cert.h
@@ -1,4 +1,4 @@
-/* ed25519_cert.h -- generated by by Trunnel v1.4.3.
+/* ed25519_cert.h -- generated by by Trunnel v1.4.4.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c
index f9b55f0739d0602b9776ba5fdd00eee9d6a2b4ff..3ef7341ae9a4845f058551a98880cfe30ff1b18d 100644 (file)
--- a/src/trunnel/link_handshake.c
+++ b/src/trunnel/link_handshake.c
@@ -1,4 +1,4 @@
-/* link_handshake.c -- generated by Trunnel v1.4.3.
+/* link_handshake.c -- generated by Trunnel v1.4.4.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -537,7 +537,8 @@ certs_cell_cert_encode(uint8_t *output, const size_t avail, const certs_cell_cer
     trunnel_assert(written <= avail);
     if (avail - written < elt_len)
       goto truncated;
-    memcpy(ptr, obj->body.elts_, elt_len);
+    if (elt_len)
+      memcpy(ptr, obj->body.elts_, elt_len);
     written += elt_len; ptr += elt_len;
   }
 
@@ -589,7 +590,8 @@ certs_cell_cert_parse_into(certs_cell_cert_t *obj, const uint8_t *input, const s
   CHECK_REMAINING(obj->cert_len, truncated);
   TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->body, obj->cert_len, {});
   obj->body.n_ = obj->cert_len;
-  memcpy(obj->body.elts_, ptr, obj->cert_len);
+  if (obj->cert_len)
+    memcpy(obj->body.elts_, ptr, obj->cert_len);
   ptr += obj->cert_len; remaining -= obj->cert_len;
   trunnel_assert(ptr + remaining == input + len_in);
   return len_in - remaining;
@@ -840,7 +842,8 @@ rsa_ed_crosscert_encode(uint8_t *output, const size_t avail, const rsa_ed_crossc
     trunnel_assert(written <= avail);
     if (avail - written < elt_len)
       goto truncated;
-    memcpy(ptr, obj->sig.elts_, elt_len);
+    if (elt_len)
+      memcpy(ptr, obj->sig.elts_, elt_len);
     written += elt_len; ptr += elt_len;
   }
 
@@ -899,7 +902,8 @@ rsa_ed_crosscert_parse_into(rsa_ed_crosscert_t *obj, const uint8_t *input, const
   CHECK_REMAINING(obj->sig_len, truncated);
   TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->sig, obj->sig_len, {});
   obj->sig.n_ = obj->sig_len;
-  memcpy(obj->sig.elts_, ptr, obj->sig_len);
+  if (obj->sig_len)
+    memcpy(obj->sig.elts_, ptr, obj->sig_len);
   ptr += obj->sig_len; remaining -= obj->sig_len;
   trunnel_assert(ptr + remaining == input + len_in);
   return len_in - remaining;
@@ -1467,7 +1471,8 @@ auth1_encode(uint8_t *output, const size_t avail, const auth1_t *obj, const auth
     trunnel_assert(written <= avail);
     if (avail - written < elt_len)
       goto truncated;
-    memcpy(ptr, obj->sig.elts_, elt_len);
+    if (elt_len)
+      memcpy(ptr, obj->sig.elts_, elt_len);
     written += elt_len; ptr += elt_len;
   }
 
@@ -1576,7 +1581,8 @@ auth1_parse_into(auth1_t *obj, const uint8_t *input, const size_t len_in, const
   /* Parse u8 sig[] */
   TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->sig, remaining, {});
   obj->sig.n_ = remaining;
-  memcpy(obj->sig.elts_, ptr, remaining);
+  if (remaining)
+    memcpy(obj->sig.elts_, ptr, remaining);
   ptr += remaining; remaining -= remaining;
   trunnel_assert(ptr + remaining == input + len_in);
   return len_in - remaining;

diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h
index 60bc28fa332fd036ef8ba500a7bb6f967499ef2e..2749ec7dd40b7dadcda15a08b90b5c68654ab0a0 100644 (file)
--- a/src/trunnel/link_handshake.h
+++ b/src/trunnel/link_handshake.h
@@ -1,4 +1,4 @@
-/* link_handshake.h -- generated by by Trunnel v1.4.3.
+/* link_handshake.h -- generated by by Trunnel v1.4.4.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c
index a80fbb949b32f0821e36de982626f143acf8f4e5..9b348a9b300482b4f28be80ec4be30fa27fda898 100644 (file)
--- a/src/trunnel/pwbox.c
+++ b/src/trunnel/pwbox.c
@@ -1,4 +1,4 @@
-/* pwbox.c -- generated by Trunnel v1.4.3.
+/* pwbox.c -- generated by Trunnel v1.4.4.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -362,7 +362,8 @@ pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *obj)
     trunnel_assert(written <= avail);
     if (avail - written < elt_len)
       goto truncated;
-    memcpy(ptr, obj->skey_header.elts_, elt_len);
+    if (elt_len)
+      memcpy(ptr, obj->skey_header.elts_, elt_len);
     written += elt_len; ptr += elt_len;
   }
 
@@ -380,7 +381,8 @@ pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *obj)
       trunnel_assert(written <= avail);
       if (avail - written < elt_len)
         goto truncated;
-      memcpy(ptr, obj->data.elts_, elt_len);
+      if (elt_len)
+        memcpy(ptr, obj->data.elts_, elt_len);
       written += elt_len; ptr += elt_len;
     }
     trunnel_assert(written <= avail);
@@ -460,7 +462,8 @@ pwbox_encoded_parse_into(pwbox_encoded_t *obj, const uint8_t *input, const size_
   CHECK_REMAINING(obj->header_len, truncated);
   TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->skey_header, obj->header_len, {});
   obj->skey_header.n_ = obj->header_len;
-  memcpy(obj->skey_header.elts_, ptr, obj->header_len);
+  if (obj->header_len)
+    memcpy(obj->skey_header.elts_, ptr, obj->header_len);
   ptr += obj->header_len; remaining -= obj->header_len;
 
   /* Parse u8 iv[16] */
@@ -476,7 +479,8 @@ pwbox_encoded_parse_into(pwbox_encoded_t *obj, const uint8_t *input, const size_
     /* Parse u8 data[] */
     TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->data, remaining, {});
     obj->data.n_ = remaining;
-    memcpy(obj->data.elts_, ptr, remaining);
+    if (remaining)
+      memcpy(obj->data.elts_, ptr, remaining);
     ptr += remaining; remaining -= remaining;
     if (remaining != 0)
       goto fail;

diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h
index c3579326816dd8052e4600aca8c97aadad6344cd..e69e2c1a0eb385bb3b4e69f0e3fd834fc958610a 100644 (file)
--- a/src/trunnel/pwbox.h
+++ b/src/trunnel/pwbox.h
@@ -1,4 +1,4 @@
-/* pwbox.h -- generated by by Trunnel v1.4.3.
+/* pwbox.h -- generated by by Trunnel v1.4.4.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */