Incorporate review comments from Tamas

Change-Id: Id3ee1617bafd047d9337b07bb114c8a567f0a744

Makefile.psa

@@ -21,33 +21,33 @@
 # This is for direct reference to QCBOR that is not installed in
 # /usr/local or some system location. The path may need to be
 # adjusted for your location of QCBOR.
-QCBOR_DIR=../QCBOR
-QCBOR_INC=-I $(QCBOR_DIR)/inc
-QCBOR_LIB=$(QCBOR_DIR)/libqcbor.a -lm
+#QCBOR_DIR=../../QCBOR/master
+#QCBOR_INC=-I $(QCBOR_DIR)/inc
+#QCBOR_LIB=$(QCBOR_DIR)/libqcbor.a
 
 # This is for reference to QCBOR that has been installed in
 # /usr/local/ or in some system location. This will typically
 # use dynamic linking if there is a libqcbor.so
-#QCBOR_INC=-I /usr/local/include
-#QCBOR_LIB=-lqcbor
+QCBOR_INC=-I /usr/local/include
+QCBOR_LIB=-lqcbor
 
 
 # ---- crypto configuration -----
 
 # These two are for direct reference to MBed Crypto that is not installed
 # in /usr/local/ /usr/local or some system location. The path names
 # may need to be adjusted for your location of MBed Crypto
-CRYPTO_INC=-I ../mbedtls/build/include/
-CRYPTO_LIB=../mbedtls/build/library/libmbedcrypto.a
+#CRYPTO_INC=-I ../../mbed-crypto/include/
+#CRYPTO_LIB=../../mbed-crypto/library/libmbedcrypto.a
 
 # These two are for reference to MBed Crypto that has been installed in
 # /usr/local/ or in some system location.
-#CRYPTO_LIB=-l mbedcrypto
-#CRYPTO_INC=-I /usr/local/include
+CRYPTO_LIB=-l mbedcrypto
+CRYPTO_INC=-I /usr/local/include
 
 CRYPTO_CONFIG_OPTS=-DT_COSE_USE_PSA_CRYPTO
 CRYPTO_OBJ=crypto_adapters/t_cose_psa_crypto.o 
-#CRYPTO_TEST_OBJ=test/t_cose_make_psa_test_key.o
+CRYPTO_TEST_OBJ=test/t_cose_make_psa_test_key.o
 
 
 # ---- compiler configuration -----
@@ -80,8 +80,8 @@ libt_cose.a: $(SRC_OBJ) $(CRYPTO_OBJ)
 libt_cose.so: $(SRC_OBJ) $(CRYPTO_OBJ)
 	cc -shared $^ -o $@ $(CRYPTO_LIB) $(QCBOR_LIB)
 
-#t_cose_test: main.o $(TEST_OBJ) libt_cose.a
-#	cc -o $@ $^ $(QCBOR_LIB) $(CRYPTO_LIB)
+t_cose_test: main.o $(TEST_OBJ) libt_cose.a
+	cc -o $@ $^ $(QCBOR_LIB) $(CRYPTO_LIB)
 
 
 t_cose_basic_example_psa: examples/t_cose_basic_example_psa.o libt_cose.a
@@ -139,7 +139,7 @@ test/t_cose_test.o: test/t_cose_test.h test/t_cose_make_test_messages.h src/t_co
 test/t_cose_sign_verify_test.o: test/t_cose_sign_verify_test.h test/t_cose_make_test_messages.h src/t_cose_crypto.h test/t_cose_make_test_pub_key.h $(PUBLIC_INTERFACE)
 test/t_cose_make_test_messages.o: test/t_cose_make_test_messages.h inc/t_cose/t_cose_sign1_sign.h inc/t_cose/t_cose_common.h src/t_cose_standard_constants.h src/t_cose_crypto.h src/t_cose_util.h
 test/run_test.o: test/run_test.h test/t_cose_test.h test/t_cose_hash_fail_test.h
-#test/t_cose_make_psa_test_key.o: test/t_cose_make_test_pub_key.h #src/t_cose_standard_constants.h inc/t_cose/t_cose_common.h
+test/t_cose_make_psa_test_key.o: test/t_cose_make_test_pub_key.h src/t_cose_standard_constants.h inc/t_cose/t_cose_common.h
 
 # ---- crypto dependencies ----
 crypto_adapters/t_cose_psa_crypto.o: src/t_cose_crypto.h inc/t_cose/t_cose_common.h src/t_cose_standard_constants.h inc/t_cose/q_useful_buf.h