From 34932d9194c1c766169b5f52bdbda3c73d38e139 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 18 Sep 2024 20:16:06 -0600 Subject: [PATCH] Use gen-certs.sh for cmake as well, fixes #1798 for cmake --- test/CMakeLists.txt | 75 ++------------------------------------------- 1 file changed, 3 insertions(+), 72 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f526047..5db77d4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -29,7 +29,7 @@ find_package(CURL REQUIRED) add_executable(httplib-test test.cc) target_compile_options(httplib-test PRIVATE "$<$:/utf-8;/bigobj>") target_link_libraries(httplib-test PRIVATE httplib GTest::gtest_main CURL::libcurl) -gtest_discover_tests(httplib-test) +gtest_discover_tests(httplib-test WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) file( COPY www www2 www3 ca-bundle.crt image.jpg @@ -37,78 +37,9 @@ file( ) if(HTTPLIB_IS_USING_OPENSSL) - find_program(OPENSSL_COMMAND - NAMES openssl - PATHS ${OPENSSL_INCLUDE_DIR}/../bin - REQUIRED - ) execute_process( - COMMAND ${OPENSSL_COMMAND} genrsa 2048 - OUTPUT_FILE key.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem - COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key.pem - OUTPUT_FILE cert.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} req -x509 -new -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} genrsa 2048 - OUTPUT_FILE rootCA.key.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} req -x509 -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024 - OUTPUT_FILE rootCA.cert.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} genrsa 2048 - OUTPUT_FILE client.key.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client.key.pem - COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial - OUTPUT_FILE client.cert.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} genrsa -passout pass:test123! 2048 - OUTPUT_FILE key_encrypted.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key_encrypted.pem - COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key_encrypted.pem - OUTPUT_FILE cert_encrypted.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} genrsa -aes256 -passout pass:test012! 2048 - OUTPUT_FILE client_encrypted.key.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - execute_process( - COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client_encrypted.key.pem -passin pass:test012! - COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial - OUTPUT_FILE client_encrypted.cert.pem - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_CURRENT_LIST_DIR}/gen-certs.sh + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} COMMAND_ERROR_IS_FATAL ANY ) endif()