Merge pull request #20 from acavella/develop

fix(pkcs12): specify p12 mac and iteration
acavella · Jan 5, 2023 · 7c75278 · 7c75278
2 parents f8a03a3 + b663148
commit 7c75278
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.3
+1.0.4
diff --git a/tcra.sh b/tcra.sh
@@ -216,7 +216,7 @@ main() {
             openssl pkcs7 -print_certs -in ${p7b} -out ${result}
             openssl pkcs12 -export -inkey ${pkey} -in ${result} -out ${tmp_p12} -passout pass:${randpass}
             openssl pkcs12 -in ${tmp_p12} -out ${enc_pem} -passin pass:${randpass} -passout pass:${randpass}
-            openssl pkcs12 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES -export -in ${enc_pem} -out ${p12} -name "${cn}-${RANDOM}" -passin pass:${randpass} -passout pass:${randpass}
+            openssl pkcs12 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES -macalg SHA1 -iter 2000 -export -in ${enc_pem} -out ${p12} -name "${cn}-${RANDOM}" -passin pass:${randpass} -passout pass:${randpass}
             rm -f ${tmp_p12}
             rm -f ${enc_pem}
             rm -f ${result}