[REVIEW] update sha TA and host as per review

Set explicit values for object types.
Update sha TA and host as per review comments.

Signed-off-by: Amey Avinash Raghatate <[email protected]>

Author: amey-raghatate

sha/host/main.c

@@ -52,13 +52,8 @@ static void terminate_tee_session(struct test_ctx *ctx)
 
 static void usage(int argc, char *argv[])
 {
-	const char *pname = "optee_example_sha";
-
-	if (argc)
-		pname = argv[0];
-
-	fprintf(stderr, "%s: %s <string to process> <algo name>\n",
-		__func__, pname);
+	fprintf(stderr, "%s: optee_example_sha <string to process> <algo name>\n",
+		__func__);
 	fprintf(stderr, "<algo_name>: algorithm name. Supported values are:\n");
 	fprintf(stderr, "HMAC_SHA1, HMAC_SHA224, HMAC_SHA256, HMAC_SHA384, HMAC_SHA512\n");
 	fprintf(stderr, "AES_CMAC\n");
@@ -318,7 +313,7 @@ int main(int argc, char *argv[])
 		/* SHA HMAC */
 		char key[key_size];
 
-		printf("Prepare SHA compute operation\n");
+		printf("Prepare MAC compute operation\n");
 		prepare_hmac_sha(&ctx, key_size, obj_type);
 
 		printf("Load key in TA\n");
@@ -328,11 +323,11 @@ int main(int argc, char *argv[])
 		printf("Reset operation in TA (provides the initial vector)\n");
 		set_iv(&ctx, NULL, 0);
 
-		printf("Compute SHA operation\n");
+		printf("Compute MAC operation\n");
 		sha_update_ops(&ctx, message, message_sz, (void *)buff,
 			       &buff_sz);
 
-		printf("Prepare SHA compare operation\n");
+		printf("Prepare MAC compare operation\n");
 		prepare_hmac_sha(&ctx, key_size, obj_type);
 
 		printf("Load key in TA\n");
@@ -349,7 +344,7 @@ int main(int argc, char *argv[])
 		if (res == TEEC_SUCCESS)
 			printf("MAC successfully matching\n");
 		else
-			printf("SHA did not match\n");
+			printf("MAC did not match\n");
 
 		printf("MAC: ");
 	}

sha/ta/include/sha_ta.h

@@ -42,17 +42,16 @@
 /* Object types */
 enum ta_sha_object_type {
 	TA_SHA_OBJ_TYPE_HMAC_SHA256 = 0,
-	TA_SHA_OBJ_TYPE_HMAC_SHA1,
-	TA_SHA_OBJ_TYPE_HMAC_SHA224,
-	TA_SHA_OBJ_TYPE_HMAC_SHA384,
-	TA_SHA_OBJ_TYPE_HMAC_SHA512,
-	TA_SHA_OBJ_TYPE_AES
-
+	TA_SHA_OBJ_TYPE_HMAC_SHA1 = 1,
+	TA_SHA_OBJ_TYPE_HMAC_SHA224 = 2,
+	TA_SHA_OBJ_TYPE_HMAC_SHA384 = 3,
+	TA_SHA_OBJ_TYPE_HMAC_SHA512 = 4,
+	TA_SHA_OBJ_TYPE_AES = 5,
 };
 
 /*
  * TA_SHA_CMD_SET_KEY - Allocate resources for the MAC operation
- * param[0] (memref) key data, size shall equal key length
+ * param[0] (memref/intput) key data, size shall equal key length
  * param[1] unused
  * param[2] unused
  * param[3] unused
@@ -61,7 +60,7 @@ enum ta_sha_object_type {
 
 /*
  * TA_SHA_CMD_SET_IV - reset IV
- * param[0] (memref) initial vector, size shall equal block length
+ * param[0] (memref/input) initial vector, size shall equal block length
  * param[1] unused
  * param[2] unused
  * param[3] unused
@@ -70,27 +69,27 @@ enum ta_sha_object_type {
 
 /*
  * TA_SHA_CMD_INIT - Process MAC operation
- * param[0] (memref) message, message size
- * param[1] (memref) MAC buffer, buffer size
+ * param[0] (memref/input) message, message size
+ * param[1] (memref/output) MAC buffer, buffer size
  * param[2] unused
  * param[3] unused
  */
 #define TA_SHA_CMD_INIT			3
 
 /*
  * TA_SHA_CMD_COMPARE_MAC - compare MAC values
- * param[0] (memref) message, message size
- * param[1] (memref) MAC buffer, buffer size
+ * param[0] (memref/input) message, message size
+ * param[1] (memref/input) Expected MAC data
  * param[2] unused
  * param[3] unused
  */
 #define TA_SHA_CMD_COMPARE_MAC		4
 
 /*
  * TA_SHA_CMD_COMPUTE_DIGEST - Computing the digest
- * param[0] (memref) message, message size
- * param[1] (memref) digest buffer, buffer size
- * param[2] (value) a:TA_ALG_SHA*, b: unused
+ * param[0] (memref/input) message, message size
+ * param[1] (memref/output) digest buffer, buffer size
+ * param[2] (value/intput) a:TA_ALG_SHA*, b: unused
  * param[3] unused
  */
 #define TA_SHA_CMD_COMPUTE_DIGEST	5