diff --git a/libs/libks/libks.sln b/libs/libks/libks.sln
index 7cd03516d1..fababf7eec 100644
--- a/libs/libks/libks.sln
+++ b/libs/libks/libks.sln
@@ -17,6 +17,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsock", "test\testsock.v
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testtime", "test\testtime.vcxproj", "{B74812A1-C67D-4568-AF84-26CE2004D8BF}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testwebsock", "test\testwebsock.vcxproj", "{90D1C15C-59B0-470F-B18A-DA355948C736}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPENSSL", "..\win32\Download OPENSSL.2015.vcxproj", "{D578E676-7EC8-4548-BD8B-845C635F14AD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openssl", "..\win32\openssl\openssl.2015.vcxproj", "{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D578E676-7EC8-4548-BD8B-845C635F14AD} = {D578E676-7EC8-4548-BD8B-845C635F14AD}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeay32", "..\win32\openssl\libeay32.2015.vcxproj", "{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssleay32", "..\win32\openssl\ssleay32.2015.vcxproj", "{B4B62169-5AD4-4559-8707-3D933AC5DB39}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -81,6 +94,46 @@ Global
{B74812A1-C67D-4568-AF84-26CE2004D8BF}.Release|x64.Build.0 = Release|x64
{B74812A1-C67D-4568-AF84-26CE2004D8BF}.Release|x86.ActiveCfg = Release|Win32
{B74812A1-C67D-4568-AF84-26CE2004D8BF}.Release|x86.Build.0 = Release|Win32
+ {90D1C15C-59B0-470F-B18A-DA355948C736}.Debug|x64.ActiveCfg = Debug|x64
+ {90D1C15C-59B0-470F-B18A-DA355948C736}.Debug|x64.Build.0 = Debug|x64
+ {90D1C15C-59B0-470F-B18A-DA355948C736}.Debug|x86.ActiveCfg = Debug|Win32
+ {90D1C15C-59B0-470F-B18A-DA355948C736}.Debug|x86.Build.0 = Debug|Win32
+ {90D1C15C-59B0-470F-B18A-DA355948C736}.Release|x64.ActiveCfg = Release|x64
+ {90D1C15C-59B0-470F-B18A-DA355948C736}.Release|x64.Build.0 = Release|x64
+ {90D1C15C-59B0-470F-B18A-DA355948C736}.Release|x86.ActiveCfg = Release|Win32
+ {90D1C15C-59B0-470F-B18A-DA355948C736}.Release|x86.Build.0 = Release|Win32
+ {D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x64.ActiveCfg = Debug|Win32
+ {D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x64.Build.0 = Debug|Win32
+ {D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x86.ActiveCfg = Debug|Win32
+ {D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x86.Build.0 = Debug|Win32
+ {D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x64.ActiveCfg = Release|Win32
+ {D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x64.Build.0 = Release|Win32
+ {D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x86.ActiveCfg = Release|Win32
+ {D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x86.Build.0 = Release|Win32
+ {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x64.ActiveCfg = Debug|x64
+ {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x64.Build.0 = Debug|x64
+ {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x86.ActiveCfg = Debug|Win32
+ {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x86.Build.0 = Debug|Win32
+ {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x64.ActiveCfg = Release|x64
+ {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x64.Build.0 = Release|x64
+ {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x86.ActiveCfg = Release|Win32
+ {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x86.Build.0 = Release|Win32
+ {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x64.ActiveCfg = Debug|x64
+ {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x64.Build.0 = Debug|x64
+ {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x86.ActiveCfg = Debug|Win32
+ {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x86.Build.0 = Debug|Win32
+ {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x64.ActiveCfg = Release|x64
+ {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x64.Build.0 = Release|x64
+ {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x86.ActiveCfg = Release|Win32
+ {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x86.Build.0 = Release|Win32
+ {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x64.ActiveCfg = Debug|x64
+ {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x64.Build.0 = Debug|x64
+ {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x86.ActiveCfg = Debug|Win32
+ {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x86.Build.0 = Debug|Win32
+ {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x64.ActiveCfg = Release|x64
+ {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x64.Build.0 = Release|x64
+ {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x86.ActiveCfg = Release|Win32
+ {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/libs/libks/libks.vcxproj b/libs/libks/libks.vcxproj
index 32ab14ae12..10378ffcaf 100644
--- a/libs/libks/libks.vcxproj
+++ b/libs/libks/libks.vcxproj
@@ -56,42 +56,46 @@
+
+
+
+
true
$(Platform)\$(Configuration)\
$(SolutionDir)$(Platform)\$(Configuration)\
- $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath)
+ $(LibraryPath)
$(Platform)\$(Configuration)\
$(SolutionDir)$(Platform)\$(Configuration)\
- $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath)
+ $(LibraryPath)
- $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath)
+ $(LibraryPath)
- $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath)
+ $(LibraryPath)
@@ -100,16 +104,18 @@
EnableAllWarnings
ProgramDatabase
Disabled
- %(AdditionalIncludeDirectories)
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;%(AdditionalIncludeDirectories)
true
true
4711;4574;4100;4127;4668;4255;4706;4710;4820;4090;4702
+ true
+ false
MachineX86
true
Windows
- Rpcrt4.lib;Crypt32.lib;libsslMT.lib;libcryptoMT.lib;%(AdditionalDependencies)
+ Rpcrt4.lib;Crypt32.lib;%(AdditionalDependencies)
@@ -118,10 +124,11 @@
MultiThreadedDLL
EnableAllWarnings
ProgramDatabase
- %(AdditionalIncludeDirectories)
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;%(AdditionalIncludeDirectories)
true
true
4711;4574;4100;4127;4668;4255;4706;4710;4820;4090;4702
+ true
MachineX86
@@ -129,37 +136,40 @@
Windows
true
true
- Rpcrt4.lib;Crypt32.lib;libsslMT.lib;libcryptoMT.lib;%(AdditionalDependencies)
+ Rpcrt4.lib;Crypt32.lib;%(AdditionalDependencies)
- %(AdditionalIncludeDirectories)
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBKS_EXPORTS;CJSON_EXPORT_SYMBOLS;%(PreprocessorDefinitions)
EditAndContinue
EnableAllWarnings
true
true
4711;4574;4100;4127;4668;4255;4706;4710;4820;4090;4702
+ true
+ false
Windows
Debug
- Rpcrt4.lib;Crypt32.lib;libsslMT.lib;libcryptoMT.lib;%(AdditionalDependencies)
+ Rpcrt4.lib;Crypt32.lib;%(AdditionalDependencies)
- %(AdditionalIncludeDirectories)
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBKS_EXPORTS;CJSON_EXPORT_SYMBOLS;%(PreprocessorDefinitions)
EnableAllWarnings
true
true
4711;4574;4100;4127;4668;4255;4706;4710;4820;4090;4702
+ true
Windows
- Rpcrt4.lib;Crypt32.lib;libsslMT.lib;libcryptoMT.lib;%(AdditionalDependencies)
+ Rpcrt4.lib;Crypt32.lib;%(AdditionalDependencies)
@@ -226,6 +236,17 @@
+
+
+ {d331904d-a00a-4694-a5a3-fcff64ab5dbe}
+
+
+ {25bd39b1-c8bf-4676-a738-9cabd9c6bc79}
+
+
+ {b4b62169-5ad4-4559-8707-3d933ac5db39}
+
+
diff --git a/libs/libks/src/kws.c b/libs/libks/src/kws.c
index bd4e7ec5d5..36e9ca37be 100644
--- a/libs/libks/src/kws.c
+++ b/libs/libks/src/kws.c
@@ -533,7 +533,8 @@ static int establish_client_logical_layer(kws_t *kws)
}
if (code < 0) {
- if (code == -1 && SSL_get_error(kws->ssl, code) != SSL_ERROR_WANT_READ) {
+ int serr = SSL_get_error(kws->ssl, code);
+ if (code == -1 && serr != SSL_ERROR_WANT_READ) {
return -1;
}
}
@@ -663,7 +664,6 @@ static int establish_logical_layer(kws_t *kws)
}
}
-
KS_DECLARE(ks_status_t) kws_init(kws_t **kwsP, ks_socket_t sock, SSL_CTX *ssl_ctx, const char *client_data, kws_flag_t flags, ks_pool_t *pool)
{
kws_t *kws;
@@ -731,7 +731,6 @@ KS_DECLARE(ks_status_t) kws_init(kws_t **kwsP, ks_socket_t sock, SSL_CTX *ssl_ct
return KS_STATUS_SUCCESS;
err:
-
kws_destroy(&kws);
return KS_STATUS_FAIL;
diff --git a/libs/libks/test/testhash.vcxproj b/libs/libks/test/testhash.vcxproj
index 433d2865ee..7c4db0e22f 100644
--- a/libs/libks/test/testhash.vcxproj
+++ b/libs/libks/test/testhash.vcxproj
@@ -74,26 +74,26 @@
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
true
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
@@ -103,8 +103,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
+ false
Console
@@ -119,8 +121,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
+ false
Console
@@ -137,8 +141,9 @@
true
_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
Console
@@ -157,8 +162,9 @@
true
_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
Console
diff --git a/libs/libks/test/testpools.vcxproj b/libs/libks/test/testpools.vcxproj
index e701b27e6a..ac1d580a1c 100644
--- a/libs/libks/test/testpools.vcxproj
+++ b/libs/libks/test/testpools.vcxproj
@@ -74,26 +74,26 @@
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
true
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
@@ -103,8 +103,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
+ false
Console
@@ -119,8 +121,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
+ false
Console
@@ -137,8 +141,9 @@
true
_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
Console
@@ -157,8 +162,9 @@
true
_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
Console
diff --git a/libs/libks/test/testq.vcxproj b/libs/libks/test/testq.vcxproj
index 8b57999219..f85ecf08bc 100644
--- a/libs/libks/test/testq.vcxproj
+++ b/libs/libks/test/testq.vcxproj
@@ -74,26 +74,26 @@
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
true
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
@@ -103,8 +103,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
+ false
Console
@@ -119,8 +121,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
+ false
Console
@@ -137,8 +141,9 @@
true
_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
Console
@@ -157,8 +162,9 @@
true
_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
Console
diff --git a/libs/libks/test/testsock.vcxproj b/libs/libks/test/testsock.vcxproj
index caf2ba9ae4..0d8492b3be 100644
--- a/libs/libks/test/testsock.vcxproj
+++ b/libs/libks/test/testsock.vcxproj
@@ -74,25 +74,25 @@
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
true
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
@@ -103,8 +103,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
+ false
Console
@@ -119,8 +121,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
+ false
Console
@@ -137,8 +141,9 @@
true
_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
Console
@@ -157,8 +162,9 @@
true
_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
Console
diff --git a/libs/libks/test/testthreadmutex.vcxproj b/libs/libks/test/testthreadmutex.vcxproj
index 3594beb0fc..5d78c95075 100644
--- a/libs/libks/test/testthreadmutex.vcxproj
+++ b/libs/libks/test/testthreadmutex.vcxproj
@@ -74,26 +74,26 @@
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
true
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
@@ -103,8 +103,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
+ false
Console
@@ -119,8 +121,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
+ false
Console
@@ -137,8 +141,9 @@
true
_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
Console
@@ -157,8 +162,9 @@
true
_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
Console
diff --git a/libs/libks/test/testtime.vcxproj b/libs/libks/test/testtime.vcxproj
index babc490498..03d3e9e5f8 100644
--- a/libs/libks/test/testtime.vcxproj
+++ b/libs/libks/test/testtime.vcxproj
@@ -74,26 +74,26 @@
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
true
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)
- $(SolutionDir)\openssl\lib;$(LibraryPath)
+ $(LibraryPath)
false
$(Platform)\$(Configuration)\$(ProjectName)\
$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)
- $(SolutionDir)\openssl\lib64;$(LibraryPath)
+ $(LibraryPath)
@@ -103,8 +103,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
+ false
Console
@@ -119,8 +121,10 @@
Disabled
_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
+ false
Console
@@ -137,8 +141,9 @@
true
_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.
4090
+ true
Console
@@ -157,8 +162,9 @@
true
_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ../src/include;.
+ $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.
4090
+ true
Console
diff --git a/libs/libks/test/testwebsock.c b/libs/libks/test/testwebsock.c
index da57737399..a477145464 100644
--- a/libs/libks/test/testwebsock.c
+++ b/libs/libks/test/testwebsock.c
@@ -94,9 +94,9 @@ void server_callback(ks_socket_t server_sock, ks_socket_t client_sock, ks_sockad
if (tcp_data->ssl) {
tcp_data->server_profile.ssl_method = SSLv23_server_method();
- ks_set_string(tcp_data->server_profile.cert, "/tmp/testwebsock.pem");
- ks_set_string(tcp_data->server_profile.key, "/tmp/testwebsock.pem");
- ks_set_string(tcp_data->server_profile.chain, "/tmp/testwebsock.pem");
+ ks_set_string(tcp_data->server_profile.cert, "./testwebsock.pem");
+ ks_set_string(tcp_data->server_profile.key, "./testwebsock.pem");
+ ks_set_string(tcp_data->server_profile.chain, "./testwebsock.pem");
init_ssl(&tcp_data->server_profile);
}
@@ -149,7 +149,6 @@ static void *tcp_sock_server(ks_thread_t *thread, void *thread_data)
return NULL;
}
-
static int test_ws(char *ip, int ssl)
{
ks_thread_t *thread_p = NULL;
@@ -168,9 +167,9 @@ static int test_ws(char *ip, int ssl)
if (ssl) {
tcp_data.ssl = 1;
tcp_data.client_profile.ssl_method = SSLv23_client_method();
- ks_set_string(tcp_data.client_profile.cert, "/tmp/testwebsock.pem");
- ks_set_string(tcp_data.client_profile.key, "/tmp/testwebsock.pem");
- ks_set_string(tcp_data.client_profile.chain, "/tmp/testwebsock.pem");
+ ks_set_string(tcp_data.client_profile.cert, "./testwebsock.pem");
+ ks_set_string(tcp_data.client_profile.key, "./testwebsock.pem");
+ ks_set_string(tcp_data.client_profile.chain, "./testwebsock.pem");
init_ssl(&tcp_data.client_profile);
}
@@ -219,7 +218,7 @@ static int test_ws(char *ip, int ssl)
ks_ssize_t bytes;
bytes = kws_read_frame(kws, &oc, &data);
- printf("WS CLIENT READ %ld bytes [%s]\n", bytes, (char *)data);
+ printf("WS CLIENT READ %ld bytes [%s]\n", (long)bytes, (char *)data);
end:
@@ -264,7 +263,7 @@ int main(void)
ok(have_v4 || have_v6);
if (have_v4 || have_v6) {
- ks_gen_cert("/tmp", "testwebsock.pem");
+ ks_gen_cert(".", "testwebsock.pem");
}
if (have_v4) {
@@ -277,7 +276,7 @@ int main(void)
ok(test_ws(v6, 1));
}
- unlink("/tmp/testwebsock.pem");
+ _unlink("./testwebsock.pem");
ks_shutdown();
done_testing();
diff --git a/libs/win32/Download OPENSSL.2015.vcxproj b/libs/win32/Download OPENSSL.2015.vcxproj
index 222054ebe3..68d2615fa4 100644
--- a/libs/win32/Download OPENSSL.2015.vcxproj
+++ b/libs/win32/Download OPENSSL.2015.vcxproj
@@ -29,16 +29,16 @@
v140
-
+
-
+
-
+
diff --git a/libs/win32/openssl/libeay32.2015.vcxproj b/libs/win32/openssl/libeay32.2015.vcxproj
index 62bb59e98f..376125a5a7 100644
--- a/libs/win32/openssl/libeay32.2015.vcxproj
+++ b/libs/win32/openssl/libeay32.2015.vcxproj
@@ -104,6 +104,7 @@
ProgramDatabase
4311;4164;4996;4267;4244;%(DisableSpecificWarnings)
false
+ true
ws2_32.lib;%(AdditionalDependencies)
@@ -132,6 +133,7 @@
ProgramDatabase
4311;4164;4996;4267;4244;%(DisableSpecificWarnings)
false
+ true
ws2_32.lib;%(AdditionalDependencies)
@@ -158,6 +160,7 @@
ProgramDatabase
4311;4164;4996;4267;4244;%(DisableSpecificWarnings)
false
+ true
ws2_32.lib;%(AdditionalDependencies)
@@ -186,6 +189,7 @@
ProgramDatabase
4311;4164;4996;4267;4244;%(DisableSpecificWarnings)
false
+ true
ws2_32.lib;%(AdditionalDependencies)
diff --git a/libs/win32/openssl/openssl.2015.vcxproj b/libs/win32/openssl/openssl.2015.vcxproj
index f579cdc39d..d901745d32 100644
--- a/libs/win32/openssl/openssl.2015.vcxproj
+++ b/libs/win32/openssl/openssl.2015.vcxproj
@@ -86,7 +86,7 @@
include_x86;include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)
true
- true
+ false
Default
MultiThreadedDebugDLL
true
@@ -96,6 +96,7 @@
true
ProgramDatabase
4996;4133;4267;4244;%(DisableSpecificWarnings)
+ true
ws2_32.lib;%(AdditionalDependencies)
@@ -114,7 +115,7 @@
include_x86;include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)
true
- true
+ false
Default
MultiThreadedDLL
true
@@ -124,6 +125,7 @@
true
ProgramDatabase
4996;4133;4267;4244;%(DisableSpecificWarnings)
+ true
ws2_32.lib;%(AdditionalDependencies)
@@ -146,7 +148,7 @@
include_x64;include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)
true
- true
+ false
Default
MultiThreadedDebugDLL
true
@@ -155,6 +157,7 @@
Level3
ProgramDatabase
4996;4133;4267;4244;%(DisableSpecificWarnings)
+ true
ws2_32.lib;%(AdditionalDependencies)
@@ -176,7 +179,7 @@
include_x64;include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)
true
- true
+ false
Default
MultiThreadedDLL
true
@@ -185,6 +188,7 @@
Level3
ProgramDatabase
4996;4133;4267;4244;%(DisableSpecificWarnings)
+ true
ws2_32.lib;%(AdditionalDependencies)
diff --git a/libs/win32/openssl/ssleay32.2015.vcxproj b/libs/win32/openssl/ssleay32.2015.vcxproj
index 111c683c02..cd58397459 100644
--- a/libs/win32/openssl/ssleay32.2015.vcxproj
+++ b/libs/win32/openssl/ssleay32.2015.vcxproj
@@ -102,6 +102,7 @@
true
ProgramDatabase
4311;4267;4244;%(DisableSpecificWarnings)
+ true
$(ProjectDir)$(Configuration);%(AdditionalLibraryDirectories)
@@ -127,6 +128,7 @@
true
ProgramDatabase
4311;4267;4244;%(DisableSpecificWarnings)
+ true
$(ProjectDir)$(Configuration);%(AdditionalLibraryDirectories)
@@ -154,6 +156,7 @@
Level3
ProgramDatabase
4311;4267;4244;%(DisableSpecificWarnings)
+ true
%(AdditionalDependencies)
@@ -182,6 +185,7 @@
Level3
ProgramDatabase
4311;4267;4244;%(DisableSpecificWarnings)
+ true
%(AdditionalDependencies)