test: fix test_tpm2_certify

Update to use trap handlers for file cleanup.

Signed-off-by: William Roberts <william.c.roberts@intel.com>

test/system/test_tpm2_certify.sh

@@ -4,69 +4,55 @@
 # Copyright (c) 2016, Intel Corporation
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, 
+#
+# 1. Redistributions of source code must retain the above copyright notice,
 # this list of conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, 
-# this list of conditions and the following disclaimer in the documentation 
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
 # and/or other materials provided with the distribution.
 #
 # 3. Neither the name of Intel Corporation nor the names of its contributors
 # may be used to endorse or promote products derived from this software without
 # specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-file_primary_key_ctx=context.p_B1
-file_certify_key_pub=opuB1_B8
-file_certify_key_priv=oprB1_B8
-file_certify_key_ctx=context_load_out_B1_B8
-file_certify_key_name=name.load.B1_B8
-file_output_attest=attest.out
-file_output_signature=certify_signature.out 
-
-# do not update alg_hash without updating alg_hash_name
-alg_hash=0x000B
-alg_hash_name=sha256
-alg_primary_key=0x0001
-alg_certify_key=0x0001
 
+onerror() {
+    echo "$BASH_COMMAND on line ${BASH_LINENO[0]} failed: $?"
+    exit 1
+}
+trap onerror ERR
+
+cleanup() {
+    rm -f primary.ctx certify.ctx certify.pub certify.priv certify.name \
+          attest.out sig.out &>/dev/null
+}
+trap cleanup EXIT
+
+cleanup
+
+tpm2_takeownership -Q -c
+
+tpm2_createprimary -Q -A e -g sha256 -G rsa -C primary.ctx
 
-rm $file_primary_key_ctx $file_certify_key_pub $file_certify_key_priv $file_certify_key_ctx $file_certify_key_name $file_output_attest $file_output_signature -rf
+tpm2_create -Q -g sha256 -G rsa -u certify.pub -r certify.priv  -c primary.ctx
 
-tpm2_takeownership -c
-tpm2_createprimary -A e -g $alg_hash -G $alg_primary_key -C $file_primary_key_ctx
-if [ $? != 0 ];then
-echo "createprimary fail, please check the environment or parameters!"
-exit 1
-fi
-tpm2_create -g $alg_hash -G $alg_certify_key -u $file_certify_key_pub -r $file_certify_key_priv  -c $file_primary_key_ctx
-if [ $? != 0 ];then
-echo "create fail, please check the environment or parameters!"
-exit 1
-fi
-tpm2_load -c $file_primary_key_ctx  -u $file_certify_key_pub  -r $file_certify_key_priv -n $file_certify_key_name -C $file_certify_key_ctx
-if [ $? != 0 ];then
-echo "load fail, please check the environment or parameters!"
-exit 1
-fi
-tpm2_certify -C $file_primary_key_ctx  -c $file_certify_key_ctx -g $alg_hash_name -a $file_output_attest -s $file_output_signature
-if [ $? != 0 ];then
- echo "certify fail, please check the environment or parameters!"
- exit 1
-fi
+tpm2_load -Q -c primary.ctx -u certify.pub -r certify.priv -n certify.name -C certify.ctx
 
+tpm2_certify -Q -C primary.ctx -c certify.ctx -g sha256 -a attest.out -s sig.out
 
+exit 0