From 8e84968ffbf6d284e8a877ddcde6ded40b3f5681 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Aug 2017 20:34:39 -0400
Subject: [PATCH] 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 172d6f8a03..02fd823bf6 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 e58bda3be1..631c99670c 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 0aa953d174..782bd59585 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 hs_link_specifier_dup() violates the opaqueness of link_specifier_t by
- *  taking its sizeof(). If we ever want to turn on TRUNNEL_OPAQUE we would
- *  need to refactor that function to do the coyp by encoding and decoding the
- *  object. */
 #if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_ED25519_CERT)
 struct ed25519_cert_st {
   uint8_t version;