[tor-commits] [tor/master] Re-run trunnel. Cosmetic changes only.

2017-08-24 Thread nickm 
commit a007c02df0140d15697cf0ca61cea90bfc494789
Author: Nick Mathewson 
Date:   Thu Aug 24 16:13:01 2017 -0400

Re-run trunnel. Cosmetic changes only.
---
 src/ext/trunnel/trunnel-impl.h   | 2 +-
 src/ext/trunnel/trunnel.c| 2 +-
 src/ext/trunnel/trunnel.h| 2 +-
 src/trunnel/channelpadding_negotiation.c | 4 ++--
 src/trunnel/channelpadding_negotiation.h | 2 +-
 src/trunnel/ed25519_cert.c   | 4 ++--
 src/trunnel/ed25519_cert.h   | 2 +-
 src/trunnel/hs/cell_common.c | 4 ++--
 src/trunnel/hs/cell_common.h | 2 +-
 src/trunnel/hs/cell_establish_intro.c| 4 ++--
 src/trunnel/hs/cell_establish_intro.h| 2 +-
 src/trunnel/hs/cell_introduce1.c | 4 ++--
 src/trunnel/hs/cell_introduce1.h | 2 +-
 src/trunnel/hs/cell_rendezvous.c | 4 ++--
 src/trunnel/hs/cell_rendezvous.h | 2 +-
 src/trunnel/link_handshake.c | 4 ++--
 src/trunnel/link_handshake.h | 2 +-
 src/trunnel/pwbox.c  | 4 ++--
 src/trunnel/pwbox.h  | 2 +-
 19 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index 85c847b3f..b233cf763 100644
--- 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.5.1
+/* trunnel-impl.h -- copied from Trunnel v1.5.2
  * 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 6a4241724..b749d8136 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.5.1
+/* trunnel.c -- copied from Trunnel v1.5.2
  * 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 dd78553c7..32c80bac2 100644
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.5.1
+/* trunnel.h -- copied from Trunnel v1.5.2
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
diff --git a/src/trunnel/channelpadding_negotiation.c 
b/src/trunnel/channelpadding_negotiation.c
index 02fd823bf..59e6b3838 100644
--- a/src/trunnel/channelpadding_negotiation.c
+++ b/src/trunnel/channelpadding_negotiation.c
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.c -- generated by Trunnel v1.5.1.
+/* channelpadding_negotiation.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int channelpaddingnegotiation_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || channelpaddingnegotiation_deadcode_dummy__
diff --git a/src/trunnel/channelpadding_negotiation.h 
b/src/trunnel/channelpadding_negotiation.h
index 631c99670..fcfc232fe 100644
--- a/src/trunnel/channelpadding_negotiation.h
+++ b/src/trunnel/channelpadding_negotiation.h
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.h -- generated by by Trunnel v1.5.1.
+/* channelpadding_negotiation.h -- generated by Trunnel v1.5.2.
  * 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 ee02fda64..1276c7a50 100644
--- a/src/trunnel/ed25519_cert.c
+++ b/src/trunnel/ed25519_cert.c
@@ -1,4 +1,4 @@
-/* ed25519_cert.c -- generated by Trunnel v1.5.1.
+/* ed25519_cert.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int edcert_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || edcert_deadcode_dummy__
diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h
index 782bd5958..e086c6fce 100644
--- a/src/trunnel/ed25519_cert.h
+++ b/src/trunnel/ed25519_cert.h
@@ -1,4 +1,4 @@
-/* ed25519_cert.h -- generated by by Trunnel v1.5.1.
+/* ed25519_cert.h -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
diff --git a/src/trunnel/hs/cell_common.c b/src/trunnel/hs/cell_common.c
index b7f19ffc6..af223560c 100644
--- a/src/trunnel/hs/cell_common.c
+++

[tor-commits] [tor/master] Re-run trunnel.

2017-08-08 Thread nickm 
commit 8e84968ffbf6d284e8a877ddcde6ded40b3f5681
Author: Nick Mathewson 
Date:   Tue Aug 8 20:34:39 2017 -0400

Re-run trunnel.
---
 src/trunnel/channelpadding_negotiation.c | 10 +-
 src/trunnel/channelpadding_negotiation.h | 10 +-
 src/trunnel/ed25519_cert.h   |  4 
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/trunnel/channelpadding_negotiation.c 
b/src/trunnel/channelpadding_negotiation.c
index 172d6f8a0..02fd823bf 100644
--- a/src/trunnel/channelpadding_negotiation.c
+++ b/src/trunnel/channelpadding_negotiation.c
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.c -- generated by Trunnel v1.4.3.
+/* channelpadding_negotiation.c -- generated by Trunnel v1.5.1.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -57,7 +57,7 @@ channelpadding_negotiate_free(channelpadding_negotiate_t *obj)
 }
 
 uint8_t
-channelpadding_negotiate_get_version(channelpadding_negotiate_t *inp)
+channelpadding_negotiate_get_version(const channelpadding_negotiate_t *inp)
 {
   return inp->version;
 }
@@ -72,7 +72,7 @@ 
channelpadding_negotiate_set_version(channelpadding_negotiate_t *inp, uint8_t va
   return 0;
 }
 uint8_t
-channelpadding_negotiate_get_command(channelpadding_negotiate_t *inp)
+channelpadding_negotiate_get_command(const channelpadding_negotiate_t *inp)
 {
   return inp->command;
 }
@@ -87,7 +87,7 @@ 
channelpadding_negotiate_set_command(channelpadding_negotiate_t *inp, uint8_t va
   return 0;
 }
 uint16_t
-channelpadding_negotiate_get_ito_low_ms(channelpadding_negotiate_t *inp)
+channelpadding_negotiate_get_ito_low_ms(const channelpadding_negotiate_t *inp)
 {
   return inp->ito_low_ms;
 }
@@ -98,7 +98,7 @@ 
channelpadding_negotiate_set_ito_low_ms(channelpadding_negotiate_t *inp, uint16_
   return 0;
 }
 uint16_t
-channelpadding_negotiate_get_ito_high_ms(channelpadding_negotiate_t *inp)
+channelpadding_negotiate_get_ito_high_ms(const channelpadding_negotiate_t *inp)
 {
   return inp->ito_high_ms;
 }
diff --git a/src/trunnel/channelpadding_negotiation.h 
b/src/trunnel/channelpadding_negotiation.h
index e58bda3be..631c99670 100644
--- a/src/trunnel/channelpadding_negotiation.h
+++ b/src/trunnel/channelpadding_negotiation.h
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.h -- generated by by Trunnel v1.4.3.
+/* channelpadding_negotiation.h -- generated by by Trunnel v1.5.1.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -60,7 +60,7 @@ int 
channelpadding_negotiate_clear_errors(channelpadding_negotiate_t *obj);
 /** Return the value of the version field of the
  * channelpadding_negotiate_t in 'inp'
  */
