From c27fef7b9c12582d5eb3a66456eb32cee6c80860 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 17 Aug 2022 14:15:46 +0300 Subject: [PATCH] Fix signing to work with PKCS#12 keystore PKCS#12 keystores only have one store password, no separate key password. The -keypass argument must not be given to jarsigner when it is not used. Change-Id: I95f0681c6a841113da3f3b341aa42e73f075d4b4 --- releng/org.simantics.sdk.build.p2.site/sign.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/releng/org.simantics.sdk.build.p2.site/sign.sh b/releng/org.simantics.sdk.build.p2.site/sign.sh index 79319ec43..558151988 100755 --- a/releng/org.simantics.sdk.build.p2.site/sign.sh +++ b/releng/org.simantics.sdk.build.p2.site/sign.sh @@ -8,7 +8,6 @@ if [ $# -lt 3 ]; then echo " must contain the following properties:" echo " jarsigner.alias: keystore entry alias" echo " jarsigner.storepass: password for the keystore" - echo " jarsigner.keypass: password for the key " echo "" echo " can be empty is timestamping is not desired." exit -1 @@ -30,7 +29,6 @@ echo "TSA URL: ${tsa}" keyalias=$(signprop 'jarsigner.alias') storepass=$(signprop 'jarsigner.storepass') -keypass=$(signprop 'jarsigner.keypass') for jar in `find "${dir}/target/repository/plugins/" -type f -not -ipath '*.source_*.jar'`; do echo "----" @@ -38,7 +36,6 @@ for jar in `find "${dir}/target/repository/plugins/" -type f -not -ipath '*.sour echo "Signing $jar" jarsigner -keystore "${keystore}" \ -storepass ${storepass} \ - -keypass ${keypass} \ -verbose \ "$jar" \ ${keyalias} @@ -46,7 +43,6 @@ for jar in `find "${dir}/target/repository/plugins/" -type f -not -ipath '*.sour echo "Signing and timestamping $jar" jarsigner -keystore "${keystore}" \ -storepass ${storepass} \ - -keypass ${keypass} \ -verbose \ -tsa "${tsa}" \ "$jar" \ -- 2.45.2