Merge pull request Tarsnap#84 from Tarsnap/test-system-scrypt

Test system scrypt

Author: cperciva

tests/05-system-scrypt-encrypt-decrypt.sh

@@ -0,0 +1,69 @@
+#!/bin/sh
+
+### Constants
+c_valgrind_min=1
+reference_file="${scriptdir}/test_scrypt.good"
+encrypted_file_1="${out}/sys-scrypt.enc"
+decrypted_file_1="${out}/sys-scrypt.txt"
+encrypted_file_2="${out}/our-scrypt.enc"
+decrypted_file_2="${out}/our-scrypt.txt"
+
+scenario_cmd() {
+if [ -z "${system_scrypt}" ]; then
+printf "no suitable system scrypt: "
+# Inform test suite that we are skipping.
+setup_check_variables
+echo "-1" > ${c_exitfile}
+return
+fi
+
+# Encrypt a file with our scrypt.
+setup_check_variables
+(
+echo ${password} | ${c_valgrind_cmd} ${bindir}/scrypt	\
+ enc -P -t 1 ${reference_file} ${encrypted_file_1}
+echo $? > ${c_exitfile}
+)
+
+# Use the system scrypt to decrypt the file we just
+# encrypted. Don't use valgrind for this.
+setup_check_variables
+(
+echo ${password} | ${system_scrypt}\
+ dec -P ${encrypted_file_1} ${decrypted_file_1}
+echo $? > ${c_exitfile}
+)
+
+# The decrypted file should match the reference.
+setup_check_variables
+if cmp -s ${decrypted_file_1} ${reference_file}; then
+echo "0"
+else
+echo "1"
+fi > ${c_exitfile}
+
+# Encrypt a file with the system scrypt. Don't use
+# valgrind for this.
+setup_check_variables
+(
+echo ${password} | ${system_scrypt}\
+ enc -P -t 1 ${reference_file} ${encrypted_file_2}
+echo $? > ${c_exitfile}
+)
+
+# Use our scrypt to decrypt the file we just encrypted.
+setup_check_variables
+(
+echo ${password} | ${c_valgrind_cmd} ${bindir}/scrypt	\
+ dec -P ${encrypted_file_2} ${decrypted_file_2}
+echo $? > ${c_exitfile}
+)
+
+# The decrypted file should match the reference.
+setup_check_variables
+if cmp -s ${decrypted_file_2} ${reference_file}; then
+echo "0"
+else
+echo "1"
+fi > ${c_exitfile}
+}

tests/shared_test_functions.sh

@@ -65,6 +65,25 @@ prepare_directories() {
 fi
 }
 
+## find_system (cmd, args...):
+# Looks for ${cmd} in the $PATH, and ensure that it supports ${args}.
+find_system() {
+cmd=$1
+cmd_with_args=$@
+# Look for ${cmd}.
+system_binary=`command -v ${cmd}`
+if [ -z "${system_binary}" ]; then
+system_binary=""
+printf "System ${cmd} not found.\n" 1>&2
+# If the command exists, check it ensures the ${args}.
+elif ${cmd_with_args} 2>&1 >/dev/null |\
+ grep -qE "(invalid|illegal) option"; then
+system_binary=""
+printf "Cannot use system ${cmd}; does not" 1>&2
+printf " support necessary arguments.\n" 1>&2
+fi
+echo "${system_binary}"
+}
 
 ## check_optional_valgrind ():
 # Return a $USE_VALGRIND variable defined; if it was previously defined and
@@ -177,7 +196,11 @@ notify_success_or_fail() {
 # Check each exitfile.
 for exitfile in `ls ${log_basename}-*.exit | sort`; do
 ret=`cat ${exitfile}`
-if [ "${ret}" -ne 0 ]; then
+if [ "${ret}" -lt 0 ]; then
+echo "SKIP!"
+return
+fi
+if [ "${ret}" -gt 0 ]; then
 echo "FAILED!"
 retval=${ret}
 if [ "${ret}" -eq "${valgrind_exit_code}" ]; then

tests/test_scrypt.sh

@@ -17,6 +17,9 @@ if [ -z ${bindir} ]; then
 bindir=".."
 fi
 
+# Find system scrypt, and ensure it supports -P.
+system_scrypt=$( find_system scrypt enc -P )
+
 # Check for optional valgrind.
 USE_VALGRIND=$( check_optional_valgrind )