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

Merge pull request #5465 from douzzer/20220812-fixes

Browse Source 
20220812-fixes
This commit is contained in:
David Garske
2022-08-14 08:03:40 -07:00
committed by GitHub
parent f515916f68 e382905311
commit dfb3616d50
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -169,6 +169,8 @@ 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\"")
set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Werror ${CMAKE_C_FLAGS}")
#################################################### ####################################################
# Build Options # Build Options
#################################################### ####################################################
@ -894,6 +896,7 @@ else()
endif() endif()
if(WOLFSSL_RSA_PSS) if(WOLFSSL_RSA_PSS)
list(APPEND WOLFSSL_DEFINITIONS "-DWC_RSA_PSS") list(APPEND WOLFSSL_DEFINITIONS "-DWC_RSA_PSS")
list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_PSS_LONG_SALT")
endif() endif()
# DH # DH

2
cmake/functions.cmake
View File

@ -912,8 +912,6 @@ function(add_to_options_file DEFINITIONS OPTION_FILE)
endif() endif()
file(APPEND ${OPTION_FILE} "\n") file(APPEND ${OPTION_FILE} "\n")
else()
message("option w/o begin -D is ${DEF}, not saving to ${OPTION_FILE}")
endif() endif()
endforeach() endforeach()
endfunction() endfunction()

2
tests/api.c
View File

@ -2416,7 +2416,7 @@ static int test_wolfSSL_CertRsaPss(void)
AssertIntEQ(wc_ParseCert(&cert, CERT_TYPE, VERIFY, cm), 0); AssertIntEQ(wc_ParseCert(&cert, CERT_TYPE, VERIFY, cm), 0);
wc_FreeDecodedCert(&cert); wc_FreeDecodedCert(&cert);
#ifdef WOLFSSL_SHA384 #if defined(WOLFSSL_SHA384) && defined(WOLFSSL_PSS_LONG_SALT)
f = XFOPEN(rsaPssSha384Cert, "rb"); f = XFOPEN(rsaPssSha384Cert, "rb");
AssertTrue((f != XBADFILE)); AssertTrue((f != XBADFILE));
bytes = (int)XFREAD(buf, 1, sizeof(buf), f); bytes = (int)XFREAD(buf, 1, sizeof(buf), f);

2
wolfcrypt/src/asn.c
View File

@ -14800,7 +14800,7 @@ void FreeSignatureCtx(SignatureCtx* sigCtx)
sigCtx->key.ed448 = NULL; sigCtx->key.ed448 = NULL;
break; break;
#endif /* HAVE_ED448 */ #endif /* HAVE_ED448 */
#if defined(HAVE_PQC) #if defined(HAVE_PQC)
#if defined(HAVE_FALCON) #if defined(HAVE_FALCON)
case FALCON_LEVEL1k: case FALCON_LEVEL1k:
case FALCON_LEVEL5k: case FALCON_LEVEL5k:

2
wolfcrypt/src/dilithium.c
View File

@ -950,7 +950,7 @@ int wc_Dilithium_PublicKeyToDer(dilithium_key* key, byte* output, word32 inLen,
return ret; return ret;
} }
#endif #endif
int wc_Dilithium_KeyToDer(dilithium_key* key, byte* output, word32 inLen) int wc_Dilithium_KeyToDer(dilithium_key* key, byte* output, word32 inLen)
{ {

8
zephyr/nrf5340dk_nrf5340_user_settings.h
View File

@ -59,11 +59,11 @@ extern "C" {
#define HAVE_ECC #define HAVE_ECC
#define ECC_USER_CURVES #define ECC_USER_CURVES
//#define HAVE_ECC192 /* #define HAVE_ECC192 */
//#define HAVE_ECC224 /* #define HAVE_ECC224 */
#undef NO_ECC256 #undef NO_ECC256
//#define HAVE_ECC384 /* #define HAVE_ECC384 */
//#define HAVE_ECC521 /* #define HAVE_ECC521 */
#define ECC_SHAMIR #define ECC_SHAMIR
#define ECC_TIMING_RESISTANT #define ECC_TIMING_RESISTANT