sharpetronics/liboqs
1
0
Fork 0
mirror of https://github.com/open-quantum-safe/liboqs.git synced 2025-11-28 00:03:48 -05:00
Code Issues Projects Releases Wiki Activity

Fixed Visual Studio project, removing bad merge side-effects. Changed default win KEM to SIKEp434.

Browse Source
This commit is contained in:
Christian Paquin 2019-06-28 17:32:19 -04:00
parent f492161d99
commit 45441e7cd0
3 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
VisualStudio/oqs/oqs.vcxproj
View File

@ -43,14 +43,19 @@
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_CLINCLUDE_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_CLINCLUDE_END -->
<ClInclude Include="..\..\src\kem\frodokem\kem_frodokem.h" /> <ClInclude Include="..\..\src\kem\frodokem\kem_frodokem.h" />
<ClInclude Include="..\..\src\kem\sike\kem_sike.h" /> <ClInclude Include="..\..\src\kem\sike\kem_sike.h" />
<ClCompile Include="..\..\src\kem\sike\kem_sike.c" />
<ClInclude Include="..\..\src\kem\sike\P434\P434_api.h" /> <ClInclude Include="..\..\src\kem\sike\P434\P434_api.h" />
<ClInclude Include="..\..\src\kem\sike\P434\P434_internal.h" /> <ClInclude Include="..\..\src\kem\sike\P434\P434_internal.h" />
<ClCompile Include="..\..\src\kem\sike\P434\P434.c" />
<ClInclude Include="..\..\src\kem\sike\P503\P503_api.h" /> <ClInclude Include="..\..\src\kem\sike\P503\P503_api.h" />
<ClInclude Include="..\..\src\kem\sike\P503\P503_internal.h" /> <ClInclude Include="..\..\src\kem\sike\P503\P503_internal.h" />
<ClCompile Include="..\..\src\kem\sike\P503\P503.c" />
<ClInclude Include="..\..\src\kem\sike\P610\P610_api.h" /> <ClInclude Include="..\..\src\kem\sike\P610\P610_api.h" />
<ClInclude Include="..\..\src\kem\sike\P610\P610_internal.h" /> <ClInclude Include="..\..\src\kem\sike\P610\P610_internal.h" />
<ClCompile Include="..\..\src\kem\sike\P610\P610.c" />
<ClInclude Include="..\..\src\kem\sike\P751\P751_api.h" /> <ClInclude Include="..\..\src\kem\sike\P751\P751_api.h" />
<ClInclude Include="..\..\src\kem\sike\P751\P751_internal.h" /> <ClInclude Include="..\..\src\kem\sike\P751\P751_internal.h" />
<ClCompile Include="..\..\src\kem\sike\P751\P751.c" />
<ClInclude Include="..\..\src\oqs.h" /> <ClInclude Include="..\..\src\oqs.h" />
<ClInclude Include="..\..\src\common\common.h" /> <ClInclude Include="..\..\src\common\common.h" />
<ClInclude Include="..\..\src\common\rand.h" /> <ClInclude Include="..\..\src\common\rand.h" />
@ -196,11 +201,6 @@
<ClCompile Include="..\..\src\kem\frodokem\external\frodo976shake.c" /> <ClCompile Include="..\..\src\kem\frodokem\external\frodo976shake.c" />
<ClCompile Include="..\..\src\kem\frodokem\external\frodo1344aes.c" /> <ClCompile Include="..\..\src\kem\frodokem\external\frodo1344aes.c" />
<ClCompile Include="..\..\src\kem\frodokem\external\frodo1344shake.c" /> <ClCompile Include="..\..\src\kem\frodokem\external\frodo1344shake.c" />
<ClCompile Include="..\..\src\kem\sike\kem_sike.c" />
<ClCompile Include="..\..\src\kem\sike\P434\P434.c" />
<ClCompile Include="..\..\src\kem\sike\P503\P503.c" />
<ClCompile Include="..\..\src\kem\sike\P610\P610.c" />
<ClCompile Include="..\..\src\kem\sike\P751\P751.c" />
<ClCompile Include="..\..\src\sig\picnic\external\aligned_alloc.c" /> <ClCompile Include="..\..\src\sig\picnic\external\aligned_alloc.c" />
<ClCompile Include="..\..\src\sig\picnic\external\bitstream.c" /> <ClCompile Include="..\..\src\sig\picnic\external\bitstream.c" />
<ClCompile Include="..\..\src\sig\picnic\external\cpu.c" /> <ClCompile Include="..\..\src\sig\picnic\external\cpu.c" />
@ -412,7 +412,7 @@ copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command> copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_DEBUG_WIN32_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_DEBUG_WIN32_END -->
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
@ -452,7 +452,7 @@ copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command> copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_DEBUGDLL_WIN32_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_DEBUGDLL_WIN32_END -->
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -492,7 +492,7 @@ copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command> copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_DEBUG_X64_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_DEBUG_X64_END -->
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
@ -540,7 +540,7 @@ copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command> copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_DEBUGDLL_X64_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_DEBUGDLL_X64_END -->
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
@ -587,7 +587,7 @@ copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command> copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_RELEASE_WIN32_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_RELEASE_WIN32_END -->
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
@ -631,7 +631,7 @@ copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command> copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_RELEASEDLL_WIN32_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_RELEASEDLL_WIN32_END -->
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -675,7 +675,7 @@ copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command> copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_RELEASE_X64_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_RELEASE_X64_END -->
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
@ -727,7 +727,7 @@ copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\" copy "$(SolutionDir)..\src\sig\dilithium\sig_dilithium.h" "$(SolutionDir)include\oqs\"
copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command> copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"</Command>
<!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_RELEASEDLL_X64_END --> <!-- OQS_COPY_FROM_PQCLEAN_FRAGMENT_PREBUILD_EVENT_COMMAND_RELEASEDLL_X64_END -->
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>

