wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add code to fallback to S/W if TSIP cannot handle

Browse Source
This commit is contained in:
TakayukiMatsuo
2022-08-30 04:05:31 +09:00
parent e88bd66501
commit c7de58ebaf
6 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_client.c
View File

@ -180,16 +180,15 @@ void wolfSSL_TLS_client_init(const char* cipherlist)
} }
/* set client private key data */ /* set client private key data */
#ifdef WOLFSSL_TLS13 #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_RENESAS_TSIP_TLS) && \
#ifdef WOLFSSL_RENESAS_TSIP_TLS (WOLFSSL_RENESAS_TSIP_VER >= 115 )
if (tsip_set_clientPrivateKeyEnc( if (tsip_set_clientPrivateKeyEnc(
g_key_block_data.encrypted_user_ecc256_private_key, g_key_block_data.encrypted_user_ecc256_private_key,
TSIP_ECCP256) != 0) { TSIP_ECCP256) != 0) {
printf("ERROR: can't load client-private key\n"); printf("ERROR: can't load client-private key\n");
return; return;
} }
#endif /* WOLFSSL_RENESAS_TSIP_TLS */ #endif
#else
if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx, if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx,
ecc_clikey_der_256, ecc_clikey_der_256,
sizeof_ecc_clikey_der_256, sizeof_ecc_clikey_der_256,
@ -197,7 +196,6 @@ void wolfSSL_TLS_client_init(const char* cipherlist)
printf("ERROR: can't load private-key data.\n"); printf("ERROR: can't load private-key data.\n");
return; return;
} }
#endif /* WOLFSSL_TLS13 */
#else #else
if (wolfSSL_CTX_use_certificate_chain_buffer_format(client_ctx, if (wolfSSL_CTX_use_certificate_chain_buffer_format(client_ctx,
@ -209,14 +207,6 @@ void wolfSSL_TLS_client_init(const char* cipherlist)
} }
/* set client private key data */ /* set client private key data */
#ifdef WOLFSSL_RENESAS_TSIP_TLS
if (tsip_set_clientPrivateKeyEnc(
g_key_block_data.encrypted_user_rsa2048_private_key,
TSIP_RSA2048) != 0) {
printf("ERROR: can't load client-private key\n");
return;
}
#endif
if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx, client_key_der_2048, if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx, client_key_der_2048,
sizeof_client_key_der_2048, SSL_FILETYPE_ASN1) sizeof_client_key_der_2048, SSL_FILETYPE_ASN1)

4
IDE/Renesas/e2studio/RX65N/RSK/wolfssl_demo/wolfssl_demo.c
View File

@ -218,7 +218,7 @@ static void Tls_client_init(const char* cipherlist)
printf("ERROR: can't load client-private key\n"); printf("ERROR: can't load client-private key\n");
return; return;
} }
#else #endif
if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx, if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx,
ecc_clikey_der_256, ecc_clikey_der_256,
sizeof_ecc_clikey_der_256, sizeof_ecc_clikey_der_256,
@ -226,7 +226,7 @@ static void Tls_client_init(const char* cipherlist)
printf("ERROR: can't load private-key data.\n"); printf("ERROR: can't load private-key data.\n");
return; return;
} }
#endif /* WOLFSSL_TLS13 */
#else #else
if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx, if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx,
client_key_der_2048, client_key_der_2048,

4
IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/wolfssl_demo.c
View File

