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

correct comment for _WINSOCKAPI_ macro manipulation

Browse Source 
The issue is with MINGW winsock2.h header file which is not compatible
with Miscrosoft version and handle _WINSOCKAPI_ macro differently
This commit is contained in:
Jiri Malak
2025-02-23 11:15:38 +01:00
parent 29c3ffb5ee
commit d066e6b9a5
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl_load.c
View File

@@ -38,7 +38,7 @@
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
#undef _WINSOCKAPI_ #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
/* mingw gcc does not support pragma comment, and the /* mingw gcc does not support pragma comment, and the
* linking with crypt32 is handled in configure.ac */ * linking with crypt32 is handled in configure.ac */

2
wolfcrypt/benchmark/benchmark.c
View File

@@ -14584,7 +14584,7 @@ void bench_sphincsKeySign(byte level, byte optim)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#undef _WINSOCKAPI_ #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
double current_time(int reset) double current_time(int reset)
{ {

2
wolfcrypt/src/random.c
View File

@@ -90,7 +90,7 @@ This library contains implementation for the random number generator.
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
#undef _WINSOCKAPI_ #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#elif defined(HAVE_WNR) #elif defined(HAVE_WNR)
#include <wnr.h> #include <wnr.h>
#include <wolfssl/wolfcrypt/logging.h> #include <wolfssl/wolfcrypt/logging.h>

4
wolfssl/internal.h
View File

@@ -156,7 +156,7 @@
#elif defined(__NT__) #elif defined(__NT__)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#undef _WINSOCKAPI_ #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#elif defined(__LINUX__) #elif defined(__LINUX__)
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED
#define WOLFSSL_PTHREADS #define WOLFSSL_PTHREADS
@@ -169,7 +169,7 @@
#else #else
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#undef _WINSOCKAPI_ #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#endif #endif
#elif defined(THREADX) #elif defined(THREADX)
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED

2
wolfssl/test.h
View File

@@ -2124,7 +2124,7 @@ static WC_INLINE unsigned int my_psk_client_cs_cb(WOLFSSL* ssl,
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#undef _WINSOCKAPI_ #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
static WC_INLINE double current_time(int reset) static WC_INLINE double current_time(int reset)
{ {

6
wolfssl/wolfcrypt/wc_port.h
View File

@@ -125,6 +125,7 @@
#if defined(USE_WINDOWS_API) #if defined(USE_WINDOWS_API)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#include <process.h> #include <process.h>
#elif defined(__OS2__) #elif defined(__OS2__)
#define INCL_DOSSEMAPHORES #define INCL_DOSSEMAPHORES
@@ -143,6 +144,7 @@
#if defined(USE_WINDOWS_API) #if defined(USE_WINDOWS_API)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#elif defined(__OS2__) #elif defined(__OS2__)
#include <os2.h> #include <os2.h>
#endif #endif
@@ -162,8 +164,7 @@
#if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API) #if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file. */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file. */
#include <windows.h> #include <windows.h>
/* winsock2.h expects _WINSOCKAPI_ to be undef, and defines it. */ #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#undef _WINSOCKAPI_
#ifndef WOLFSSL_USER_IO #ifndef WOLFSSL_USER_IO
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> /* required for InetPton */ #include <ws2tcpip.h> /* required for InetPton */
@@ -1218,6 +1219,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
#elif defined(_WIN32_WCE) #elif defined(_WIN32_WCE)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#include <stdlib.h> /* For file system */ #include <stdlib.h> /* For file system */
time_t windows_time(time_t* timer); time_t windows_time(time_t* timer);