diff options
author | Brent Cook <busterb@gmail.com> | 2023-07-04 02:17:58 +0300 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2023-07-04 03:29:19 +0300 |
commit | b16ad4dbd4143aa27e89744a635ebd7d48697af4 (patch) | |
tree | ea2b7a06ca7b67cfd9d1726d0301fbf2eaa845ca /tests | |
parent | 2722f95501a11cddf4494b15ac75bca2332ee5ea (diff) | |
download | portable-b16ad4dbd4143aa27e89744a635ebd7d48697af4.tar.gz portable-b16ad4dbd4143aa27e89744a635ebd7d48697af4.tar.bz2 portable-b16ad4dbd4143aa27e89744a635ebd7d48697af4.zip |
disable client / server tests for now
These were broken with the removal of TLS 1.0/1.1 support due to
static checks in packet structure.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CMakeLists.txt | 28 | ||||
-rw-r--r-- | tests/Makefile.am | 9 |
2 files changed, 20 insertions, 17 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7a7e391..48d2da7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt | |||
@@ -263,9 +263,10 @@ target_link_libraries(cipherstest ${OPENSSL_TEST_LIBS}) | |||
263 | add_test(cipherstest cipherstest) | 263 | add_test(cipherstest cipherstest) |
264 | 264 | ||
265 | # clienttest | 265 | # clienttest |
266 | # Disabled for now after removal of TLS 1.0/1.1 support | ||
266 | add_executable(clienttest clienttest.c) | 267 | add_executable(clienttest clienttest.c) |
267 | target_link_libraries(clienttest ${OPENSSL_TEST_LIBS}) | 268 | target_link_libraries(clienttest ${OPENSSL_TEST_LIBS}) |
268 | add_test(clienttest clienttest) | 269 | #add_test(clienttest clienttest) |
269 | 270 | ||
270 | # cmstest | 271 | # cmstest |
271 | add_executable(cmstest cmstest.c) | 272 | add_executable(cmstest cmstest.c) |
@@ -581,14 +582,15 @@ add_test(rsa_test rsa_test) | |||
581 | # server.c | 582 | # server.c |
582 | 583 | ||
583 | # servertest | 584 | # servertest |
585 | # Disabled for now after removal of TLS 1.0/1.1 support | ||
584 | add_executable(servertest servertest.c) | 586 | add_executable(servertest servertest.c) |
585 | target_link_libraries(servertest ${OPENSSL_TEST_LIBS}) | 587 | target_link_libraries(servertest ${OPENSSL_TEST_LIBS}) |
586 | if(NOT MSVC) | 588 | #if(NOT MSVC) |
587 | add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh) | 589 | # add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh) |
588 | else() | 590 | #else() |
589 | add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat $<TARGET_FILE:servertest>) | 591 | # add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat $<TARGET_FILE:servertest>) |
590 | endif() | 592 | #endif() |
591 | set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") | 593 | #set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") |
592 | 594 | ||
593 | # sha_test | 595 | # sha_test |
594 | add_executable(sha_test sha_test.c) | 596 | add_executable(sha_test sha_test.c) |
@@ -657,12 +659,12 @@ add_test(ssl_versions ssl_versions) | |||
657 | # ssltest | 659 | # ssltest |
658 | add_executable(ssltest ssltest.c) | 660 | add_executable(ssltest ssltest.c) |
659 | target_link_libraries(ssltest ${OPENSSL_TEST_LIBS}) | 661 | target_link_libraries(ssltest ${OPENSSL_TEST_LIBS}) |
660 | if(NOT MSVC) | 662 | #if(NOT MSVC) |
661 | add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) | 663 | # add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) |
662 | else() | 664 | #else() |
663 | add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $<TARGET_FILE:ssltest> $<TARGET_FILE:openssl>) | 665 | # add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $<TARGET_FILE:ssltest> $<TARGET_FILE:openssl>) |
664 | endif() | 666 | #endif() |
665 | set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") | 667 | #set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") |
666 | 668 | ||
667 | # string_table | 669 | # string_table |
668 | add_executable(string_table string_table.c) | 670 | add_executable(string_table string_table.c) |
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2353396..f2ebbdf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
@@ -279,7 +279,8 @@ check_PROGRAMS += cipherstest | |||
279 | cipherstest_SOURCES = cipherstest.c | 279 | cipherstest_SOURCES = cipherstest.c |
280 | 280 | ||
281 | # clienttest | 281 | # clienttest |
282 | TESTS += clienttest | 282 | # Disabled for now after removal of TLS 1.0/1.1 support |
283 | #TESTS += clienttest | ||
283 | check_PROGRAMS += clienttest | 284 | check_PROGRAMS += clienttest |
284 | clienttest_SOURCES = clienttest.c | 285 | clienttest_SOURCES = clienttest.c |
285 | 286 | ||
@@ -616,7 +617,8 @@ rsa_test_SOURCES = rsa_test.c | |||
616 | # server.c | 617 | # server.c |
617 | 618 | ||
618 | # servertest | 619 | # servertest |
619 | TESTS += servertest.sh | 620 | # Disabled for now after removal of TLS 1.0/1.1 support |
621 | #TESTS += servertest.sh | ||
620 | check_PROGRAMS += servertest | 622 | check_PROGRAMS += servertest |
621 | servertest_SOURCES = servertest.c | 623 | servertest_SOURCES = servertest.c |
622 | EXTRA_DIST += servertest.sh servertest.bat | 624 | EXTRA_DIST += servertest.sh servertest.bat |
@@ -676,7 +678,7 @@ check_PROGRAMS += ssl_versions | |||
676 | ssl_versions_SOURCES = ssl_versions.c | 678 | ssl_versions_SOURCES = ssl_versions.c |
677 | 679 | ||
678 | # ssltest | 680 | # ssltest |
679 | TESTS += ssltest.sh | 681 | #TESTS += ssltest.sh |
680 | check_PROGRAMS += ssltest | 682 | check_PROGRAMS += ssltest |
681 | ssltest_SOURCES = ssltest.c | 683 | ssltest_SOURCES = ssltest.c |
682 | EXTRA_DIST += ssltest.sh ssltest.bat | 684 | EXTRA_DIST += ssltest.sh ssltest.bat |
@@ -693,7 +695,6 @@ EXTRA_DIST += server2-ecdsa.pem server2-rsa-chain.pem server2-rsa.pem | |||
693 | EXTRA_DIST += server3-ecdsa-chain.pem server3-ecdsa.pem server3-rsa-chain.pem | 695 | EXTRA_DIST += server3-ecdsa-chain.pem server3-ecdsa.pem server3-rsa-chain.pem |
694 | EXTRA_DIST += server3-rsa.pem | 696 | EXTRA_DIST += server3-rsa.pem |
695 | 697 | ||
696 | |||
697 | # string_table | 698 | # string_table |
698 | TESTS += string_table | 699 | TESTS += string_table |
699 | check_PROGRAMS += string_table | 700 | check_PROGRAMS += string_table |