From 0198f1143935a33c75d356fd19bcb14e4218ca36 Mon Sep 17 00:00:00 2001 From: "Sandowicz, Krzysztof" Date: Tue, 9 Dec 2025 01:34:30 +0100 Subject: [PATCH 1/2] debug configurations fixed --- Windows/sgx/SGXOpenSSLLibrary.sln | 10 ++++++++-- Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj | 4 ++-- Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj | 4 ++-- Windows/sgx/test_app/app/TestApp.vcxproj | 4 ++-- Windows/sgx/test_app/enclave/TestEnclave.vcxproj | 8 ++++---- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Windows/sgx/SGXOpenSSLLibrary.sln b/Windows/sgx/SGXOpenSSLLibrary.sln index 5d05548a..e93a90f1 100644 --- a/Windows/sgx/SGXOpenSSLLibrary.sln +++ b/Windows/sgx/SGXOpenSSLLibrary.sln @@ -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 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 diff --git a/Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj b/Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj index 4170f9c9..077508f2 100644 --- a/Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj +++ b/Windows/sgx/libsgx_tsgxssl/libsgx_tsgxssl.vcxproj @@ -207,7 +207,7 @@ Default - MultiThreaded + MultiThreadedDebug Disabled Level3 $(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) @@ -226,7 +226,7 @@ Default - MultiThreaded + MultiThreadedDebug Disabled Level3 $(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) diff --git a/Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj b/Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj index 36a039a9..0e8d7800 100644 --- a/Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj +++ b/Windows/sgx/libsgx_usgxssl/libsgx_usgxssl.vcxproj @@ -207,7 +207,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb - MultiThreaded + MultiThreadedDebug true @@ -249,7 +249,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb true - MultiThreaded + MultiThreadedDebug Windows diff --git a/Windows/sgx/test_app/app/TestApp.vcxproj b/Windows/sgx/test_app/app/TestApp.vcxproj index 67a55ae7..c5aa4994 100644 --- a/Windows/sgx/test_app/app/TestApp.vcxproj +++ b/Windows/sgx/test_app/app/TestApp.vcxproj @@ -246,7 +246,7 @@ Console true $(SolutionDir)$(Platform)\$(Configuration)\;$(SGXSDKInstallPath)\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - libsgx_usgxssl.lib;sgx_urts.lib;Ws2_32.lib;user32.lib + libsgx_usgxssl.lib;sgx_urtsd.lib;Ws2_32.lib;user32.lib @@ -280,7 +280,7 @@ Console true $(SolutionDir)$(Platform)\$(Configuration)\;$(SGXSDKInstallPath)\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - libsgx_usgxssl.lib;sgx_urts.lib;sgx_uae_service.lib;%(AdditionalDependencies) + libsgx_usgxssl.lib;sgx_urtsd.lib;sgx_uae_service.lib;%(AdditionalDependencies) diff --git a/Windows/sgx/test_app/enclave/TestEnclave.vcxproj b/Windows/sgx/test_app/enclave/TestEnclave.vcxproj index 801d1766..b105ea72 100644 --- a/Windows/sgx/test_app/enclave/TestEnclave.vcxproj +++ b/Windows/sgx/test_app/enclave/TestEnclave.vcxproj @@ -223,7 +223,7 @@ Default - MultiThreadedDebug + MultiThreadedDebugDLL Disabled Level3 .;$(SolutionDir)\..\package\include;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\libc++;%(AdditionalIncludeDirectories) @@ -267,7 +267,7 @@ Default - MultiThreaded + MultiThreadedDLL MaxSpeed Level3 .;$(SolutionDir)\..\package\include;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\libc++;%(AdditionalIncludeDirectories) @@ -366,7 +366,7 @@ Default - MultiThreadedDebug + MultiThreadedDebugDLL Disabled Level3 .;$(SolutionDir)\..\package\include;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\libc++;%(AdditionalIncludeDirectories) @@ -412,7 +412,7 @@ Default - MultiThreaded + MultiThreadedDLL MaxSpeed Level3 .;$(SolutionDir)\..\package\include;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\libc++;%(AdditionalIncludeDirectories) From a8d463c2d24e90d16b97dc1c5e46c9258b964cec Mon Sep 17 00:00:00 2001 From: Krzysztof Sandowicz Date: Wed, 10 Dec 2025 00:39:20 +0100 Subject: [PATCH 2/2] Revert linking changes --- .../sgx/test_app/enclave/TestEnclave.vcxproj | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Windows/sgx/test_app/enclave/TestEnclave.vcxproj b/Windows/sgx/test_app/enclave/TestEnclave.vcxproj index b105ea72..614ea125 100644 --- a/Windows/sgx/test_app/enclave/TestEnclave.vcxproj +++ b/Windows/sgx/test_app/enclave/TestEnclave.vcxproj @@ -223,7 +223,7 @@ Default - MultiThreadedDebugDLL + MultiThreadedDebug Disabled Level3 .;$(SolutionDir)\..\package\include;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\libc++;%(AdditionalIncludeDirectories) @@ -237,7 +237,7 @@ true - "$(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" + "$(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" sign the enclave @@ -267,7 +267,7 @@ Default - MultiThreadedDLL + MultiThreaded MaxSpeed Level3 .;$(SolutionDir)\..\package\include;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\libc++;%(AdditionalIncludeDirectories) @@ -283,7 +283,7 @@ true - "$(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" + "$(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" generate the enclave signing material @@ -308,7 +308,7 @@ true - "$(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" + "$(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" generate the enclave signing material @@ -333,7 +333,7 @@ true - "$(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" + "$(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" generate the enclave signing material @@ -358,7 +358,7 @@ true - "$(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" + "$(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" sign the enclave @@ -366,7 +366,7 @@ Default - MultiThreadedDebugDLL + MultiThreadedDebug Disabled Level3 .;$(SolutionDir)\..\package\include;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\libc++;%(AdditionalIncludeDirectories) @@ -381,7 +381,7 @@ true - "$(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" + "$(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" sign the enclave @@ -412,7 +412,7 @@ Default - MultiThreadedDLL + MultiThreaded MaxSpeed Level3 .;$(SolutionDir)\..\package\include;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\libc++;%(AdditionalIncludeDirectories) @@ -429,7 +429,7 @@ true - "$(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" + "$(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" generate the enclave signing material @@ -455,7 +455,7 @@ true - "$(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" + "$(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" generate the enclave signing material @@ -481,7 +481,7 @@ true - "$(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" + "$(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" generate the enclave signing material @@ -507,7 +507,7 @@ true - "$(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" + "$(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" sign the enclave @@ -605,4 +605,4 @@ - \ No newline at end of file +