Regenerate trunnel code with trunnel 1.5

1 files changed, 183 insertions, 13 deletions

diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c
index c2717f36bf..a4b1fe034a 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.6.
+/* link_handshake.c -- generated by Trunnel v1.5.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -64,12 +64,17 @@ auth_challenge_cell_getlen_challenge(const auth_challenge_cell_t *inp)
 }
 
 uint8_t
-auth_challenge_cell_get_challenge(const auth_challenge_cell_t *inp, size_t idx)
+auth_challenge_cell_get_challenge(auth_challenge_cell_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->challenge[idx];
 }
 
+uint8_t
+auth_challenge_cell_getconst_challenge(const auth_challenge_cell_t *inp, size_t idx)
+{
+  return auth_challenge_cell_get_challenge((auth_challenge_cell_t*)inp, idx);
+}
 int
 auth_challenge_cell_set_challenge(auth_challenge_cell_t *inp, size_t idx, uint8_t elt)
 {
@@ -83,6 +88,11 @@ auth_challenge_cell_getarray_challenge(auth_challenge_cell_t *inp)
 {
   return inp->challenge;
 }
+const uint8_t  *
+auth_challenge_cell_getconstarray_challenge(const auth_challenge_cell_t *inp)
+{
+  return (const uint8_t  *)auth_challenge_cell_getarray_challenge((auth_challenge_cell_t*)inp);
+}
 uint16_t
 auth_challenge_cell_get_n_methods(auth_challenge_cell_t *inp)
 {
@@ -106,6 +116,11 @@ auth_challenge_cell_get_methods(auth_challenge_cell_t *inp, size_t idx)
   return TRUNNEL_DYNARRAY_GET(&inp->methods, idx);
 }
 
+uint16_t
+auth_challenge_cell_getconst_methods(const auth_challenge_cell_t *inp, size_t idx)
+{
+  return auth_challenge_cell_get_methods((auth_challenge_cell_t*)inp, idx);
+}
 int
 auth_challenge_cell_set_methods(auth_challenge_cell_t *inp, size_t idx, uint16_t elt)
 {
@@ -131,6 +146,11 @@ auth_challenge_cell_getarray_methods(auth_challenge_cell_t *inp)
 {
   return inp->methods.elts_;
 }
+const uint16_t  *
+auth_challenge_cell_getconstarray_methods(const auth_challenge_cell_t *inp)
+{
+  return (const uint16_t  *)auth_challenge_cell_getarray_methods((auth_challenge_cell_t*)inp);
+}
 int
 auth_challenge_cell_setlen_methods(auth_challenge_cell_t *inp, size_t newlen)
 {
@@ -415,6 +435,11 @@ certs_cell_cert_get_body(certs_cell_cert_t *inp, size_t idx)
   return TRUNNEL_DYNARRAY_GET(&inp->body, idx);
 }
 
+uint8_t
+certs_cell_cert_getconst_body(const certs_cell_cert_t *inp, size_t idx)
+{
+  return certs_cell_cert_get_body((certs_cell_cert_t*)inp, idx);
+}
 int
 certs_cell_cert_set_body(certs_cell_cert_t *inp, size_t idx, uint8_t elt)
 {
@@ -440,6 +465,11 @@ certs_cell_cert_getarray_body(certs_cell_cert_t *inp)
 {
   return inp->body.elts_;
 }
+const uint8_t  *
+certs_cell_cert_getconstarray_body(const certs_cell_cert_t *inp)
+{
+  return (const uint8_t  *)certs_cell_cert_getarray_body((certs_cell_cert_t*)inp);
+}
 int
 certs_cell_cert_setlen_body(certs_cell_cert_t *inp, size_t newlen)
 {
@@ -652,12 +682,17 @@ rsa_ed_crosscert_getlen_ed_key(const rsa_ed_crosscert_t *inp)
 }
 
 uint8_t
-rsa_ed_crosscert_get_ed_key(const rsa_ed_crosscert_t *inp, size_t idx)
+rsa_ed_crosscert_get_ed_key(rsa_ed_crosscert_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->ed_key[idx];
 }
 
+uint8_t
+rsa_ed_crosscert_getconst_ed_key(const rsa_ed_crosscert_t *inp, size_t idx)
+{
+  return rsa_ed_crosscert_get_ed_key((rsa_ed_crosscert_t*)inp, idx);
+}
 int
 rsa_ed_crosscert_set_ed_key(rsa_ed_crosscert_t *inp, size_t idx, uint8_t elt)
 {
@@ -671,6 +706,11 @@ rsa_ed_crosscert_getarray_ed_key(rsa_ed_crosscert_t *inp)
 {
   return inp->ed_key;
 }
+const uint8_t  *
+rsa_ed_crosscert_getconstarray_ed_key(const rsa_ed_crosscert_t *inp)
+{
+  return (const uint8_t  *)rsa_ed_crosscert_getarray_ed_key((rsa_ed_crosscert_t*)inp);
+}
 uint32_t
 rsa_ed_crosscert_get_expiration(rsa_ed_crosscert_t *inp)
 {
@@ -710,6 +750,11 @@ rsa_ed_crosscert_get_sig(rsa_ed_crosscert_t *inp, size_t idx)
   return TRUNNEL_DYNARRAY_GET(&inp->sig, idx);
 }
 
+uint8_t
+rsa_ed_crosscert_getconst_sig(const rsa_ed_crosscert_t *inp, size_t idx)
+{
+  return rsa_ed_crosscert_get_sig((rsa_ed_crosscert_t*)inp, idx);
+}
 int
 rsa_ed_crosscert_set_sig(rsa_ed_crosscert_t *inp, size_t idx, uint8_t elt)
 {
@@ -735,6 +780,11 @@ rsa_ed_crosscert_getarray_sig(rsa_ed_crosscert_t *inp)
 {
   return inp->sig.elts_;
 }
+const uint8_t  *
+rsa_ed_crosscert_getconstarray_sig(const rsa_ed_crosscert_t *inp)
+{
+  return (const uint8_t  *)rsa_ed_crosscert_getarray_sig((rsa_ed_crosscert_t*)inp);
+}
 int
 rsa_ed_crosscert_setlen_sig(rsa_ed_crosscert_t *inp, size_t newlen)
 {
@@ -964,12 +1014,17 @@ auth1_getlen_type(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_type(const auth1_t *inp, size_t idx)
+auth1_get_type(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 8);
   return inp->type[idx];
 }
 
+uint8_t
+auth1_getconst_type(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_type((auth1_t*)inp, idx);
+}
 int
 auth1_set_type(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -983,6 +1038,11 @@ auth1_getarray_type(auth1_t *inp)
 {
   return inp->type;
 }
+const uint8_t  *
+auth1_getconstarray_type(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_type((auth1_t*)inp);
+}
 size_t
 auth1_getlen_cid(const auth1_t *inp)
 {
@@ -990,12 +1050,17 @@ auth1_getlen_cid(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_cid(const auth1_t *inp, size_t idx)
+auth1_get_cid(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->cid[idx];
 }
 
+uint8_t
+auth1_getconst_cid(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_cid((auth1_t*)inp, idx);
+}
 int
 auth1_set_cid(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1009,6 +1074,11 @@ auth1_getarray_cid(auth1_t *inp)
 {
   return inp->cid;
 }
+const uint8_t  *
+auth1_getconstarray_cid(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_cid((auth1_t*)inp);
+}
 size_t
 auth1_getlen_sid(const auth1_t *inp)
 {
@@ -1016,12 +1086,17 @@ auth1_getlen_sid(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_sid(const auth1_t *inp, size_t idx)
+auth1_get_sid(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->sid[idx];
 }
 
+uint8_t
+auth1_getconst_sid(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_sid((auth1_t*)inp, idx);
+}
 int
 auth1_set_sid(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1035,6 +1110,11 @@ auth1_getarray_sid(auth1_t *inp)
 {
   return inp->sid;
 }
+const uint8_t  *
+auth1_getconstarray_sid(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_sid((auth1_t*)inp);
+}
 size_t
 auth1_getlen_u1_cid_ed(const auth1_t *inp)
 {
@@ -1042,12 +1122,17 @@ auth1_getlen_u1_cid_ed(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_u1_cid_ed(const auth1_t *inp, size_t idx)
+auth1_get_u1_cid_ed(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->u1_cid_ed[idx];
 }
 
+uint8_t
+auth1_getconst_u1_cid_ed(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_u1_cid_ed((auth1_t*)inp, idx);
+}
 int
 auth1_set_u1_cid_ed(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1061,6 +1146,11 @@ auth1_getarray_u1_cid_ed(auth1_t *inp)
 {
   return inp->u1_cid_ed;
 }
+const uint8_t  *
+auth1_getconstarray_u1_cid_ed(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_u1_cid_ed((auth1_t*)inp);
+}
 size_t
 auth1_getlen_u1_sid_ed(const auth1_t *inp)
 {
@@ -1068,12 +1158,17 @@ auth1_getlen_u1_sid_ed(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_u1_sid_ed(const auth1_t *inp, size_t idx)
+auth1_get_u1_sid_ed(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->u1_sid_ed[idx];
 }
 
+uint8_t
+auth1_getconst_u1_sid_ed(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_u1_sid_ed((auth1_t*)inp, idx);
+}
 int
 auth1_set_u1_sid_ed(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1087,6 +1182,11 @@ auth1_getarray_u1_sid_ed(auth1_t *inp)
 {
   return inp->u1_sid_ed;
 }
+const uint8_t  *
+auth1_getconstarray_u1_sid_ed(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_u1_sid_ed((auth1_t*)inp);
+}
 size_t
 auth1_getlen_slog(const auth1_t *inp)
 {
@@ -1094,12 +1194,17 @@ auth1_getlen_slog(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_slog(const auth1_t *inp, size_t idx)
+auth1_get_slog(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->slog[idx];
 }
 
+uint8_t
+auth1_getconst_slog(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_slog((auth1_t*)inp, idx);
+}
 int
 auth1_set_slog(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1113,6 +1218,11 @@ auth1_getarray_slog(auth1_t *inp)
 {
   return inp->slog;
 }
+const uint8_t  *
+auth1_getconstarray_slog(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_slog((auth1_t*)inp);
+}
 size_t
 auth1_getlen_clog(const auth1_t *inp)
 {
@@ -1120,12 +1230,17 @@ auth1_getlen_clog(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_clog(const auth1_t *inp, size_t idx)
+auth1_get_clog(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->clog[idx];
 }
 
+uint8_t
+auth1_getconst_clog(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_clog((auth1_t*)inp, idx);
+}
 int
 auth1_set_clog(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1139,6 +1254,11 @@ auth1_getarray_clog(auth1_t *inp)
 {
   return inp->clog;
 }
+const uint8_t  *
+auth1_getconstarray_clog(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_clog((auth1_t*)inp);
+}
 size_t
 auth1_getlen_scert(const auth1_t *inp)
 {
@@ -1146,12 +1266,17 @@ auth1_getlen_scert(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_scert(const auth1_t *inp, size_t idx)
+auth1_get_scert(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->scert[idx];
 }
 
+uint8_t
+auth1_getconst_scert(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_scert((auth1_t*)inp, idx);
+}
 int
 auth1_set_scert(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1165,6 +1290,11 @@ auth1_getarray_scert(auth1_t *inp)
 {
   return inp->scert;
 }
+const uint8_t  *
+auth1_getconstarray_scert(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_scert((auth1_t*)inp);
+}
 size_t
 auth1_getlen_tlssecrets(const auth1_t *inp)
 {
@@ -1172,12 +1302,17 @@ auth1_getlen_tlssecrets(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_tlssecrets(const auth1_t *inp, size_t idx)
+auth1_get_tlssecrets(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->tlssecrets[idx];
 }
 
+uint8_t
+auth1_getconst_tlssecrets(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_tlssecrets((auth1_t*)inp, idx);
+}
 int
 auth1_set_tlssecrets(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1191,6 +1326,11 @@ auth1_getarray_tlssecrets(auth1_t *inp)
 {
   return inp->tlssecrets;
 }
+const uint8_t  *
+auth1_getconstarray_tlssecrets(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_tlssecrets((auth1_t*)inp);
+}
 const uint8_t *
 auth1_get_end_of_fixed_part(const auth1_t *inp)
 {
@@ -1203,12 +1343,17 @@ auth1_getlen_rand(const auth1_t *inp)
 }
 
 uint8_t
-auth1_get_rand(const auth1_t *inp, size_t idx)
+auth1_get_rand(auth1_t *inp, size_t idx)
 {
   trunnel_assert(idx < 24);
   return inp->rand[idx];
 }
 
+uint8_t
+auth1_getconst_rand(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_rand((auth1_t*)inp, idx);
+}
 int
 auth1_set_rand(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1222,6 +1367,11 @@ auth1_getarray_rand(auth1_t *inp)
 {
   return inp->rand;
 }
+const uint8_t  *
+auth1_getconstarray_rand(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_rand((auth1_t*)inp);
+}
 const uint8_t *
 auth1_get_end_of_signed(const auth1_t *inp)
 {
@@ -1239,6 +1389,11 @@ auth1_get_sig(auth1_t *inp, size_t idx)
   return TRUNNEL_DYNARRAY_GET(&inp->sig, idx);
 }
 
+uint8_t
+auth1_getconst_sig(const auth1_t *inp, size_t idx)
+{
+  return auth1_get_sig((auth1_t*)inp, idx);
+}
 int
 auth1_set_sig(auth1_t *inp, size_t idx, uint8_t elt)
 {
@@ -1260,6 +1415,11 @@ auth1_getarray_sig(auth1_t *inp)
 {
   return inp->sig.elts_;
 }
+const uint8_t  *
+auth1_getconstarray_sig(const auth1_t *inp)
+{
+  return (const uint8_t  *)auth1_getarray_sig((auth1_t*)inp);
+}
 int
 auth1_setlen_sig(auth1_t *inp, size_t newlen)
 {
@@ -1669,6 +1829,11 @@ certs_cell_get_certs(certs_cell_t *inp, size_t idx)
   return TRUNNEL_DYNARRAY_GET(&inp->certs, idx);
 }
 
+ const struct certs_cell_cert_st *
+certs_cell_getconst_certs(const certs_cell_t *inp, size_t idx)
+{
+  return certs_cell_get_certs((certs_cell_t*)inp, idx);
+}
 int
 certs_cell_set_certs(certs_cell_t *inp, size_t idx, struct certs_cell_cert_st * elt)
 {
@@ -1702,6 +1867,11 @@ certs_cell_getarray_certs(certs_cell_t *inp)
 {
   return inp->certs.elts_;
 }
+const struct certs_cell_cert_st *  const  *
+certs_cell_getconstarray_certs(const certs_cell_t *inp)
+{
+  return (const struct certs_cell_cert_st *  const  *)certs_cell_getarray_certs((certs_cell_t*)inp);
+}
 int
 certs_cell_setlen_certs(certs_cell_t *inp, size_t newlen)
 {