-uint8_t channelpadding_negotiate_get_version(channelpadding_negotiate_t *inp);
+uint8_t channelpadding_negotiate_get_version(const channelpadding_negotiate_t 
*inp);
 /** Set the value of the version field of the
  * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success;
  * return -1 and set the error code on 'inp' on failure.
@@ -69,7 +69,7 @@ int 
channelpadding_negotiate_set_version(channelpadding_negotiate_t *inp, uint8_
 /** Return the value of the command field of the
  * channelpadding_negotiate_t in 'inp'
  */
-uint8_t channelpadding_negotiate_get_command(channelpadding_negotiate_t *inp);
+uint8_t channelpadding_negotiate_get_command(const channelpadding_negotiate_t 
*inp);
 /** Set the value of the command field of the
  * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success;
  * return -1 and set the error code on 'inp' on failure.
@@ -78,7 +78,7 @@ int 
channelpadding_negotiate_set_command(channelpadding_negotiate_t *inp, uint8_
 /** Return the value of the ito_low_ms field of the
  * channelpadding_negotiate_t in 'inp'
  */
-uint16_t channelpadding_negotiate_get_ito_low_ms(channelpadding_negotiate_t 
*inp);
+uint16_t channelpadding_negotiate_get_ito_low_ms(const 
channelpadding_negotiate_t *inp);
 /** Set the value of the ito_low_ms field of the
  * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success;
  * return -1 and set the error code on 'inp' on failure.
@@ -87,7 +87,7 @@ int 
channelpadding_negotiate_set_ito_low_ms(channelpadding_negotiate_t *inp, uin
 /** Return the value of the ito_high_ms field of the
  * channelpadding_negotiate_t in 'inp'
  */
