Skip to content

Add experimental Adobe Reader DS signing/validation configurator #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add experimental Adobe Reader DS signing/validation configurator #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions HyperlinkSidebarTheme.en.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,5 @@ Instructions on how to enable token plugin can be found <a href="http://id.ee
<String Id="chromeplugin">Chrome browser signing support</String>
<String Id="firefoxplugin">Firefox browser signing and authentication support</String>
<String Id="minidriver">Estonian ID-card support</String>
<String Id="AdobeConfig">Experimental: Configure Adobe Reader DC for signing and validation</String>
</WixLocalization>
1 change: 1 addition & 0 deletions HyperlinkSidebarTheme.et.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,5 @@ Juhend aktiveerimiseks on leitav &lt;a href="http://id.ee/?lang=et&amp;id=36636"
<String Id="chromeplugin">Chrome'i allkirjastamise tugi</String>
<String Id="firefoxplugin">Firefoxi allkirjastamise ja autentimise tugi</String>
<String Id="minidriver">Eesti ID-kaardi tugi</String>
<String Id="AdobeConfig">Experimental: Configure Adobe Reader DC for signing and validation</String>
</WixLocalization>
1 change: 1 addition & 0 deletions HyperlinkSidebarTheme.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<Static X="30" Y="253" Width="-30" Height="1" />
<Checkbox Name="IconsDesktop" X="30" Y="256" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsDesktop)</Checkbox>
<Checkbox Name="RunQesteidutil" X="30" Y="278" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.RunQesteidUtilDescription)</Checkbox>
<Checkbox Name="AdobeConfig" X="30" Y="300" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.AdobeConfig)</Checkbox>
<Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
<Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
</Page>
Expand Down
44 changes: 44 additions & 0 deletions adobe.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>

<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Name="RIA Adobe Configuration" UpgradeCode="83ce67cf-f9a1-423e-91ae-0d4d878c25d0"
Id="*" Language="1033" Version="$(var.MSI_VERSION)" Codepage="1251" Manufacturer="RIA">
<Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine"/>
<Media Id='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."/>
<Directory Id='TARGETDIR' Name='SourceDir'/>
<Feature Id='MainFeature' Level='1'>
<Component Id='Content' Directory='TARGETDIR' Transitive="yes">
<!-- http://www.adobe.com/devnet-docs/acrobatetk/tools/PrefRef/Windows/Security.html -->
<!-- Signature settings -->
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cPubSec'
Name='aSignFormat' Value='ETSI.CAdES.detached' Type='string' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_LTVProvider'
Name='iAutoAddLTV' Value='2' Type='integer' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cSPIs\cRevocationChecker'
Name='t0' Value='Adobe_OCSPRevChecker' Type='string' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cASPKI\cSign'
Name='iReqRevCheck' Value='3' Type='integer' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_LTVProvider'
Name='bIsEnabled' Value='1' Type='integer' />
<!-- OCSP settings -->
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_OCSPRevChecker'
Name='bSendNonce' Value='0' Type='integer' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_OCSPRevChecker'
Name='iSendNonce' Value='0' Type='integer' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_OCSPRevChecker'
Name='iURLToConsult' Value='2' Type='integer' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_OCSPRevChecker'
Name='sURL' Value='http://aia.sk.ee/esteid2011/' Type='string' />
<!-- TS settings -->
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cASPKI\cAdobe_TSPProvider'
Name='sURL' Value='http://tsa.sk.ee/' Type='string' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cPPKHandler\cTimeStampServers\c0'
Name='tServer' Value='http://tsa.sk.ee/' Type='string' />
<RegistryValue Root='HKCU' Key='Software\Adobe\Acrobat Reader\DC\Security\cPPKHandler\cTimeStampServers\c0'
Name='tName' Value='SK TIMESTAMPING AUTHORITY' Type='string' />
</Component>
</Feature>
</Product>
</Wix>
8 changes: 8 additions & 0 deletions bootstrapper.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<Variable Name="IconsDesktop" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
<Variable Name="AutoUpdate" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
<Variable Name="RunQesteidutil" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
<Variable Name="AdobeConfig" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="0"/>
<Variable Name="InstallX64" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="$(var.defaultX64)"/>
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles6432Folder]\Open-EID"/>

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

Expand Down Expand Up @@ -170,6 +173,10 @@
<MsiProperty Name="RUN_UTIL" Value="[RunQesteidutil]"/>
</MsiPackage>

<MsiPackage Id="AdobeConfig" ForcePerMachine="yes" SourceFile="adobe.msi" Compressed="yes" InstallCondition="AdobeConfig = 1">
<MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/>
</MsiPackage>

<MsiPackage Id="MetaInfo" ForcePerMachine="yes" SourceFile="metainfo.msi" Compressed="yes">
<MsiProperty Name="IESupport" Value="[IESupport]"/>
<MsiProperty Name="ChromeSupport" Value="[ChromeSupport]"/>
Expand All @@ -179,6 +186,7 @@
<MsiProperty Name="QesteidutilInstall" Value="[QesteidutilInstall]"/>
<MsiProperty Name="AutoUpdate" Value="[AutoUpdate]"/>
<MsiProperty Name="IconsDesktop" Value="[IconsDesktop]"/>
<MsiProperty Name="AdobeConfig" Value="[AdobeConfig]"/>
</MsiPackage>
</Chain>
</Bundle>
Expand Down
3 changes: 3 additions & 0 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,12 @@ Function Create($filename, $defaultX64) {
& $light -nologo -out "metainfo.msi" metainfo.wixobj
& $candle -nologo "$path\uninstaller.wxs" "-dMSI_VERSION=$msiversion"
& $light -nologo -out "uninstaller.msi" uninstaller.wixobj
& $candle -nologo "$path\adobe.wxs" "-dMSI_VERSION=$msiversion"
& $light -nologo -out "adobe.msi" adobe.wixobj
if($sign) {
Sign("metainfo.msi")
Sign("uninstaller.msi")
Sign("adobe.msi")
}
Create $filename".exe" 1
Create $filename"_x86.exe" 0
2 changes: 2 additions & 0 deletions metainfo.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
Name='AutoUpdate' Value='[AUTOUPDATE]' Type='integer' />
<RegistryValue Root='HKMU' Key='SOFTWARE\[Manufacturer]\Open-EID'
Name='IconsDesktop' Value='[ICONSDESKTOP]' Type='integer' />
<RegistryValue Root='HKMU' Key='SOFTWARE\[Manufacturer]\Open-EID'
Name='AdobeConfig' Value='[ADOBECONFIG]' Type='integer' />
</Component>
</Feature>
</Product>
Expand Down