From 6555da9448f78907fda2d8efd61fbf3e2d336bce Mon Sep 17 00:00:00 2001
From: Hideki Miyazaki <hide@wolfssl.com>
Date: Fri, 31 Jan 2025 14:13:36 +0900
Subject: [PATCH] revert TSIP_KEY_TYPE as TSIP TLS definition
---
wolfcrypt/src/port/Renesas/renesas_common.c | 2 ++
.../wolfcrypt/port/Renesas/renesas-tsip-crypt.h | 12 ++++++------
.../wolfcrypt/port/Renesas/renesas_tsip_types.h | 14 +++++++-------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/wolfcrypt/src/port/Renesas/renesas_common.c b/wolfcrypt/src/port/Renesas/renesas_common.c
index 5dc92ec8bb..5e81b2f42a 100644
--- a/wolfcrypt/src/port/Renesas/renesas_common.c
+++ b/wolfcrypt/src/port/Renesas/renesas_common.c
@@ -284,10 +284,12 @@ static int Renesas_cmn_CryptoDevCb(int devIdArg, wc_CryptoInfo* info, void* ctx)
*info->pk.rsa_get_size.keySize = 256;
ret = 0;
}
+ #ifdef WOLFSSL_RENESAS_TSIP_CRYPTONLY
else if (cbInfo->wrappedKeyType == TSIP_KEY_TYPE_RSA1024) {
*info->pk.rsa_get_size.keySize = 128;
ret = 0;
}
+ #endif
}
#endif /* !NO_RSA */
#if defined(HAVE_ECC)
diff --git a/wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h b/wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h
index e5b376264e..bbde10f82c 100644
--- a/wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h
+++ b/wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h
@@ -98,13 +98,13 @@ enum {
typedef enum {
#ifdef WOLFSSL_RENESAS_TSIP_CRYPTONLY
- TSIP_KEY_TYPE_RSA1024 = 1, /* TSIP_RSA1024 */
+ TSIP_KEY_TYPE_RSA1024 = 1, /* RSA 1024 */
#endif
- TSIP_KEY_TYPE_RSA2048 = 2, /* TSIP_RSA2048 */
- TSIP_KEY_TYPE_RSA3072 = 3, /* TSIP_RSA3072 */
- TSIP_KEY_TYPE_RSA4096 = 4, /* TSIP_RSA4096 */
- TSIP_KEY_TYPE_ECDSAP256 = 5, /* TSIP_ECCP256 */
- TSIP_KEY_TYPE_ECDSAP384 = 6, /* TSIP_ECCP384 */
+ TSIP_KEY_TYPE_RSA2048 = 2, /* RSA 2048 */
+ TSIP_KEY_TYPE_RSA3072 = 3, /* RSA 3072 */
+ TSIP_KEY_TYPE_RSA4096 = 4, /* RSA 4096 */
+ TSIP_KEY_TYPE_ECDSAP256 = 5, /* ECC P256 */
+ TSIP_KEY_TYPE_ECDSAP384 = 6, /* ECC P384 */
} wolfssl_TSIP_KEY_TYPE;
diff --git a/wolfssl/wolfcrypt/port/Renesas/renesas_tsip_types.h b/wolfssl/wolfcrypt/port/Renesas/renesas_tsip_types.h
index be699cdabe..e454a5cb5c 100644
--- a/wolfssl/wolfcrypt/port/Renesas/renesas_tsip_types.h
+++ b/wolfssl/wolfcrypt/port/Renesas/renesas_tsip_types.h
@@ -58,16 +58,16 @@ typedef wolfssl_TSIP_Hash wc_Sha256;
#endif /* !NO_SHA || !NO_SHA256 */
+#if defined(WOLFSSL_RENESAS_TSIP_TLS)
+#include "r_tsip_rx_if.h"
+/* TSIP TLS KEY Definition */
typedef enum {
- TSIP_RSA1024 = 1,
- TSIP_RSA2048 = 2,
- TSIP_RSA3072 = 3,
- TSIP_RSA4096 = 4,
- TSIP_ECCP256 = 5,
- TSIP_ECCP384 = 6,
+ TSIP_RSA2048 = R_TSIP_TLS_PUBLIC_KEY_TYPE_RSA2048,
+ TSIP_RSA4096 = R_TSIP_TLS_PUBLIC_KEY_TYPE_RSA4096,
+ TSIP_ECCP256 = R_TSIP_TLS_PUBLIC_KEY_TYPE_ECDSA_P256,
} TSIP_KEY_TYPE;
-
+#endif
#if defined(WOLFSSL_RENESAS_TSIP_TLS_AES_CRYPT) || \
defined(WOLFSSL_RENESAS_TSIP_CRYPTONLY)