Skip to content

Commit

Permalink
Merge pull request #8403 from miyazakh/keytype_tsip
Browse files Browse the repository at this point in the history 
Revert TSIP_KEY_TYPE as TSIP TLS definition
  • Loading branch information
@dgarske
dgarske authored Feb 4, 2025
2 parents efd36a4 + d56b623 commit f061e19
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 70 deletions.
114 changes: 57 additions & 57 deletions IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/key_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ const st_key_block_data_t g_key_block_data =
{
/* uint8_t encrypted_provisioning_key[R_TSIP_AES_CBC_IV_BYTE_SIZE * 2]; */
{
0xDF, 0x78, 0x49, 0x28, 0xA9, 0x4C, 0x36, 0xD6, 0xC9, 0x89, 0x98, 0xDF,
0xFF, 0xB1, 0xCB, 0xBC, 0x9F, 0xF4, 0x34, 0xCD, 0x81, 0x53, 0x67, 0xB3,
0xFC, 0x85, 0xC6, 0x0B, 0xA2, 0xC8, 0xF4, 0x83
0xDF, 0x78, 0x49, 0x28, 0xA9, 0x4C, 0x36, 0xD6, 0xC9, 0x89, 0x98, 0xDF,
0xFF, 0xB1, 0xCB, 0xBC, 0x9F, 0xF4, 0x34, 0xCD, 0x81, 0x53, 0x67, 0xB3,
0xFC, 0x85, 0xC6, 0x0B, 0xA2, 0xC8, 0xF4, 0x83
},
/* uint8_t iv[R_TSIP_AES_CBC_IV_BYTE_SIZE]; */
{
0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x23,
0x45, 0x67, 0x89, 0x01
0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x23,
0x45, 0x67, 0x89, 0x01
},
/* uint8_t
* encrypted_user_rsa2048_ne_key[R_TSIP_RSA2048_NE_KEY_BYTE_SIZE + 16];
Expand Down Expand Up @@ -186,64 +186,64 @@ const uint32_t encrypted_user_key_type =

const unsigned char ca_ecc_cert_der_sig[] =
{
0x64, 0x38, 0x4F, 0x4E, 0x04, 0x69, 0xC9, 0xFC, 0x2C, 0x31,
0x00, 0x85, 0x6B, 0xC9, 0xE6, 0x81, 0xFF, 0x4A, 0x98, 0x4F,
0x02, 0x1B, 0x63, 0x01, 0x5C, 0xEE, 0xE0, 0x6C, 0x0D, 0xA0,
0x7E, 0xC2, 0xA5, 0xFC, 0x87, 0x90, 0xB7, 0xFE, 0xA1, 0x4C,
0x0D, 0xB9, 0x81, 0xC7, 0x68, 0x39, 0x26, 0xD3, 0x38, 0xAD,
0x3C, 0xCC, 0x4B, 0xA5, 0x59, 0x01, 0xF1, 0x56, 0x50, 0x72,
0x5F, 0xFF, 0x5D, 0x8C, 0x4D, 0xB9, 0xA6, 0xA1, 0x08, 0xE1,
0xF2, 0x30, 0xA4, 0x20, 0x19, 0x08, 0x7F, 0x7E, 0x5C, 0xE7,
0x6F, 0x7B, 0x19, 0x0D, 0xC0, 0x04, 0x9F, 0x68, 0x15, 0x52,
0xDE, 0x8D, 0x9C, 0xA2, 0xC8, 0xE7, 0x71, 0xF2, 0x3B, 0xEE,
0x5E, 0xB1, 0x72, 0xF5, 0x53, 0x80, 0xD8, 0x48, 0x2D, 0xF0,
0x5B, 0xA1, 0x11, 0xFE, 0x0F, 0xCB, 0x60, 0x29, 0x2F, 0x27,
0x44, 0x82, 0xE6, 0x24, 0x40, 0xE6, 0xF9, 0x63, 0x82, 0x82,
0xFC, 0x3E, 0x82, 0xC0, 0xA2, 0x80, 0xF5, 0x25, 0x56, 0xB0,
0x3A, 0x18, 0x70, 0x4C, 0x3F, 0x8A, 0xCD, 0xF5, 0x9E, 0xA9,
0x34, 0x5D, 0x82, 0x24, 0xA3, 0xA7, 0x14, 0xC0, 0x13, 0x31,
0x51, 0xED, 0x6F, 0x3E, 0x88, 0x2B, 0xAB, 0xE6, 0x7F, 0x2B,
0xA7, 0x08, 0x24, 0xC5, 0x25, 0xDF, 0x16, 0x7D, 0x1E, 0x9B,
0x7F, 0xA0, 0xDA, 0x07, 0xB0, 0x40, 0xF0, 0xCC, 0x76, 0x62,
0xF7, 0xB1, 0x70, 0x98, 0x78, 0x94, 0x6D, 0xE4, 0x0E, 0xD4,
0x86, 0x59, 0x9C, 0x4C, 0xBC, 0xC2, 0x6E, 0x82, 0x35, 0xF3,
0x34, 0x2A, 0x17, 0x75, 0xA7, 0xD7, 0x5F, 0xF1, 0x45, 0x84,
0xD5, 0x75, 0xF9, 0x3C, 0x2A, 0x82, 0xB7, 0xC0, 0x9E, 0x3E,
0x76, 0xB2, 0xB3, 0xC2, 0xDC, 0xF4, 0xEA, 0x19, 0xC3, 0x8D,
0xE9, 0x08, 0x8F, 0xA0, 0x2D, 0x5C, 0x48, 0x51, 0x51, 0x2B,
0x74, 0x9E, 0xC8, 0xEB, 0x7C, 0x3C
0x80, 0x1C, 0x3A, 0xC0, 0x74, 0xC8, 0xF8, 0xB7, 0x23, 0xB0,
0x4D, 0xEC, 0x5A, 0xA3, 0x28, 0xD9, 0x27, 0x93, 0xD2, 0xEF,
0x48, 0xBD, 0x29, 0x99, 0x65, 0x7F, 0xCB, 0x60, 0xD3, 0xB7,
0xFF, 0x4D, 0xC4, 0x2D, 0x07, 0x53, 0xD3, 0xF9, 0xB6, 0xE7,
0x56, 0x25, 0x5D, 0x3E, 0x9C, 0x31, 0x1D, 0x8D, 0xA3, 0x29,
0xA0, 0x9C, 0xFB, 0xEC, 0x91, 0xF5, 0x58, 0x14, 0x11, 0xFD,
0x43, 0xFB, 0xA5, 0xAC, 0x70, 0xAE, 0x68, 0x89, 0x03, 0x32,
0x82, 0x53, 0xB9, 0xE3, 0x40, 0xD4, 0x50, 0xC5, 0xB4, 0xB2,
0x1F, 0xF6, 0x24, 0x10, 0xFE, 0x76, 0xA2, 0x1C, 0xAE, 0x01,
0x79, 0xBF, 0xF7, 0x5A, 0x5C, 0xA9, 0x9B, 0x80, 0x02, 0x7D,
0x24, 0x94, 0xCE, 0xFE, 0x41, 0x85, 0x1A, 0x63, 0x50, 0xD4,
0xDE, 0xBD, 0xB4, 0x26, 0xA4, 0x13, 0xE3, 0x94, 0x0C, 0xBB,
0xBE, 0x27, 0x0F, 0xDE, 0xF2, 0x2A, 0x0D, 0xD5, 0x79, 0x4B,
0x7A, 0xD6, 0x3C, 0x3B, 0xED, 0x4D, 0xAB, 0xB6, 0xBD, 0x53,
0x57, 0x9B, 0xA1, 0x69, 0x26, 0xD3, 0xDF, 0x47, 0x64, 0x4F,
0xD5, 0xC9, 0x11, 0x35, 0xB6, 0x17, 0x6C, 0x48, 0x6E, 0xBE,
0xCB, 0x0C, 0x63, 0x8C, 0x31, 0x45, 0x8B, 0x7F, 0x93, 0x02,
0x7C, 0xC6, 0xD3, 0x14, 0x2F, 0x5B, 0x41, 0x72, 0x4F, 0x48,
0xE6, 0xCC, 0x89, 0x4E, 0x31, 0x98, 0xBA, 0xBA, 0xE0, 0xAA,
0x04, 0x68, 0xF2, 0x07, 0xF5, 0x0B, 0x1F, 0xC2, 0x21, 0x28,
0x38, 0x44, 0xAF, 0x2C, 0x7C, 0x1B, 0x69, 0x12, 0xCC, 0x3B,
0xF7, 0xE8, 0xC2, 0x56, 0x00, 0x10, 0x14, 0x05, 0x6F, 0x29,
0x80, 0x7C, 0x1E, 0xB2, 0x37, 0x2C, 0xBF, 0x09, 0x77, 0xC9,
0x1D, 0xB1, 0x13, 0x7A, 0xDC, 0x87, 0x7D, 0xF1, 0x2E, 0xBC,
0xFC, 0x2B, 0x3D, 0x4A, 0x55, 0xD5, 0x85, 0x0C, 0xF1, 0x1D,
0xFE, 0x80, 0x73, 0xD9, 0xB4, 0x84
};
const int sizeof_ca_ecc_cert_sig = sizeof(ca_ecc_cert_der_sig);

/* ./ca-cert.der.sign, */
const unsigned char ca_cert_der_sig[] =
{
0x2C, 0xA8, 0x2C, 0xA2, 0x95, 0x60, 0x27, 0xDA, 0xE1, 0xB9,
0xD8, 0x74, 0x30, 0x10, 0x13, 0x5B, 0xDA, 0x9B, 0x15, 0xB7,
0xF4, 0x65, 0x3A, 0x9C, 0x08, 0xF6, 0x2A, 0xC2, 0xF4, 0xD9,
0x29, 0x3C, 0x27, 0xD2, 0xC6, 0x8B, 0x09, 0xB2, 0xBF, 0xEF,
0x77, 0x7D, 0x95, 0x6B, 0xCC, 0x9E, 0x6F, 0x12, 0xDA, 0x7B,
0x88, 0x36, 0x84, 0xB3, 0xC5, 0x9D, 0xCD, 0xEB, 0xE9, 0x87,
0xC3, 0xB9, 0x25, 0xF2, 0x35, 0x27, 0x3D, 0x82, 0x00, 0xA9,
0xDA, 0x16, 0x56, 0x29, 0xD1, 0xBD, 0xE5, 0x85, 0x79, 0xC9,
0x2F, 0x95, 0x51, 0xDF, 0xD2, 0x3D, 0x83, 0x3F, 0x8C, 0xE6,
0xB5, 0x6C, 0x86, 0x2D, 0x7B, 0x7D, 0x70, 0x02, 0xAF, 0x0C,
0x63, 0x78, 0xB5, 0x9A, 0x39, 0xA7, 0x21, 0x8C, 0x84, 0xCB,
0x21, 0x21, 0x9F, 0xEE, 0x3D, 0x38, 0xBC, 0xD6, 0x9B, 0x64,
0xF0, 0x33, 0xD6, 0xE0, 0x81, 0x2E, 0x4F, 0x19, 0xBF, 0x2A,
0x4B, 0x24, 0x0B, 0x2C, 0x39, 0xAA, 0xA6, 0x92, 0xAC, 0x00,
0x89, 0xEB, 0xD5, 0xC2, 0x19, 0x5D, 0x33, 0xFA, 0xEE, 0xCB,
0x99, 0x4E, 0xCE, 0x10, 0xAA, 0xFB, 0xB1, 0x3B, 0x6E, 0xEC,
0x81, 0x01, 0xEE, 0x65, 0xE8, 0xB9, 0xC2, 0xBE, 0x05, 0x23,
0xFE, 0x44, 0x27, 0xAA, 0x34, 0x68, 0xB3, 0x79, 0x27, 0xB8,
0xFC, 0xCF, 0x1C, 0x31, 0x73, 0x7E, 0xFA, 0x65, 0x08, 0x91,
0x45, 0xB6, 0xD7, 0x4D, 0x0E, 0x0D, 0x9C, 0x96, 0xDB, 0x49,
0x98, 0xAE, 0xD6, 0xB5, 0xE7, 0x1C, 0x5E, 0xB4, 0x62, 0x52,
0x5D, 0x82, 0x2C, 0xF2, 0x2F, 0xAE, 0xB8, 0xB4, 0x0C, 0x2A,
0x26, 0x7E, 0xD2, 0x22, 0xE9, 0x51, 0x65, 0x75, 0x9E, 0x4F,
0x23, 0xB9, 0x5E, 0x06, 0xD6, 0x71, 0xE6, 0x24, 0xFC, 0x89,
0x16, 0xA1, 0xCC, 0xE2, 0x99, 0x5A, 0x98, 0xD0, 0x11, 0x8A,
0x36, 0x26, 0xB5, 0xB4, 0xB1, 0x57
0x77, 0x62, 0x9D, 0x3D, 0x7A, 0x60, 0xF7, 0x9C, 0x7C, 0x1C,
0xC8, 0x9D, 0x09, 0x2D, 0x98, 0xBE, 0x39, 0x25, 0x4E, 0x05,
0xED, 0xF1, 0x93, 0xB1, 0x4B, 0x1B, 0x29, 0x2D, 0x8F, 0x3A,
0xCA, 0x3A, 0x8F, 0x3F, 0x77, 0x61, 0xF1, 0x97, 0x05, 0x69,
0xDC, 0x4A, 0x92, 0x52, 0x29, 0xC8, 0x26, 0x38, 0x53, 0x7A,
0x41, 0x7C, 0x73, 0xCA, 0xA7, 0x6B, 0xD7, 0x19, 0xC4, 0x99,
0x64, 0xCD, 0x27, 0xC9, 0x85, 0x19, 0x53, 0xD2, 0x93, 0xC5,
0x7A, 0xE5, 0xDC, 0x88, 0xA0, 0xFB, 0xB3, 0xEB, 0x8B, 0x01,
0xD6, 0x80, 0x9C, 0x93, 0x9D, 0x44, 0x5A, 0x17, 0x4B, 0x87,
0x8B, 0xD1, 0x08, 0xBA, 0x82, 0x87, 0xA7, 0x69, 0x06, 0x70,
0x67, 0x68, 0xE3, 0xD1, 0x6C, 0x05, 0x85, 0x97, 0x84, 0x6B,
0xBF, 0xC2, 0x91, 0xBC, 0xA5, 0x32, 0x37, 0x99, 0x5C, 0xC7,
0xE9, 0x8C, 0x4F, 0xBD, 0xFD, 0x66, 0x98, 0x38, 0xD8, 0x31,
0x4E, 0x97, 0x57, 0x66, 0x0C, 0x1F, 0x43, 0x81, 0xC5, 0x0F,
0xA2, 0x5A, 0xF2, 0xF6, 0x68, 0x9D, 0x97, 0xA9, 0x39, 0x42,
0xFD, 0xCB, 0xCB, 0x29, 0x56, 0xA0, 0x49, 0x8D, 0x79, 0x40,
0x66, 0x60, 0xC1, 0xB1, 0x99, 0xD7, 0x32, 0x06, 0x80, 0x64,
0x43, 0x7F, 0x2B, 0x5A, 0xF7, 0xD9, 0x54, 0xF6, 0x3E, 0x2C,
0x92, 0x6F, 0xEE, 0xCA, 0x59, 0x53, 0xC1, 0xCA, 0x3C, 0xDB,
0xA3, 0x20, 0xF9, 0x8D, 0xEF, 0xFD, 0x8B, 0x08, 0xCE, 0x25,
0x58, 0x16, 0x00, 0x93, 0xB6, 0xF6, 0xF8, 0x7D, 0x1C, 0x35,
0xD2, 0x8E, 0xAE, 0x51, 0x1F, 0x08, 0x99, 0xBA, 0x63, 0x4B,
0x05, 0x93, 0x61, 0x64, 0x40, 0x85, 0x71, 0x69, 0xBB, 0xF2,
0xC4, 0xAE, 0x9E, 0xFB, 0x5C, 0xD1, 0x3F, 0x5F, 0x0D, 0x85,
0xAA, 0x73, 0x23, 0x16, 0xE7, 0x13, 0x60, 0x5D, 0xF4, 0x88,
0x34, 0xB1, 0xD2, 0xC9, 0x6B, 0xD4
};
const int sizeof_ca_cert_sig = sizeof(ca_cert_der_sig);
/* ./client-cert.der.sign, */
Expand Down
2 changes: 2 additions & 0 deletions wolfcrypt/src/port/Renesas/renesas_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
14 changes: 7 additions & 7 deletions wolfssl/wolfcrypt/port/Renesas/renesas_tsip_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f061e19

Please sign in to comment.