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

Merge pull request #5683 from douzzer/20221010-fixes-missing-field-initializers-etc

Browse Source 
20221010-fixes-missing-field-initializers-etc
This commit is contained in:
David Garske
2022-10-10 16:29:27 -07:00
committed by GitHub
parent 4d9aacbe87 af4987628f
commit b7f74962ad
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -169,7 +169,9 @@ find_package(Threads)
# Example for map file and custom linker script # Example for map file and custom linker script
#set(CMAKE_EXE_LINKER_FLAGS " -Xlinker -Map=output.map -T\"${CMAKE_CURRENT_SOURCE_DIR}/linker.ld\"") #set(CMAKE_EXE_LINKER_FLAGS " -Xlinker -Map=output.map -T\"${CMAKE_CURRENT_SOURCE_DIR}/linker.ld\"")
if(WIN32) if(DEFINED WARNING_C_FLAGS)
set(CMAKE_C_FLAGS "${WARNING_C_FLAGS} ${CMAKE_C_FLAGS}")
elseif(WIN32)
# Windows cl.exe does not support the -Wextra, -Wno-unused and -Werror flags. # Windows cl.exe does not support the -Wextra, -Wno-unused and -Werror flags.
set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
else() else()

4
configure.ac
View File

@ -4188,6 +4188,10 @@ AS_CASE([$FIPS_VERSION],
AS_IF([test "$ENABLED_AESGCM" = "no" && (test "$FIPS_VERSION" != "dev" || test "$enable_aesgcm" != "no")], AS_IF([test "$ENABLED_AESGCM" = "no" && (test "$FIPS_VERSION" != "dev" || test "$enable_aesgcm" != "no")],
[ENABLED_AESGCM="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_AESGCM"]) [ENABLED_AESGCM="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_AESGCM"])
# AES-GCM streaming isn't part of the current FIPS suite.
AS_IF([test "$ENABLED_AESGCM_STREAM" = "yes" && (test "$FIPS_VERSION" != "dev" || test "$enable_aesgcm_stream" != "yes")],
[ENABLED_AESGCM_STREAM="no"])
# Old TLS requires MD5 + HMAC, which is not allowed under FIPS 140-3 # Old TLS requires MD5 + HMAC, which is not allowed under FIPS 140-3
AS_IF([test "$ENABLED_OLD_TLS" != "no"], AS_IF([test "$ENABLED_OLD_TLS" != "no"],
[ENABLED_OLD_TLS="no"; AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS"]) [ENABLED_OLD_TLS="no"; AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS"])

8
tests/api.c
View File

@ -58973,11 +58973,13 @@ static int test_wolfSSL_DTLS_fragment_buckets(void)
!defined(NO_OLD_TLS) !defined(NO_OLD_TLS)
static int test_WOLFSSL_dtls_version_alert(void) static int test_WOLFSSL_dtls_version_alert(void)
{ {
struct test_memio_ctx test_ctx = { 0 }; struct test_memio_ctx test_ctx;
WOLFSSL_CTX *ctx_c, *ctx_s; WOLFSSL_CTX *ctx_c, *ctx_s;
WOLFSSL *ssl_c, *ssl_s; WOLFSSL *ssl_c, *ssl_s;
int ret; int ret;
XMEMSET(&test_ctx, 0, sizeof(test_ctx));
ret = test_memio_setup(&test_ctx, &ctx_c, &ctx_s, &ssl_c, &ssl_s, ret = test_memio_setup(&test_ctx, &ctx_c, &ctx_s, &ssl_c, &ssl_s,
wolfDTLSv1_2_client_method, wolfDTLSv1_server_method); wolfDTLSv1_2_client_method, wolfDTLSv1_server_method);
if (ret != 0) if (ret != 0)
@ -59147,12 +59149,14 @@ static int test_ticket_nonce_cache(WOLFSSL *ssl_s, WOLFSSL *ssl_c, byte len)
static int test_ticket_nonce_malloc(void) static int test_ticket_nonce_malloc(void)
{ {
struct test_memio_ctx test_ctx = { 0 }; struct test_memio_ctx test_ctx;
WOLFSSL_CTX *ctx_c, *ctx_s; WOLFSSL_CTX *ctx_c, *ctx_s;
byte small, medium, big; byte small, medium, big;
WOLFSSL *ssl_c, *ssl_s; WOLFSSL *ssl_c, *ssl_s;
int ret; int ret;
XMEMSET(&test_ctx, 0, sizeof(test_ctx));
ret = test_memio_setup(&test_ctx, &ctx_c, &ctx_s, &ssl_c, &ssl_s, ret = test_memio_setup(&test_ctx, &ctx_c, &ctx_s, &ssl_c, &ssl_s,
wolfTLSv1_3_client_method, wolfTLSv1_3_server_method); wolfTLSv1_3_client_method, wolfTLSv1_3_server_method);
if (ret != 0) if (ret != 0)

2
wolfssl/test.h
View File

@ -5117,7 +5117,7 @@ void DEBUG_WRITE_DER(const byte* der, int derSz, const char* fileName);
(defined(WOLFSSL_DTLS) && !defined(WOLFSSL_NO_TLS12) && \ (defined(WOLFSSL_DTLS) && !defined(WOLFSSL_NO_TLS12) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER) && \ !defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER) && \
!defined(NO_OLD_TLS)) !defined(NO_OLD_TLS))
#define TEST_MEMIO_BUF_SZ 64 * 1024 #define TEST_MEMIO_BUF_SZ (64 * 1024)
struct test_memio_ctx struct test_memio_ctx
{ {
byte c_buff[TEST_MEMIO_BUF_SZ]; byte c_buff[TEST_MEMIO_BUF_SZ];