WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8044 from douzzer/20241004-wc_static_assert 

20241004-wc_static_assert
pull/8046/head
David Garske 2024-10-05 09:11:11 -07:00 committed by GitHub
parent 4962180a93 e944967731
commit c230e10f4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 47 additions and 54 deletions
Show Stats 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];
} 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

6
src/ssl_crypto.c
View File

@ -2923,8 +2923,7 @@ void wolfSSL_DES_ecb_encrypt(WOLFSSL_DES_cblock* in, WOLFSSL_DES_cblock* out,
static int wolfssl_aes_set_key(const unsigned char *key, const int bits,
AES_KEY *aes, int enc)
{
typedef char aes_test[sizeof(AES_KEY) >= sizeof(Aes) ? 1 : -1];
(void)sizeof(aes_test);
wc_static_assert(sizeof(AES_KEY) >= sizeof(Aes));
/* Validate parameters. */
if ((key == NULL) || (aes == NULL)) {
@ -3438,8 +3437,7 @@ size_t wolfSSL_CRYPTO_cts128_decrypt(const unsigned char *in,
void wolfSSL_RC4_set_key(WOLFSSL_RC4_KEY* key, int len,
const unsigned char* data)
{
typedef char rc4_test[sizeof(WOLFSSL_RC4_KEY) >= sizeof(Arc4) ? 1 : -1];
(void)sizeof(rc4_test);
wc_static_assert(sizeof(WOLFSSL_RC4_KEY) >= sizeof(Arc4));
WOLFSSL_ENTER("wolfSSL_RC4_set_key");

11
wolfcrypt/src/evp.c
View File

@ -10495,6 +10495,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
const WOLFSSL_EVP_MD* md)
{
int ret = WOLFSSL_SUCCESS;
#ifdef WOLFSSL_ASYNC_CRYPT
wc_static_assert(WC_ASYNC_DEV_SIZE >= sizeof(WC_ASYNC_DEV));
#endif
WOLFSSL_ENTER("EVP_DigestInit");
@ -10502,14 +10505,6 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
return WOLFSSL_FAILURE;
}
#ifdef WOLFSSL_ASYNC_CRYPT
/* compile-time validation of ASYNC_CTX_SIZE */
typedef char async_test[WC_ASYNC_DEV_SIZE >= sizeof(WC_ASYNC_DEV) ?
1 : -1];
(void)sizeof(async_test);
#endif
/* Set to 0 if no match */
ctx->macType = EvpMd2MacType(md);
if (md == NULL) {

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
* infelicitous...
*/
#if !defined(STRING_USER) && !defined(NO_ERROR_STRINGS) && \
#if !defined(STRING_USER) && !defined(NO_ERROR_STRINGS) && \
(defined(__STDC_VERSION__) && (__STDC_VERSION__ > 199901L)) && \
((defined(__GLIBC__) && (__GLIBC__ >= 2)) || \
(defined(__USE_XOPEN2K) && \
defined(_POSIX_C_SOURCE) && \
((defined(__GLIBC__) && (__GLIBC__ >= 2) && defined(__USE_GNU)) || \
(defined(__USE_XOPEN2K) && \
defined(_POSIX_C_SOURCE) && \
(_POSIX_C_SOURCE >= 200112L)))
char errno_buf[64], *errno_string;

13
wolfssl/internal.h
View File

@ -2071,18 +2071,9 @@ enum Misc {
#define MAX_ENCRYPT_SZ ENCRYPT_LEN
/* A static check to assert a relation between x and y */
#define WOLFSSL_ASSERT_TEST(x, y, op) do { \
typedef char _args_test_[(x) op (y) ? 1 : -1]; \
(void)sizeof(_args_test_); \
} while(0)
#define WOLFSSL_ASSERT_EQ(x, y) wc_static_assert((x) == (y))
#define WOLFSSL_ASSERT_EQ(x, y) WOLFSSL_ASSERT_TEST(x, y, ==)
#define WOLFSSL_ASSERT_SIZEOF_TEST(x, y, op) \
WOLFSSL_ASSERT_TEST(sizeof(x), sizeof(y), op)
#define WOLFSSL_ASSERT_SIZEOF_GE(x, y) WOLFSSL_ASSERT_SIZEOF_TEST(x, y, >=)
#define WOLFSSL_ASSERT_SIZEOF_GE(x, y) wc_static_assert(sizeof(x) >= sizeof(y))
/* states. Adding state before HANDSHAKE_DONE will break session importing */
enum states {

13
wolfssl/wolfcrypt/settings.h
View File

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

48
wolfssl/wolfcrypt/types.h
View File

@ -1695,13 +1695,25 @@ typedef struct w64wrapper {
#define WC_CPP_CAT_(a, b) a ## b
#define WC_CPP_CAT(a, b) WC_CPP_CAT_(a, b)
#if (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
(defined(_MSVC_LANG) && (_MSVC_LANG >= 201103L))
#ifndef static_assert2
#define static_assert2 static_assert
#endif
#elif !defined(static_assert)
#if !defined(__cplusplus) && \
#if defined(WC_NO_STATIC_ASSERT)
#define wc_static_assert(expr) struct wc_static_assert_dummy_struct
#define wc_static_assert2(expr, msg) wc_static_assert(expr)
#elif !defined(wc_static_assert)
#if (defined(__cplusplus) && (__cplusplus >= 201703L)) || \
(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L)) || \
(defined(_MSVC_LANG) && (_MSVC_LANG >= 201103L))
/* native variadic static_assert() */
#define wc_static_assert static_assert
#ifndef wc_static_assert2
#define wc_static_assert2 static_assert
#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(WOLF_C89) && \
defined(__STDC_VERSION__) && \
@ -1709,19 +1721,23 @@ typedef struct w64wrapper {
((defined(__GNUC__) && \
(__GNUC__ >= 5)) || \
defined(__clang__))
#define static_assert(expr) _Static_assert(expr, #expr)
#ifndef static_assert2
#define static_assert2(expr, msg) _Static_assert(expr, msg)
/* 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
#else
#define static_assert(expr) \
struct WC_CPP_CAT(wc_dummy_struct_L, __LINE__)
#ifndef static_assert2
#define static_assert2(expr, msg) static_assert(expr)
/* C89-compatible fallback */
#define wc_static_assert(expr) \
struct WC_CPP_CAT(wc_static_assert_dummy_struct_L, __LINE__) { \
char t[(expr) ? 1 : -1]; \
}
#ifndef wc_static_assert2
#define wc_static_assert2(expr, msg) wc_static_assert(expr)
#endif
#endif
#elif !defined(static_assert2)
#define static_assert2(expr, msg) static_assert(expr)
#elif !defined(wc_static_assert2)
#define wc_static_assert2(expr, msg) wc_static_assert(expr)
#endif
#ifndef SAVE_VECTOR_REGISTERS