Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add cherry-pickable shim for hsm signing #1330

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

Merged
merged 1 commit into from
Apr 8, 2025
Merged

Add cherry-pickable shim for hsm signing #1330

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
Binary file removed ant/lib/jsign-4.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added ant/lib/jsign-7.1.jar
View file
Open in desktop
Binary file not shown.
54 changes: 54 additions & 0 deletions ant/signing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,60 @@
<!-- Fallback code-signing properties -->
<property file="ant/private/private.properties"/>

<!-- Locate first jsign-x.x.x.jar sorted name desc -->
<target name="find-jsign">
<sort id="jsign.sorted">
<fileset dir="${basedir}/ant/lib/">
<include name="jsign*.jar"/>
</fileset>
<reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators"/>
</sort>
<first id="jsign.first">
<resources refid="jsign.sorted"/>
</first>
<pathconvert property="jsign.path" refid="jsign.first">
<identitymapper/>
</pathconvert>

<echo message="Found jsign: ${jsign.path}"/>
</target>

<!-- File signing via hsm with timestamp -->
<target name="sign-file-hsm" if="hsm.storetype" depends="find-jsign">
<property description="suppress property warning" name="sign.file" value="something went wrong"/>

<!-- Handle quoting via backwards-compatible shim (for cherry-pick) -->
<condition property="sign.file.quoted" value="&quot;${sign.file}&quot;">
<contains string="${sign.file}" substring="&quot;"/>
</condition>
<property description="fallback value" name="sign.file.quoted" value="${sign.file}"/>

<property description="suppress property warning" name="hsm.storetype" value="something went wrong"/>
<echo level="info">Signing with hsm: ${hsm.keystore}</echo>
<java jar="${jsign.path}" fork="true" failonerror="true">
<arg value="--name"/>
<arg value="${project.name}"/>
<arg value="--url"/>
<arg value="${vendor.website}"/>
<arg value="--replace"/>
<arg value="--alg"/>
<arg value="${hsm.algorithm}"/>
<arg value="--storetype"/>
<arg value="${hsm.storetype}"/>
<arg value="--keystore"/>
<arg value="${hsm.keystore}"/>
<arg value="--alias"/>
<arg value="${hsm.alias}"/>
<arg value="--storepass"/>
<arg value="${hsm.storepass}"/>
<arg value="--tsaurl"/>
<arg value="${hsm.tsaurl}"/>
<arg value="--certfile"/>
<arg value="${hsm.certfile}"/>
<arg line="${sign.file.quoted}"/>
</java>
</target>

<target name="sign-jar">
<antcall target="sign-jar-tsa">
<param name="sign.jar.file" value="${sign.jar.file}"/>
Expand Down
22 changes: 10 additions & 12 deletions ant/windows/installer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,6 @@
</antcall>
</target>

<target name="find-jsign">
<!-- Locate jsign -->
<path id="jsign.found">
<first>
<fileset dir="${basedir}/ant/lib/">
<include name="jsign*.jar"/>
</fileset>
</first>
</path>
<pathconvert property="jsign.path" refid="jsign.found"/>
</target>

<target name="find-nsisbin" depends="nsisbin-from-unix,nsisbin-from-32,nsisbin-from-64"/>

<!-- Linux makensis -->
Expand Down Expand Up @@ -112,6 +100,16 @@
<antcall target="sign-win-self">
<param name="sign.win.file" value="${sign.win.file}"/>
</antcall>

<!-- Handle property name via backwards-compatible shim (for cherry-pick) -->
<condition property="sign.win.file" value="${sign.exe.file}">
<isset property="sign.exe.file"/>
</condition>

<!-- Honor "hsm.storetype" -->
<antcall target="sign-file-hsm">
<param name="sign.file" value="${sign.win.file}"/>
</antcall>
</target>

<target name="copy-dlls" if="target.os.windows">
Expand Down
13 changes: 13 additions & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@
</and>
</condition>

<!-- Handle codesign.mac backwards-compatible shim (for cherry-pick) -->
<condition property="codesign.mac" value="true">
<and>
<or>
<isset property="target.os.mac"/>
<isset property="target.platform.mac"/>
</or>
<or>
<isset property="signing.tsaurl"/>
<isset property="hsm.storetype"/>
</or>
</and>
</condition>
<echo message="Building ${project.filename} using JDK ${ant.java.version}"/>
</target>

Expand Down