51
VisualStudio/oqs/oqs.vcxproj.filters
View File

@ -306,15 +306,6 @@
<ClCompile Include="..\..\src\kem\frodokem\external\frodo1344shake.c"> <ClCompile Include="..\..\src\kem\frodokem\external\frodo1344shake.c">
<Filter>frodokem</Filter> <Filter>frodokem</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kem\sike\kem_sike.c">
<Filter>sike</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kem\sike\P503\P503.c">
<Filter>sike</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kem\sike\P751\P751.c">
<Filter>sike</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\rand_nist.c"> <ClCompile Include="..\..\src\common\rand_nist.c">
<Filter>common</Filter> <Filter>common</Filter>
</ClCompile> </ClCompile>
@ -519,18 +510,45 @@
<ClInclude Include="..\..\src\kem\sike\kem_sike.h"> <ClInclude Include="..\..\src\kem\sike\kem_sike.h">
<Filter>sike</Filter> <Filter>sike</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\kem\sike\kem_sike.c">
<Filter>sike</Filter>
</ClCompile>
<ClInclude Include="..\..\src\kem\sike\P434\P434_internal.h">
<Filter>sike</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kem\sike\P434\P434_api.h">
<Filter>sike</Filter>
</ClInclude>
<ClCompile Include="..\..\src\kem\sike\P434\P434.c">
<Filter>sike</Filter>
</ClCompile>
<ClInclude Include="..\..\src\kem\sike\P503\P503_internal.h"> <ClInclude Include="..\..\src\kem\sike\P503\P503_internal.h">
<Filter>sike</Filter> <Filter>sike</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kem\sike\P503\P503_api.h">
<Filter>sike</Filter>
</ClInclude>
<ClCompile Include="..\..\src\kem\sike\P503\P503.c">
<Filter>sike</Filter>
</ClCompile>
<ClInclude Include="..\..\src\kem\sike\P610\P610_internal.h">
<Filter>sike</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kem\sike\P610\P610_api.h">
<Filter>sike</Filter>
</ClInclude>
<ClCompile Include="..\..\src\kem\sike\P610\P610.c">
<Filter>sike</Filter>
</ClCompile>
<ClInclude Include="..\..\src\kem\sike\P751\P751_internal.h"> <ClInclude Include="..\..\src\kem\sike\P751\P751_internal.h">
<Filter>sike</Filter> <Filter>sike</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kem\sike\P751\P751_api.h"> <ClInclude Include="..\..\src\kem\sike\P751\P751_api.h">
<Filter>sike</Filter> <Filter>sike</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kem\sike\P503\P503_api.h"> <ClCompile Include="..\..\src\kem\sike\P751\P751.c">
<Filter>sike</Filter> <Filter>sike</Filter>
</ClInclude> </ClCompile>
<ClInclude Include="..\..\src\sig\picnic\sig_picnic.h"> <ClInclude Include="..\..\src\sig\picnic\sig_picnic.h">
<Filter>picnic</Filter> <Filter>picnic</Filter>
</ClInclude> </ClInclude>
@ -624,17 +642,6 @@
<ClInclude Include="..\..\src\sig\picnic\external\sha3\opt64\KeccakP-1600-SnP.h"> <ClInclude Include="..\..\src\sig\picnic\external\sha3\opt64\KeccakP-1600-SnP.h">
<Filter>picnic</Filter> <Filter>picnic</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kem\sike\P434\P434_api.h">
<Filter>sike</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kem\sike\P434\P434_internal.h">
<Filter>sike</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kem\sike\P610\P610_api.h">
<Filter>sike</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kem\sike\P610\P610_internal.h">
<Filter>sike</Filter>
<ClInclude Include="..\..\src\sig\dilithium\sig_dilithium.h"> <ClInclude Include="..\..\src\sig\dilithium\sig_dilithium.h">
<Filter>dilithium</Filter> <Filter>dilithium</Filter>
</ClInclude> </ClInclude>

