Merge pull request #38 from olszomal/cabfiles

Code cleanup
2025-04-05 01:00:11 -05:00 · 2020-04-11 11:19:03 +02:00 · 2020-04-11 11:19:03 +02:00 · 146b79bd04
commit 146b79bd04
parent 2830ab5795 e59e922d32
14 changed files with 2272 additions and 1643 deletions
--- a/osslsigncode.c
+++ b/osslsigncode.c
--- a/tests/recipes/06_test_sha256sum
+++ b/tests/recipes/06_test_sha256sum
@ -13,8 +13,6 @@ if test -s "test.exe"
        res=1
        cat "sha256sum_exe.log" >> "results.log"
        printf "Non-unique SHA256 message digests found\n" >> "results.log"
-      else
-        rm -f test_0[1-5]*[1-3]*.exe
      fi
    rm -f "sha256sum_exe.log"
  else
@ -28,8 +26,6 @@ if test -s "test.ex_"
        res=1
        cat "sha256sum_ex_.log" >> "results.log"
        printf "Non-unique SHA256 message digests found\n" >> "results.log"
-      else
-        rm -f test_0[1-5]*[1-3]*.ex_
      fi
    rm -f "sha256sum_ex_.log"
  else
@ -43,8 +39,6 @@ if test -s "sample.msi"
        res=1
        cat "sha256sum_msi.log" >> "results.log"
        printf "Non-unique SHA256 message digests found\n" >> "results.log"
-      else
-        rm -f test_0[1-5]*[1-3]*.msi
      fi
    rm -f "sha256sum_msi.log"
  else
--- a/tests/recipes/26_extract_signature_pem
+++ b/tests/recipes/26_extract_signature_pem
@ -1,58 +1,58 @@
 #!/bin/sh
-# Extract the signature from the PE/CAB/MSI file.
+# Extract the signature in the PEM format from the PE/CAB/MSI file.

 . $(dirname $0)/../test_library
 script_path=$(pwd)

 # PE file
-test_name="311. Extract the signature from the PE file"
+test_name="261. Extract the PEM signature from the PE file"
 printf "\n%s\n" "$test_name"
 if test -s "test.exe"
  then
-    ../../osslsigncode sign -h sha256 \
+    ../../osslsigncode sign -h sha512 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "test.exe" -out "test_311.exe" && \
+        -in "test.exe" -out "test_261.exe" && \
    ../../osslsigncode extract-signature -pem \
-        -in "test_311.exe" -out "sign_pe.pem"
-    verify_signature "$?" "311" "exe" "success" "@2019-09-01 12:00:00" \
-	"sha256sum" "ASCII" "osslsigncode" "UNUSED_PATTERN"
+        -in "test_261.exe" -out "sign_pe.pem"
+    verify_signature "$?" "261" "exe" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
  fi

 # CAB file
-test_name="312. Extract the signature from the CAB file"
+test_name="262. Extract the PEM signature from the CAB file"
 printf "\n%s\n" "$test_name"
 if [ -s "test.ex_" ]
  then
-    ../../osslsigncode sign -h sha256 \
+    ../../osslsigncode sign -h sha512 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "test.ex_" -out "test_312.ex_" && \
+        -in "test.ex_" -out "test_262.ex_" && \
    ../../osslsigncode extract-signature -pem \
-        -in "test_312.ex_" -out "sign_cab.pem"
-    verify_signature "$?" "312" "ex_" "success" "@2019-09-01 12:00:00" \
-	"sha256sum" "ASCII" "osslsigncode" "UNUSED_PATTERN"
+        -in "test_262.ex_" -out "sign_cab.pem"
+    verify_signature "$?" "262" "ex_" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
  fi

 # MSI file
-test_name="313. Extract the signature from the MSI file"
+test_name="263. Extract the PEM signature from the MSI file"
 printf "\n%s\n" "$test_name"
 if test -s "sample.msi"
  then
-    ../../osslsigncode sign -h sha256 \
+    ../../osslsigncode sign -h sha512 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "sample.msi" -out "test_313.msi" && \
+        -in "sample.msi" -out "test_263.msi" && \
    ../../osslsigncode extract-signature -pem \
