Skip to content

Commit 2831eb3

Browse files
committed
Fix TSIP TLS. Call rsa_pad crypt cb in the case of TSIP
1 parent 43879f9 commit 2831eb3

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

wolfcrypt/src/port/Renesas/renesas_common.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,11 @@ static int Renesas_cmn_CryptoDevCb(int devIdArg, wc_CryptoInfo* info, void* ctx)
266266
info->pk.rsa.type == RSA_PRIVATE_DECRYPT) {
267267
ret = tsip_SignRsaPkcs(info, cbInfo);
268268
}
269+
#ifdef WOLFSSL_RENESAS_TSIP_CRYPTONLY
269270
else {
270271
ret = wc_tsip_RsaVerifyPkcs(info, cbInfo);
271272
}
273+
#endif
272274
}
273275
#ifdef WOLFSSL_RENESAS_TSIP_CRYPTONLY
274276
else if (pad && pad->pad_value == RSA_BLOCK_TYPE_2) {

wolfcrypt/src/rsa.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3578,7 +3578,12 @@ static int RsaPrivateDecryptEx(const byte* in, word32 inLen, byte* out,
35783578

35793579
case RSA_STATE_DECRYPT_EXPTMOD:
35803580
#if defined(WOLF_CRYPTO_CB) && defined(WOLF_CRYPTO_CB_RSA_PAD)
3581-
if ((key->devId != INVALID_DEVID) && (rsa_type != RSA_PUBLIC_DECRYPT)) {
3581+
if ((key->devId != INVALID_DEVID)
3582+
#if !defined(WOLFSSL_RENESAS_FSPSM_CRYPTONLY) && \
3583+
!defined(WOLFSSL_RENESAS_TSIP_CRYPTONLY)
3584+
&& (rsa_type != RSA_PUBLIC_DECRYPT)
3585+
#endif
3586+
) {
35823587
/* Everything except verify goes to crypto cb if
35833588
* WOLF_CRYPTO_CB_RSA_PAD defined */
35843589
XMEMSET(&padding, 0, sizeof(RsaPadding));

0 commit comments

Comments
 (0)