diff --git a/cmake/CMakeTest.cmake b/cmake/CMakeTest.cmake index 7e8a664..f280b41 100644 --- a/cmake/CMakeTest.cmake +++ b/cmake/CMakeTest.cmake @@ -40,10 +40,10 @@ if(NOT CMAKE_HOST_WIN32) else() set(makecerts_result 1) endif() - if(makecerts_result) + message(STATUS "makecerts.sh failed") if(makecerts_output) - message(STATUS "makecerts.sh failed: ${makecerts_output}") + message(STATUS "${makecerts_output}") endif() file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/tests/certs" DESTINATION "${PROJECT_BINARY_DIR}/Testing" diff --git a/tests/certs/tsa-serial b/tests/certs/tsa-serial deleted file mode 100644 index 487db5f..0000000 --- a/tests/certs/tsa-serial +++ /dev/null @@ -1 +0,0 @@ -7f6f24f728adda6a80c55f00607e8ad9 diff --git a/tests/conf/makecerts.sh b/tests/conf/makecerts.sh old mode 100644 new mode 100755 index fb19b0b..654de41 --- a/tests/conf/makecerts.sh +++ b/tests/conf/makecerts.sh @@ -37,7 +37,7 @@ make_certs() { echo 1001 > "CA/crlnumber" date > "makecerts.log" "$OPENSSL" version 2>> "makecerts.log" 1>&2 - echo -n "$password" > "password.txt" + echo -n "$password" > tmp/password.txt printf "\nGenerate root CA certificate\n" >> "makecerts.log" "$OPENSSL" genrsa -out CA/CA.key \ @@ -231,7 +231,8 @@ make_certs() { -a -s tmp/crosscert.pem -a -s tmp/expired.pem -a -s tmp/revoked.pem -a -s tmp/revoked.spc \ -a -s tmp/TSA.pem -a -s tmp/TSA.key -a -s tmp/tsa-chain.pem then - cp tmp/* ./ + mkdir "../certs" + cp tmp/* ../certs printf "%s" "keys & certificates successfully generated" else printf "%s" "error logs ${result_path}/makecerts.log"