-        -in "test_313.msi" -out "sign_msi.pem"
-    verify_signature "$?" "313" "msi" "success" "@2019-09-01 12:00:00" \
-	"sha256sum" "ASCII" "osslsigncode" "UNUSED_PATTERN"
+        -in "test_263.msi" -out "sign_msi.pem"
+    verify_signature "$?" "263" "msi" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
--- a/tests/recipes/27_extract_signature_der
+++ b/tests/recipes/27_extract_signature_der
@ -0,0 +1,61 @@
+#!/bin/sh
+# Extract the signature in the DER format from the PE/CAB/MSI file.
+
+. $(dirname $0)/../test_library
+script_path=$(pwd)
+
+# PE file
+test_name="271. Extract the DER signature from the PE file"
+printf "\n%s\n" "$test_name"
+if test -s "test.exe"
+  then
+    ../../osslsigncode sign -h sha512 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "test.exe" -out "test_271.exe" && \
+    ../../osslsigncode extract-signature \
+        -in "test_271.exe" -out "sign_pe.der"
+    verify_signature "$?" "271" "exe" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+# CAB file
+test_name="272. Extract the DER signature from the CAB file"
+printf "\n%s\n" "$test_name"
+if [ -s "test.ex_" ]
+  then
+    ../../osslsigncode sign -h sha512 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "test.ex_" -out "test_272.ex_" && \
+    ../../osslsigncode extract-signature \
+        -in "test_272.ex_" -out "sign_cab.der"
+    verify_signature "$?" "272" "ex_" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+# MSI file
+test_name="273. Extract the DER signature from the MSI file"
+printf "\n%s\n" "$test_name"
+if test -s "sample.msi"
+  then
+    ../../osslsigncode sign -h sha512 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "sample.msi" -out "test_273.msi" && \
+    ../../osslsigncode extract-signature \
+        -in "test_273.msi" -out "sign_msi.der"
+    verify_signature "$?" "273" "msi" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+exit 0
--- a/tests/recipes/31_attach_signature_der
+++ b/tests/recipes/31_attach_signature_der
@ -0,0 +1,58 @@
+#!/bin/sh
+# Attach the DER signature to the PE/CAB/MSI file.
+
+. $(dirname $0)/../test_library
+script_path=$(pwd)
+
+# PE file
+test_name="311. Attach the DER signature to the PE file"
+printf "\n%s\n" "$test_name"
+if test -s "test.exe"
+  then
+    ../../osslsigncode attach-signature \
+        -sigin "sign_pe.der" \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "test.exe" -out "test_311.exe"
+    verify_signature "$?" "311" "exe" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+# CAB file
+test_name="312. Attach the DER signature to the CAB file"
+printf "\n%s\n" "$test_name"
+if [ -s "test.ex_" ]
+  then
+    ../../osslsigncode attach-signature \
+        -sigin "sign_cab.der" \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "test.ex_" -out "test_312.ex_"
+    verify_signature "$?" "312" "ex_" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+# MSI file
+test_name="313. Attach the DER signature to the MSI file"
+printf "\n%s\n" "$test_name"
+if test -s "sample.msi"
+  then
+    ../../osslsigncode attach-signature \
+        -sigin "sign_msi.der" \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "sample.msi" -out "test_313.msi"
+    verify_signature "$?" "313" "msi" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+exit 0
--- a/tests/recipes/32_attach_signature_pem
+++ b/tests/recipes/32_attach_signature_pem
@ -1,52 +1,55 @@
 #!/bin/sh
-# Attach the signature to the PE/CAB/MSI file.
+# Attach the PEM signature to the PE/CAB/MSI file.

 . $(dirname $0)/../test_library
 script_path=$(pwd)

 # PE file
-test_name="321. Attach the signature to the PE file"
+test_name="321. Attach the PEM signature to the PE file"
 printf "\n%s\n" "$test_name"
 if test -s "test.exe"
  then
