Re-run trunnel.

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index dfe5f89e1a526cdb76db051be9dd2fe6cb0eb83b..3ffde6e09b44189028f049fa657d2594d40b0300 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.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

diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index 0ed75aa9a45d19d1baa284825e087330b2f94c17..3994422643bf160162abec398907f840e743f82c 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.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__

diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h
index 62e87ee50c7ed30811b87fa7767d5a54fa23842c..41068b8fb34caa1bb52583f264b96c53df7bed9f 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.4
+/* trunnel.h -- copied from Trunnel v1.4.6
  * 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 f495743667bafa24b13706903fba5aa1a38fa74a..24988d510b6c0418a95e8896e3d357f02098b31c 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.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;

diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h
index 75a82d8aff4f69579807b7f12ebc779f4e0974ca..28f6feef31da7d4694d15358a7704db11037a649 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.4.
+/* ed25519_cert.h -- generated by by Trunnel v1.4.6.
  * 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 3ef7341ae9a4845f058551a98880cfe30ff1b18d..c2717f36bf8bdf2e859318aabda486d3433ccbef 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.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;

diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h
index 2749ec7dd40b7dadcda15a08b90b5c68654ab0a0..54611b96e8284a859c4459ecff61d91e1d3a0c86 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.4.
+/* link_handshake.h -- generated by by Trunnel v1.4.6.
  * 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 9b348a9b300482b4f28be80ec4be30fa27fda898..62662a936949f7c258e5d019644696c835e0b05a 100644 (file)
--- a/src/trunnel/pwbox.c
+++ b/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;

diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h
index e69e2c1a0eb385bb3b4e69f0e3fd834fc958610a..77a813d12337869c76cdeded12ad469bce4aad7d 100644 (file)
--- a/src/trunnel/pwbox.h
+++ b/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.
  */