Commit bc968097 authored by Neel Chauhan's avatar Neel Chauhan Committed by David Goulet
Browse files

Fix script failures

parent 1588767e

src/test/test_key_expiration.sh

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --Ex 


# Step 1: Start Tor with --list-fingerprint --quiet.  Make sure everything is there.

echo "Setup step #1"

${TOR} --list-fingerprint ${SILENTLY} > /dev/null

${TOR} ${SILENTLY} --list-fingerprint > /dev/null



check_dir "${DATA_DIR}/keys"

check_file "${DATA_DIR}/keys/ed25519_master_id_public_key"

src/test/test_keygen.sh

+7 −7
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 


# Step 1: Start Tor with --list-fingerprint --quiet.  Make sure everything is there.

mkdir "${DATA_DIR}/orig"

${TOR} --DataDirectory "${DATA_DIR}/orig" --list-fingerprint ${SILENTLY} > /dev/null

${TOR} --DataDirectory "${DATA_DIR}/orig" ${SILENTLY} --list-fingerprint > /dev/null



check_dir "${DATA_DIR}/orig/keys"

check_file "${DATA_DIR}/orig/keys/ed25519_master_id_public_key"
@@ -206,7 +206,7 @@ SRC="${DATA_DIR}/orig" 


mkdir -p "${ME}/keys"

cp "${SRC}/keys/ed25519_master_id_"* "${ME}/keys/"

${TOR} --DataDirectory "${ME}" --list-fingerprint ${SILENTLY} >/dev/null || die "Tor failed when starting with only master key"

${TOR} --DataDirectory "${ME}" ${SILENTLY} --list-fingerprint >/dev/null || die "Tor failed when starting with only master key"

check_files_eq "${SRC}/keys/ed25519_master_id_public_key" "${ME}/keys/ed25519_master_id_public_key"

check_files_eq "${SRC}/keys/ed25519_master_id_secret_key" "${ME}/keys/ed25519_master_id_secret_key"

check_file "${ME}/keys/ed25519_signing_cert"
@@ -264,11 +264,11 @@ SRC="${DATA_DIR}/orig" 


mkdir -p "${ME}/keys"

cp "${SRC}/keys/ed25519_master_id_secret_key" "${ME}/keys/"

${TOR} --DataDirectory "${ME}" --list-fingerprint ${SILENTLY} > "${ME}/fp1" || die "Tor wouldn't start with only unencrypted secret key"

${TOR} --DataDirectory "${ME}" ${SILENTLY} --list-fingerprint > "${ME}/fp1" || die "Tor wouldn't start with only unencrypted secret key"

check_file "${ME}/keys/ed25519_master_id_public_key"

check_file "${ME}/keys/ed25519_signing_cert"

check_file "${ME}/keys/ed25519_signing_secret_key"

${TOR} --DataDirectory "${ME}" --list-fingerprint ${SILENTLY} > "${ME}/fp2" || die "Tor wouldn't start again after starting once with only unencrypted secret key."

${TOR} --DataDirectory "${ME}" ${SILENTLY} --list-fingerprint > "${ME}/fp2" || die "Tor wouldn't start again after starting once with only unencrypted secret key."



check_files_eq "${ME}/fp1" "${ME}/fp2"
@@ -330,7 +330,7 @@ cp "${SRC}/keys/ed25519_master_id_secret_key" "${ME}/keys/" 
cp "${SRC}/keys/ed25519_signing_cert" "${ME}/keys/"

cp "${SRC}/keys/ed25519_signing_secret_key" "${ME}/keys/"



${TOR} --DataDirectory "${ME}" --list-fingerprint ${SILENTLY} >/dev/null || die "Failed when starting with missing public key"

${TOR} --DataDirectory "${ME}" ${SILENTLY} --list-fingerprint >/dev/null || die "Failed when starting with missing public key"

check_keys_eq ed25519_master_id_secret_key

check_keys_eq ed25519_master_id_public_key

check_keys_eq ed25519_signing_secret_key
@@ -352,7 +352,7 @@ cp "${SRC}/keys/ed25519_master_id_public_key" "${ME}/keys/" 
cp "${SRC}/keys/ed25519_signing_cert" "${ME}/keys/"

cp "${SRC}/keys/ed25519_signing_secret_key" "${ME}/keys/"



${TOR} --DataDirectory "${ME}" --list-fingerprint ${SILENTLY} >/dev/null || die "Failed when starting with offline secret key"

${TOR} --DataDirectory "${ME}" ${SILENTLY} --list-fingerprint >/dev/null || die "Failed when starting with offline secret key"

check_no_file "${ME}/keys/ed25519_master_id_secret_key"

check_keys_eq ed25519_master_id_public_key

check_keys_eq ed25519_signing_secret_key
@@ -373,7 +373,7 @@ mkdir -p "${ME}/keys" 
cp "${SRC}/keys/ed25519_signing_cert" "${ME}/keys/"

cp "${SRC}/keys/ed25519_signing_secret_key" "${ME}/keys/"



${TOR} --DataDirectory "${ME}" --list-fingerprint ${SILENTLY} >/dev/null || die "Failed when starting with only signing material"

${TOR} --DataDirectory "${ME}" ${SILENTLY} --list-fingerprint >/dev/null || die "Failed when starting with only signing material"

check_no_file "${ME}/keys/ed25519_master_id_secret_key"

check_file "${ME}/keys/ed25519_master_id_public_key"

check_keys_eq ed25519_signing_secret_key