1 files changed, 47 insertions, 7 deletions

diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c
index 62662a9369..c356515d36 100644
--- a/src/trunnel/pwbox.c
+++ b/src/trunnel/pwbox.c
@@ -1,4 +1,4 @@
-/* pwbox.c -- generated by Trunnel v1.4.6.
+/* pwbox.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 pwbox_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || pwbox_deadcode_dummy__
@@ -62,7 +62,7 @@ pwbox_encoded_free(pwbox_encoded_t *obj)
 }
 
 uint32_t
-pwbox_encoded_get_fixedbytes0(pwbox_encoded_t *inp)
+pwbox_encoded_get_fixedbytes0(const pwbox_encoded_t *inp)
 {
   return inp->fixedbytes0;
 }
@@ -77,7 +77,7 @@ pwbox_encoded_set_fixedbytes0(pwbox_encoded_t *inp, uint32_t val)
   return 0;
 }
 uint32_t
-pwbox_encoded_get_fixedbytes1(pwbox_encoded_t *inp)
+pwbox_encoded_get_fixedbytes1(const pwbox_encoded_t *inp)
 {
   return inp->fixedbytes1;
 }
@@ -92,7 +92,7 @@ pwbox_encoded_set_fixedbytes1(pwbox_encoded_t *inp, uint32_t val)
   return 0;
 }
 uint8_t
-pwbox_encoded_get_header_len(pwbox_encoded_t *inp)
+pwbox_encoded_get_header_len(const pwbox_encoded_t *inp)
 {
   return inp->header_len;
 }
@@ -114,6 +114,11 @@ pwbox_encoded_get_skey_header(pwbox_encoded_t *inp, size_t idx)
   return TRUNNEL_DYNARRAY_GET(&inp->skey_header, idx);
 }
 
+uint8_t
+pwbox_encoded_getconst_skey_header(const pwbox_encoded_t *inp, size_t idx)
+{
+  return pwbox_encoded_get_skey_header((pwbox_encoded_t*)inp, idx);
+}
 int
 pwbox_encoded_set_skey_header(pwbox_encoded_t *inp, size_t idx, uint8_t elt)
 {
@@ -139,6 +144,11 @@ pwbox_encoded_getarray_skey_header(pwbox_encoded_t *inp)
 {
   return inp->skey_header.elts_;
 }
+const uint8_t  *
+pwbox_encoded_getconstarray_skey_header(const pwbox_encoded_t *inp)
+{
+  return (const uint8_t  *)pwbox_encoded_getarray_skey_header((pwbox_encoded_t*)inp);
+}
 int
 pwbox_encoded_setlen_skey_header(pwbox_encoded_t *inp, size_t newlen)
 {
@@ -166,12 +176,17 @@ pwbox_encoded_getlen_iv(const pwbox_encoded_t *inp)
 }
 
 uint8_t
-pwbox_encoded_get_iv(const pwbox_encoded_t *inp, size_t idx)
+pwbox_encoded_get_iv(pwbox_encoded_t *inp, size_t idx)
 {
   trunnel_assert(idx < 16);
   return inp->iv[idx];
 }
 
+uint8_t
+pwbox_encoded_getconst_iv(const pwbox_encoded_t *inp, size_t idx)
+{
+  return pwbox_encoded_get_iv((pwbox_encoded_t*)inp, idx);
+}
 int
 pwbox_encoded_set_iv(pwbox_encoded_t *inp, size_t idx, uint8_t elt)
 {
@@ -185,6 +200,11 @@ pwbox_encoded_getarray_iv(pwbox_encoded_t *inp)
 {
   return inp->iv;
 }
+const uint8_t  *
+pwbox_encoded_getconstarray_iv(const pwbox_encoded_t *inp)
+{
+  return (const uint8_t  *)pwbox_encoded_getarray_iv((pwbox_encoded_t*)inp);
+}
 size_t
 pwbox_encoded_getlen_data(const pwbox_encoded_t *inp)
 {
@@ -197,6 +217,11 @@ pwbox_encoded_get_data(pwbox_encoded_t *inp, size_t idx)
   return TRUNNEL_DYNARRAY_GET(&inp->data, idx);
 }
 
+uint8_t
+pwbox_encoded_getconst_data(const pwbox_encoded_t *inp, size_t idx)
+{
+  return pwbox_encoded_get_data((pwbox_encoded_t*)inp, idx);
+}
 int
 pwbox_encoded_set_data(pwbox_encoded_t *inp, size_t idx, uint8_t elt)
 {
@@ -218,6 +243,11 @@ pwbox_encoded_getarray_data(pwbox_encoded_t *inp)
 {
   return inp->data.elts_;
 }
+const uint8_t  *
+pwbox_encoded_getconstarray_data(const pwbox_encoded_t *inp)
+{
+  return (const uint8_t  *)pwbox_encoded_getarray_data((pwbox_encoded_t*)inp);
+}
 int
 pwbox_encoded_setlen_data(pwbox_encoded_t *inp, size_t newlen)
 {
@@ -241,12 +271,17 @@ pwbox_encoded_getlen_hmac(const pwbox_encoded_t *inp)
 }
 
 uint8_t
-pwbox_encoded_get_hmac(const pwbox_encoded_t *inp, size_t idx)
+pwbox_encoded_get_hmac(pwbox_encoded_t *inp, size_t idx)
 {
   trunnel_assert(idx < 32);
   return inp->hmac[idx];
 }
 
+uint8_t
+pwbox_encoded_getconst_hmac(const pwbox_encoded_t *inp, size_t idx)
+{
+  return pwbox_encoded_get_hmac((pwbox_encoded_t*)inp, idx);
+}
 int
 pwbox_encoded_set_hmac(pwbox_encoded_t *inp, size_t idx, uint8_t elt)
 {
@@ -260,6 +295,11 @@ pwbox_encoded_getarray_hmac(pwbox_encoded_t *inp)
 {
   return inp->hmac;
 }
+const uint8_t  *
+pwbox_encoded_getconstarray_hmac(const pwbox_encoded_t *inp)
+{
+  return (const uint8_t  *)pwbox_encoded_getarray_hmac((pwbox_encoded_t*)inp);
+}
 const char *
 pwbox_encoded_check(const pwbox_encoded_t *obj)
 {