Commit bc68eedd authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Update to trunnel 1.5.1

parent e1f00c5f

scripts/codegen/run_trunnel.sh

+4 −2
Original line number Diff line number Diff line
@@ -5,11 +5,13 @@ if test "x$TRUNNEL_PATH" != "x"; then 
  export PYTHONPATH

fi



OPTIONS="--require-version=1.5.1"



# Get all .trunnel files recursively from that directory so we can support

# multiple sub-directories.

for file in `find ./src/trunnel/ -name '*.trunnel'`; do

  python -m trunnel --require-version=1.4 $file

  python -m trunnel ${OPTIONS} $file

done



python -m trunnel --require-version=1.4 --write-c-files --target-dir=./src/ext/trunnel/

python -m trunnel ${OPTIONS} --write-c-files --target-dir=./src/ext/trunnel/

src/ext/trunnel/trunnel-impl.h

+1 −1
Original line number Diff line number Diff line 
/* trunnel-impl.h -- copied from Trunnel v1.5

/* trunnel-impl.h -- copied from Trunnel v1.5.1

 * https://gitweb.torproject.org/trunnel.git

 * You probably shouldn't edit this file.

 */

src/ext/trunnel/trunnel.c

+1 −1
Original line number Diff line number Diff line 
/* trunnel.c -- copied from Trunnel v1.5

/* trunnel.c -- copied from Trunnel v1.5.1

 * https://gitweb.torproject.org/trunnel.git

 * You probably shouldn't edit this file.

 */

src/ext/trunnel/trunnel.h

+1 −1
Original line number Diff line number Diff line 
/* trunnel.h -- copied from Trunnel v1.5

/* trunnel.h -- copied from Trunnel v1.5.1

 * https://gitweb.torproject.org/trunnel.git

 * You probably shouldn't edit this file.

 */

src/trunnel/ed25519_cert.c

+20 −20
Original line number Diff line number Diff line 
/* ed25519_cert.c -- generated by Trunnel v1.5.

/* ed25519_cert.c -- generated by Trunnel v1.5.1.

 * https://gitweb.torproject.org/trunnel.git

 * You probably shouldn't edit this file.

 */
@@ -58,7 +58,7 @@ create2_cell_body_free(create2_cell_body_t *obj) 
}



uint16_t

create2_cell_body_get_handshake_type(create2_cell_body_t *inp)

create2_cell_body_get_handshake_type(const create2_cell_body_t *inp)

{

  return inp->handshake_type;

}
@@ -69,7 +69,7 @@ create2_cell_body_set_handshake_type(create2_cell_body_t *inp, uint16_t val) 
  return 0;

}

uint16_t

create2_cell_body_get_handshake_len(create2_cell_body_t *inp)

create2_cell_body_get_handshake_len(const create2_cell_body_t *inp)

{

  return inp->handshake_len;

}
@@ -333,7 +333,7 @@ ed25519_cert_extension_free(ed25519_cert_extension_t *obj) 
}



uint16_t

ed25519_cert_extension_get_ext_length(ed25519_cert_extension_t *inp)

ed25519_cert_extension_get_ext_length(const ed25519_cert_extension_t *inp)

{

  return inp->ext_length;

}
@@ -344,7 +344,7 @@ ed25519_cert_extension_set_ext_length(ed25519_cert_extension_t *inp, uint16_t va 
  return 0;

}

uint8_t

ed25519_cert_extension_get_ext_type(ed25519_cert_extension_t *inp)

ed25519_cert_extension_get_ext_type(const ed25519_cert_extension_t *inp)

{

  return inp->ext_type;

}
@@ -355,7 +355,7 @@ ed25519_cert_extension_set_ext_type(ed25519_cert_extension_t *inp, uint8_t val) 
  return 0;

}

uint8_t

ed25519_cert_extension_get_ext_flags(ed25519_cert_extension_t *inp)

ed25519_cert_extension_get_ext_flags(const ed25519_cert_extension_t *inp)

{

  return inp->ext_flags;

}
@@ -733,7 +733,7 @@ extend1_cell_body_free(extend1_cell_body_t *obj) 
}



uint32_t

extend1_cell_body_get_ipv4addr(extend1_cell_body_t *inp)

extend1_cell_body_get_ipv4addr(const extend1_cell_body_t *inp)

{

  return inp->ipv4addr;

}
@@ -744,7 +744,7 @@ extend1_cell_body_set_ipv4addr(extend1_cell_body_t *inp, uint32_t val) 
  return 0;

}

