[Bug 3095] Compatibility with openssl 1.1

 - add new sources to project files

bk: 57ef83b7YWk5t8RGMNgHdb6I-51z8w

diff --git a/ports/winnt/vs2005/libntp.vcproj b/ports/winnt/vs2005/libntp.vcproj
index 01f7f500f5138e11e91504466f52a61be5657362..e1c7b659558c5e7c77bfb4dd186d0e0ea3681b66 100644 (file)
--- a/ports/winnt/vs2005/libntp.vcproj
+++ b/ports/winnt/vs2005/libntp.vcproj
@@ -332,10 +332,18 @@
                                RelativePath="..\..\..\libntp\lib_strbuf.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\libntp\libssl_compat.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\sntp\libopts\libopts.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\libntp\libssl_compat.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\lib\isc\log.c"
                                >

diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj
index 7dfd9a5559f92f29a0b68c507c2e181d28394534..2057d758b6760e0dda04c5251033d2d4ad9e6bb9 100644 (file)
--- a/ports/winnt/vs2008/libntp/libntp.vcproj
+++ b/ports/winnt/vs2008/libntp/libntp.vcproj
@@ -443,6 +443,10 @@
                                RelativePath="..\..\..\..\sntp\libopts\libopts.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\..\libntp\libssl_compat.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\..\lib\isc\log.c"
                                >
@@ -768,6 +772,14 @@
                                RelativePath="..\..\..\..\include\lib_strbuf.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\..\include\libntp.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\..\include\libssl_compat.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\..\lib\isc\include\isc\log.h"
                                >

diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj
index a2e964f0be9badfa14a674d6aa6335200db8456d..5171e948a09b0352112f3f0d772189d215551e6a 100644 (file)
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugXP|Win32">
@@ -239,6 +239,7 @@
     <ClCompile Include="..\..\..\..\libntp\icom.c" />
     <ClCompile Include="..\..\..\..\libntp\iosignal.c" />
     <ClCompile Include="..\..\..\..\libntp\is_ip_address.c" />
+    <ClCompile Include="..\..\..\..\libntp\libssl_compat.c" />
     <ClCompile Include="..\..\..\..\libntp\lib_strbuf.c" />
     <ClCompile Include="..\..\..\..\libntp\machines.c" />
     <ClCompile Include="..\..\..\..\libntp\mktime.c" />
@@ -324,6 +325,8 @@
     <ClInclude Include="..\..\..\..\include\intreswork.h" />
     <ClInclude Include="..\..\..\..\include\iosignal.h" />
     <ClInclude Include="..\..\..\..\include\isc\mem.h" />
+    <ClInclude Include="..\..\..\..\include\libntp.h" />
+    <ClInclude Include="..\..\..\..\include\libssl_compat.h" />
     <ClInclude Include="..\..\..\..\include\lib_strbuf.h" />
     <ClInclude Include="..\..\..\..\include\l_stdlib.h" />
     <ClInclude Include="..\..\..\..\include\ntp.h" />

diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
index bfdb3bd08e1aed41442ae1e9aa630bbe855a8b75..022ccf4a12c9d073ddf1b57bb4e21a34c871d1fe 100644 (file)
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -299,9 +299,6 @@
     <ClCompile Include="..\..\..\..\libntp\timevalops.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\libntp\tsmemcmp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\uglydate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -329,6 +326,12 @@
     <ClCompile Include="..\..\..\..\libntp\is_ip_address.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\lib\isc\tsmemcmp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\libssl_compat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\sntp\libopts\ag-char-map.h">
@@ -565,10 +568,16 @@
     <ClInclude Include="..\..\..\..\include\safecast.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\libntp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\libssl_compat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\libntp\messages.mc">
       <Filter>Resource Files</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/ports/winnt/vs2015/libntp/libntp.vcxproj b/ports/winnt/vs2015/libntp/libntp.vcxproj
index 42c1ef20bee255fb92dc4487c702cb3381766cf7..6f6899f9cc4f50174cc94ff7449a3d1c7cf11f0c 100644 (file)
--- a/ports/winnt/vs2015/libntp/libntp.vcxproj
+++ b/ports/winnt/vs2015/libntp/libntp.vcxproj
@@ -239,6 +239,7 @@
     <ClCompile Include="..\..\..\..\libntp\icom.c" />
     <ClCompile Include="..\..\..\..\libntp\iosignal.c" />
     <ClCompile Include="..\..\..\..\libntp\is_ip_address.c" />
+    <ClCompile Include="..\..\..\..\libntp\libssl_compat.c" />
     <ClCompile Include="..\..\..\..\libntp\lib_strbuf.c" />
     <ClCompile Include="..\..\..\..\libntp\machines.c" />
     <ClCompile Include="..\..\..\..\libntp\mktime.c" />
@@ -324,6 +325,8 @@
     <ClInclude Include="..\..\..\..\include\intreswork.h" />
     <ClInclude Include="..\..\..\..\include\iosignal.h" />
     <ClInclude Include="..\..\..\..\include\isc\mem.h" />
+    <ClInclude Include="..\..\..\..\include\libntp.h" />
+    <ClInclude Include="..\..\..\..\include\libssl_compat.h" />
     <ClInclude Include="..\..\..\..\include\lib_strbuf.h" />
     <ClInclude Include="..\..\..\..\include\l_stdlib.h" />
     <ClInclude Include="..\..\..\..\include\ntp.h" />

diff --git a/ports/winnt/vs2015/libntp/libntp.vcxproj.filters b/ports/winnt/vs2015/libntp/libntp.vcxproj.filters
index ab9b5383c3d72a49cdd91ab7b8d9dc6172b1adc2..022ccf4a12c9d073ddf1b57bb4e21a34c871d1fe 100644 (file)
--- a/ports/winnt/vs2015/libntp/libntp.vcxproj.filters
+++ b/ports/winnt/vs2015/libntp/libntp.vcxproj.filters
@@ -329,6 +329,9 @@
     <ClCompile Include="..\..\..\..\lib\isc\tsmemcmp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\libssl_compat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\sntp\libopts\ag-char-map.h">
@@ -565,6 +568,12 @@
     <ClInclude Include="..\..\..\..\include\safecast.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\libntp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\libssl_compat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\libntp\messages.mc">