Commit c27fef7b authored by Tuukka Lehtonen's avatar Tuukka Lehtonen
Browse files

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
parent d331e06e
......@@ -8,7 +8,6 @@ if [ $# -lt 3 ]; then
echo "<signing property file> 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 <jarsigner.alias>"
echo ""
echo "<TSA URL> 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" \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment