Re-run trunnel.

src/ext/trunnel/trunnel-impl.h

@@ -1,4 +1,4 @@
-/* trunnel-impl.h -- copied from Trunnel v1.4.4
+/* trunnel-impl.h -- copied from Trunnel v1.4.6
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -11,12 +11,12 @@
 
 #ifndef TRUNNEL_IMPL_H_INCLUDED_
 #define TRUNNEL_IMPL_H_INCLUDED_
-#include "trunnel.h"
-#include <assert.h>
-#include <string.h>
 #ifdef TRUNNEL_LOCAL_H
 #include "trunnel-local.h"
 #endif
+#include "trunnel.h"
+#include <assert.h>
+#include <string.h>
 
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 #define uint8_t unsigned char

src/ext/trunnel/trunnel.c

@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.4.4
+/* trunnel.c -- copied from Trunnel v1.4.6
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -10,9 +10,9 @@
  * See trunnel-impl.h for documentation of these functions.
  */
 
+#include "trunnel-impl.h"
 #include <stdlib.h>
 #include <string.h>
-#include "trunnel-impl.h"
 
 #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
 	__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

src/ext/trunnel/trunnel.h

@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.4.4
+/* trunnel.h -- copied from Trunnel v1.4.6
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

src/trunnel/ed25519_cert.c

@@ -1,4 +1,4 @@
-/* ed25519_cert.c -- generated by Trunnel v1.4.4.
+/* ed25519_cert.c -- generated by Trunnel v1.4.6.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -157,7 +157,7 @@ ed25519_cert_extension_setlen_un_unparsed(ed25519_cert_extension_t *inp, size_t
                  &inp->un_unparsed.n_, inp->un_unparsed.elts_, newlen,
                  sizeof(inp->un_unparsed.elts_[0]), (trunnel_free_fn_t) NULL,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->un_unparsed.elts_ = newptr;
   return 0;
@@ -589,7 +589,7 @@ ed25519_cert_setlen_ext(ed25519_cert_t *inp, size_t newlen)
                  &inp->ext.n_, inp->ext.elts_, newlen,
                  sizeof(inp->ext.elts_[0]), (trunnel_free_fn_t) ed25519_cert_extension_free,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->ext.elts_ = newptr;
   return 0;

src/trunnel/ed25519_cert.h

@@ -1,4 +1,4 @@
-/* ed25519_cert.h -- generated by by Trunnel v1.4.4.
+/* ed25519_cert.h -- generated by by Trunnel v1.4.6.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

src/trunnel/link_handshake.c

@@ -1,4 +1,4 @@
-/* link_handshake.c -- generated by Trunnel v1.4.4.
+/* link_handshake.c -- generated by Trunnel v1.4.6.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -143,7 +143,7 @@ auth_challenge_cell_setlen_methods(auth_challenge_cell_t *inp, size_t newlen)
                  &inp->methods.n_, inp->methods.elts_, newlen,
                  sizeof(inp->methods.elts_[0]), (trunnel_free_fn_t) NULL,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->methods.elts_ = newptr;
   return 0;
@@ -452,7 +452,7 @@ certs_cell_cert_setlen_body(certs_cell_cert_t *inp, size_t newlen)
                  &inp->body.n_, inp->body.elts_, newlen,
                  sizeof(inp->body.elts_[0]), (trunnel_free_fn_t) NULL,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->body.elts_ = newptr;
   return 0;
@@ -747,7 +747,7 @@ rsa_ed_crosscert_setlen_sig(rsa_ed_crosscert_t *inp, size_t newlen)
                  &inp->sig.n_, inp->sig.elts_, newlen,
                  sizeof(inp->sig.elts_[0]), (trunnel_free_fn_t) NULL,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->sig.elts_ = newptr;
   return 0;
@@ -1268,7 +1268,7 @@ auth1_setlen_sig(auth1_t *inp, size_t newlen)
                  &inp->sig.n_, inp->sig.elts_, newlen,
                  sizeof(inp->sig.elts_[0]), (trunnel_free_fn_t) NULL,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->sig.elts_ = newptr;
   return 0;
@@ -1714,7 +1714,7 @@ certs_cell_setlen_certs(certs_cell_t *inp, size_t newlen)
                  &inp->certs.n_, inp->certs.elts_, newlen,
                  sizeof(inp->certs.elts_[0]), (trunnel_free_fn_t) certs_cell_cert_free,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->certs.elts_ = newptr;
   return 0;

src/trunnel/link_handshake.h

@@ -1,4 +1,4 @@
-/* link_handshake.h -- generated by by Trunnel v1.4.4.
+/* link_handshake.h -- generated by by Trunnel v1.4.6.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

src/trunnel/pwbox.c

@@ -1,4 +1,4 @@
-/* pwbox.c -- generated by Trunnel v1.4.4.
+/* pwbox.c -- generated by Trunnel v1.4.6.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -151,7 +151,7 @@ pwbox_encoded_setlen_skey_header(pwbox_encoded_t *inp, size_t newlen)
                  &inp->skey_header.n_, inp->skey_header.elts_, newlen,
                  sizeof(inp->skey_header.elts_[0]), (trunnel_free_fn_t) NULL,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->skey_header.elts_ = newptr;
   return 0;
@@ -226,7 +226,7 @@ pwbox_encoded_setlen_data(pwbox_encoded_t *inp, size_t newlen)
                  &inp->data.n_, inp->data.elts_, newlen,
                  sizeof(inp->data.elts_[0]), (trunnel_free_fn_t) NULL,
                  &inp->trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 && newptr == NULL)
     goto trunnel_alloc_failed;
   inp->data.elts_ = newptr;
   return 0;

src/trunnel/pwbox.h

@@ -1,4 +1,4 @@
-/* pwbox.h -- generated by by Trunnel v1.4.4.
+/* pwbox.h -- generated by by Trunnel v1.4.6.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */