Enable TLS1.2 on Win7 if not already enabled

karl80038 · May 31, 2023 · 6111c45 · 6111c45
1 parent 3913f8e
commit 6111c45
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/cmake b/cmake
diff --git a/common b/common
diff --git a/extensions b/extensions
diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
@@ -48,6 +48,7 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
     <Property Id="ARPPRODUCTICON" Value="qdigidoc4.ico"/>
     <Property Id="APPLICATIONNAME" Value="qdigidoc4"/>
     <Property Id="DESKTOP_SHORTCUT" Value="0"/>
+    <Property Id="TLS12" Value="1"/>
     <MajorUpgrade AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" DowngradeErrorMessage=
       "A newer version of [ProductName] is already installed. If you are trying to downgrade, please uninstall the newer version first."/>
     <UIRef Id="WixUI_Minimal2" />
@@ -165,6 +166,11 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
 <?endif?>
 <?endif?>
           </Component>
+          <Component Id="ldapsOnW7" Guid="14397c62-610a-41ee-8168-a70757e71cdc">
+            <Condition><![CDATA[(VersionNT = 601 AND TLS12 = 1)]]></Condition>
+            <RegistryValue Root='HKLM' Type='integer' Name='DisabledByDefault' Value='0'
+                Key='SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Client'/>
+          </Component>
           <Directory Id="SchemaFolder" Name="schema"/>
 <?ifdef var.qt_path ?>
           <Directory Id="platforms" Name="platforms" FileSource="$(var.qt_path)\..\plugins\platforms">
@@ -206,6 +212,7 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
       <ComponentRef Id="DesktopShortcut4" />
       <ComponentRef Id="Application4"/>
       <ComponentRef Id="Base"/>
+      <ComponentRef Id="ldapsOnW7"/>
       <ComponentGroupRef Id="Schemas"/>
 <?ifdef var.qt_path ?>
       <ComponentRef Id="qwindows.dll" />
+1 −1		modules/FindXmlSecurityC.cmake
+1 −15		modules/VersionInfo.cmake
+12 −10		.github/workflows/build.yml
+3 −4		CMakeLists.txt
+2 −2		Common.cpp
+12 −30		Configuration.cpp
+14 −16		QPCSC.cpp
+1 −1		cmake
+0 −4		qtsingleapplication/CMakeLists.txt
+2,269 −955		translations/qtbase_et.ts
+2,081 −762		translations/qtbase_ru.ts
+1 −1		DigiDocQL/Info.plist
+1 −1		cmake
+18 −9		nautilus/nautilus-qdigidoc.py