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

wolfssl/wolfcrypt/types.h: refactor static_assert*() as wc_static_assert*() to avoid conflicts with target-native static_assert(), and add additional coverage for C23 and MSVC C11.

Browse Source 
wolfcrypt/test/test.c: in render_error_message(), in tests for strerror_r(), test for __USE_GNU.
This commit is contained in:
Daniel Pouzzner
2024-10-04 16:41:33 -05:00
parent 898815f11b
commit a25c0244a7
4 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dtls13.c
View File

@@ -71,7 +71,7 @@ typedef struct Dtls13HandshakeHeader {
byte fragmentLength[3]; byte fragmentLength[3];
} Dtls13HandshakeHeader; } Dtls13HandshakeHeader;
static_assert(sizeof(Dtls13HandshakeHeader) == DTLS13_HANDSHAKE_HEADER_SZ); wc_static_assert(sizeof(Dtls13HandshakeHeader) == DTLS13_HANDSHAKE_HEADER_SZ);
/** /**
* struct Dtls13Recordplaintextheader: represent header of unprotected DTLSv1.3 * struct Dtls13Recordplaintextheader: represent header of unprotected DTLSv1.3

8
wolfcrypt/test/test.c
View File

@@ -841,11 +841,11 @@ static void render_error_message(const char* msg, wc_test_ret_t es)
* stores an error string in the supplied buffer. this is all most * stores an error string in the supplied buffer. this is all most
* infelicitous... * infelicitous...
*/ */
#if !defined(STRING_USER) && !defined(NO_ERROR_STRINGS) && \ #if !defined(STRING_USER) && !defined(NO_ERROR_STRINGS) && \
(defined(__STDC_VERSION__) && (__STDC_VERSION__ > 199901L)) && \ (defined(__STDC_VERSION__) && (__STDC_VERSION__ > 199901L)) && \
((defined(__GLIBC__) && (__GLIBC__ >= 2)) || \ ((defined(__GLIBC__) && (__GLIBC__ >= 2) && defined(__USE_GNU)) || \
(defined(__USE_XOPEN2K) && \ (defined(__USE_XOPEN2K) && \
defined(_POSIX_C_SOURCE) && \ defined(_POSIX_C_SOURCE) && \
(_POSIX_C_SOURCE >= 200112L))) (_POSIX_C_SOURCE >= 200112L)))
char errno_buf[64], *errno_string; char errno_buf[64], *errno_string;

13
wolfssl/wolfcrypt/settings.h
View File

@@ -20,24 +20,17 @@
*/ */
/* /*
* ************************************************************************ * Note, this file should not be edited to activate/deactivate features.
* *
* ******************************** NOTICE ******************************** * Instead, add/edit user_settings.h, and compile with -DWOLFSSL_USER_SETTINGS
*
* ************************************************************************
*
* This method of uncommenting a line in settings.h is outdated.
*
* Please use user_settings.h / WOLFSSL_USER_SETTINGS
* *
* or * or
* *
* ./configure CFLAGS="-DFLAG" * ./configure CFLAGS="-DFEATURE_FLAG_TO_DEFINE -UFEATURE_FLAG_TO_CLEAR [...]"
* *
* For more information see: * For more information see:
* *
* https://www.wolfssl.com/how-do-i-manage-the-build-configuration-of-wolfssl/ * https://www.wolfssl.com/how-do-i-manage-the-build-configuration-of-wolfssl/
*
*/ */

44
wolfssl/wolfcrypt/types.h
View File

@@ -1693,15 +1693,22 @@ typedef struct w64wrapper {
#define PRAGMA_DIAG_POP /* null expansion */ #define PRAGMA_DIAG_POP /* null expansion */
#endif #endif
#define WC_CPP_CAT_(a, b) a ## b #ifndef wc_static_assert
#define WC_CPP_CAT(a, b) WC_CPP_CAT_(a, b) #if (defined(__cplusplus) && (__cplusplus >= 201703L)) || \
#if (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L)) || \
(defined(_MSVC_LANG) && (_MSVC_LANG >= 201103L)) (defined(_MSVC_LANG) && (_MSVC_LANG >= 201103L))
#ifndef static_assert2 /* directly usable variadic declaration */
#define static_assert2 static_assert #define wc_static_assert static_assert
#endif #ifndef wc_static_assert2
#elif !defined(static_assert) #define wc_static_assert2 static_assert
#if !defined(__cplusplus) && \ #endif
#elif defined(_MSC_VER) && (__STDC_VERSION__ >= 201112L)
/* native 2-argument static_assert() */
#define wc_static_assert(expr) static_assert(expr, #expr)
#ifndef wc_static_assert2
#define wc_static_assert2(expr, msg) static_assert(expr, msg)
#endif
#elif !defined(__cplusplus) && \
!defined(__STRICT_ANSI__) && \ !defined(__STRICT_ANSI__) && \
!defined(WOLF_C89) && \ !defined(WOLF_C89) && \
defined(__STDC_VERSION__) && \ defined(__STDC_VERSION__) && \
@@ -1709,19 +1716,20 @@ typedef struct w64wrapper {
((defined(__GNUC__) && \ ((defined(__GNUC__) && \
(__GNUC__ >= 5)) || \ (__GNUC__ >= 5)) || \
defined(__clang__)) defined(__clang__))
#define static_assert(expr) _Static_assert(expr, #expr) /* native 2-argument _Static_assert() */
#ifndef static_assert2 #define wc_static_assert(expr) _Static_assert(expr, #expr)
#define static_assert2(expr, msg) _Static_assert(expr, msg) #ifndef wc_static_assert2
#define wc_static_assert2(expr, msg) _Static_assert(expr, msg)
#endif #endif
#else #else
#define static_assert(expr) \ /* fallback -- map wc_static_assert*() to do-nothing. */
struct WC_CPP_CAT(wc_dummy_struct_L, __LINE__) #define wc_static_assert(expr) struct wc_static_assert_dummy_struct
#ifndef static_assert2 #ifndef wc_static_assert2
#define static_assert2(expr, msg) static_assert(expr) #define wc_static_assert2(expr, msg) wc_static_assert(expr)
#endif #endif
#endif #endif
#elif !defined(static_assert2) #elif !defined(wc_static_assert2)
#define static_assert2(expr, msg) static_assert(expr) #define wc_static_assert2(expr, msg) wc_static_assert(expr)
#endif #endif
#ifndef SAVE_VECTOR_REGISTERS #ifndef SAVE_VECTOR_REGISTERS