-uint16_t channelpadding_negotiate_get_ito_high_ms(channelpadding_negotiate_t 
*inp);
+uint16_t channelpadding_negotiate_get_ito_high_ms(const 
channelpadding_negotiate_t *inp);
 /** Set the value of the ito_high_ms field of the
  * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success;
  * return -1 and set the error code on 'inp' on failure.
diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h
index 0aa953d17..782bd5958 100644
--- a/src/trunnel/ed25519_cert.h
+++ b/src/trunnel/ed25519_cert.h
@@ -59,10 +59,6 @@ struct link_specifier_st {
 };
 #endif
 typedef struct link_specifier_st link_specifier_t;
-/** XXX

[tor-commits] [tor/master] Re-run trunnel.

2016-10-31 Thread nickm 
commit 1d76d389033e09645ff746c2d2c449ea5af098a3
Author: Nick Mathewson 
Date:   Mon Oct 31 16:25:34 2016 -0400

Re-run trunnel.
---
 src/trunnel/hs/cell_introduce1.c | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/trunnel/hs/cell_introduce1.c b/src/trunnel/hs/cell_introduce1.c
index d327ea8..51f5676 100644
--- a/src/trunnel/hs/cell_introduce1.c
+++ b/src/trunnel/hs/cell_introduce1.c
@@ -733,6 +733,7 @@ hs_cell_introduce_encrypted_new(void)
   hs_cell_introduce_encrypted_t *val = trunnel_calloc(1, 
sizeof(hs_cell_introduce_encrypted_t));
   if (NULL == val)
 return NULL;
+  val->onion_key_type = 1;
   return val;
 }
 
@@ -836,6 +837,10 @@ 
hs_cell_introduce_encrypted_get_onion_key_type(hs_cell_introduce_encrypted_t *in
 int
 hs_cell_introduce_encrypted_set_onion_key_type(hs_cell_introduce_encrypted_t 
*inp, uint8_t val)
 {
+  if (! ((val == 1))) {
+ TRUNNEL_SET_ERROR_CODE(inp);
+ return -1;
+  }
   inp->onion_key_type = val;
   return 0;
 }
@@ -1074,6 +1079,8 @@ hs_cell_introduce_encrypted_check(const 
hs_cell_introduce_encrypted_t *obj)
 if (NULL != (msg = cell_extension_check(obj->extensions)))
   return msg;
   }
+  if (! (obj->onion_key_type == 1))
+return "Integer out of bounds";
   if (TRUNNEL_DYNARRAY_LEN(>onion_key) != obj->onion_key_len)
 return "Length mismatch for onion_key";
   {
@@ -1105,7 +1112,7 @@ hs_cell_introduce_encrypted_encoded_len(const 
hs_cell_introduce_encrypted_t *obj
   /* Length of struct cell_extension extensions */
   result += cell_extension_encoded_len(obj->extensions);
 
-  /* Length of u8 onion_key_type */
+  /* Length of u8 onion_key_type IN [1] */
   result += 1;
 
   /* Length of u16 onion_key_len */
@@ -1169,7 +1176,7 @@ hs_cell_introduce_encrypted_encode(uint8_t *output, const 
size_t avail, const hs
 goto fail; /* XXX !*/
   written += result; ptr += result;
 
-  /* Encode u8 onion_key_type */
+  /* Encode u8 onion_key_type IN [1] */
   trunnel_assert(written <= avail);
   if (avail - written < 1)
 goto truncated;
@@ -1273,10 +1280,12 @@ 
hs_cell_introduce_encrypted_parse_into(hs_cell_introduce_encrypted_t *obj, const
   trunnel_assert((size_t)result <= remaining);
   remaining -= result; ptr += result;
 
-  /* Parse u8 onion_key_type */
+  /* Parse u8 onion_key_type IN [1] */
   CHECK_REMAINING(1, truncated);
   obj->onion_key_type = (trunnel_get_uint8(ptr));
   remaining -= 1; ptr += 1;
+  if (! (obj->onion_key_type == 1))
+goto fail;
 
   /* Parse u16 onion_key_len */
   CHECK_REMAINING(2, truncated);
@@ -1327,6 +1336,9 @@ 
hs_cell_introduce_encrypted_parse_into(hs_cell_introduce_encrypted_t *obj, const
   return result;
  trunnel_alloc_failed:
   return -1;
+ fail:
+  result = -1;
+  return result;
 }
 
 ssize_t

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Re-run trunnel.

2016-09-11 Thread nickm 
commit 25513ae174d80a62ca0a8dcca52683089be95ea3
Author: Nick Mathewson 
Date:   Thu Jul 28 10:52:43 2016 -0400

Re-run trunnel.
---
 src/ext/trunnel/trunnel-impl.h |  8 
 src/ext/trunnel/trunnel.c  |  4 ++--
 src/ext/trunnel/trunnel.h  |  2 +-
 src/trunnel/ed25519_cert.c |  6 +++---
 src/trunnel/ed25519_cert.h |  2 +-
 src/trunnel/link_handshake.c   | 12 ++--
 src/trunnel/link_handshake.h   |  2 +-
 src/trunnel/pwbox.c|  6 +++---
 src/trunnel/pwbox.h|  2 +-
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index dfe5f89..3ffde6e 100644
--- 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 
-#include 
 #ifdef TRUNNEL_LOCAL_H
 #include "trunnel-local.h"
 #endif
+#include "trunnel.h"
+#include 
+#include 
 
 #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 0ed75aa..3994422 100644
--- 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 
 #include 
-#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 62e87ee..41068b8 100644
--- 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 f495743..24988d5 100644
--- 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
  >un_unparsed.n_, inp->un_unparsed.elts_, newlen,
  sizeof(inp->un_unparsed.elts_[0]), (trunnel_free_fn_t) NULL,
  >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)
  >ext.n_, inp->ext.elts_, newlen,
  sizeof(inp->ext.elts_[0]), (trunnel_free_fn_t) 
ed25519_cert_extension_free,
  >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 75a82d8..28f6fee 100644
--- 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 3ef7341..c2717f3 100644
--- 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)
  >methods.n_, inp->methods.elts_, newlen,
  sizeof(inp->methods.elts_[0]), (trunnel_free_fn_t) NULL,
  >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)
  >body.n_, inp->body.elts_, newlen,
  sizeof(inp->body.elts_[0]), (trunnel_free_fn_t) NULL,
  >trunnel_error_code_);
