Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 7c4799d

Browse files
authored
Fix yhirose#1798 for CMake (yhirose#1944)
1 parent c239087 commit 7c4799d

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

‎test/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ file(
3737
)
3838

3939
if(HTTPLIB_IS_USING_OPENSSL)
40+
if (OPENSSL_VERSION VERSION_LESS "3.2.0")
41+
set(OPENSSL_X509_FLAG "-x509")
42+
else()
43+
set(OPENSSL_X509_FLAG "-x509v1")
44+
endif()
4045
find_program(OPENSSL_COMMAND
4146
NAMES openssl
4247
PATHS ${OPENSSL_INCLUDE_DIR}/../bin
@@ -56,7 +61,7 @@ if(HTTPLIB_IS_USING_OPENSSL)
5661
COMMAND_ERROR_IS_FATAL ANY
5762
)
5863
execute_process(
59-
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
64+
COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
6065
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
6166
COMMAND_ERROR_IS_FATAL ANY
6267
)
@@ -67,7 +72,7 @@ if(HTTPLIB_IS_USING_OPENSSL)
6772
COMMAND_ERROR_IS_FATAL ANY
6873
)
6974
execute_process(
70-
COMMAND ${OPENSSL_COMMAND} req -x509 -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024
75+
COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024
7176
OUTPUT_FILE rootCA.cert.pem
7277
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
7378
COMMAND_ERROR_IS_FATAL ANY

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /