diff options
Diffstat (limited to 'tests/run_preamble_tests.sh')
| -rwxr-xr-x | tests/run_preamble_tests.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/run_preamble_tests.sh b/tests/run_preamble_tests.sh index 429213c8..23902158 100755 --- a/tests/run_preamble_tests.sh +++ b/tests/run_preamble_tests.sh @@ -34,10 +34,8 @@ for d in $algs; do for rr in $algs; do if [ "$r" = "$rr" ]; then what="verify" - cmp="-ne" else what="reject" - cmp="-eq" fi : $(( tests++ )) echo -n "${what} fw_${d}_${r}.vblock with root_${rr}.vbpubk ... " @@ -45,7 +43,9 @@ for d in $algs; do --verify "${V2DIR}/fw_${d}_${r}.vblock" \ --signpubkey "${DATADIR}/root_${rr}.vbpubk" \ --fv "${DATADIR}/FWDATA" >/dev/null 2>&1 - if [ "$?" "$cmp" 0 ]; then + if [[ ( $? != 0 && $what == "verify" ) || \ + ( $? == 0 && $what == "reject" ) ]] + then echo -e "${COL_RED}FAILED${COL_STOP}" : $(( errs++ )) else @@ -62,17 +62,17 @@ for d in $algs; do for rr in $algs; do if [ "$r" = "$rr" ]; then what="verify" - cmp="-ne" else what="reject" - cmp="-eq" fi : $(( tests++ )) echo -n "${what} kern_${d}_${r}.vblock with root_${rr}.vbpubk ... " "${FUTILITY}" vbutil_kernel \ --verify "${V2DIR}/kern_${d}_${r}.vblock" \ --signpubkey "${DATADIR}/root_${rr}.vbpubk" >/dev/null 2>&1 - if [ "$?" "$cmp" 0 ]; then + if [[ ( $? != 0 && $what == "verify" ) || \ + ( $? == 0 && $what == "reject" ) ]] + then echo -e "${COL_RED}FAILED${COL_STOP}" : $(( errs++ )) else @@ -88,9 +88,9 @@ for d in $algs; do for r in $algs; do : $(( tests++ )) echo -n "verify kern_${d}_${r}.vblock with hash only ... " - "${FUTILITY}" vbutil_kernel \ + if ! "${FUTILITY}" vbutil_kernel \ --verify "${V2DIR}/kern_${d}_${r}.vblock" >/dev/null 2>&1 - if [ "$?" -ne 0 ]; then + then echo -e "${COL_RED}FAILED${COL_STOP}" : $(( errs++ )) else |