Skip to content

Commit bb12186

Browse files
metsmametsma
committed
Add experimental Adobe Reader DS signing/validation configurator
SKEID-158 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent b976e4b commit bb12186

7 files changed

Lines changed: 60 additions & 0 deletions

‎HyperlinkSidebarTheme.en.wxl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,5 @@ Instructions on how to enable token plugin can be found &lt;a href="http://id.ee
7373
<String Id="chromeplugin">Chrome browser signing support</String>
7474
<String Id="firefoxplugin">Firefox browser signing and authentication support</String>
7575
<String Id="minidriver">Estonian ID-card support</String>
76+
<String Id="AdobeConfig">Experimental: Configure Adobe Reader DC for signing and validation</String>
7677
</WixLocalization>

‎HyperlinkSidebarTheme.et.wxl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,5 @@ Juhend aktiveerimiseks on leitav &lt;a href="http://id.ee/?lang=et&amp;id=36636"
7373
<String Id="chromeplugin">Chrome'i allkirjastamise tugi</String>
7474
<String Id="firefoxplugin">Firefoxi allkirjastamise ja autentimise tugi</String>
7575
<String Id="minidriver">Eesti ID-kaardi tugi</String>
76+
<String Id="AdobeConfig">Experimental: Configure Adobe Reader DC for signing and validation</String>
7677
</WixLocalization>

‎HyperlinkSidebarTheme.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<Static X="30" Y="253" Width="-30" Height="1" />
4646
<Checkbox Name="IconsDesktop" X="30" Y="256" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsDesktop)</Checkbox>
4747
<Checkbox Name="RunQesteidutil" X="30" Y="278" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.RunQesteidUtilDescription)</Checkbox>
48+
<Checkbox Name="AdobeConfig" X="30" Y="300" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.AdobeConfig)</Checkbox>
4849
<Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
4950
<Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
5051
</Page>

‎adobe.wxs‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
4+
<Product Name="RIA Adobe Configuration" UpgradeCode="83ce67cf-f9a1-423e-91ae-0d4d878c25d0"
5+
Id="*" Language="1033" Version="$(var.MSI_VERSION)" Codepage="1251" Manufacturer="RIA">
6+
<Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine"/>
7+
<Media Id='1' />
8+
<MajorUpgrade AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" DowngradeErrorMessage=
9+
"A newer version of [ProductName] is already installed. If you are trying to downgrade, please uninstall the newer version first."/>
10+
<Directory Id='TARGETDIR' Name='SourceDir'/>
11+
<Feature Id='MainFeature' Level='1'>
12+
<Component Id='Content' Directory='TARGETDIR' Transitive="yes">
13+
<!-- http://www.adobe.com/devnet-docs/acrobatetk/tools/PrefRef/Windows/Security.html -->
14+
<!-- Signature settings -->
15+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cPubSec'
16+
Name='aSignFormat' Value='ETSI.CAdES.detached' Type='string' />
17+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_LTVProvider'
18+
Name='iAutoAddLTV' Value='2' Type='integer' />
19+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cSPIs\cRevocationChecker'
20+
Name='t0' Value='Adobe_OCSPRevChecker' Type='string' />
21+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cASPKI\cSign'
22+
Name='iReqRevCheck' Value='3' Type='integer' />
23+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_LTVProvider'
24+
Name='bIsEnabled' Value='1' Type='integer' />
25+
<!-- OCSP settings -->
26+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_OCSPRevChecker'
27+
Name='bSendNonce' Value='0' Type='integer' />
28+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_OCSPRevChecker'
29+
Name='iSendNonce' Value='0' Type='integer' />
30+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_OCSPRevChecker'
31+
Name='iURLToConsult' Value='2' Type='integer' />
32+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_OCSPRevChecker'
33+
Name='sURL' Value='http://ocsp.sk.ee/ocsp_good/' Type='string' />
34+
<!-- TS settings -->
35+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_TSPProvider'
36+
Name='sURL' Value='http://tsa.sk.ee/' Type='string' />
37+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cPPKHandler\cTimeStampServers\c0'
38+
Name='tServer' Value='http://tsa.sk.ee/' Type='string' />
39+
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cPPKHandler\cTimeStampServers\c0'
40+
Name='tName' Value='SK TIMESTAMPING AUTHORITY' Type='string' />
41+
</Component>
42+
</Feature>
43+
</Product>
44+
</Wix>

‎bootstrapper.wxs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<Variable Name="IconsDesktop" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
2626
<Variable Name="AutoUpdate" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
2727
<Variable Name="RunQesteidutil" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
28+
<Variable Name="AdobeConfig" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="0"/>
2829
<Variable Name="InstallX64" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="$(var.defaultX64)"/>
2930
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles6432Folder]\Open-EID"/>
3031

@@ -52,6 +53,8 @@
5253
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="AutoUpdate" Variable="AutoUpdate" Condition="AutoUpdateExists"/>
5354
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IconsDesktop" Variable="IconsDesktopExists" Result="exists"/>
5455
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IconsDesktop" Variable="IconsDesktop" Condition="IconsDesktopExists"/>
56+
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="AdobeConfig" Variable="AdobeConfigExists" Result="exists"/>
57+
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="AdobeConfig" Variable="AdobeConfig" Condition="AdobeConfigExists"/>
5558
<util:DirectorySearch Path="[InstallFolder]" Variable="Installed" Result="exists"/>
5659
<util:FileSearch Path="[ProgramFiles64Folder]\Open-EID\ID-Updater.exe" Variable="InstallX64" Result="exists" Condition="Installed"/>
5760

@@ -170,6 +173,10 @@
170173
<MsiProperty Name="RUN_UTIL" Value="[RunQesteidutil]"/>
171174
</MsiPackage>
172175

176+
<MsiPackage Id="AdobeConfig" ForcePerMachine="yes" SourceFile="adobe.msi" Compressed="yes" InstallCondition="AdobeConfig = 1">
177+
<MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/>
178+
</MsiPackage>
179+
173180
<MsiPackage Id="MetaInfo" ForcePerMachine="yes" SourceFile="metainfo.msi" Compressed="yes">
174181
<MsiProperty Name="IESupport" Value="[IESupport]"/>
175182
<MsiProperty Name="ChromeSupport" Value="[ChromeSupport]"/>
@@ -179,6 +186,7 @@
179186
<MsiProperty Name="QesteidutilInstall" Value="[QesteidutilInstall]"/>
180187
<MsiProperty Name="AutoUpdate" Value="[AutoUpdate]"/>
181188
<MsiProperty Name="IconsDesktop" Value="[IconsDesktop]"/>
189+
<MsiProperty Name="AdobeConfig" Value="[AdobeConfig]"/>
182190
</MsiPackage>
183191
</Chain>
184192
</Bundle>

‎build.ps1‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,12 @@ Function Create($filename, $defaultX64) {
6767
& $light -nologo -out "metainfo.msi" metainfo.wixobj
6868
& $candle -nologo "$path\uninstaller.wxs" "-dMSI_VERSION=$msiversion"
6969
& $light -nologo -out "uninstaller.msi" uninstaller.wixobj
70+
& $candle -nologo "$path\adobe.wxs" "-dMSI_VERSION=$msiversion"
71+
& $light -nologo -out "adobe.msi" adobe.wixobj
7072
if($sign) {
7173
Sign("metainfo.msi")
7274
Sign("uninstaller.msi")
75+
Sign("adobe.msi")
7376
}
7477
Create $filename".exe" 1
7578
Create $filename"_x86.exe" 0

‎metainfo.wxs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
Name='AutoUpdate' Value='[AUTOUPDATE]' Type='integer' />
3434
<RegistryValue Root='HKMU' Key='SOFTWARE\[Manufacturer]\Open-EID'
3535
Name='IconsDesktop' Value='[ICONSDESKTOP]' Type='integer' />
36+
<RegistryValue Root='HKMU' Key='SOFTWARE\[Manufacturer]\Open-EID'
37+
Name='AdobeConfig' Value='[ADOBECONFIG]' Type='integer' />
3638
</Component>
3739
</Feature>
3840
</Product>

0 commit comments

Comments
 (0)