commit 988d208814e68162d78f66a033940f715a24834a Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 18 09:47:36 2015 -0400

Update to latest trunnel --- src/ext/trunnel/trunnel-impl.h | 2 +- src/ext/trunnel/trunnel.c | 2 +- src/ext/trunnel/trunnel.h | 2 +- src/trunnel/ed25519_cert.c | 2 +- src/trunnel/ed25519_cert.h | 6 +++--- src/trunnel/link_handshake.c | 2 +- src/trunnel/link_handshake.h | 12 ++++++------ src/trunnel/pwbox.c | 2 +- src/trunnel/pwbox.h | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index ab790f8..a97caf2 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.2 +/* trunnel-impl.h -- copied from Trunnel v1.4.3 * 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 dc1c9fc..25a46d9 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -1,4 +1,4 @@ -/* trunnel.c -- copied from Trunnel v1.4.2 +/* trunnel.c -- copied from Trunnel v1.4.3 * 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 776e2cf..6140a39 100644 --- a/src/ext/trunnel/trunnel.h +++ b/src/ext/trunnel/trunnel.h @@ -1,4 +1,4 @@ -/* trunnel.h -- copied from Trunnel v1.4.2 +/* trunnel.h -- copied from Trunnel v1.4.3 * 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 294d20b..ee010db 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.2. +/* ed25519_cert.c -- generated by Trunnel v1.4.3. * 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 fb00686..face810 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.2. +/* ed25519_cert.h -- generated by by Trunnel v1.4.3. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -61,7 +61,7 @@ ssize_t ed25519_cert_extension_encoded_len(const ed25519_cert_extension_t *obj); * On success, return the number of bytes used. On failure, return -2 * if the buffer was not long enough, and -1 if the input was invalid. */ -ssize_t ed25519_cert_extension_encode(uint8_t *output, const size_t avail, const ed25519_cert_extension_t *input); +ssize_t ed25519_cert_extension_encode(uint8_t *output, size_t avail, const ed25519_cert_extension_t *input); /** Check whether the internal state of the ed25519_cert_extension in * 'obj' is consistent. Return NULL if it is, and a short message if * it is not. @@ -167,7 +167,7 @@ ssize_t ed25519_cert_encoded_len(const ed25519_cert_t *obj); * success, return the number of bytes used. On failure, return -2 if * the buffer was not long enough, and -1 if the input was invalid. */ -ssize_t ed25519_cert_encode(uint8_t *output, const size_t avail, const ed25519_cert_t *input); +ssize_t ed25519_cert_encode(uint8_t *output, size_t avail, const ed25519_cert_t *input); /** Check whether the internal state of the ed25519_cert in 'obj' is * consistent. Return NULL if it is, and a short message if it is not. */ diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c index 5ba1c17..f9b55f0 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.2. +/* link_handshake.c -- generated by Trunnel v1.4.3. * 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 b4f5f19..60bc28f 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.2. +/* link_handshake.h -- generated by by Trunnel v1.4.3. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -104,7 +104,7 @@ ssize_t auth_challenge_cell_encoded_len(const auth_challenge_cell_t *obj); * success, return the number of bytes used. On failure, return -2 if * the buffer was not long enough, and -1 if the input was invalid. */ -ssize_t auth_challenge_cell_encode(uint8_t *output, const size_t avail, const auth_challenge_cell_t *input); +ssize_t auth_challenge_cell_encode(uint8_t *output, size_t avail, const auth_challenge_cell_t *input); /** Check whether the internal state of the auth_challenge_cell in * 'obj' is consistent. Return NULL if it is, and a short message if * it is not. @@ -206,7 +206,7 @@ ssize_t certs_cell_cert_encoded_len(const certs_cell_cert_t *obj); * success, return the number of bytes used. On failure, return -2 if * the buffer was not long enough, and -1 if the input was invalid. */ -ssize_t certs_cell_cert_encode(uint8_t *output, const size_t avail, const certs_cell_cert_t *input); +ssize_t certs_cell_cert_encode(uint8_t *output, size_t avail, const certs_cell_cert_t *input); /** Check whether the internal state of the certs_cell_cert in 'obj' * is consistent. Return NULL if it is, and a short message if it is * not. @@ -285,7 +285,7 @@ ssize_t rsa_ed_crosscert_encoded_len(const rsa_ed_crosscert_t *obj); * success, return the number of bytes used. On failure, return -2 if * the buffer was not long enough, and -1 if the input was invalid. */ -ssize_t rsa_ed_crosscert_encode(uint8_t *output, const size_t avail, const rsa_ed_crosscert_t *input); +ssize_t rsa_ed_crosscert_encode(uint8_t *output, size_t avail, const rsa_ed_crosscert_t *input); /** Check whether the internal state of the rsa_ed_crosscert in 'obj' * is consistent. Return NULL if it is, and a short message if it is * not. @@ -382,7 +382,7 @@ ssize_t auth1_encoded_len(const auth1_t *obj, const auth_ctx_t *auth_ctx_ctx); * the number of bytes used. On failure, return -2 if the buffer was * not long enough, and -1 if the input was invalid. */ -ssize_t auth1_encode(uint8_t *output, const size_t avail, const auth1_t *input, const auth_ctx_t *auth_ctx_ctx); +ssize_t auth1_encode(uint8_t *output, size_t avail, const auth1_t *input, const auth_ctx_t *auth_ctx_ctx); /** Check whether the internal state of the auth1 in 'obj' is * consistent. Return NULL if it is, and a short message if it is not. */ @@ -602,7 +602,7 @@ ssize_t certs_cell_encoded_len(const certs_cell_t *obj); * success, return the number of bytes used. On failure, return -2 if * the buffer was not long enough, and -1 if the input was invalid. */ -ssize_t certs_cell_encode(uint8_t *output, const size_t avail, const certs_cell_t *input); +ssize_t certs_cell_encode(uint8_t *output, size_t avail, const certs_cell_t *input); /** Check whether the internal state of the certs_cell in 'obj' is * consistent. Return NULL if it is, and a short message if it is not. */ diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c index 9c84b90..a80fbb9 100644 --- a/src/trunnel/pwbox.c +++ b/src/trunnel/pwbox.c @@ -1,4 +1,4 @@ -/* pwbox.c -- generated by Trunnel v1.4.2. +/* pwbox.c -- generated by Trunnel v1.4.3. * 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 4dfb364..c357932 100644 --- a/src/trunnel/pwbox.h +++ b/src/trunnel/pwbox.h @@ -1,4 +1,4 @@ -/* pwbox.h -- generated by by Trunnel v1.4.2. +/* pwbox.h -- generated by by Trunnel v1.4.3. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -49,7 +49,7 @@ ssize_t pwbox_encoded_encoded_len(const pwbox_encoded_t *obj); * success, return the number of bytes used. On failure, return -2 if * the buffer was not long enough, and -1 if the input was invalid. */ -ssize_t pwbox_encoded_encode(uint8_t *output, const size_t avail, const pwbox_encoded_t *input); +ssize_t pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *input); /** Check whether the internal state of the pwbox_encoded in 'obj' is * consistent. Return NULL if it is, and a short message if it is not. */