sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Have zero_length_keys.sh use an empty torrc file. 

Fixes 15033; bugfix on 0.2.6.3-alpha.
This commit is contained in:
Nick Mathewson 2015-02-26 15:21:31 -05:00
parent 51df1f9906
commit d7fcaca3fc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug15033 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (tests):
- When running the zero-length-keys check, do not use the default
torrc file. Fixes bug 15033; bugfix on 0.2.6.3-alpha. Reported
by "reezer".

4
src/test/zero_length_keys.sh
View File

@ -36,9 +36,11 @@ if [ ! -d "$DATA_DIR" ]; then
fi
trap "rm -rf '$DATA_DIR'" 0
touch "$DATA_DIR"/empty_torrc
# DisableNetwork means that the ORPort won't actually be opened.
# 'ExitRelay 0' suppresses a warning.
TOR="./src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0"
TOR="./src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc"
if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] &&
[ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then