Add a script to run trunnel on the trunnel files.

Also, re-run the latest trunnel.

Closes ticket 13242
This commit is contained in:
Nick Mathewson
2014-09-25 12:31:31 -04:00
parent 36700ee99e
commit 1b13139709
3 changed files with 21 additions and 5 deletions
+9
View File
@@ -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
+9 -3
View File
@@ -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);
}
+3 -2
View File
@@ -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