Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Windows/sgx/SGXOpenSSLLibrary.sln
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.779
# Visual Studio Version 16
VisualStudioVersion = 16.0.36422.26
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IS there any reason why we need specific version instead of latest available?

MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsgx_tsgxssl", "libsgx_tsgxssl\libsgx_tsgxssl.vcxproj", "{CAB477F7-900D-4B9A-9F10-30A41D130C1C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsgx_usgxssl", "libsgx_usgxssl\libsgx_usgxssl.vcxproj", "{5E02F357-8A0E-4E37-96F3-DDA4ADED4E5B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "test_app\app\TestApp.vcxproj", "{7E653C46-DAAA-4DA1-ACDA-7B477EC0307C}"
ProjectSection(ProjectDependencies) = postProject
{5E02F357-8A0E-4E37-96F3-DDA4ADED4E5B} = {5E02F357-8A0E-4E37-96F3-DDA4ADED4E5B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestEnclave", "test_app\enclave\TestEnclave.vcxproj", "{2D7787DF-3342-474E-AC6D-01E60D7C579E}"
ProjectSection(ProjectDependencies) = postProject
{CAB477F7-900D-4B9A-9F10-30A41D130C1C} = {CAB477F7-900D-4B9A-9F10-30A41D130C1C}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
4 changes: 2 additions & 2 deletions Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<Optimization>Disabled</Optimization>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(SolutionDir)\..\package\include;$(SolutionDir)..\..\..\..\common\inc\;$(SolutionDir)..\..\..\..\common\inc\tlibc;$(SolutionDir)..\..\..\..\sdk\tlibstdcxx\stlport;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\libc++;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\stlport;%(AdditionalIncludeDirectories);$(VCInstallDir)include;$(IncludePath)</AdditionalIncludeDirectories>
Expand All @@ -226,7 +226,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<Optimization>Disabled</Optimization>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(SolutionDir)\..\package\include;$(SolutionDir)..\..\..\..\common\inc\;$(SolutionDir)..\..\..\..\common\inc\tlibc;$(SolutionDir)..\..\..\..\sdk\tlibstdcxx\stlport;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\libc++;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\stlport;%(AdditionalIncludeDirectories);$(VCInstallDir)include;$(IncludePath)</AdditionalIncludeDirectories>
Expand Down
4 changes: 2 additions & 2 deletions Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<OmitDefaultLibName>true</OmitDefaultLibName>
<AdditionalIncludeDirectories>
</AdditionalIncludeDirectories>
Expand Down Expand Up @@ -249,7 +249,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<OmitDefaultLibName>true</OmitDefaultLibName>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down
4 changes: 2 additions & 2 deletions Windows/sgx/test_app/app/TestApp.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\;$(SGXSDKInstallPath)\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libsgx_usgxssl.lib;sgx_urts.lib;Ws2_32.lib;user32.lib</AdditionalDependencies>
<AdditionalDependencies>libsgx_usgxssl.lib;sgx_urtsd.lib;Ws2_32.lib;user32.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Simulation|Win32'">
Expand Down Expand Up @@ -280,7 +280,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\;$(SGXSDKInstallPath)\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libsgx_usgxssl.lib;sgx_urts.lib;sgx_uae_service.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libsgx_usgxssl.lib;sgx_urtsd.lib;sgx_uae_service.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Simulation|x64'">
Expand Down
22 changes: 11 additions & 11 deletions Windows/sgx/test_app/enclave/TestEnclave.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>sign the enclave</Message>
</PostBuildEvent>
Expand Down Expand Up @@ -283,7 +283,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>generate the enclave signing material</Message>
</PostBuildEvent>
Expand All @@ -308,7 +308,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>generate the enclave signing material</Message>
</PostBuildEvent>
Expand All @@ -333,7 +333,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>generate the enclave signing material</Message>
</PostBuildEvent>
Expand All @@ -358,7 +358,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>sign the enclave</Message>
</PostBuildEvent>
Expand All @@ -381,7 +381,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>sign the enclave</Message>
</PostBuildEvent>
Expand Down Expand Up @@ -429,7 +429,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>generate the enclave signing material</Message>
</PostBuildEvent>
Expand All @@ -455,7 +455,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>generate the enclave signing material</Message>
</PostBuildEvent>
Expand All @@ -481,7 +481,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>generate the enclave signing material</Message>
</PostBuildEvent>
Expand All @@ -507,7 +507,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<PostBuildEvent>
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
<Command>"$(SGXSDKInstallPath)bin\win32\release\sgx_sign.exe" sign -key "$(ProjectDir)TestEnclave_private.pem" -enclave "$(OutDir)TestEnclave.dll" -out "$(OutDir)TestEnclave.signed.dll" -config "$(ProjectDir)TestEnclave.config.xml"
</Command>
<Message>sign the enclave</Message>
</PostBuildEvent>
Expand Down Expand Up @@ -605,4 +605,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Loading