wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1683 from kaleb-himes/SGX_STATIC_LIB_FIX

Browse Source 
Update SGX Static lib solution, solve through settings.h
This commit is contained in:
JacobBarthelmeh
2018-07-17 10:22:14 -06:00
committed by GitHub
parent f0422bec41 ddd6563442
commit eebbe0239a
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
IDE/WIN-SGX/wolfSSL_SGX.vcxproj
View File

@@ -301,6 +301,7 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\wolfcrypt\src\aes.c" /> <ClCompile Include="..\..\wolfcrypt\src\aes.c" />
<ClCompile Include="..\..\wolfcrypt\src\asn.c" /> <ClCompile Include="..\..\wolfcrypt\src\asn.c" />
<ClCompile Include="..\..\wolfcrypt\src\coding.c" />
<ClCompile Include="..\..\wolfcrypt\src\hash.c" /> <ClCompile Include="..\..\wolfcrypt\src\hash.c" />
<ClCompile Include="..\..\wolfcrypt\src\hmac.c"> <ClCompile Include="..\..\wolfcrypt\src\hmac.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\stlport;$(SolutionDir)wolfssl-3.9.6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\stlport;$(SolutionDir)wolfssl-3.9.6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -314,6 +315,9 @@
<ClCompile Include="..\..\wolfcrypt\src\rsa.c" /> <ClCompile Include="..\..\wolfcrypt\src\rsa.c" />
<ClCompile Include="..\..\wolfcrypt\src\sha256.c" /> <ClCompile Include="..\..\wolfcrypt\src\sha256.c" />
<ClCompile Include="..\..\wolfcrypt\src\tfm.c" /> <ClCompile Include="..\..\wolfcrypt\src\tfm.c" />
<ClCompile Include="..\..\wolfcrypt\src\wc_encrypt.c" />
<ClCompile Include="..\..\wolfcrypt\src\wc_port.c" />
<ClCompile Include="..\..\wolfcrypt\src\wolfmath.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

12
IDE/WIN-SGX/wolfSSL_SGX.vcxproj.filters
View File

@@ -54,5 +54,17 @@
<ClCompile Include="..\..\wolfcrypt\src\random.c"> <ClCompile Include="..\..\wolfcrypt\src\random.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\wolfcrypt\src\coding.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\wolfcrypt\src\wc_encrypt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\wolfcrypt\src\wolfmath.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\wolfcrypt\src\wc_port.c">
<Filter>Source Files\Resource Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

8
wolfssl/wolfcrypt/settings.h
View File

@@ -1267,7 +1267,6 @@ extern void uITRON4_free(void *p) ;
#else #else
#define TFM_TIMING_RESISTANT #define TFM_TIMING_RESISTANT
#define NO_WOLFSSL_DIR #define NO_WOLFSSL_DIR
#define NO_FILESYSTEM
#define NO_WRITEV #define NO_WRITEV
#define NO_MAIN_DRIVER #define NO_MAIN_DRIVER
#define WOLFSSL_LOG_PRINTF #define WOLFSSL_LOG_PRINTF
@@ -1275,9 +1274,6 @@ extern void uITRON4_free(void *p) ;
#endif #endif
#else #else
#define HAVE_ECC #define HAVE_ECC
#define ECC_TIMING_RESISTANT
#define TFM_TIMING_RESISTANT
#define NO_FILESYSTEM
#define NO_WRITEV #define NO_WRITEV
#define NO_MAIN_DRIVER #define NO_MAIN_DRIVER
#define USER_TICKS #define USER_TICKS
@@ -1287,6 +1283,10 @@ extern void uITRON4_free(void *p) ;
#if !defined(HAVE_FIPS) && !defined(NO_RSA) #if !defined(HAVE_FIPS) && !defined(NO_RSA)
#define WC_RSA_BLINDING #define WC_RSA_BLINDING
#endif #endif
#define NO_FILESYSTEM
#define ECC_TIMING_RESISTANT
#define TFM_TIMING_RESISTANT
#define SINGLE_THREADED #define SINGLE_THREADED
#define NO_ASN_TIME /* can not use headers such as windows.h */ #define NO_ASN_TIME /* can not use headers such as windows.h */
#define HAVE_AESGCM #define HAVE_AESGCM