Skip to content

Commit 493022b

Browse files
committed
revert 2b4acf5
fix build failure when no using TSIP
1 parent 0ab1f19 commit 493022b

3 files changed

Lines changed: 5 additions & 13 deletions

File tree

IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/user_settings.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@
263263
#else
264264
#define OPENSSL_EXTRA
265265
#define WOLFSSL_GENSEED_FORTEST /* Warning: define your own seed gen */
266+
#if !defined(min)
267+
#define min(data1, data2) _builtin_min(data1, data2)
268+
#endif
266269
#endif
267270

268271

src/ssl_asn1.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3545,6 +3545,7 @@ WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_to_generalizedtime(WOLFSSL_ASN1_TIME *t,
35453545
return ret;
35463546
}
35473547

3548+
#if !defined(USER_TIME) && !defined(TIME_OVERRIDES)
35483549
WOLFSSL_ASN1_TIME* wolfSSL_ASN1_UTCTIME_set(WOLFSSL_ASN1_TIME *s, time_t t)
35493550
{
35503551
WOLFSSL_ASN1_TIME* ret = s;
@@ -3570,7 +3571,7 @@ WOLFSSL_ASN1_TIME* wolfSSL_ASN1_UTCTIME_set(WOLFSSL_ASN1_TIME *s, time_t t)
35703571

35713572
return ret;
35723573
}
3573-
3574+
#endif /* !USER_TIME && !TIME_OVERRIDES */
35743575
#endif /* OPENSSL_EXTRA */
35753576

35763577
#if defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(OPENSSL_EXTRA)

wolfcrypt/src/random.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@ This library contains implementation for the random number generator.
126126
#elif defined(WOLFSSL_PB)
127127
#elif defined(WOLFSSL_ZEPHYR)
128128
#elif defined(WOLFSSL_TELIT_M2MB)
129-
#elif defined(WOLFSSL_RENESAS_TSIP)
130-
/* for wc_tsip_GenerateRandBlock */
131-
#include "wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h"
132129
#elif defined(WOLFSSL_SCE) && !defined(WOLFSSL_SCE_NO_TRNG)
133130
#elif defined(WOLFSSL_IMXRT1170_CAAM)
134131
#elif defined(CY_USING_HAL) && defined(COMPONENT_WOLFSSL)
@@ -3655,15 +3652,6 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
36553652
return 0;
36563653
}
36573654

3658-
#elif defined(WOLFSSL_RENESAS_TSIP)
3659-
3660-
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
3661-
{
3662-
(void)os;
3663-
return wc_tsip_GenerateRandBlock(output, sz);
3664-
}
3665-
3666-
36673655
#elif defined(WOLFSSL_SCE) && !defined(WOLFSSL_SCE_NO_TRNG)
36683656
#include "hal_data.h"
36693657

0 commit comments

Comments
 (0)