xtest: combine aes_perf and hash_perf TAs into crypto_perf

There is quite a bit of copy in these files. So, I consolidate the
code to make it easier to maintain.

Signed-off-by: Zexi Yu <yuzexi@hisilicon.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
[jf: edit commit subject, fix whitespace in ta_crypto_perf_priv.h]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@foss.st.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/ta/crypto_perf/Android.mk b/ta/crypto_perf/Android.mk
new file mode 100644
index 0000000..1763ae1
--- /dev/null
+++ b/ta/crypto_perf/Android.mk
@@ -0,0 +1,4 @@
+LOCAL_PATH := $(call my-dir)
+
+local_module := 02a42f43-d8b7-4a57-aa4d-87bd9b5587cb.ta
+include $(BUILD_OPTEE_MK)
diff --git a/ta/crypto_perf/Makefile b/ta/crypto_perf/Makefile
new file mode 100644
index 0000000..830a53b
--- /dev/null
+++ b/ta/crypto_perf/Makefile
@@ -0,0 +1,4 @@
+BINARY = 02a42f43-d8b7-4a57-aa4d-87bd9b5587cb
+
+include ../ta_common.mk
+
diff --git a/ta/crypto_perf/include/ta_crypto_perf.h b/ta/crypto_perf/include/ta_crypto_perf.h
new file mode 100644
index 0000000..ba47efa
--- /dev/null
+++ b/ta/crypto_perf/include/ta_crypto_perf.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+/*
+ * Copyright (c) 2015, Linaro Limited
+ */
+
+#ifndef TA_CRYPTO_PERF_H
+#define TA_CRYPTO_PERF_H
+
+#define TA_CRYPTO_PERF_UUID { 0x02a42f43, 0xd8b7, 0x4a57, \
+	{ 0xaa, 0x4d, 0x87, 0xbd, 0x9b, 0x55, 0x87, 0xcb } }
+
+/*
+ * Commands implemented by the TA
+ */
+
+#define TA_CRYPTO_PERF_CMD_CIPHER_PREPARE_KEY			0
+#define TA_CRYPTO_PERF_CMD_CIPHER_PROCESS			1
+#define TA_CRYPTO_PERF_CMD_CIPHER_PROCESS_SDP			2
+#define TA_CRYPTO_PERF_CMD_HASH_PREPARE_OP			3
+#define TA_CRYPTO_PERF_CMD_HASH_PROCESS				4
+
+/*
+ * Supported AES modes of operation
+ */
+
+#define TA_AES_ECB	0
+#define TA_AES_CBC	1
+#define TA_AES_CTR	2
+#define TA_AES_XTS	3
+#define TA_AES_GCM	4
+
+/*
+ * AES key sizes
+ */
+#define AES_128	128
+#define AES_192	192
+#define AES_256	256
+
+/*
+ * Supported hash algorithms
+ */
+
+#define TA_SHA_SHA1	0
+#define TA_SHA_SHA224	1
+#define TA_SHA_SHA256	2
+#define TA_SHA_SHA384	3
+#define TA_SHA_SHA512	4
+#define TA_SM3		5
+#define TA_HMAC_SHA1	6
+#define TA_HMAC_SHA224	7
+#define TA_HMAC_SHA256	8
+#define TA_HMAC_SHA384	9
+#define TA_HMAC_SHA512	10
+#define TA_HMAC_SM3	11
+
+#endif /* TA_CRYPTO_PERF_H */
diff --git a/ta/crypto_perf/include/ta_crypto_perf_priv.h b/ta/crypto_perf/include/ta_crypto_perf_priv.h
new file mode 100644
index 0000000..c859537
--- /dev/null
+++ b/ta/crypto_perf/include/ta_crypto_perf_priv.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+/*
+ * Copyright (c) 2015, Linaro Limited
+ */
+
+#ifndef TA_CRYPTO_PERF_PRIV_H
+#define TA_CRYPTO_PERF_PRIV_H
+
+#include <tee_api.h>
+
+TEE_Result cmd_cipher_prepare_key(uint32_t param_types, TEE_Param params[4]);
+TEE_Result cmd_cipher_process(uint32_t param_types, TEE_Param params[4],
+			      bool sdp);
+TEE_Result cmd_hash_prepare_op(uint32_t param_types, TEE_Param params[4]);
+TEE_Result cmd_hash_process(uint32_t param_types, TEE_Param params[4]);
+void cmd_clean_res(void);
+
+#endif /* TA_CRYPTO_PERF_PRIV_H */
diff --git a/ta/crypto_perf/include/user_ta_header_defines.h b/ta/crypto_perf/include/user_ta_header_defines.h
new file mode 100644
index 0000000..dd8cc08
--- /dev/null
+++ b/ta/crypto_perf/include/user_ta_header_defines.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+/*
+ * Copyright (c) 2015, Linaro Limited
+ */
+
+#ifndef USER_TA_HEADER_DEFINES_H
+#define USER_TA_HEADER_DEFINES_H
+
+#include "ta_crypto_perf.h"
+
+#define TA_UUID TA_CRYPTO_PERF_UUID
+
+#define TA_FLAGS                0
+
+#define TA_STACK_SIZE		(2 * 1024)
+#define TA_DATA_SIZE		(32 * 1024)
+
+#endif
diff --git a/ta/crypto_perf/sub.mk b/ta/crypto_perf/sub.mk
new file mode 100644
index 0000000..2555292
--- /dev/null
+++ b/ta/crypto_perf/sub.mk
@@ -0,0 +1,3 @@
+global-incdirs-y += include
+srcs-y += ta_entry.c
+srcs-y += ta_crypto_perf.c
diff --git a/ta/crypto_perf/ta_crypto_perf.c b/ta/crypto_perf/ta_crypto_perf.c
new file mode 100644
index 0000000..6f60eb9
--- /dev/null
+++ b/ta/crypto_perf/ta_crypto_perf.c
@@ -0,0 +1,472 @@
+// SPDX-License-Identifier: BSD-2-Clause
+/*
+ * Copyright (c) 2015, Linaro Limited
+ */
+
+#include <string.h>
+#include <tee_internal_api_extensions.h>
+#include <tee_internal_api.h>
+#include <tee_ta_api.h>
+#include <trace.h>
+#include <utee_defines.h>
+#include <util.h>
+
+#include "ta_crypto_perf.h"
+#include "ta_crypto_perf_priv.h"
+
+#define CHECK(res, name, action) do {			\
+		if ((res) != TEE_SUCCESS) {		\
+			DMSG(name ": 0x%08x", (res));	\
+			action				\
+		}					\
+	} while(0)
+
+#define TAG_LEN	128
+
+static uint8_t iv[] = { 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
+			0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF };
+static int use_iv;
+
+static TEE_OperationHandle crypto_op;
+static uint32_t algo;
+
+static bool is_inbuf_a_secure_memref(TEE_Param *param)
+{
+	TEE_Result res = TEE_ERROR_GENERIC;
+
+	/*
+	 * Check secure attribute for the referenced buffer
+	 * Trust core on validity of the memref size: test only 1st byte
+	 * instead of the overall buffer, and if it's not secure, assume
+	 * the buffer is nonsecure.
+	 */
+	res = TEE_CheckMemoryAccessRights(TEE_MEMORY_ACCESS_ANY_OWNER |
+					 TEE_MEMORY_ACCESS_READ |
+					 TEE_MEMORY_ACCESS_SECURE,
+					 param->memref.buffer, 1);
+	return (res == TEE_SUCCESS);
+}
+
+static bool is_outbuf_a_secure_memref(TEE_Param *param)
+{
+	TEE_Result res = TEE_ERROR_GENERIC;
+
+	/*
+	 * Check secure attribute for the referenced buffer
+	 * Trust core on validity of the memref size: test only 1st byte
+	 * instead of the overall buffer, and if it's not secure, assume
+	 * the buffer is nonsecure.
+	 */
+	res = TEE_CheckMemoryAccessRights(TEE_MEMORY_ACCESS_ANY_OWNER |
+					 TEE_MEMORY_ACCESS_WRITE |
+					 TEE_MEMORY_ACCESS_SECURE,
+					 param->memref.buffer, 1);
+	return (res == TEE_SUCCESS);
+}
+
+#if defined(CFG_CACHE_API)
+static TEE_Result flush_memref_buffer(TEE_Param *param)
+{
+	TEE_Result res = TEE_ERROR_GENERIC;
+
+	res = TEE_CacheFlush(param->memref.buffer,
+			     param->memref.size);
+	CHECK(res, "TEE_CacheFlush(in)", return res;);
+	return res;
+}
+#else
+static __maybe_unused TEE_Result flush_memref_buffer(TEE_Param *param __unused)
+{
+	return TEE_SUCCESS;
+}
+#endif /* CFG_CACHE_API */
+
+TEE_Result cmd_cipher_process(uint32_t param_types,
+		       TEE_Param params[TEE_NUM_PARAMS],
+		       bool use_sdp)
+{
+	TEE_Result res = TEE_ERROR_GENERIC;
+	int n = 0;
+	int unit = 0;
+	void *in = NULL;
+	void *out = NULL;
+	size_t insz = 0;
+	size_t outsz = 0;
+	uint32_t exp_param_types = TEE_PARAM_TYPES(TEE_PARAM_TYPE_MEMREF_INOUT,
+						   TEE_PARAM_TYPE_MEMREF_INOUT,
+						   TEE_PARAM_TYPE_VALUE_INPUT,
+						   TEE_PARAM_TYPE_NONE);
+	bool secure_in = false;
+	bool secure_out = false;
+	TEE_Result (*do_update)(TEE_OperationHandle, const void *, size_t,
+				void *, size_t *) = NULL;
+
+	if (param_types != exp_param_types)
+		return TEE_ERROR_BAD_PARAMETERS;
+
+	if (use_sdp) {
+		/*
+		 * Whatever is expected as memory reference, it is mandatory
+		 * for SDP aware trusted applications of safely indentify all
+		 * memory reference parameters. Hence these tests must be part
+		 * of the performance test setup.
+		 */
+		secure_in = is_inbuf_a_secure_memref(&params[0]);
+		secure_out = is_outbuf_a_secure_memref(&params[1]);
+
+		/*
+		 * We could invalidate only the caches. We prefer to flush
+		 * them in case 2 sub-buffers are accessed by TAs from a single
+		 * allocated SDP memory buffer, and those are not cache-aligned.
+		 * Invalidating might cause data loss in cache lines. Hence
+		 * rather flush them all before accessing (in read or write).
+		 */
+		if (secure_in) {
+			res = flush_memref_buffer(&params[0]);
+			CHECK(res, "pre-flush in memref param", return res;);
+		}
+		if (secure_out) {
+			res = flush_memref_buffer(&params[1]);
+			CHECK(res, "pre-flush out memref param", return res;);
+		}
+	}
+
+	in = params[0].memref.buffer;
+	insz = params[0].memref.size;
+	out = params[1].memref.buffer;
+	outsz = params[1].memref.size;
+	n = params[2].value.a;
+	unit = params[2].value.b;
+	if (!unit)
+		unit = insz;
+
+	if (algo == TEE_ALG_AES_GCM)
+		do_update = TEE_AEUpdate;
+	else
+		do_update = TEE_CipherUpdate;
+
+	while (n--) {
+		uint32_t i = 0;
+		for (i = 0; i < insz / unit; i++) {
+			res = do_update(crypto_op, in, unit, out, &outsz);
+			CHECK(res, "TEE_CipherUpdate/TEE_AEUpdate", return res;);
+			in  = (void *)((uintptr_t)in + unit);
+			out = (void *)((uintptr_t)out + unit);
+		}
+		if (insz % unit) {
+			res = do_update(crypto_op, in, insz % unit, out, &outsz);
+			CHECK(res, "TEE_CipherUpdate/TEE_AEUpdate", return res;);
+		}
+	}
+
+	if (secure_out) {
+		/* intentionally flush output data from cache for SDP buffers */
+		res = flush_memref_buffer(&params[1]);
+		CHECK(res, "post-flush out memref param", return res;);
+	}
+
+	return TEE_SUCCESS;
+}
+
+TEE_Result cmd_cipher_prepare_key(uint32_t param_types, TEE_Param params[4])
+{
+	TEE_Result res = TEE_ERROR_GENERIC;
+	TEE_ObjectHandle hkey = TEE_HANDLE_NULL;
+	TEE_ObjectHandle hkey2 = TEE_HANDLE_NULL;
+	TEE_ObjectType objectType;
+	TEE_Attribute attr = { };
+	uint32_t mode = 0;
+	uint32_t op_keysize = 0;
+	uint32_t keysize = 0;
+	const uint8_t *ivp = NULL;
+	size_t ivlen = 0;
+	static uint8_t cipher_key[] = { 0x00, 0x01, 0x02, 0x03,
+				     0x04, 0x05, 0x06, 0x07,
+				     0x08, 0x09, 0x0A, 0x0B,
+				     0x0C, 0x0D, 0x0E, 0x0F,
+				     0x10, 0x11, 0x12, 0x13,
+				     0x14, 0x15, 0x16, 0x17,
+				     0x18, 0x19, 0x1A, 0x1B,
+				     0x1C, 0x1D, 0x1E, 0x1F };
+	static uint8_t cipher_key2[] = { 0x20, 0x21, 0x22, 0x23,
+				      0x24, 0x25, 0x26, 0x27,
+				      0x28, 0x29, 0x2A, 0x2B,
+				      0x2C, 0x2D, 0x2E, 0x2F,
+				      0x30, 0x31, 0x32, 0x33,
+				      0x34, 0x35, 0x36, 0x37,
+				      0x38, 0x39, 0x3A, 0x3B,
+				      0x3C, 0x3D, 0x3E, 0x3F };
+	uint32_t exp_param_types = TEE_PARAM_TYPES(TEE_PARAM_TYPE_VALUE_INPUT,
+						   TEE_PARAM_TYPE_VALUE_INPUT,
+						   TEE_PARAM_TYPE_NONE,
+						   TEE_PARAM_TYPE_NONE);
+
+	if (param_types != exp_param_types)
+		return TEE_ERROR_BAD_PARAMETERS;
+
+	mode = params[0].value.a ? TEE_MODE_DECRYPT : TEE_MODE_ENCRYPT;
+	keysize = params[0].value.b;
+	op_keysize = keysize;
+
+	switch (params[1].value.a) {
+	case TA_AES_ECB:
+		algo = TEE_ALG_AES_ECB_NOPAD;
+		objectType = TEE_TYPE_AES;
+		use_iv = 0;
+		break;
+	case TA_AES_CBC:
+		algo = TEE_ALG_AES_CBC_NOPAD;
+		objectType = TEE_TYPE_AES;
+		use_iv = 1;
+		break;
+	case TA_AES_CTR:
+		algo = TEE_ALG_AES_CTR;
+		objectType = TEE_TYPE_AES;
+		use_iv = 1;
+		break;
+	case TA_AES_XTS:
+		algo = TEE_ALG_AES_XTS;
+		objectType = TEE_TYPE_AES;
+		use_iv = 1;
+		op_keysize *= 2;
+		break;
+	case TA_AES_GCM:
+		algo = TEE_ALG_AES_GCM;
+		objectType = TEE_TYPE_AES;
+		use_iv = 1;
+		break;
+	default:
+		return TEE_ERROR_BAD_PARAMETERS;
+	}
+
+	cmd_clean_res();
+
+	res = TEE_AllocateOperation(&crypto_op, algo, mode, op_keysize);
+	CHECK(res, "TEE_AllocateOperation", return res;);
+
+	res = TEE_AllocateTransientObject(objectType, keysize, &hkey);
+	CHECK(res, "TEE_AllocateTransientObject", return res;);
+
+	attr.attributeID = TEE_ATTR_SECRET_VALUE;
+	attr.content.ref.buffer = cipher_key;
+	attr.content.ref.length = keysize / 8;
+
+	res = TEE_PopulateTransientObject(hkey, &attr, 1);
+	CHECK(res, "TEE_PopulateTransientObject", return res;);
+
+	if (algo == TEE_ALG_AES_XTS) {
+		res = TEE_AllocateTransientObject(objectType, keysize,
+						  &hkey2);
+		CHECK(res, "TEE_AllocateTransientObject", return res;);
+
+		attr.content.ref.buffer = cipher_key2;
+
+		res = TEE_PopulateTransientObject(hkey2, &attr, 1);
+		CHECK(res, "TEE_PopulateTransientObject", return res;);
+
+		res = TEE_SetOperationKey2(crypto_op, hkey, hkey2);
+		CHECK(res, "TEE_SetOperationKey2", return res;);
+
+		TEE_FreeTransientObject(hkey2);
+	} else {
+		res = TEE_SetOperationKey(crypto_op, hkey);
+		CHECK(res, "TEE_SetOperationKey", return res;);
+	}
+
+	TEE_FreeTransientObject(hkey);
+
+	if (use_iv) {
+		ivp = iv;
+		ivlen = sizeof(iv);
+	} else {
+		ivp = NULL;
+		ivlen = 0;
+	}
+
+	if (algo == TEE_ALG_AES_GCM) {
+		return TEE_AEInit(crypto_op, ivp, ivlen, TAG_LEN, 0, 0);
+	} else {
+		TEE_CipherInit(crypto_op, ivp, ivlen);
+		return TEE_SUCCESS;
+	}
+}
+
+static bool is_mac(uint32_t hash_algo)
+{
+	switch (hash_algo) {
+	case TEE_ALG_HMAC_SHA1:
+	case TEE_ALG_HMAC_SHA224:
+	case TEE_ALG_HMAC_SHA256:
+	case TEE_ALG_HMAC_SHA384:
+	case TEE_ALG_HMAC_SHA512:
+	case TEE_ALG_HMAC_SM3:
+		return true;
+	default:
+		return false;
+	}
+}
+
+TEE_Result cmd_hash_process(uint32_t param_types, TEE_Param params[4])
+{
+	TEE_Result res = TEE_ERROR_GENERIC;
+	TEE_OperationInfo info = { };
+	int n = 0;
+	void *in = NULL;
+	void *out = NULL;
+	size_t insz = 0;
+	size_t outsz = 0;
+	uint32_t offset = 0;
+	uint32_t exp_param_types = TEE_PARAM_TYPES(TEE_PARAM_TYPE_MEMREF_INPUT,
+						   TEE_PARAM_TYPE_MEMREF_OUTPUT,
+						   TEE_PARAM_TYPE_VALUE_INPUT,
+						   TEE_PARAM_TYPE_NONE);
+
+	if (param_types != exp_param_types)
+		return TEE_ERROR_BAD_PARAMETERS;
+
+	offset = params[2].value.b;
+	in = (uint8_t *)params[0].memref.buffer + offset;
+	insz = params[0].memref.size - offset;
+	out = params[1].memref.buffer;
+	outsz = params[1].memref.size;
+	n = params[2].value.a;
+
+	TEE_GetOperationInfo(crypto_op, &info);
+
+	if (is_mac(info.algorithm)) {
+		while (n--) {
+			TEE_MACInit(crypto_op, NULL, 0);
+			res = TEE_MACComputeFinal(crypto_op, in, insz, out, &outsz);
+			CHECK(res, "TEE_MACComputeFinal", return res;);
+		}
+	} else {
+		while (n--) {
+			res = TEE_DigestDoFinal(crypto_op, in, insz, out, &outsz);
+			CHECK(res, "TEE_DigestDoFinal", return res;);
+		}
+	}
+
+	return TEE_SUCCESS;
+}
+
+TEE_Result cmd_hash_prepare_op(uint32_t param_types, TEE_Param params[4])
+{
+	TEE_ObjectHandle hkey = TEE_HANDLE_NULL;
+	TEE_Result res = TEE_ERROR_GENERIC;
+	TEE_Attribute attr = { };
+	uint32_t key_type = TEE_TYPE_HMAC_SHA1;
+	uint32_t mac_key_size = 512;
+	uint32_t max_key_size = 0;
+	uint32_t hash_algo = 0;
+	static uint8_t mac_key[] = {
+		0x00, 0x01, 0x02, 0x03,
+		0x04, 0x05, 0x06, 0x07,
+		0x08, 0x09, 0x0A, 0x0B,
+		0x0C, 0x0D, 0x0E, 0x0F,
+		0x10, 0x11, 0x12, 0x13,
+		0x14, 0x15, 0x16, 0x17,
+		0x18, 0x19, 0x1A, 0x1B,
+		0x1C, 0x1D, 0x1E, 0x1F,
+		0x20, 0x21, 0x22, 0x23,
+		0x24, 0x25, 0x26, 0x27,
+		0x28, 0x29, 0x2A, 0x2B,
+		0x2C, 0x2D, 0x2E, 0x2F,
+		0x30, 0x31, 0x32, 0x33,
+		0x34, 0x35, 0x36, 0x37,
+		0x38, 0x39, 0x3A, 0x3B,
+		0x3C, 0x3D, 0x3E, 0x3F
+	};
+	uint32_t exp_param_types = TEE_PARAM_TYPES(TEE_PARAM_TYPE_VALUE_INPUT,
+						   TEE_PARAM_TYPE_NONE,
+						   TEE_PARAM_TYPE_NONE,
+						   TEE_PARAM_TYPE_NONE);
+
+	if (param_types != exp_param_types)
+		return TEE_ERROR_BAD_PARAMETERS;
+
+	switch (params[0].value.a) {
+	case TA_SHA_SHA1:
+		hash_algo = TEE_ALG_SHA1;
+		break;
+	case TA_SHA_SHA224:
+		hash_algo = TEE_ALG_SHA224;
+		break;
+	case TA_SHA_SHA256:
+		hash_algo = TEE_ALG_SHA256;
+		break;
+	case TA_SHA_SHA384:
+		hash_algo = TEE_ALG_SHA384;
+		break;
+	case TA_SHA_SHA512:
+		hash_algo = TEE_ALG_SHA512;
+		break;
+	case TA_SM3:
+		hash_algo = TEE_ALG_SM3;
+		break;
+	case TA_HMAC_SHA1:
+		key_type = TEE_TYPE_HMAC_SHA1;
+		hash_algo = TEE_ALG_HMAC_SHA1;
+		max_key_size = 512;
+		break;
+	case TA_HMAC_SHA224:
+		key_type = TEE_TYPE_HMAC_SHA224;
+		hash_algo = TEE_ALG_HMAC_SHA224;
+		max_key_size = 512;
+		break;
+	case TA_HMAC_SHA256:
+		key_type = TEE_TYPE_HMAC_SHA256;
+		hash_algo = TEE_ALG_HMAC_SHA256;
+		max_key_size = 512;
+		break;
+	case TA_HMAC_SHA384:
+		key_type = TEE_TYPE_HMAC_SHA384;
+		hash_algo = TEE_ALG_HMAC_SHA384;
+		max_key_size = 1024;
+		break;
+	case TA_HMAC_SHA512:
+		key_type = TEE_TYPE_HMAC_SHA512;
+		hash_algo = TEE_ALG_HMAC_SHA512;
+		max_key_size = 1024;
+		break;
+	case TA_HMAC_SM3:
+		key_type = TEE_TYPE_HMAC_SM3;
+		hash_algo = TEE_ALG_HMAC_SM3;
+		max_key_size = 512;
+		break;
+	default:
+		return TEE_ERROR_BAD_PARAMETERS;
+	}
+
+	if (crypto_op)
+		TEE_FreeOperation(crypto_op);
+
+	if (is_mac(hash_algo)) {
+		res = TEE_AllocateOperation(&crypto_op, hash_algo, TEE_MODE_MAC, max_key_size);
+		CHECK(res, "TEE_AllocateOperation", return res;);
+
+		res = TEE_AllocateTransientObject(key_type, max_key_size, &hkey);
+		CHECK(res, "TEE_AllocateTransientObject", return res;);
+
+		attr.attributeID = TEE_ATTR_SECRET_VALUE;
+		attr.content.ref.buffer = mac_key;
+		attr.content.ref.length = mac_key_size / 8;
+
+		res = TEE_PopulateTransientObject(hkey, &attr, 1);
+		CHECK(res, "TEE_PopulateTransientObject", return res;);
+
+		res = TEE_SetOperationKey(crypto_op, hkey);
+		CHECK(res, "TEE_SetOperationKey", return res;);
+
+		TEE_FreeTransientObject(hkey);
+	} else {
+		res = TEE_AllocateOperation(&crypto_op, hash_algo, TEE_MODE_DIGEST, 0);
+		CHECK(res, "TEE_AllocateOperation", return res;);
+	}
+	return TEE_SUCCESS;
+}
+
+void cmd_clean_res(void)
+{
+	if (crypto_op)
+		TEE_FreeOperation(crypto_op);
+}
diff --git a/ta/crypto_perf/ta_entry.c b/ta/crypto_perf/ta_entry.c
new file mode 100644
index 0000000..6cdb8d8
--- /dev/null
+++ b/ta/crypto_perf/ta_entry.c
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: BSD-2-Clause
+/*
+ * Copyright (c) 2015, Linaro Limited
+
+ */
+
+#include <tee_ta_api.h>
+#include <trace.h>
+
+#include "ta_crypto_perf.h"
+#include "ta_crypto_perf_priv.h"
+
+/*
+ * Trusted Application Entry Points
+ */
+
+/* Called each time a new instance is created */
+TEE_Result TA_CreateEntryPoint(void)
+{
+	return TEE_SUCCESS;
+}
+
+/* Called each time an instance is destroyed */
+void TA_DestroyEntryPoint(void)
+{
+}
+
+/* Called each time a session is opened */
+TEE_Result TA_OpenSessionEntryPoint(uint32_t nParamTypes,
+				    TEE_Param pParams[4],
+				    void **ppSessionContext)
+{
+	(void)nParamTypes;
+	(void)pParams;
+	(void)ppSessionContext;
+	return TEE_SUCCESS;
+}
+
+/* Called each time a session is closed */
+void TA_CloseSessionEntryPoint(void *pSessionContext)
+{
+	(void)pSessionContext;
+
+	cmd_clean_res();
+}
+
+/* Called when a command is invoked */
+TEE_Result TA_InvokeCommandEntryPoint(void *pSessionContext,
+				      uint32_t nCommandID, uint32_t nParamTypes,
+				      TEE_Param pParams[4])
+{
+	(void)pSessionContext;
+
+	switch (nCommandID) {
+	case TA_CRYPTO_PERF_CMD_CIPHER_PREPARE_KEY:
+		return cmd_cipher_prepare_key(nParamTypes, pParams);
+
+	case TA_CRYPTO_PERF_CMD_CIPHER_PROCESS:
+		return cmd_cipher_process(nParamTypes, pParams, false);
+	case TA_CRYPTO_PERF_CMD_CIPHER_PROCESS_SDP:
+#ifdef CFG_SECURE_DATA_PATH
+		return cmd_cipher_process(nParamTypes, pParams, true);
+#else
+		EMSG("Invalid SDP commands: TA was built without SDP support");
+		return TEE_ERROR_NOT_SUPPORTED;
+#endif
+	case TA_CRYPTO_PERF_CMD_HASH_PREPARE_OP:
+		return cmd_hash_prepare_op(nParamTypes, pParams);
+	case TA_CRYPTO_PERF_CMD_HASH_PROCESS:
+		return cmd_hash_process(nParamTypes, pParams);
+
+	default:
+		return TEE_ERROR_BAD_PARAMETERS;
+	}
+}