@ -269,7 +269,7 @@ static void Tls_client_init()
printf("ERROR: can't load client-private key\n"); printf("ERROR: can't load client-private key\n");
return; return;
} }
#else #endif
if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx, if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx,
ecc_clikey_der_256, ecc_clikey_der_256,
sizeof_ecc_clikey_der_256, sizeof_ecc_clikey_der_256,
@ -277,7 +277,7 @@ static void Tls_client_init()
printf("ERROR: can't load private-key data.\n"); printf("ERROR: can't load private-key data.\n");
return; return;
} }
#endif /* WOLFSSL_TLS13 */
#else #else
if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx, if (wolfSSL_CTX_use_PrivateKey_buffer(client_ctx,
client_key_der_2048, client_key_der_2048,

5
src/internal.c
View File

@ -4922,6 +4922,11 @@ int EccSign(WOLFSSL* ssl, const byte* in, word32 inSz, byte* out,
} }
ret = ssl->ctx->EccSignCb(ssl, in, inSz, out, outSz, keyBuf, ret = ssl->ctx->EccSignCb(ssl, in, inSz, out, outSz, keyBuf,
keySz, ctx); keySz, ctx);
#if defined(WOLFSSL_RENESAS_TSIP_TLS)
if (ret == CRYPTOCB_UNAVAILABLE) {
ret = wc_ecc_sign_hash(in, inSz, out, outSz, ssl->rng, key);
}
#endif /* WOLFSSL_RENESAS_TSIP_TLS */
} }
else else
#endif /* HAVE_PK_CALLBACKS */ #endif /* HAVE_PK_CALLBACKS */

8
src/tls13.c
View File

@ -515,13 +515,7 @@ static int DeriveClientHandshakeSecret(WOLFSSL* ssl, byte* key)
if (ssl == NULL || ssl->arrays == NULL) { if (ssl == NULL || ssl->arrays == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#if defined(WOLFSSL_RENESAS_TSIP_TLS) && (WOLFSSL_RENESAS_TSIP_Ver >= 115)
(void)key;
ret = tsip_DeriveClientHandshakeSecret(ssl);
if (ret != CRYPTOCB_UNAVAILABLE) {
return ret;
}
#endif
ret = Tls13DeriveKey(ssl, key, -1, ssl->arrays->preMasterSecret, ret = Tls13DeriveKey(ssl, key, -1, ssl->arrays->preMasterSecret,
clientHandshakeLabel, CLIENT_HANDSHAKE_LABEL_SZ, clientHandshakeLabel, CLIENT_HANDSHAKE_LABEL_SZ,
ssl->specs.mac_algorithm, 1); ssl->specs.mac_algorithm, 1);

7
wolfcrypt/src/port/Renesas/renesas_common.c
View File

@ -66,7 +66,7 @@ WOLFSSL_LOCAL int Renesas_cmn_RsaSignCb(WOLFSSL* ssl,
const unsigned char* keyDer, unsigned int keySz, const unsigned char* keyDer, unsigned int keySz,
void* ctx) void* ctx)
{ {
int ret = NOT_COMPILED_IN; int ret = CRYPTOCB_UNAVAILABLE;
WOLFSSL_ENTER("Renesas_cmn_RsaSignCb"); WOLFSSL_ENTER("Renesas_cmn_RsaSignCb");
/* This is just a stub function that provides no logic */ /* This is just a stub function that provides no logic */
@ -81,7 +81,7 @@ WOLFSSL_LOCAL int Renesas_cmn_EccSignCb(WOLFSSL* ssl,
const unsigned char* keyDer, unsigned int keySz, const unsigned char* keyDer, unsigned int keySz,
void* ctx) void* ctx)
{ {
int ret = NOT_COMPILED_IN; int ret = CRYPTOCB_UNAVAILABLE;
WOLFSSL_ENTER("Renesas_cmn_EccSignCb"); WOLFSSL_ENTER("Renesas_cmn_EccSignCb");
/* This is just a stub function that provides no logic */ /* This is just a stub function that provides no logic */
@ -118,6 +118,7 @@ static int Renesas_cmn_CryptoDevCb(int devIdArg, wc_CryptoInfo* info, void* ctx)
#endif #endif
#if defined(WOLFSSL_RENESAS_TSIP) #if defined(WOLFSSL_RENESAS_TSIP)
ret = CRYPTOCB_UNAVAILABLE;
if (info->algo_type == WC_ALGO_TYPE_CIPHER) { if (info->algo_type == WC_ALGO_TYPE_CIPHER) {
@ -327,7 +328,7 @@ static int Renesas_cmn_CryptoDevCb(int devIdArg, wc_CryptoInfo* info, void* ctx)
(void)devIdArg; (void)devIdArg;
(void)ctx; (void)ctx;
WOLFSSL_LEAVE("Renesas_cmn_CryptoDevCb", ret);
return ret; return ret;
} }