Commit d7fcaca3 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Have zero_length_keys.sh use an empty torrc file. 

Fixes 15033; bugfix on 0.2.6.3-alpha.
parent 51df1f99

changes/bug15033

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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".

src/test/zero_length_keys.sh

+3 −1
Original line number Diff line number Diff line
@@ -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