feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #8600 from JacobBarthelmeh/microchip

Browse Source 
random implementation does not require PIC32 build macro
This commit is contained in:
Sean Parkinson
2025-04-01 08:36:45 +10:00
committed by GitHub
parent 307d746653 151a156581
commit c5dadd6f8d
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/random.c
View File

@ -2775,7 +2775,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
return ret;
}
#elif defined(MICROCHIP_PIC32)
#elif defined(MICROCHIP_PIC32) || defined(MICROCHIP_MPLAB_HARMONY)
#ifdef MICROCHIP_MPLAB_HARMONY
#ifdef MICROCHIP_MPLAB_HARMONY_3

16
wolfssl/wolfcrypt/types.h
View File

@ -767,11 +767,13 @@ typedef struct w64wrapper {
#endif
#ifndef XSTRCASECMP
#if defined(MICROCHIP_PIC32) && (__XC32_VERSION >= 1000) && (__XC32_VERSION < 4000)
#if (defined(MICROCHIP_MPLAB_HARMONY) || defined(MICROCHIP_PIC32)) && \
(__XC32_VERSION >= 1000) && (__XC32_VERSION < 4000)
/* XC32 supports str[n]casecmp in version >= 1.0 through 4.0. */
#define XSTRCASECMP(s1,s2) strcasecmp((s1),(s2))
#elif defined(MICROCHIP_PIC32) || defined(WOLFSSL_TIRTOS) || \
defined(WOLFSSL_ZEPHYR) || defined(MICROCHIP_PIC24)
#elif defined(MICROCHIP_MPLAB_HARMONY) || defined(MICROCHIP_PIC32) || \
defined(WOLFSSL_TIRTOS) || defined(WOLFSSL_ZEPHYR) || \
defined(MICROCHIP_PIC24)
/* XC32 version < 1.0 does not support strcasecmp. */
#define USE_WOLF_STRCASECMP
#elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM)
@ -799,11 +801,13 @@ typedef struct w64wrapper {
#endif /* !XSTRCASECMP */
#ifndef XSTRNCASECMP
#if defined(MICROCHIP_PIC32) && (__XC32_VERSION >= 1000)
#if (defined(MICROCHIP_MPLAB_HARMONY) || defined(MICROCHIP_PIC32)) && \
(__XC32_VERSION >= 1000)
/* XC32 supports str[n]casecmp in version >= 1.0. */
#define XSTRNCASECMP(s1,s2,n) strncasecmp((s1),(s2),(n))
#elif defined(MICROCHIP_PIC32) || defined(WOLFSSL_TIRTOS) || \
defined(WOLFSSL_ZEPHYR) || defined(MICROCHIP_PIC24)
#elif defined(MICROCHIP_MPLAB_HARMONY) || defined(MICROCHIP_PIC32) || \
defined(WOLFSSL_TIRTOS) || defined(WOLFSSL_ZEPHYR) || \
defined(MICROCHIP_PIC24)
/* XC32 version < 1.0 does not support strncasecmp. */
#define USE_WOLF_STRNCASECMP
#elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM)