1
0
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-10-24 04:09:07 +03:00

WIN-PQ-FIPSv7: correct project and documentation inconsistencies

This commit is contained in:
kaleb-himes
2026-09-03 15:41:42 -06:00
parent 1130ad0c1f
commit 0d6d76c36d
12 changed files with 115 additions and 138 deletions

View File

@@ -10,15 +10,26 @@ stateful hash-based signatures LMS and XMSS (SP 800-208).
# Building the wolfssl-fips project
The wolfCrypt FIPS library for Windows is a part of the wolfSSL library. It
must be built as a static library, for the moment.
The project has eight configurations: Debug, Release, DLL Debug and DLL
Release, for Win32 and x64. The Debug and Release configurations build a
static library; the DLL configurations build a DLL.
The library project is built with Whole Program Optimization disabled. This is
The library must be built with Whole Program Optimization disabled. This is
required so that necessary components of the library are not optimized away.
There are two functions added to the library that are used as markers in
memory for the in-core memory check of the code. WPO consolidates them into a
single function. WPO also optimizes away the automatic FIPS entry function.
In the project as shipped, five configurations set
WholeProgramOptimization=true at the project level: Release|Win32,
Release|x64, DLL Release|Win32, DLL Release|x64 and DLL Debug|x64. Two of
those, Release|Win32 and Release|x64, are overridden back to false in their
ClCompile settings, and fips.c carries its own false override for the four
Debug and Release configurations. That leaves DLL Release|Win32, DLL
Release|x64 and DLL Debug|x64 compiling with WPO on. Before trusting an
in-core memory test result, confirm Whole Program Optimization is set to No
(/GL absent) for the configuration you are building.
Each of the source files inside the FIPS boundary defines their own code and
constant section. The code section names start with ".fipsA$" and the constant
section names start with ".fipsB$". Each subsection has a letter to organize
@@ -32,13 +43,24 @@ The In Core Memory test calculates a checksum (HMAC-SHA512 for the v7.0.0
module) of the wolfCrypt FIPS library code and constant data and compares it
with a known value in the code.
The following wolfCrypt FIPS project linker settings are required for the DLL Win32 configuration:
The following linker settings matter for the in-core memory test. They are set
on the four DLL configurations. A static library does not link, so on the
Debug and Release configurations the application that links the library has
to supply them.
1) The [Randomized Base Address setting (ASLR)](https://learn.microsoft.com/en-us/cpp/build/reference/dynamicbase-use-address-space-layout-randomization?view=msvc-170)
needs to be disabled on all builds as the feature throws off the in-core memory calculation causing the test to fail.
is disabled, because the feature throws off the in-core memory calculation and
the test fails. All four DLL configurations set RandomizedBaseAddress to false.
2) The [Incremental Link](https://learn.microsoft.com/en-us/cpp/build/reference/incremental-link-incrementally?view=msvc-170)
option need turned off so function pointers go to actual code, not a jump instruction.
option is turned off so function pointers go to actual code, not a jump
instruction. All four DLL configurations set LinkIncremental to false.
3) The [FixedBaseAddress](https://learn.microsoft.com/en-us/cpp/build/reference/fixed-fixed-base-address?view=msvc-170)
option to YES, which disables the support for ASLR.
option is set to YES, which drops the base relocation table. All four DLL
configurations set it. The two Win32 configurations and DLL Debug|x64 also
fix the image base at 0x5A000000.
The DLL Debug configurations additionally set DataExecutionPrevention to
false.
The "verifyCore" check value in the source fips_test.c needs to be updated when
building the code. The POS performs this check and the default failure callback
@@ -49,87 +71,27 @@ check value when changing your application.
# Build Options
The default build options should be the proper default set of options:
* HAVE_FIPS
* HAVE_FIPS_VERSION=7
* HAVE_FIPS_VERSION_MINOR=0
* HAVE_THREAD_LS
* WOLFSSL_KEY_GEN
* HAVE_AESGCM
* HAVE_HASHDRBG
* WOLFSSL_SHA384
* WOLFSSL_SHA512
* NO_PSK
* NO_RC4
* NO_DSA
* NO_MD4
* WOLFSSL_SHA224
* WOLFSSL_SHA3
* WC_RSA_PSS
* WC_RSA_NO_PADDING
* HAVE_ECC
* ECC_SHAMIR
* HAVE_ECC_CDH
* ECC_TIMING_RESISTANT
* TFM_TIMING_RESISTANT
* WOLFSSL_AES_COUNTER
* WOLFSSL_AES_DIRECT
* HAVE_AES_ECB
* HAVE_AESCCM
* WOLFSSL_CMAC
* HAVE_HKDF
* WOLFSSL_VALIDATE_ECC_IMPORT
* WOLFSSL_VALIDATE_FFC_IMPORT
* HAVE_FFDHE_Q
* NO_DES
* NO_DES3
* NO_MD5
* NO_OLD_TLS
* WOLFSSL_TLS13
* HAVE_TLS_EXTENSIONS
* HAVE_SUPPORTED_CURVES
* GCM_TABLE_4BIT
* WOLFSSL_NO_SHAKE256
* WOLFSSL_VALIDATE_ECC_KEYGEN
* WOLFSSL_ECDSA_SET_K
* WOLFSSL_WOLFSSH
* WOLFSSL_PUBLIC_MP
* WC_RNG_SEED_CB
* TFM_ECC256
* ECC_USER_CURVES
* HAVE_ECC192
* HAVE_ECC224
* HAVE_ECC256
* HAVE_ECC384
* HAVE_ECC521
* HAVE_FFDHE_2048
* HAVE_FFDHE_3072
* HAVE_FFDHE_4096
* HAVE_FFDHE_6144
* HAVE_FFDHE_8192
* FP_MAX_BITS 16384
The "NO" options explicitly disable algorithms that are not allowed in
FIPS mode.
Additionally one may enable:
* WOLFSSL_AESNI
* OPENSSL_EXTRA
These settings are defined in IDE/WIN-PQ-FIPSv7/user_settings.h.
The build options are defined in IDE/WIN-PQ-FIPSv7/user_settings.h, which is
the single source of truth for this project. The "NO" options there disable
algorithms not allowed in FIPS mode.
Optional configurations
-----------------------
user_settings.h is the shipping configuration. Options are supplied as patches
against it rather than as extra copies, so an edit is only made once:
user_settings.h is the shipping configuration: no harness, no optest. Options
are supplied as patches against it rather than as extra copies, so an edit is
only made once:
user_settings.h.wolfentropy.patch MemUse (wolfEntropy) entropy source
user_settings.h.paa.patch x86_64 AES-NI PAA lane, x64 only
user_settings.h.wolfentropy.patch MemUse (wolfEntropy) entropy source
user_settings.h.paa.patch x86_64 AES-NI PAA lane, x64 only
user_settings.h.harness-optest.patch wolfACVP harness and optest together,
for vector processing and lab testing
They are independent and may both be applied. From the wolfSSL tree root:
They are independent and may be combined. From the wolfSSL tree root:
git apply IDE/WIN-PQ-FIPSv7/user_settings.h.paa.patch
git apply -R IDE/WIN-PQ-FIPSv7/user_settings.h.paa.patch
git apply IDE/WIN-PQ-FIPSv7/user_settings.h.harness-optest.patch
Reverse any of them with "git apply -R".
The harness/optest patch also enables MD5, which the optest uses to show that a
non-approved algorithm sits outside the module boundary.

View File

@@ -1,13 +0,0 @@
# vim:ft=automake
# included from Top Level Makefile.am
# All paths should be given relative to the root
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/README.txt
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/test.vcxproj
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/wolfssl-fips.sln
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/wolfssl-fips.vcxproj
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/user_settings.h
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/user_settings.h.wolfentropy.patch
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/user_settings.h.paa.patch
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/resource.h
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7/wolfssl-fips.rc

View File

@@ -41,35 +41,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -124,6 +124,7 @@
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -233,6 +234,7 @@
<SubSystem>Console</SubSystem>
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
@@ -288,4 +290,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@@ -11,7 +11,6 @@
#define HAVE_FIPS_VERSION_MINOR 0
#endif
/* Set the following to 1 for WCv5.0-RC12 build. */
#if 1 /* wolfSSL FIPS 140-3 v7.0.0 PQ module (Windows MSVC) */
#undef HAVE_FIPS
#define HAVE_FIPS
@@ -23,14 +22,15 @@
#define HAVE_FIPS_VERSION_MINOR 0
#undef HAVE_FIPS_VERSION_PATCH
#define HAVE_FIPS_VERSION_PATCH 0
/* FIPS Ready, matching the Linux validated options.h: settings.h then forces
* HAVE_FIPS_VERSION 7 and selects FIPS 186-4, as the Linux module does. */
/* FIPS Ready, matching the Linux validated options.h. The version is set
* above; FIPS Ready is what selects FIPS 186-4, as the Linux module does. */
#define WOLFSSL_FIPS_READY
#endif
/* ===== Operational test (optest) build toggle =====
* Define OPTEST_BUILD for the optest variant (MD5 + force-failure injection +
* verbose FIPS logging). Leave UNDEFINED for production. */
* verbose FIPS logging). Off by default; see
* user_settings.h.harness-optest.patch. */
/* #define OPTEST_BUILD */ /* OFF */
#ifdef OPTEST_BUILD
#define HAVE_FORCE_FIPS_FAILURE
@@ -47,9 +47,10 @@
#endif
/* ===== wolfACVP harness build toggle =====
* The harness needs heap-routed buffers and the embedded cert/key buffers, but
* not the optest force-failure/verbose logs. Exclusive with OPTEST_BUILD. */
#define HARNESS_BUILD /* ON (OPTEST_BUILD must stay OFF) */
* The harness needs heap-routed buffers and the embedded cert/key buffers.
* Off by default; apply user_settings.h.harness-optest.patch to turn this and
* OPTEST_BUILD on together for vector processing and lab optest runs. */
/* #define HARNESS_BUILD */ /* OFF */
#ifdef HARNESS_BUILD
#define WOLFSSL_SMALL_STACK
#define USE_CERT_BUFFERS_2048
@@ -120,9 +121,9 @@
#define WOLFSSL_VALIDATE_ECC_IMPORT
#define WOLFSSL_VALIDATE_FFC_IMPORT
#define HAVE_FFDHE_Q
#ifdef _WIN64
#define WOLFSSL_AESNI
#endif
#ifdef _WIN64
#define WOLFSSL_AESNI
#endif
#endif /* FIPS v2 */
#if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 5)
#define NO_DES
@@ -169,8 +170,8 @@
#define FP_MAX_BITS 16384
#endif /* FIPS v5 */
#if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 6)
#ifndef WOLFSSL_USE_AESNI_PAA
#undef WOLFSSL_AESNI /* default OFF (pure-C, match Linux) */
#ifndef WOLFSSL_USE_AESNI_PAA
#undef WOLFSSL_AESNI /* default OFF (pure-C, match Linux) */
#endif
#define HAVE_ED25519
/* Curve25519/Curve448 (X25519/X448) are NOT in the v7 module: Linux
@@ -190,9 +191,6 @@
#define HAVE_AES_KEYWRAP
#define WC_SRTP_KDF
#define HAVE_PBKDF2
#define WOLFCRYPT_FIPS_CORE_HASH_VALUE \
AE8F969C072FB4A87B5C594F96162002F3CCEB6026BDB2553C8621AE197F7059 //woPAA
//E257E8C21764333E4710316D208A90D4ECA0682D6F40DC3F4A6E259D4752E306 //wPAA
/* SHA-512/224 and SHA-512/256 are approved v7 algorithms and the
* wolfACVP harness references them, so they must NOT be disabled. */
/* #define WOLFSSL_NOSHA512_224 */
@@ -235,9 +233,6 @@
#define WOLFSSL_SLHDSA_PARAM_SHA2_256F
#define WOLFSSL_DRBG_SHA512 /* SHA-512 Hash_DRBG (SP 800-90A) */
/* Leave WOLFCRYPT_FIPS_CORE_HASH_VALUE undefined for v7 (undo the v6
* block above) so fips_test.c uses its verifyCore[] placeholder. */
#undef WOLFCRYPT_FIPS_CORE_HASH_VALUE
#endif /* FIPS v7 */
#else
/* Enables blinding mode, to prevent timing attacks */
@@ -287,6 +282,6 @@
#define OPTEST_LOG_TE_MAPPING
#define DEEPLY_EMBEDDED
#define WORKING_WITH_AEGISOLVE
#endif /* 1 || 0 */
#endif /* 0 */
#endif /* _WIN_USER_SETTINGS_H_ */

View File

@@ -0,0 +1,24 @@
Build for vector processing and lab operational testing: turns on the wolfACVP
harness and the optest variant together. Not for a shipping build, it adds
force-failure injection and verbose FIPS logging.
--- a/IDE/WIN-PQ-FIPSv7/user_settings.h
+++ b/IDE/WIN-PQ-FIPSv7/user_settings.h
@@ -31,7 +31,7 @@
* Define OPTEST_BUILD for the optest variant (MD5 + force-failure injection +
* verbose FIPS logging). Off by default; see
* user_settings.h.harness-optest.patch. */
-/* #define OPTEST_BUILD */ /* OFF */
+#define OPTEST_BUILD
#ifdef OPTEST_BUILD
#define HAVE_FORCE_FIPS_FAILURE
#define DEBUG_FIPS_VERBOSE
@@ -50,7 +50,7 @@
* The harness needs heap-routed buffers and the embedded cert/key buffers.
* Off by default; apply user_settings.h.harness-optest.patch to turn this and
* OPTEST_BUILD on together for vector processing and lab optest runs. */
-/* #define HARNESS_BUILD */ /* OFF */
+#define HARNESS_BUILD
#ifdef HARNESS_BUILD
#define WOLFSSL_SMALL_STACK
#define USE_CERT_BUFFERS_2048

View File

@@ -2,7 +2,7 @@ Enable the x86_64 AES-NI PAA lane. x64 only; Win32 has no AES-NI assembly.
--- a/IDE/WIN-PQ-FIPSv7/user_settings.h
+++ b/IDE/WIN-PQ-FIPSv7/user_settings.h
@@ -58,7 +58,7 @@
@@ -59,7 +59,7 @@
/* x86_64 AES-NI PAA toggle. Default OFF = pure-C AES, matching the Linux
* validated options.h; x64 only, Win32 stays pure-C. */

View File

@@ -3,7 +3,7 @@ wolfentropy.c compiles to nothing on Windows.
--- a/IDE/WIN-PQ-FIPSv7/user_settings.h
+++ b/IDE/WIN-PQ-FIPSv7/user_settings.h
@@ -74,7 +74,7 @@
@@ -75,7 +75,7 @@
* wc_InitMutex/wc_FreeMutex path in wolfentropy.c; without it that file is an
* empty translation unit and C2 is indistinguishable from C1. Kept at column 0
* beside the AES-NI toggle so autonomous-oe-run.ps1's Toggle() can flip it. */

View File

@@ -71,7 +71,7 @@ BEGIN
VALUE "FileDescription", "The wolfSSL FIPS embedded SSL library is a lightweight, portable, C-language-based SSL/TLS library targeted at IoT, embedded, and RTOS environments primarily because of its size, speed, and feature set."
VALUE "FileVersion", "5.9.2.0"
VALUE "InternalName", "wolfssl-fips"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "LegalCopyright", "Copyright (C) 2026"
VALUE "OriginalFilename", "wolfssl-fips.dll"
VALUE "ProductName", "wolfSSL FIPS"
VALUE "ProductVersion", "5.9.2.0"

View File

@@ -132,7 +132,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)XXX-fips-test\IDE\WIN-PQ-FIPSv7;$(SolutionDir)XXX-fips-test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -144,7 +144,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)XXX-fips-test\IDE\WIN-PQ-FIPSv7;$(SolutionDir)XXX-fips-test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILDING_WOLFSSL;WOLFSSL_DLL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -164,7 +164,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)XXX-fips-test\IDE\WIN-PQ-FIPSv7;$(SolutionDir)XXX-fips-test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)XXX-fips-test\IDE\WIN-PQ-FIPSv7;$(SolutionDir)XXX-fips-test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILDING_WOLFSSL;WOLFSSL_DLL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -197,7 +197,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)XXX-fips-test\IDE\WIN-PQ-FIPSv7;$(SolutionDir)XXX-fips-test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -210,7 +210,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)XXX-fips-test\IDE\WIN-PQ-FIPSv7;$(SolutionDir)XXX-fips-test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILDING_WOLFSSL;WOLFSSL_DLL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -228,7 +228,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)XXX-fips-test\IDE\WIN-PQ-FIPSv7;$(SolutionDir)XXX-fips-test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -241,7 +241,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)XXX-fips-test\IDE\WIN-PQ-FIPSv7;$(SolutionDir)XXX-fips-test;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILDING_WOLFSSL;WOLFSSL_DLL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -251,6 +251,7 @@
<Link>
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -416,4 +417,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@@ -124,6 +124,7 @@
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -164,6 +165,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -227,6 +229,7 @@
<SubSystem>Console</SubSystem>
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">

View File

@@ -124,6 +124,7 @@
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -164,6 +165,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -227,6 +229,7 @@
<SubSystem>Console</SubSystem>
<AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">

View File

@@ -52,6 +52,7 @@ EXTRA_DIST+= IDE/VS-ARM
EXTRA_DIST+= IDE/VS-AZURE-SPHERE
EXTRA_DIST+= IDE/WICED-STUDIO
EXTRA_DIST+= IDE/WIN
EXTRA_DIST+= IDE/WIN-PQ-FIPSv7
EXTRA_DIST+= IDE/WIN-SGX
EXTRA_DIST+= IDE/WIN-SRTP-KDF-140-3
EXTRA_DIST+= IDE/WIN10
@@ -69,7 +70,6 @@ EXTRA_DIST+= IDE/zephyr
# enumerated file-by-file rather than shipped wholesale.
include IDE/apple-universal/include.am
include IDE/MPLABX16/include.am
include IDE/WIN-PQ-FIPSv7/include.am
include IDE/MPLABX16/wolfcrypt_test.X/nbproject/include.am
include IDE/MPLABX16/wolfssl.X/nbproject/include.am
include IDE/Renesas/cs+/Projects/include.am