-  if (newptr == NULL)
+  if (newlen != 0 &&

[tor-commits] [tor/master] Re-run trunnel to capture change for msvc.

2015-07-23 Thread nickm 
commit 3323615dd2bffa54970624bb6eb2465f4064d812
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Jul 23 12:05:06 2015 -0400

Re-run trunnel to capture change for msvc.
---
 src/ext/trunnel/trunnel-impl.h |4 ++--
 src/ext/trunnel/trunnel.c  |2 +-
 src/ext/trunnel/trunnel.h  |2 +-
 src/trunnel/ed25519_cert.c |2 +-
 src/trunnel/ed25519_cert.h |2 +-
 src/trunnel/link_handshake.c   |2 +-
 src/trunnel/link_handshake.h   |2 +-
 src/trunnel/pwbox.c|2 +-
 src/trunnel/pwbox.h|2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index d98dc34..ab790f8 100644
--- 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.1
+/* trunnel-impl.h -- copied from Trunnel v1.4.2
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -18,7 +18,7 @@
 #include trunnel-local.h
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)  (_MSC_VER  1600)
 #define uint8_t unsigned char
 #define uint16_t unsigned short
 #define uint32_t unsigned int
diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index ce8db4d..dc1c9fc 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.4.1
+/* trunnel.c -- copied from Trunnel v1.4.2
  * 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 78da904..776e2cf 100644
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.4.1
+/* trunnel.h -- copied from Trunnel v1.4.2
  * 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 6931eae..294d20b 100644
--- a/src/trunnel/ed25519_cert.c
+++ b/src/trunnel/ed25519_cert.c
@@ -1,4 +1,4 @@
-/* ed25519_cert.c -- generated by Trunnel v1.4.1.
+/* ed25519_cert.c -- generated by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h
index 7839af4..fb00686 100644
--- 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.1.
+/* ed25519_cert.h -- generated by by Trunnel v1.4.2.
  * 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 f53161a..5ba1c17 100644
--- a/src/trunnel/link_handshake.c
+++ b/src/trunnel/link_handshake.c
@@ -1,4 +1,4 @@
-/* link_handshake.c -- generated by Trunnel v1.4.1.
+/* link_handshake.c -- generated by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h
index 6da6599..b4f5f19 100644
--- 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.1.
+/* link_handshake.h -- generated by by Trunnel v1.4.2.
  * 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 28a4f74..9c84b90 100644
--- a/src/trunnel/pwbox.c
+++ b/src/trunnel/pwbox.c
@@ -1,4 +1,4 @@
-/* pwbox.c -- generated by Trunnel v1.4.1.
+/* pwbox.c -- generated by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h
index a6964b5..4dfb364 100644
--- a/src/trunnel/pwbox.h
+++ b/src/trunnel/pwbox.h
@@ -1,4 +1,4 @@
-/* pwbox.h -- generated by by Trunnel v1.4.1.
+/* pwbox.h -- generated by by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits