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

Merge pull request #7884 from dgarske/x86_notwindows

Browse Source 
Fixes for building x86 in Visual Studio for non-windows OS
This commit is contained in:
Daniel Pouzzner
2024-08-23 17:38:30 -05:00
committed by GitHub
parent 88d4f486e2 294362a0b7
commit a39f521f7f
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/random.c
View File

@ -4055,7 +4055,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
{ {
word32 i; word32 i;
for (i = 0; i < sz; i++ ) for (i = 0; i < sz; i++ )
output[i] = i; output[i] = (byte)i;
(void)os; (void)os;

27
wolfssl/wolfcrypt/types.h
View File

@ -420,10 +420,13 @@ typedef struct w64wrapper {
#define FALL_THROUGH #define FALL_THROUGH
#endif #endif
/* Micrium will use Visual Studio for compilation but not the Win32 API */ /* For platforms where the target OS is not Windows, but compilation is
* done on Windows/Visual Studio, enable a way to disable USE_WINDOWS_API.
* Examples: Micrium, TenAsus INtime, uTasker, FreeRTOS simulator */
#if defined(_WIN32) && !defined(MICRIUM) && !defined(FREERTOS) && \ #if defined(_WIN32) && !defined(MICRIUM) && !defined(FREERTOS) && \
!defined(FREERTOS_TCP) && !defined(EBSNET) && \ !defined(FREERTOS_TCP) && !defined(EBSNET) && \
!defined(WOLFSSL_UTASKER) && !defined(INTIME_RTOS) !defined(WOLFSSL_UTASKER) && !defined(INTIME_RTOS) && \
!defined(WOLFSSL_NOT_WINDOWS_API)
#define USE_WINDOWS_API #define USE_WINDOWS_API
#endif #endif
@ -717,10 +720,10 @@ typedef struct w64wrapper {
#include <string.h> #include <string.h>
#endif #endif
#define XMEMCPY(d,s,l) memcpy((d),(s),(l)) #define XMEMCPY(d,s,l) memcpy((d),(s),(l))
#define XMEMSET(b,c,l) memset((b),(c),(l)) #define XMEMSET(b,c,l) memset((b),(c),(l))
#define XMEMCMP(s1,s2,n) memcmp((s1),(s2),(n)) #define XMEMCMP(s1,s2,n) memcmp((s1),(s2),(n))
#define XMEMMOVE(d,s,l) memmove((d),(s),(l)) #define XMEMMOVE(d,s,l) memmove((d),(s),(l))
#define XSTRLEN(s1) strlen((s1)) #define XSTRLEN(s1) strlen((s1))
#define XSTRNCPY(s1,s2,n) strncpy((s1),(s2),(n)) #define XSTRNCPY(s1,s2,n) strncpy((s1),(s2),(n))
@ -746,7 +749,6 @@ typedef struct w64wrapper {
defined(WOLFSSL_ZEPHYR) || defined(MICROCHIP_PIC24) defined(WOLFSSL_ZEPHYR) || defined(MICROCHIP_PIC24)
/* XC32 version < 1.0 does not support strcasecmp. */ /* XC32 version < 1.0 does not support strcasecmp. */
#define USE_WOLF_STRCASECMP #define USE_WOLF_STRCASECMP
#define XSTRCASECMP(s1,s2) wc_strcasecmp(s1,s2)
#elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM) #elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM)
#define XSTRCASECMP(s1,s2) _stricmp((s1),(s2)) #define XSTRCASECMP(s1,s2) _stricmp((s1),(s2))
#else #else
@ -759,13 +761,16 @@ typedef struct w64wrapper {
#elif defined(WOLFSSL_CMSIS_RTOSv2) || defined(WOLFSSL_AZSPHERE) \ #elif defined(WOLFSSL_CMSIS_RTOSv2) || defined(WOLFSSL_AZSPHERE) \
|| defined(WOLF_C89) || defined(WOLF_C89)
#define USE_WOLF_STRCASECMP #define USE_WOLF_STRCASECMP
#define XSTRCASECMP(s1,s2) wc_strcasecmp(s1, s2)
#elif defined(WOLF_C89) #elif defined(WOLF_C89)
#define XSTRCASECMP(s1,s2) strcmp((s1),(s2)) #define XSTRCASECMP(s1,s2) strcmp((s1),(s2))
#else #else
#define XSTRCASECMP(s1,s2) strcasecmp((s1),(s2)) #define XSTRCASECMP(s1,s2) strcasecmp((s1),(s2))
#endif #endif
#endif #endif
#ifdef USE_WOLF_STRCASECMP
#undef XSTRCASECMP
#define XSTRCASECMP(s1,s2) wc_strcasecmp((s1), (s2))
#endif
#endif /* !XSTRCASECMP */ #endif /* !XSTRCASECMP */
#ifndef XSTRNCASECMP #ifndef XSTRNCASECMP
@ -776,7 +781,6 @@ typedef struct w64wrapper {
defined(WOLFSSL_ZEPHYR) || defined(MICROCHIP_PIC24) defined(WOLFSSL_ZEPHYR) || defined(MICROCHIP_PIC24)
/* XC32 version < 1.0 does not support strncasecmp. */ /* XC32 version < 1.0 does not support strncasecmp. */
#define USE_WOLF_STRNCASECMP #define USE_WOLF_STRNCASECMP
#define XSTRNCASECMP(s1,s2,n) wc_strncasecmp((s1),(s2),(n))
#elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM) #elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM)
#define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n)) #define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n))
#else #else
@ -789,13 +793,16 @@ typedef struct w64wrapper {
#elif defined(WOLFSSL_CMSIS_RTOSv2) || defined(WOLFSSL_AZSPHERE) \ #elif defined(WOLFSSL_CMSIS_RTOSv2) || defined(WOLFSSL_AZSPHERE) \
|| defined(WOLF_C89) || defined(WOLF_C89)
#define USE_WOLF_STRNCASECMP #define USE_WOLF_STRNCASECMP
#define XSTRNCASECMP(s1,s2,n) wc_strncasecmp(s1, s2 ,n)
#elif defined(WOLF_C89) #elif defined(WOLF_C89)
#define XSTRNCASECMP(s1,s2,n) strncmp((s1),(s2),(n)) #define XSTRNCASECMP(s1,s2,n) strncmp((s1),(s2),(n))
#else #else
#define XSTRNCASECMP(s1,s2,n) strncasecmp((s1),(s2),(n)) #define XSTRNCASECMP(s1,s2,n) strncasecmp((s1),(s2),(n))
#endif #endif
#endif #endif
#ifdef USE_WOLF_STRNCASECMP
#undef XSTRNCASECMP
#define XSTRNCASECMP(s1,s2,n) wc_strncasecmp((s1),(s2),(n))
#endif
#endif /* !XSTRNCASECMP */ #endif /* !XSTRNCASECMP */
/* snprintf is used in asn.c for GetTimeString, PKCS7 test, and when /* snprintf is used in asn.c for GetTimeString, PKCS7 test, and when