uint16_t

extend1_cell_body_get_port(extend1_cell_body_t *inp)

extend1_cell_body_get_port(const extend1_cell_body_t *inp)

{

  return inp->port;

}
@@ -1016,7 +1016,7 @@ link_specifier_free(link_specifier_t *obj) 
}



uint8_t

link_specifier_get_ls_type(link_specifier_t *inp)

link_specifier_get_ls_type(const link_specifier_t *inp)

{

  return inp->ls_type;

}
@@ -1027,7 +1027,7 @@ link_specifier_set_ls_type(link_specifier_t *inp, uint8_t val) 
  return 0;

}

uint8_t

link_specifier_get_ls_len(link_specifier_t *inp)

link_specifier_get_ls_len(const link_specifier_t *inp)

{

  return inp->ls_len;

}
@@ -1038,7 +1038,7 @@ link_specifier_set_ls_len(link_specifier_t *inp, uint8_t val) 
  return 0;

}

uint32_t

link_specifier_get_un_ipv4_addr(link_specifier_t *inp)

link_specifier_get_un_ipv4_addr(const link_specifier_t *inp)

{

  return inp->un_ipv4_addr;

}
@@ -1049,7 +1049,7 @@ link_specifier_set_un_ipv4_addr(link_specifier_t *inp, uint32_t val) 
  return 0;

}

uint16_t

link_specifier_get_un_ipv4_port(link_specifier_t *inp)

link_specifier_get_un_ipv4_port(const link_specifier_t *inp)

{

  return inp->un_ipv4_port;

}
@@ -1096,7 +1096,7 @@ link_specifier_getconstarray_un_ipv6_addr(const link_specifier_t *inp) 
  return (const uint8_t  *)link_specifier_getarray_un_ipv6_addr((link_specifier_t*)inp);

}

uint16_t

link_specifier_get_un_ipv6_port(link_specifier_t *inp)

link_specifier_get_un_ipv6_port(const link_specifier_t *inp)

{

  return inp->un_ipv6_port;

}
@@ -1615,7 +1615,7 @@ ed25519_cert_free(ed25519_cert_t *obj) 
}



uint8_t

ed25519_cert_get_version(ed25519_cert_t *inp)

ed25519_cert_get_version(const ed25519_cert_t *inp)

{

  return inp->version;

}
@@ -1630,7 +1630,7 @@ ed25519_cert_set_version(ed25519_cert_t *inp, uint8_t val) 
  return 0;

}

uint8_t

ed25519_cert_get_cert_type(ed25519_cert_t *inp)

ed25519_cert_get_cert_type(const ed25519_cert_t *inp)

{

  return inp->cert_type;

}
@@ -1641,7 +1641,7 @@ ed25519_cert_set_cert_type(ed25519_cert_t *inp, uint8_t val) 
  return 0;

}

uint32_t

ed25519_cert_get_exp_field(ed25519_cert_t *inp)

ed25519_cert_get_exp_field(const ed25519_cert_t *inp)

{

  return inp->exp_field;

}
@@ -1652,7 +1652,7 @@ ed25519_cert_set_exp_field(ed25519_cert_t *inp, uint32_t val) 
  return 0;

}

uint8_t

ed25519_cert_get_cert_key_type(ed25519_cert_t *inp)

ed25519_cert_get_cert_key_type(const ed25519_cert_t *inp)

{

  return inp->cert_key_type;

}
@@ -1699,7 +1699,7 @@ ed25519_cert_getconstarray_certified_key(const ed25519_cert_t *inp) 
  return (const uint8_t  *)ed25519_cert_getarray_certified_key((ed25519_cert_t*)inp);

}

uint8_t

ed25519_cert_get_n_extensions(ed25519_cert_t *inp)

ed25519_cert_get_n_extensions(const ed25519_cert_t *inp)

{

  return inp->n_extensions;

}
@@ -2123,7 +2123,7 @@ extend2_cell_body_free(extend2_cell_body_t *obj) 
}



uint8_t

extend2_cell_body_get_n_spec(extend2_cell_body_t *inp)

extend2_cell_body_get_n_spec(const extend2_cell_body_t *inp)

{

  return inp->n_spec;

}
@@ -2458,7 +2458,7 @@ link_specifier_list_free(link_specifier_list_t *obj) 
}



uint8_t

link_specifier_list_get_n_spec(link_specifier_list_t *inp)

link_specifier_list_get_n_spec(const link_specifier_list_t *inp)

{

  return inp->n_spec;

}