-    ../../osslsigncode attach-signature -sigin "sign_pe.pem" \
+    ../../osslsigncode attach-signature \
+        -sigin "sign_pe.pem" \
        -CAfile "${script_path}/../certs/CACert.pem" \
        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
        -in "test.exe" -out "test_321.exe"
    verify_signature "$?" "321" "exe" "success" "@2019-09-01 12:00:00" \
-	"sha256sum" "ASCII" "osslsigncode" "UNUSED_PATTERN"
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
  fi

 # CAB file
-test_name="322. Attach the signature to the CAB file"
+test_name="322. Attach the PEM signature to the CAB file"
 printf "\n%s\n" "$test_name"
 if [ -s "test.ex_" ]
  then
-    ../../osslsigncode attach-signature -sigin "sign_cab.pem" \
+    ../../osslsigncode attach-signature \
+        -sigin "sign_cab.pem" \
        -CAfile "${script_path}/../certs/CACert.pem" \
        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
        -in "test.ex_" -out "test_322.ex_"
    verify_signature "$?" "322" "ex_" "success" "@2019-09-01 12:00:00" \
-	"sha256sum" "ASCII" "osslsigncode" "UNUSED_PATTERN"
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
  fi

 # MSI file
-test_name="323. Attach the signature to the MSI file"
+test_name="323. Attach the PEM signature to the MSI file"
 printf "\n%s\n" "$test_name"
 if test -s "sample.msi"
  then
-    ../../osslsigncode attach-signature -sigin "sign_msi.pem" \
+    ../../osslsigncode attach-signature \
+        -sigin "sign_msi.pem" \
        -CAfile "${script_path}/../certs/CACert.pem" \
        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
        -in "sample.msi" -out "test_323.msi"
    verify_signature "$?" "323" "msi" "success" "@2019-09-01 12:00:00" \
