Update OpenSSL to 1.0.2q

vslavik · Dec 22, 2018 · 9e20132 · 9e20132
1 parent e89aeee
commit 9e20132
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 3 deletions.
diff --git a/3rdparty/libcrypto-2010.vcxproj b/3rdparty/libcrypto-2010.vcxproj
@@ -340,6 +340,7 @@
     <ClCompile Include="openssl\crypto\cversion.c" />
     <ClCompile Include="openssl\crypto\ebcdic.c" />
     <ClCompile Include="openssl\crypto\ex_data.c" />
+    <ClCompile Include="openssl\crypto\getenv.c" />
     <ClCompile Include="openssl\crypto\mem.c" />
     <ClCompile Include="openssl\crypto\mem_clr.c" />
     <ClCompile Include="openssl\crypto\mem_dbg.c" />

diff --git a/3rdparty/libcrypto-2010.vcxproj.filters b/3rdparty/libcrypto-2010.vcxproj.filters
@@ -575,6 +575,9 @@
     <ClCompile Include="openssl\crypto\ex_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="openssl\crypto\getenv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="openssl\crypto\mem.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/3rdparty/libcrypto-2012.vcxproj b/3rdparty/libcrypto-2012.vcxproj
@@ -346,6 +346,7 @@
     <ClCompile Include="openssl\crypto\cversion.c" />
     <ClCompile Include="openssl\crypto\ebcdic.c" />
     <ClCompile Include="openssl\crypto\ex_data.c" />
+    <ClCompile Include="openssl\crypto\getenv.c" />
     <ClCompile Include="openssl\crypto\mem.c" />
     <ClCompile Include="openssl\crypto\mem_clr.c" />
     <ClCompile Include="openssl\crypto\mem_dbg.c" />

diff --git a/3rdparty/libcrypto-2012.vcxproj.filters b/3rdparty/libcrypto-2012.vcxproj.filters
@@ -575,6 +575,9 @@
     <ClCompile Include="openssl\crypto\ex_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="openssl\crypto\getenv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="openssl\crypto\mem.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/3rdparty/libcrypto-2013.vcxproj b/3rdparty/libcrypto-2013.vcxproj
@@ -346,6 +346,7 @@
     <ClCompile Include="openssl\crypto\cversion.c" />
     <ClCompile Include="openssl\crypto\ebcdic.c" />
     <ClCompile Include="openssl\crypto\ex_data.c" />
+    <ClCompile Include="openssl\crypto\getenv.c" />
     <ClCompile Include="openssl\crypto\mem.c" />
     <ClCompile Include="openssl\crypto\mem_clr.c" />
     <ClCompile Include="openssl\crypto\mem_dbg.c" />

diff --git a/3rdparty/libcrypto-2013.vcxproj.filters b/3rdparty/libcrypto-2013.vcxproj.filters
@@ -575,6 +575,9 @@
     <ClCompile Include="openssl\crypto\ex_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="openssl\crypto\getenv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="openssl\crypto\mem.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/3rdparty/libcrypto-2015.vcxproj b/3rdparty/libcrypto-2015.vcxproj
@@ -348,6 +348,7 @@
     <ClCompile Include="openssl\crypto\cversion.c" />
     <ClCompile Include="openssl\crypto\ebcdic.c" />
     <ClCompile Include="openssl\crypto\ex_data.c" />
+    <ClCompile Include="openssl\crypto\getenv.c" />
     <ClCompile Include="openssl\crypto\mem.c" />
     <ClCompile Include="openssl\crypto\mem_clr.c" />
     <ClCompile Include="openssl\crypto\mem_dbg.c" />

diff --git a/3rdparty/libcrypto-2015.vcxproj.filters b/3rdparty/libcrypto-2015.vcxproj.filters
@@ -575,6 +575,9 @@
     <ClCompile Include="openssl\crypto\ex_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="openssl\crypto\getenv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="openssl\crypto\mem.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/3rdparty/libcrypto-2017.vcxproj b/3rdparty/libcrypto-2017.vcxproj
@@ -352,6 +352,7 @@
     <ClCompile Include="openssl\crypto\cversion.c" />
     <ClCompile Include="openssl\crypto\ebcdic.c" />
     <ClCompile Include="openssl\crypto\ex_data.c" />
+    <ClCompile Include="openssl\crypto\getenv.c" />
     <ClCompile Include="openssl\crypto\mem.c" />
     <ClCompile Include="openssl\crypto\mem_clr.c" />
     <ClCompile Include="openssl\crypto\mem_dbg.c" />
@@ -724,4 +725,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/3rdparty/libcrypto-2017.vcxproj.filters b/3rdparty/libcrypto-2017.vcxproj.filters
@@ -1679,5 +1679,8 @@
     <ClCompile Include="openssl\crypto\x509v3\v3err.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="openssl\crypto\getenv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/3rdparty/libcrypto.bkl b/3rdparty/libcrypto.bkl
@@ -236,6 +236,7 @@ library WinSparkle_libcrypto : t_3rdparty {
      cversion.c
      ebcdic.c
      ex_data.c
+     getenv.c
      mem.c
      mem_clr.c
      mem_dbg.c

diff --git a/3rdparty/libcrypto.vcproj b/3rdparty/libcrypto.vcproj
@@ -1051,6 +1051,10 @@
 				RelativePath="openssl\crypto\ex_data.c"
 				>
 			</File>
+			<File
+				RelativePath="openssl\crypto\getenv.c"
+				>
+			</File>
 			<File
 				RelativePath="openssl\crypto\mem.c"
 				>

diff --git a/3rdparty/openssl b/3rdparty/openssl
diff --git a/3rdparty/openssl-win32/openssl/bn_int.h b/3rdparty/openssl-win32/openssl/bn_int.h
@@ -0,0 +1 @@
+#include "../../openssl/crypto/bn_int.h"