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

Peer review feedback. Thank you @jmalak

Browse Source
This commit is contained in:
David Garske
2025-02-04 14:32:24 -08:00
parent 345c969164
commit 60c5a0ac7f
7 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -2491,9 +2491,7 @@ if(WOLFSSL_EXAMPLES)
add_executable(tls_bench add_executable(tls_bench
${CMAKE_CURRENT_SOURCE_DIR}/examples/benchmark/tls_bench.c) ${CMAKE_CURRENT_SOURCE_DIR}/examples/benchmark/tls_bench.c)
target_link_libraries(tls_bench wolfssl) target_link_libraries(tls_bench wolfssl)
if(NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom") target_link_libraries(tls_bench Threads::Threads)
target_link_libraries(tls_bench Threads::Threads)
endif()
set_property(TARGET tls_bench set_property(TARGET tls_bench
PROPERTY RUNTIME_OUTPUT_DIRECTORY PROPERTY RUNTIME_OUTPUT_DIRECTORY
${WOLFSSL_OUTPUT_BASE}/examples/benchmark) ${WOLFSSL_OUTPUT_BASE}/examples/benchmark)
@ -2515,9 +2513,7 @@ if(WOLFSSL_EXAMPLES)
${CMAKE_CURRENT_BINARY_DIR}) ${CMAKE_CURRENT_BINARY_DIR})
target_compile_options(unit_test PUBLIC "-DNO_MAIN_DRIVER") target_compile_options(unit_test PUBLIC "-DNO_MAIN_DRIVER")
target_link_libraries(unit_test wolfssl) target_link_libraries(unit_test wolfssl)
if(NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom") target_link_libraries(unit_test Threads::Threads)
target_link_libraries(unit_test Threads::Threads)
endif()
set_property(TARGET unit_test set_property(TARGET unit_test
PROPERTY RUNTIME_OUTPUT_DIRECTORY PROPERTY RUNTIME_OUTPUT_DIRECTORY
${WOLFSSL_OUTPUT_BASE}/tests/) ${WOLFSSL_OUTPUT_BASE}/tests/)
@ -2778,12 +2774,12 @@ if(WOLFSSL_INSTALL)
else() else()
set(LIBM) set(LIBM)
endif() endif()
configure_file(support/wolfssl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/support/wolfssl.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/support/wolfssl.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif() endif()
configure_file(support/wolfssl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/support/wolfssl.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/support/wolfssl.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/wolfssl-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/wolfssl-config.cmake"

2
src/ssl_load.c
View File

@ -35,7 +35,7 @@
#ifdef WOLFSSL_SYS_CA_CERTS #ifdef WOLFSSL_SYS_CA_CERTS
#ifdef _WIN32 #ifdef _WIN32
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>

2
wolfcrypt/benchmark/benchmark.c
View File

@ -14463,7 +14463,7 @@ void bench_sphincsKeySign(byte level, byte optim)
#if defined(_WIN32) && !defined(INTIME_RTOS) #if defined(_WIN32) && !defined(INTIME_RTOS)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
double current_time(int reset) double current_time(int reset)

2
wolfcrypt/src/random.c
View File

@ -87,7 +87,7 @@ This library contains implementation for the random number generator.
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400 #define _WIN32_WINNT 0x0400
#endif #endif
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
#elif defined(HAVE_WNR) #elif defined(HAVE_WNR)

4
wolfssl/internal.h
View File

@ -154,7 +154,7 @@
#ifdef __WATCOMC__ #ifdef __WATCOMC__
#if defined(__OS2__) #if defined(__OS2__)
#elif defined(__NT__) #elif defined(__NT__)
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#elif defined(__LINUX__) #elif defined(__LINUX__)
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED
@ -166,7 +166,7 @@
#ifdef WOLFSSL_GAME_BUILD #ifdef WOLFSSL_GAME_BUILD
#include "system/xtl.h" #include "system/xtl.h"
#else #else
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#endif #endif
#elif defined(THREADX) #elif defined(THREADX)

2
wolfssl/test.h
View File

@ -2132,7 +2132,7 @@ static WC_INLINE unsigned int my_psk_client_cs_cb(WOLFSSL* ssl,
#elif defined(USE_WINDOWS_API) #elif defined(USE_WINDOWS_API)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
static WC_INLINE double current_time(int reset) static WC_INLINE double current_time(int reset)

8
wolfssl/wolfcrypt/wc_port.h
View File

@ -123,7 +123,7 @@
#if defined(__WATCOMC__) #if defined(__WATCOMC__)
#if !defined(SINGLE_THREADED) #if !defined(SINGLE_THREADED)
#if defined(USE_WINDOWS_API) #if defined(USE_WINDOWS_API)
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#include <process.h> #include <process.h>
#elif defined(__OS2__) #elif defined(__OS2__)
@ -141,7 +141,7 @@
#endif #endif
#else #else
#if defined(USE_WINDOWS_API) #if defined(USE_WINDOWS_API)
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#elif defined(__OS2__) #elif defined(__OS2__)
#include <os2.h> #include <os2.h>
@ -160,7 +160,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif #endif
#if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API) #if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API)
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#ifndef WOLFSSL_USER_IO #ifndef WOLFSSL_USER_IO
#include <ws2tcpip.h> /* required for InetPton */ #include <ws2tcpip.h> /* required for InetPton */
@ -1205,7 +1205,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
#define XGMTIME(c, t) gmtime((c)) #define XGMTIME(c, t) gmtime((c))
#elif defined(_WIN32_WCE) #elif defined(_WIN32_WCE)
#define _WINSOCKAPI_ /* Force winsock (workaround for WinCE) */ #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h> #include <windows.h>
#include <stdlib.h> /* For file system */ #include <stdlib.h> /* For file system */