-	"sha256sum" "ASCII" "osslsigncode" "UNUSED_PATTERN"
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
--- a/tests/recipes/33_attach_signed
+++ b/tests/recipes/33_attach_signed
@ -0,0 +1,69 @@
+#!/bin/sh
+# Attach the signature to the signed PE/CAB/MSI file.
+
+. $(dirname $0)/../test_library
+script_path=$(pwd)
+
+# PE file
+test_name="331. Attach the signature to the signed PE file"
+printf "\n%s\n" "$test_name"
+if test -s "test.exe"
+  then
+    ../../osslsigncode sign -h sha256 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "test.exe" -out "test_331_signed.exe"
+    ../../osslsigncode attach-signature \
+        -sigin "sign_pe.pem" \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "test_331_signed.exe" -out "test_331.exe"
+    verify_signature "$?" "331" "exe" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+# CAB file
+test_name="332. Attach the signature to the signed CAB file"
+printf "\n%s\n" "$test_name"
+if [ -s "test.ex_" ]
+  then
+    ../../osslsigncode sign -h sha256 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "test.ex_" -out "test_332_signed.ex_"
+    ../../osslsigncode attach-signature \
+        -sigin "sign_cab.pem" \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "test_332_signed.ex_" -out "test_332.ex_"
+    verify_signature "$?" "332" "ex_" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+# MSI file
+test_name="333. Attach the signature to the signed MSI file"
+printf "\n%s\n" "$test_name"
+if test -s "sample.msi"
+  then
+    ../../osslsigncode sign -h sha256 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "sample.msi" -out "test_333_signed.msi"
+    ../../osslsigncode attach-signature -sigin "sign_msi.pem" \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "test_333_signed.msi" -out "test_333.msi"
+    verify_signature "$?" "333" "msi" "success" "@2019-09-01 12:00:00" \
+	"sha256sum" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+exit 0
--- a/tests/recipes/34_attach_nest
+++ b/tests/recipes/34_attach_nest
@ -0,0 +1,74 @@
+#!/bin/sh
+# Attach the signature to the signed PE/CAB/MSI file with the "nest" flag
+# in order to attach the new signature instead of replacing the first one.
+
+. $(dirname $0)/../test_library
+script_path=$(pwd)
+
+# PE file
+test_name="341. Attach the signature to the signed PE file with the nest flag"
+printf "\n%s\n" "$test_name"
+if test -s "test.exe"
+  then
+    ../../osslsigncode sign -h sha256 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "test.exe" -out "test_341_signed.exe"
+    ../../osslsigncode attach-signature \
+        -sigin "sign_pe.pem" \
+        -nest \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "test_341_signed.exe" -out "test_341.exe"
+    verify_signature "$?" "341" "exe" "success" "@2019-09-01 12:00:00" \
+	"UNUSED_PATTERN" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+# CAB file
+test_name="342. Attach the signature to the signed CAB file with the nest flag"
+printf "\n%s\n" "$test_name"
+if test -s "test.ex_"
+  then
+    ../../osslsigncode sign -h sha256 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "test.ex_" -out "test_342_signed.ex_"
+    ../../osslsigncode attach-signature \
+        -sigin "sign_cab.pem" \
+        -nest \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "test_342_signed.ex_" -out "test_342.ex_"
+    verify_signature "$?" "342" "ex_" "success" "@2019-09-01 12:00:00" \
+	"UNUSED_PATTERN" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+# MSI file
+test_name="343. Attach the signature to the signed MSI file with the nest flag"
+printf "\n%s\n" "$test_name"
+if test -s "sample.msi"
+  then
+    ../../osslsigncode sign -h sha256 \
+        -st "1556668800" \
+        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
+        -in "sample.msi" -out "test_343_signed.msi"
+    ../../osslsigncode attach-signature \
+        -sigin "sign_msi.pem" \
+        -nest \
+        -CAfile "${script_path}/../certs/CACert.pem" \
+        -CRLfile "${script_path}/../certs/CACertCRL.pem" \
+        -in "test_343_signed.msi" -out "test_343.msi"
+    verify_signature "$?" "343" "msi" "success" "@2019-09-01 12:00:00" \
+	"UNUSED_PATTERN" "ASCII" "SHA512" "UNUSED_PATTERN"
+    test_result "$?" "$test_name"
+  else
+    printf "Test skipped\n"
+  fi
+
+exit 0
--- a/tests/recipes/35_remove_signature
+++ b/tests/recipes/35_remove_signature
@ -5,54 +5,54 @@
 script_path=$(pwd)

 # PE file
-test_name="331. Remove the signature from the PE file"
+test_name="351. Remove the signature from the PE file"
 printf "\n%s\n" "$test_name"
 if test -s "test.exe"
  then
    ../../osslsigncode sign -h sha256 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "test.exe" -out "test_331_signed.exe" && \
+        -in "test.exe" -out "test_351_signed.exe" && \
    ../../osslsigncode remove-signature \
-        -in "test_331_signed.exe" -out "test_331.exe"
-    verify_signature "$?" "331" "exe" "fail" "@2019-09-01 12:00:00" \
-	"sha256sum" "UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN"
+        -in "test_351_signed.exe" -out "test_351.exe"
+    verify_signature "$?" "351" "exe" "fail" "@2019-09-01 12:00:00" \
+	"UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
  fi

 # CAB file
-test_name="332. Remove the signature from the CAB file"
+test_name="352. Remove the signature from the CAB file"
 printf "\n%s\n" "$test_name"
 if [ -s "test.ex_" ]
  then
    ../../osslsigncode sign -h sha256 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "test.ex_" -out "test_332_signed.ex_" && \
+        -in "test.ex_" -out "test_352_signed.ex_" && \
    ../../osslsigncode remove-signature \
-        -in "test_332_signed.ex_" -out "test_332.ex_"
-    verify_signature "$?" "332" "ex_" "fail" "@2019-09-01 12:00:00" \
-	"sha256sum" "UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN"
+        -in "test_352_signed.ex_" -out "test_352.ex_"
+    verify_signature "$?" "352" "ex_" "fail" "@2019-09-01 12:00:00" \
+	"UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
  fi

 # MSI file
