commit 50d15e06b32ce743ac4da532f29abb3781c4b990 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 25 14:49:00 2014 -0400
Use --require-version to prevent running trunnel pre-1.2
(Also, regenerate trunnel stuff with trunnel 1.2. This just adds a few comments to our output.) --- scripts/codegen/run_trunnel.sh | 4 ++-- src/ext/trunnel/trunnel-impl.h | 4 ++++ src/ext/trunnel/trunnel.c | 4 ++++ src/ext/trunnel/trunnel.h | 4 ++++ src/trunnel/pwbox.c | 3 ++- src/trunnel/pwbox.h | 3 ++- 6 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/scripts/codegen/run_trunnel.sh b/scripts/codegen/run_trunnel.sh index df84a6e..5f694ce 100755 --- a/scripts/codegen/run_trunnel.sh +++ b/scripts/codegen/run_trunnel.sh @@ -5,7 +5,7 @@ if test "x$TRUNNEL_PATH" != "x"; then export PYTHONPATH fi
-python -m trunnel ./src/trunnel/*.trunnel +python -m trunnel --require-version=1.2 ./src/trunnel/*.trunnel
-python -m trunnel --write-c-files --target-dir=./src/ext/trunnel/ +python -m trunnel --require-version=1.2 --write-c-files --target-dir=./src/ext/trunnel/
diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index 4dd710f..c88ee39 100644 --- a/src/ext/trunnel/trunnel-impl.h +++ b/src/ext/trunnel/trunnel-impl.h @@ -1,3 +1,7 @@ +/* trunnel-impl.h -- copied from Trunnel v1.2 + * https://gitweb.torproject.org/trunnel.git + * You probably shouldn't edit this file. + */ /* trunnel-impl.h -- Implementation helpers for trunnel, included by * generated trunnel files * diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index 4bc28e3..da4885c 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -1,3 +1,7 @@ +/* trunnel.c -- copied from Trunnel v1.2 + * https://gitweb.torproject.org/trunnel.git + * You probably shouldn't edit this file. + */ /* trunnel.c -- Helper functions to implement trunnel. * * Copyright 2014, The Tor Project, Inc. diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h index 0a78e6c..f51cade 100644 --- a/src/ext/trunnel/trunnel.h +++ b/src/ext/trunnel/trunnel.h @@ -1,3 +1,7 @@ +/* trunnel.h -- copied from Trunnel v1.2 + * https://gitweb.torproject.org/trunnel.git + * You probably shouldn't edit this file. + */ /* trunnel.h -- Public declarations for trunnel, to be included * in trunnel header files.
diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c index 0fbbf2e..b70e1d8 100644 --- a/src/trunnel/pwbox.c +++ b/src/trunnel/pwbox.c @@ -1,5 +1,6 @@ -/* pwbox.c -- generated by Trunnel v1.1-dev. +/* pwbox.c -- generated by Trunnel v1.2. * https://gitweb.torproject.org/trunnel.git + * You probably shouldn't edit this file. */ #include <stdlib.h> #include "trunnel-impl.h" diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h index 84bbdf3..5b170eb 100644 --- a/src/trunnel/pwbox.h +++ b/src/trunnel/pwbox.h @@ -1,5 +1,6 @@ -/* pwbox.h -- generated by by Trunnel v1.1-dev. +/* pwbox.h -- generated by by Trunnel v1.2. * https://gitweb.torproject.org/trunnel.git + * You probably shouldn't edit this file. */ #ifndef TRUNNEL_PWBOX_H #define TRUNNEL_PWBOX_H