Python 3.8.20.2+ uses OpenSSL3

Author: rickprice

PCbuild/get_externals.bat

@@ -54,8 +54,8 @@ set libraries=
 set libraries=%libraries%                                       bzip2-1.0.8
 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.4.4
 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1w
-set libraries=%libraries%                                       sqlite-3.45.1.0
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
+set libraries=%libraries%                                       sqlite-3.49.1.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
 set libraries=%libraries%                                       xz-5.2.2

PCbuild/openssl.props

@@ -6,24 +6,32 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(opensslLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;$(opensslLibDir)\libcrypto.lib;$(opensslLibDir)\libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <PropertyGroup>
-    <_DLLSuffix>-1_1</_DLLSuffix>
+    <SSLMajorVersion>$(SSL_MAJOR_VERSION)</SSLMajorVersion>
+    <SSLMajorVersion Condition="$(SSLMajorVersion) == ''">3</SSLMajorVersion>
+    <SSLMinorVersion>$(SSL_MINOR_VERSION)</SSLMinorVersion>
+    <SSLMinorVersion Condition="$(SSLMinorVersion) == ''">0</SSLMinorVersion>
+    <SSLVersion>$(SSLMajorVersion)_$(SSLMinorVersion)</SSLVersion>
+    <SSLVersion Condition="$(SSLMinorVersion) == '0'">$(SSLMajorVersion)</SSLVersion>
+    <SSLVersion Condition="$(SSLMajorVersion) == '3'">$(SSLMajorVersion)</SSLVersion>
+    <_DLLSuffix>-$(SSLVersion)</_DLLSuffix>
+    <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64</_DLLSuffix>
     <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
     <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
   </PropertyGroup>
   <ItemGroup>
-    <_SSLDLL Include="$(opensslLibDir)\libcrypto$(_DLLSuffix).dll" />
-    <_SSLDLL Include="$(opensslLibDir)\libcrypto$(_DLLSuffix).pdb" />
-    <_SSLDLL Include="$(opensslLibDir)\libssl$(_DLLSuffix).dll" />
-    <_SSLDLL Include="$(opensslLibDir)\libssl$(_DLLSuffix).pdb" />
+    <_SSLDLL Include="$(opensslBinDir)\libcrypto$(_DLLSuffix).dll" />
+    <_SSLDLL Include="$(opensslBinDir)\libcrypto$(_DLLSuffix).pdb" />
+    <_SSLDLL Include="$(opensslBinDir)\libssl$(_DLLSuffix).dll" />
+    <_SSLDLL Include="$(opensslBinDir)\libssl$(_DLLSuffix).pdb" />
   </ItemGroup>
   <Target Name="_CopySSLDLL" Inputs="@(_SSLDLL)" Outputs="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
     <Copy SourceFiles="@(_SSLDLL)" DestinationFolder="$(OutDir)" />
   </Target>
   <Target Name="_CleanSSLDLL" BeforeTargets="Clean">
     <Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
   </Target>
-</Project>
+</Project>

PCbuild/python.props

@@ -62,7 +62,7 @@
 
   <PropertyGroup>
     <sqlite3Dir>$(SQLITE3_DIR)</sqlite3Dir>
-    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.1.0\</sqlite3Dir>
+    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.49.1.0\</sqlite3Dir>
     <sqlite3Dir Condition="!HasTrailingSlash($(sqlite3Dir))">$(sqlite3Dir)\</sqlite3Dir>
     <bz2Dir>$(BZIP2_DIR)</bz2Dir>
     <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
@@ -80,13 +80,16 @@
     <opensslLibdir/>
     <opensslOutDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-bin-1.1.1w\$(ArchName)\</opensslOutDir>
     <opensslLibDir Condition="$(opensslDir) == ''">$(opensslOutDir)</opensslLibDir>
+    <opensslBinDir Condition="$(opensslDir) == ''">$(opensslOutDir)</opensslBinDir>
     <opensslIncludeDir Condition="$(opensslDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
 
     <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1w\</opensslDir>
     <opensslDir Condition="!HasTrailingSlash($(opensslDir))">$(opensslDir)\</opensslDir>
 
     <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslDir)include</opensslIncludeDir>
     <opensslLibDir Condition="$(opensslLibDir) == ''">$(opensslDir)lib</opensslLibDir>
+    <opensslBinDir Condition="$(opensslBinDir) == '' and $(SSLMajorVersion) == '1'">$(opensslDir)lib</opensslBinDir>
+    <opensslBinDir Condition="$(opensslBinDir) == ''">$(opensslDir)bin</opensslBinDir>
     <nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ZLIB_DIR)</zlibDir>
     <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>

PCbuild/tcltk.props

@@ -7,7 +7,7 @@
     <TclMinorVersion>$(TCL_MINOR_VERSION)</TclMinorVersion>
     <TclMinorVersion Condition="$(TclMinorVersion) == ''">6</TclMinorVersion>
     <TclPatchLevel>$(TCL_PATCHLEVEL)</TclPatchLevel>
-    <TclPatchLevel Condition="$(TclPatchLevel) == ''">12</TclPatchLevel>
+    <TclPatchLevel Condition="$(TclPatchLevel) == ''">15</TclPatchLevel>
     <TclRevision>$(TCL_REVISION)</TclRevision>
     <TclRevision Condition="$(TclRevision) == ''">0</TclRevision>
     <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
@@ -17,9 +17,9 @@
     <TixMajorVersion>$(TIX_MAJOR_VERSION)</TixMajorVersion>
     <TixMajorVersion Condition="$(TixMajorVersion) == ''">8</TixMajorVersion>
     <TixMinorVersion>$(TIX_MINOR_VERSION)</TixMinorVersion>
-    <TixMinorVersion Condition="$(TixMinorVersion) == ''">4</TixMinorVersion>
+    <TixMinorVersion Condition="$(TixMinorVersion) == ''">6</TixMinorVersion>
     <TixPatchLevel>$(TIX_PATCHLEVEL)</TixPatchLevel>
-    <TixPatchLevel Condition="$(TixPatchlevel) == ''">3</TixPatchLevel>
+    <TixPatchLevel Condition="$(TixPatchlevel) == ''">15</TixPatchLevel>
     <TixRevision>$(TIX_REVISION)</TixRevision>
     <TixRevision Condition="$(TixRevision) == ''">6</TixRevision>
     <tclDir>$(TCL_DIR)</tclDir>