commit 1b13139709348f6a7f19808c1cd82d2b62823680 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 25 12:31:31 2014 -0400

Add a script to run trunnel on the trunnel files.

Also, re-run the latest trunnel.

Closes ticket 13242 --- scripts/codegen/run_trunnel.sh | 9 +++++++++ src/trunnel/pwbox.c | 12 +++++++++--- src/trunnel/pwbox.h | 5 +++-- 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/scripts/codegen/run_trunnel.sh b/scripts/codegen/run_trunnel.sh new file mode 100755 index 0000000..3a3deb2 --- /dev/null +++ b/scripts/codegen/run_trunnel.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +if test "x$TRUNNEL_PATH" != "x"; then + PYTHONPATH="${TRUNNEL_PATH}:${PYTHONPATH}" + export PYTHONPATH +fi + +python -m trunnel ./src/trunnel/*.trunnel + diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c index b124627..0fbbf2e 100644 --- a/src/trunnel/pwbox.c +++ b/src/trunnel/pwbox.c @@ -1,5 +1,6 @@ - -/* pwbox.c -- generated by trunnel. */ +/* pwbox.c -- generated by Trunnel v1.1-dev. + * https://gitweb.torproject.org/trunnel.git + */ #include <stdlib.h> #include "trunnel-impl.h"

@@ -303,12 +304,18 @@ pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *obj) size_t written = 0; uint8_t *ptr = output; const char *msg; +#ifdef TRUNNEL_CHECK_ENCODED_LEN + const ssize_t encoded_len = pwbox_encoded_encoded_len(obj); +#endif int enforce_avail = 0; const size_t avail_orig = avail;

if (NULL != (msg = pwbox_encoded_check(obj))) goto check_failed;

+#ifdef TRUNNEL_CHECK_ENCODED_LEN + trunnel_assert(encoded_len >= 0); +#endif

/* Encode u32 fixedbytes0 IN [PWBOX0_CONST0] */ trunnel_assert(written <= avail); @@ -383,7 +390,6 @@ pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *obj) goto check_failed; #ifdef TRUNNEL_CHECK_ENCODED_LEN { - ssize_t encoded_len = pwbox_encoded_encoded_len(obj); trunnel_assert(encoded_len >= 0); trunnel_assert((size_t)encoded_len == written); } diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h index d37ef5d..84bbdf3 100644 --- a/src/trunnel/pwbox.h +++ b/src/trunnel/pwbox.h @@ -1,5 +1,6 @@ - -/* pwbox.h -- generated by trunnel. */ +/* pwbox.h -- generated by by Trunnel v1.1-dev. + * https://gitweb.torproject.org/trunnel.git + */ #ifndef TRUNNEL_PWBOX_H #define TRUNNEL_PWBOX_H