-test_name="333. Remove the signature from the MSI file"
+test_name="353. Remove the signature from the MSI file"
 printf "\n%s\n" "$test_name"
 if test -s "sample.msi"
  then
    ../../osslsigncode sign -h sha256 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "sample.msi" -out "test_333_signed.msi" && \
+        -in "sample.msi" -out "test_353_signed.msi" && \
    ../../osslsigncode remove-signature \
-        -in "test_333_signed.msi" -out "test_333.msi"
-    verify_signature "$?" "333" "msi" "fail" "@2019-09-01 12:00:00" \
-	"sha256sum" "UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN"
+        -in "test_353_signed.msi" -out "test_353.msi"
+    verify_signature "$?" "353" "msi" "fail" "@2019-09-01 12:00:00" \
+	"UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
--- a/tests/recipes/36_varia_sha256sum
+++ b/tests/recipes/36_varia_sha256sum
@ -1,11 +1,11 @@
 #!/bin/sh
-# Checking SHA256 message digests for 31x-34x tests.
+# Checking SHA256 message digests for 31x-33x tests.

 . $(dirname $0)/../test_library
 res=0
 res=0
 skip=0
-test_name="351. Checking SHA256 message digests for 31x-34x tests"
+test_name="361. Checking SHA256 message digests for 31x-33x tests"
 printf "\n%s\n" "$test_name"
 if test -s "test.exe"
  then
@ -14,8 +14,6 @@ if test -s "test.exe"
        res=1
        cat "sha256sum_exe.log" >> "results.log"
        printf "Non-unique SHA256 message digests found\n" >> "results.log"
-      else
-        rm -f test_3[1-4]*[1-2]*.exe
      fi
    rm -f "sha256sum_exe.log"
  else
@ -29,8 +27,6 @@ if test -s "test.ex_"
        res=1
        cat "sha256sum_ex_.log" >> "results.log"
        printf "Non-unique SHA256 message digests found\n" >> "results.log"
-      else
-        rm -f test_3[1-4]*[1-2]*.ex_
      fi
    rm -f "sha256sum_ex_.log"
  else
@ -44,8 +40,6 @@ if test -s "sample.msi"
        res=1
        cat "sha256sum_msi.log" >> "results.log"
        printf "Non-unique SHA256 message digests found\n" >> "results.log"
-      else
-        rm -f test_3[1-4]*[1-2]*.msi
      fi
    rm -f "sha256sum_msi.log"
  else
--- a/tests/recipes/39_add_signature_blob
+++ b/tests/recipes/39_add_signature_blob
@ -5,18 +5,18 @@
 script_path=$(pwd)

 # PE file
-test_name="361. Add an unauthenticated blob to the PE file"
+test_name="391. Add an unauthenticated blob to the PE file"
 printf "\n%s\n" "$test_name"
 if test -s "test.exe"
  then
    ../../osslsigncode sign -h sha256 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "test.exe" -out "test_361_signed.exe"
+        -in "test.exe" -out "test_391_signed.exe"
    ../../osslsigncode add \
        -addUnauthenticatedBlob \
-        -in "test_361_signed.exe" -out "test_361.exe"
-    verify_signature "$?" "361" "exe" "success" "@2019-09-01 12:00:00" \
+        -in "test_391_signed.exe" -out "test_391.exe"
+    verify_signature "$?" "391" "exe" "success" "@2019-09-01 12:00:00" \
 	"UNUSED_PATTERN" "ASCII" "BEGIN_BLOB" "MODIFY"
    test_result "$?" "$test_name"
  else
@ -24,18 +24,18 @@ if test -s "test.exe"
  fi

 # CAB file
-test_name="362. Add an unauthenticated blob to the CAB file"
+test_name="392. Add an unauthenticated blob to the CAB file"
 printf "\n%s\n" "$test_name"
 if test -s "test.ex_"
  then
    ../../osslsigncode sign -h sha256 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "test.ex_" -out "test_362_signed.ex_"
+        -in "test.ex_" -out "test_392_signed.ex_"
    ../../osslsigncode add \
        -addUnauthenticatedBlob \
-        -in "test_362_signed.ex_" -out "test_362.ex_"
-    verify_signature "$?" "362" "ex_" "success" "@2019-09-01 12:00:00" \
+        -in "test_392_signed.ex_" -out "test_392.ex_"
+    verify_signature "$?" "392" "ex_" "success" "@2019-09-01 12:00:00" \
 	"UNUSED_PATTERN" "ASCII" "BEGIN_BLOB" "MODIFY"
    test_result "$?" "$test_name"
  else
@ -43,18 +43,18 @@ if test -s "test.ex_"
  fi

 # MSI file
-test_name="363. Add an unauthenticated blob to the MSI file"
+test_name="393. Add an unauthenticated blob to the MSI file"
 printf "\n%s\n" "$test_name"
 if test -s "sample.msi"
  then
    ../../osslsigncode sign -h sha256 \
        -st "1556668800" \
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/key.pem" \
-        -in "sample.msi" -out "test_363_signed.msi"
+        -in "sample.msi" -out "test_393_signed.msi"
    ../../osslsigncode add \
        -addUnauthenticatedBlob \
-        -in "test_363_signed.msi" -out "test_363.msi"
-    verify_signature "$?" "363" "msi" "success" "@2019-09-01 12:00:00" \
+        -in "test_393_signed.msi" -out "test_393.msi"
+    verify_signature "$?" "393" "msi" "success" "@2019-09-01 12:00:00" \
 	"UNUSED_PATTERN" "ASCII" "BEGIN_BLOB" "MODIFY"
    test_result "$?" "$test_name"
  else
--- a/tests/recipes/41_sign_add_msi_dse
+++ b/tests/recipes/41_sign_add_msi_dse
@ -25,9 +25,8 @@ if test -s "sample.msi"
        -certs "${script_path}/../certs/cert.pem" -key "${script_path}/../certs/keyp.pem" \
        -pass passme \
        -in "sample.msi" -out "test_411.msi"
-#"MsiDigitalSignatureEx 4d00730069004400690067006900740061006c005300690067006e0061007400750072006500450078"
    verify_signature "$?" "411" "msi" "success" "@2019-09-01 12:00:00" \
-	"UNUSED_PATTERN" "HEX" "4d00730069004400690067006900740061006c005300690067006e0061007400750072006500450078" "UNUSED_PATTERN"
+	"UNUSED_PATTERN" "HEX" "MsiDigitalSignatureEx" "UNUSED_PATTERN"
    test_result "$?" "$test_name"
  else
    printf "Test skipped\n"
--- a/tests/test_library
+++ b/tests/test_library
@ -113,12 +113,7 @@ verify_signature() {
        fi
      if test "$6" = "sha256sum"
        then
-          if test -s "test_$2_signed.$3"
-            then
-              sha256sum "test_$2_signed.$3" 2>> "sha256sum_$3.log" 1>&2
-            else
-              sha256sum "test_$2.$3" 2>> "sha256sum_$3.log" 1>&2
-            fi
+          sha256sum "test_$2.$3" 2>> "sha256sum_$3.log" 1>&2
        fi
      if test "$4" = "success" -a "$result" -eq 0
        then
--- a/tests/testall.sh
+++ b/tests/testall.sh
@ -91,7 +91,7 @@ if grep -q "no libgsf available" "results.log"
 # Timestamping support
 if grep -q "no libcurl available" "results.log"
  then
-    printf "%s\n" "configure --with_curl is required for timestamping support"
+    printf "%s\n" "configure --with-curl is required for timestamping support"
  fi

 # Tests requirements
@ -102,6 +102,7 @@ if test -n "$(command -v faketime)"
        make_tests
        result=$?
        rm -f "test.exe" "test.ex_" "sample.msi" "sample.wxs" "FoobarAppl10.exe"
+        rm -f "sign_pe.der" "sign_cab.der" "sign_msi.der"
        rm -f "sign_pe.pem" "sign_cab.pem" "sign_msi.pem" "verify.log"
      else
        printf "%s\n" "xxd not found in \$PATH"