6
VisualStudio/winconfig.h
View File

@ -19,11 +19,11 @@
#define OQS_ENABLE_KEM_frodokem_976_shake #define OQS_ENABLE_KEM_frodokem_976_shake
#define OQS_ENABLE_KEM_frodokem_1344_aes #define OQS_ENABLE_KEM_frodokem_1344_aes
#define OQS_ENABLE_KEM_frodokem_1344_shake #define OQS_ENABLE_KEM_frodokem_1344_shake
#define OQS_ENABLE_KEM_sike_p464 #define OQS_ENABLE_KEM_sike_p434
#define OQS_ENABLE_KEM_sike_p503 #define OQS_ENABLE_KEM_sike_p503
#define OQS_ENABLE_KEM_sike_p610 #define OQS_ENABLE_KEM_sike_p610
#define OQS_ENABLE_KEM_sike_p751 #define OQS_ENABLE_KEM_sike_p751
#define OQS_ENABLE_KEM_sidh_p464 #define OQS_ENABLE_KEM_sidh_p434
#define OQS_ENABLE_KEM_sidh_p503 #define OQS_ENABLE_KEM_sidh_p503
#define OQS_ENABLE_KEM_sidh_p610 #define OQS_ENABLE_KEM_sidh_p610
#define OQS_ENABLE_KEM_sidh_p751 #define OQS_ENABLE_KEM_sidh_p751
@ -39,7 +39,7 @@
#define OQS_ENABLE_SIG_dilithium_2 #define OQS_ENABLE_SIG_dilithium_2
#define OQS_ENABLE_SIG_dilithium_3 #define OQS_ENABLE_SIG_dilithium_3
#define OQS_ENABLE_SIG_dilithium_4 #define OQS_ENABLE_SIG_dilithium_4
#define OQS_KEM_DEFAULT OQS_KEM_alg_sike_p503 #define OQS_KEM_DEFAULT OQS_KEM_alg_sike_p434
#define OQS_SIG_DEFAULT OQS_SIG_alg_picnic_L1_FS #define OQS_SIG_DEFAULT OQS_SIG_alg_picnic_L1_FS